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 523FBA0543 for ; Sat, 5 Nov 2022 18:12:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CBDD40151; Sat, 5 Nov 2022 18:12:28 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id A052A400D5 for ; Sat, 5 Nov 2022 18:12:26 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id a14so10883999wru.5 for ; Sat, 05 Nov 2022 10:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S3+TWy40VVIj2u3ByVfGnWijpmR+AAqYLS4wKqvrQ0M=; b=SHYNNtil8BnDYCnR6TVJ5nFKXw94AIQNOQx0gqgg9nxRY/BJiUSjiLWEzwbMxgFSLX cRWpa6eVx3RLOXD3AIlepWXQyJrfiJL40DjLi5uebtnOmrrL7xb0tIxVBaaEE48J6tER HC5HFimRIW3ZBnZkr08UFWB9w+mRLJQzFWrPchOYTh9Bo29za4U8+ZTG5mUo+jSM31gI opKpMb2wAORl+QKAvx/Pj49Bv1YuiS0ZrUtW0ZTbqnkCTVxAvMaGQVRleNnTDGhrQHDq D3goKxYNL3QjcYvcArhnsNTM21pmXhgyn0Y8Xg9HzcbQxOX3INqB9MT8oagPUNP4kBrz iwoA== 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=S3+TWy40VVIj2u3ByVfGnWijpmR+AAqYLS4wKqvrQ0M=; b=RcYssAqyQmpyLmrHs1OXg5qL+04FkcWj/eAn94SF7e3qqZ1lPPXSUHRpRVXzrmbDyN e8HlLloQYK+K0AhPb82jqrIcToHBkyiIh86nuzvc3NfcQyj49o6tdncMmH4cIh99/P6/ 6lpiQCSQu2FeCf7L4y8tT6HqsQWaoDYITomxrJysaiLl2/wN04ruSuvZIT8zsTEikq86 QZkLRWjR1awh3IG6KOBM2RMv1rWvOik932TmMydjr/HiSbdzcpMUS5NkF1eYKLx4m9ko 98w2frrTfhfZXDWrtpHNvo/lvJ8fdH3QvGxAdTW5nJKtxnGFgDQBOsYn1edcUP308Z3a 6xHQ== X-Gm-Message-State: ACrzQf2DiiGatcbbA1d/PR8lQF4Lrx5o5FvwfJX0ZzrN/kopAVO8Jl4Y mvS4DDV1xJah2vrA4RcCiGj6PZMYzMI= X-Google-Smtp-Source: AMsMyM4CsVdBEq5ZvbNC2niom/IqhhBHIbGJDss64G36TOaqIv0d4rcRwsGbAbElBHsU58Cba11aFA== X-Received: by 2002:adf:f352:0:b0:236:ba3a:d58e with SMTP id e18-20020adff352000000b00236ba3ad58emr23833316wrp.430.1667668346380; Sat, 05 Nov 2022 10:12:26 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id s13-20020a5d69cd000000b0023659925b2asm2614140wrw.51.2022.11.05.10.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Naga Harish K S V Cc: dpdk stable Subject: patch 'eventdev/eth_tx: fix queue delete' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:11 +0000 Message-Id: <20221105171146.1520039-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.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 20.11.7 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/07/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b6f4010798c294a8dc92869a994447990550bd25 Thanks. Luca Boccassi --- >From b6f4010798c294a8dc92869a994447990550bd25 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 20470d8a58..8870071a8b 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c @@ -821,6 +821,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; @@ -833,10 +835,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:09.764224169 +0000 +++ 0012-eventdev-eth_tx-fix-queue-delete.patch 2022-11-05 17:11:08.598941010 +0000 @@ -1 +1 @@ -From 75c5bfc320fdc41226cbeeb864161268fb344c49 Mon Sep 17 00:00:00 2001 +From b6f4010798c294a8dc92869a994447990550bd25 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 20470d8a58..8870071a8b 100644 +--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c ++++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c +@@ -821,6 +821,8 @@ txa_service_queue_del(uint8_t id, @@ -40 +41 @@ -@@ -946,10 +948,10 @@ txa_service_queue_del(uint8_t id, +@@ -833,10 +835,10 @@ txa_service_queue_del(uint8_t id,