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 502D4A0350 for ; Mon, 21 Feb 2022 16:43:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B54F41143; Mon, 21 Feb 2022 16:43:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DAFE7410F3 for ; Mon, 21 Feb 2022 16:43:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yWJduCGJ+/r6wCdm5yUkuH0D1fdSiFYkrwQ6LDYiYNU=; b=Tpco4cPNtBoSel4ADAKNL1+SdrqH/wvvnp3cm8VH5KeNppU5LUCe/4wsAxFF3la6qDJqCI 01DrHkUu2xz3iEk0KWulsEEBYG/+l8tzwIUh4zs57D8Je9xkoZt9zD811m1+FByuCIpcFX ofCqFsgK6t0COQceeLeLUBAdoG8PDwY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-SC7hLjJBOXCQslo0UmV5CQ-1; Mon, 21 Feb 2022 10:43:32 -0500 X-MC-Unique: SC7hLjJBOXCQslo0UmV5CQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E2D0B814243; Mon, 21 Feb 2022 15:43:30 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id F25037E131; Mon, 21 Feb 2022 15:43:29 +0000 (UTC) From: Kevin Traynor 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 21.11.1 Date: Mon, 21 Feb 2022 15:36:25 +0000 Message-Id: <20220221153625.152324-196-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/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/692ae335d6040a91682057543a927903f57d0fb4 Thanks. Kevin --- >From 692ae335d6040a91682057543a927903f57d0fb4 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/eventdev/rte_event_eth_tx_adapter.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 @@ -807,8 +807,6 @@ 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); @@ -822,4 +820,6 @@ 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; @@ -837,4 +837,8 @@ txa_service_queue_add(uint8_t id, txa->nb_queues++; +ret_unlock: + rte_spinlock_unlock(&txa->tx_lock); + return 0; + err_unlock: if (txa->nb_queues == 0) { @@ -845,5 +849,5 @@ err_unlock: rte_spinlock_unlock(&txa->tx_lock); - return 0; + return -1; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:48.921050971 +0000 +++ 0196-eventdev-eth_tx-fix-queue-add-error-code.patch 2022-02-21 15:22:44.391704802 +0000 @@ -1 +1 @@ -From bd0a32d14b87661c39130d73ab4323247b80f864 Mon Sep 17 00:00:00 2001 +From 692ae335d6040a91682057543a927903f57d0fb4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd0a32d14b87661c39130d73ab4323247b80f864 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org