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 8ECC6A0350 for ; Mon, 28 Feb 2022 22:20:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BF7640140; Mon, 28 Feb 2022 22:20:52 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 6EBA540140 for ; Mon, 28 Feb 2022 22:20:50 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id b5so17486074wrr.2 for ; Mon, 28 Feb 2022 13:20:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IkqU9Nxr4UG66i5g44aUQtgmb5cw8gFoGx02V65bFG0=; b=GIqMF1UN/bE5ggu3ehlm1YJX/4lA7HnIfdytqjv/VwTYMGSrHgtWkp8iDYyIV9Tkji sFlRr7YaGouOV7AcBgiMKHAtdOdbB7RihRbjJzOp6zMODzShYb6M1LXwong2l2yx+Vfo OM3Q/fVRPrZqP5/EFqAxUAqPPlrxbte9jy88qiTgA1dQnPskCWrK1ObkR4WQipLXGiu6 qjl/AK0eoGcVXW+InU4x6GMFdM+tUbWDDtLL/dfSb23NkzxHqvnzPwehqAoNkDurQQF0 FRXr0H9QU6XX2O0XjITMqMpb5TgpZH46H5fAfM0AoDIkKTQCAqQfWRM9XU5Ol6EZbl38 wAzA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IkqU9Nxr4UG66i5g44aUQtgmb5cw8gFoGx02V65bFG0=; b=BmNDy5wV5cwcfPighmHGN1aEM+geTTvtgUEF4Eo5PaSfYaPP6Tsoj/MdUh/aNxQvn4 b4ic9JCGoaOFIYAw7u7UwXZ5jsn4gAq0nuIhCUF4ezI3j79WQpVljqy6Ui9vtnOUCANL ASclgeKRM35nfLg1LI9J7FYx3R8Ti+atY87pLG94nZBJ1VmkD0U7NFUCUnFHnS0IxND5 r8Li8JelXoHrObqGtZrZlPxiddPDHex2g4Yd7n9oYsd/Y22jQSYS8jjrAKzzEW/kas4v 3bOi+zfbps9bgJlCHTznByIDlA1Mvrnj8ECahBjdLzJvtSOTAt7PLI423xDWYo5jHp6F yhLg== X-Gm-Message-State: AOAM531zTljZvIoVCEL7XZ7OnsRg/r+jzfXB/FB4isWO1suZa11v69Su PJgMqLX5uDk1dXshHoHQfROLLNhobmlerQ== X-Google-Smtp-Source: ABdhPJzBd9T7/uP52hLxD5WT85jh86WJgTRFIKiU4L96+MhtDqLtTjgClA91UflTkQfDL9m9m4bOGw== X-Received: by 2002:adf:e94a:0:b0:1ea:9bdf:d2c4 with SMTP id m10-20020adfe94a000000b001ea9bdfd2c4mr17462157wrn.176.1646083249916; Mon, 28 Feb 2022 13:20:49 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id v14-20020a7bcb4e000000b0034492fa24c6sm504072wmj.34.2022.02.28.13.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:20:49 -0800 (PST) From: luca.boccassi@gmail.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 20.11.5 Date: Mon, 28 Feb 2022 21:19:57 +0000 Message-Id: <20220228212047.3341966-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-122-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-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.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5d76457095c13677bfab501a3488de0c2bb5fa2e Thanks. Luca Boccassi --- >From 5d76457095c13677bfab501a3488de0c2bb5fa2e 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 2684eb4308..21155362f9 100644 --- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c +++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c @@ -760,10 +760,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) @@ -775,6 +773,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; @@ -790,6 +790,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, @@ -798,7 +802,7 @@ err_unlock: } rte_spinlock_unlock(&txa->tx_lock); - return 0; + return -1; } static int -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:54.121594598 +0000 +++ 0001-eventdev-eth_tx-fix-queue-add-error-code.patch 2022-02-28 21:17:53.776927828 +0000 @@ -1 +1 @@ -From bd0a32d14b87661c39130d73ab4323247b80f864 Mon Sep 17 00:00:00 2001 +From 5d76457095c13677bfab501a3488de0c2bb5fa2e 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 2684eb4308..21155362f9 100644 +--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c ++++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c +@@ -760,10 +760,8 @@ txa_service_queue_add(uint8_t id, @@ -36 +37 @@ -@@ -821,6 +819,8 @@ txa_service_queue_add(uint8_t id, +@@ -775,6 +773,8 @@ txa_service_queue_add(uint8_t id, @@ -45 +46 @@ -@@ -836,6 +836,10 @@ txa_service_queue_add(uint8_t id, +@@ -790,6 +790,10 @@ txa_service_queue_add(uint8_t id, @@ -56 +57 @@ -@@ -844,7 +848,7 @@ err_unlock: +@@ -798,7 +802,7 @@ err_unlock: