From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1F122A0544 for ; Fri, 11 Nov 2022 12:41:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1AF2D427F2; Fri, 11 Nov 2022 12:41:18 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 4542240141 for ; Fri, 11 Nov 2022 12:41:16 +0100 (CET) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1FC6B423E3 for ; Fri, 11 Nov 2022 11:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166876; bh=fzTKTy1EAr8Y1cY2zzf/xnhfG/95vz97txlDWf1eyRs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hl9IaXhMThvfTBBiGBYkI9fGpLMRjrp8euE2UxrGTAo+HTP0LnSSWHN53QF2jyoxc /Cl6nwX784eEdsH1jer52Ue3q1W+KK4lLNHk2+3iMSWPk+2jOELzMCNAtI2yoRVWnR 1i/0Bp4YR9rmF7LQ7UERf9HF+qOWmDpIoaxgesCGft5sZ4H4HB+XOwrZW1lqTk6F/y AJmQJ0p1RTrWwiFqq6VndNKtpCcIi25HJqFoFWP8dXlkZC6ryiNKQJpv/Te5H9SD2C JsyVAytImp3yIahW5KuikfHDCzN/b/ZWj6HE0IC4H1hPEGutSvRiBQ9+2wZml5+lmP E2K5ibj2oOR/Q== Received: by mail-ej1-f71.google.com with SMTP id xc12-20020a170907074c00b007416699ea14so2889276ejb.19 for ; Fri, 11 Nov 2022 03:41:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fzTKTy1EAr8Y1cY2zzf/xnhfG/95vz97txlDWf1eyRs=; b=4m8E6+7aRso22UwoIFWmDRmf1hXoQxT23BQdCOx3uQtmK38lM0YSQ+lv906NDq9iNJ 7h+DbJ5n6eNMWHvw3piteFbP1qWU7evyBMU1o0+JSX9HR0s7DGSV/c16t42E6Nd4pe+6 LIkKWNkxFknOjF9ZHvVHY+VQMqo9gRE/ThA7VQPRO6isj+eNtAhWRi2FxTpTpoBRlc9X HFlh3ZBWxESM6Wn48Ux2v5tJITS78uLix9HYLD3lQD5yaC7Pwamws8ucqBRiEj4EQ9qU QHtrhptfFF4ILbNnCYc/3Cx4T/Zt5K5tHgIh85EhuTc6kj/JYpeP+NBVxf0LSyxMJBWz 23OA== X-Gm-Message-State: ANoB5pnDLzzd0IggDnrwH9hU/ux89QB8u/ywn9uCtui4LMG7JfK63ynO YJyaUgtfdxCkHxSZfBAQeHskbz+aq2tAj9N8DcMdtqjfEcnzHNc5QTbgXoij66XTNtJ//CGCElA cnpOgMWcKk8G6ckv6k8qsU/2l X-Received: by 2002:a17:907:cb85:b0:7ad:b9a0:8a9b with SMTP id un5-20020a170907cb8500b007adb9a08a9bmr1560460ejc.509.1668166875418; Fri, 11 Nov 2022 03:41:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf7+SS+lF0S4kwCN+tjW4zwg1b82h5xkqCItEBYx7FsaNlx5PMz4+AGuymUK6/BHJ9d9pO2ipA== X-Received: by 2002:a17:907:cb85:b0:7ad:b9a0:8a9b with SMTP id un5-20020a170907cb8500b007adb9a08a9bmr1560446ejc.509.1668166875186; Fri, 11 Nov 2022 03:41:15 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id i2-20020a1709061e4200b007ad84cf1346sm788585ejj.110.2022.11.11.03.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:41:14 -0800 (PST) From: christian.ehrhardt@canonical.com To: Naga Harish K S V Cc: dpdk stable Subject: patch 'eventdev/eth_tx: fix queue delete' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:56 +0100 Message-Id: <20221111113904.1549618-39-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.14 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/18/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/50db92f50bd19a9cf59a893c7a3a88007936a3d1 Thanks. Christian Ehrhardt --- >From 50db92f50bd19a9cf59a893c7a3a88007936a3d1 Mon Sep 17 00:00:00 2001 From: Naga Harish K S V Date: Fri, 21 Oct 2022 01:43:14 -0500 Subject: [PATCH] eventdev/eth_tx: fix queue delete [ upstream commit 75c5bfc320fdc41226cbeeb864161268fb344c49 ] To delete all the queues of an ethdev device associated with adapter instance the queue_id can be passed as -1 to the queue delete API. When a subset of queues of a ethdev device are associated, the queue delete logic is exiting without deleting the queues in some cases (higher numbered associated queues) for above scenario as the queue delete logic is not checking all the queue association status. This patch fixes this issue by checking the queue association status of all the queues of the ethernet device. Fixes: 741b499e6421 ("eventdev/eth_tx: fix queue delete logic") Signed-off-by: Naga Harish K S V --- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c index fa685db42b..f403a584c9 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c @@ -820,6 +820,8 @@ txa_service_queue_del(uint8_t id, uint16_t i, q, nb_queues; int ret = 0; + if (txa->txa_ethdev == NULL) + return 0; nb_queues = txa->txa_ethdev[port_id].nb_queues; if (nb_queues == 0) return 0; @@ -832,10 +834,10 @@ txa_service_queue_del(uint8_t id, if (tqi[q].added) { ret = txa_service_queue_del(id, dev, q); + i++; if (ret != 0) break; } - i++; q++; } return ret; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:06.149543292 +0100 +++ 0039-eventdev-eth_tx-fix-queue-delete.patch 2022-11-11 12:35:04.797192195 +0100 @@ -1 +1 @@ -From 75c5bfc320fdc41226cbeeb864161268fb344c49 Mon Sep 17 00:00:00 2001 +From 50db92f50bd19a9cf59a893c7a3a88007936a3d1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 75c5bfc320fdc41226cbeeb864161268fb344c49 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - lib/eventdev/rte_event_eth_tx_adapter.c | 4 +++- + lib/librte_eventdev/rte_event_eth_tx_adapter.c | 4 +++- @@ -27,5 +28,5 @@ -diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c -index c2a848103b..88309d2aaa 100644 ---- a/lib/eventdev/rte_event_eth_tx_adapter.c -+++ b/lib/eventdev/rte_event_eth_tx_adapter.c -@@ -934,6 +934,8 @@ txa_service_queue_del(uint8_t id, +diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c +index fa685db42b..f403a584c9 100644 +--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c ++++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c +@@ -820,6 +820,8 @@ txa_service_queue_del(uint8_t id, @@ -40 +41 @@ -@@ -946,10 +948,10 @@ txa_service_queue_del(uint8_t id, +@@ -832,10 +834,10 @@ txa_service_queue_del(uint8_t id,