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 7EA6FA0093 for ; Wed, 9 Mar 2022 12:01:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 798AA410E8; Wed, 9 Mar 2022 12:01:29 +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 3D04E40687 for ; Wed, 9 Mar 2022 12:01:28 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (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 F31BB3F1FC for ; Wed, 9 Mar 2022 11:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823687; bh=Hv0vvYYp2ZByKfbkL9HKC8Pt542SMKGWstmxwtyV4yo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=BWkRghVnb9a9o2C4MStPI4u42cY9IKR5rq2+3Z2sYq2/7QEAZrp0p9HMOUh3SUcoi DkZLfVM6K1ohHT5L2RtywK5CeMcb5LW2hq99YMq4aGaIT/ynT/r+SMkjz07r2WT8j5 o8bNmzRRVQ20ssLa4ND1HeRhLieDRP80GW16NHNcMh8HB8iU8TQ96GpOZjO42b2B0X RTlzJoHnZHkkAs+9Ak6svexxMGVrwg8FdgUlOpnbMK8y+JjItR4YqaNjZzZN4MVers sLsbvrsbvRO4C95cymeeLBrcDsJSwkVbv8S3jWc+21KWNtVCDz6VzVflP74SZmeFAk kvCHapPz2/sIQ== Received: by mail-wm1-f69.google.com with SMTP id 20-20020a05600c231400b00389886f6b23so823152wmo.6 for ; Wed, 09 Mar 2022 03:01:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Hv0vvYYp2ZByKfbkL9HKC8Pt542SMKGWstmxwtyV4yo=; b=x1F5wsnjCFlKF3seFNhjmzYzfFru6oSd8SXca/3RLcpXg3dt82eyJTAqsbJtNO+bTa apZdZN7gaqMUjUk0L+R9RogaQlfde6QxsIAh5ALqw9NY8JwoL5IUsGuYhOPXt3s6pfz/ AvFJZBbd3cJvIcT2/rLFLaoqPCe33L/+e0xk7f4nef7I0glaASDD1I4hQ2fb/iKgCUj5 vrMz9RPrmpQpZoA/eBt6eI4PLFhczfx1thAJM0RrehtMq3yo1/lXUZAwNsxDhl/Ajknt 2+vnk8k5jCn3Mb3U3ybYse+zq13jKUvIrwI5e10nUrvPh40tO76Qf6I3e+pjk3u1yV7F idDA== X-Gm-Message-State: AOAM531inERpHfQ4K3rYCu3o3aILGFSMBpGcJRocFWySWGOGMaGFYiXt KO3MNLzR9eJG66lcm4bfaNc8mMPneQzX9GzDrtp/9h1TsnKEJhQOHTQcNiQrkQbXP2kS6Q5WiaH yvNt7h1YAPTgjhsI6N0v8MVIk X-Received: by 2002:a05:600c:21d1:b0:381:4fed:159a with SMTP id x17-20020a05600c21d100b003814fed159amr2898961wmj.143.1646823686731; Wed, 09 Mar 2022 03:01:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6IwcLlnnAlCXNAARGVZVcZRrjZzR3JKkdhXTQypSjUHPfgJIoaKHPJf5FTLJ2/+sHV+a1LA== X-Received: by 2002:a05:600c:21d1:b0:381:4fed:159a with SMTP id x17-20020a05600c21d100b003814fed159amr2898937wmj.143.1646823686439; Wed, 09 Mar 2022 03:01:26 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id h36-20020a05600c49a400b00382aa0b1619sm1412438wmp.45.2022.03.09.03.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:01:26 -0800 (PST) From: christian.ehrhardt@canonical.com To: Naga Harish K S V Cc: Jay Jayatheerthan , dpdk stable Subject: patch 'eventdev/eth_tx: fix queue add error code' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:32 +0100 Message-Id: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 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.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/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/c9f51a980e6abb1597db5c9f058041d97d142095 Thanks. Christian Ehrhardt --- >From c9f51a980e6abb1597db5c9f058041d97d142095 Mon Sep 17 00:00:00 2001 From: Naga Harish K S V Date: Tue, 8 Feb 2022 23:31:51 -0600 Subject: [PATCH] eventdev/eth_tx: fix queue add error code [ upstream commit bd0a32d14b87661c39130d73ab4323247b80f864 ] The internal function txa_service_queue_add() is returning 0 in case of error, correct this logic to return a negative value to indicate failure. Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation") Signed-off-by: Naga Harish K S V Acked-by: Jay Jayatheerthan --- lib/librte_eventdev/rte_event_eth_tx_adapter.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c index e4dbae7bc5..38bc79c51b 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c @@ -759,10 +759,8 @@ txa_service_queue_add(uint8_t id, rte_spinlock_lock(&txa->tx_lock); - if (txa_service_is_queue_added(txa, eth_dev, tx_queue_id)) { - rte_spinlock_unlock(&txa->tx_lock); - return 0; - } + if (txa_service_is_queue_added(txa, eth_dev, tx_queue_id)) + goto ret_unlock; ret = txa_service_queue_array_alloc(txa, eth_dev->data->port_id); if (ret) @@ -774,6 +772,8 @@ txa_service_queue_add(uint8_t id, tdi = &txa->txa_ethdev[eth_dev->data->port_id]; tqi = txa_service_queue(txa, eth_dev->data->port_id, tx_queue_id); + if (tqi == NULL) + goto err_unlock; txa_retry = &tqi->txa_retry; txa_retry->id = txa->id; @@ -789,6 +789,10 @@ txa_service_queue_add(uint8_t id, tdi->nb_queues++; txa->nb_queues++; +ret_unlock: + rte_spinlock_unlock(&txa->tx_lock); + return 0; + err_unlock: if (txa->nb_queues == 0) { txa_service_queue_array_free(txa, @@ -797,7 +801,7 @@ err_unlock: } rte_spinlock_unlock(&txa->tx_lock); - return 0; + return -1; } static int -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:43.476103040 +0100 +++ 0001-eventdev-eth_tx-fix-queue-add-error-code.patch 2022-03-09 11:57:43.312937879 +0100 @@ -1 +1 @@ -From bd0a32d14b87661c39130d73ab4323247b80f864 Mon Sep 17 00:00:00 2001 +From c9f51a980e6abb1597db5c9f058041d97d142095 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd0a32d14b87661c39130d73ab4323247b80f864 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eventdev/rte_event_eth_tx_adapter.c | 14 +++++++++----- + lib/librte_eventdev/rte_event_eth_tx_adapter.c | 14 +++++++++----- @@ -19,5 +20,5 @@ -diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c -index c17f33f098..1b304f0a73 100644 ---- a/lib/eventdev/rte_event_eth_tx_adapter.c -+++ b/lib/eventdev/rte_event_eth_tx_adapter.c -@@ -806,10 +806,8 @@ txa_service_queue_add(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 e4dbae7bc5..38bc79c51b 100644 +--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c ++++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c +@@ -759,10 +759,8 @@ txa_service_queue_add(uint8_t id, @@ -36 +37 @@ -@@ -821,6 +819,8 @@ txa_service_queue_add(uint8_t id, +@@ -774,6 +772,8 @@ txa_service_queue_add(uint8_t id, @@ -45 +46 @@ -@@ -836,6 +836,10 @@ txa_service_queue_add(uint8_t id, +@@ -789,6 +789,10 @@ txa_service_queue_add(uint8_t id, @@ -56 +57 @@ -@@ -844,7 +848,7 @@ err_unlock: +@@ -797,7 +801,7 @@ err_unlock: