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 C9B30427EF for ; Wed, 22 Mar 2023 11:32:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C65F2410DD; Wed, 22 Mar 2023 11:32:49 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1D34342BAC for ; Wed, 22 Mar 2023 11:32:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481167; 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=TvsbQUDJr77Yj9Z5FvPDQ3ap6hyNeRMCLYesDEPFByw=; b=Y42YA9Pxs3J9dr+zK1fEj4p3iLbjCiv7eEjhFSKJk3HJwydiCGrZ9mgAU9b2+WsUEBPMkr whZ7ikD1bCgLb2Rd1Tf08lY0AgmrVKSVICL4rEtISSTlqX+ksabRhC8vrR6oU+9/G6GFLl 4FdYCKP0wN87LWGWLGWLTE600IIBVCE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-ajXN2rpYOmmjyRMHgXeB2w-1; Wed, 22 Mar 2023 06:32:44 -0400 X-MC-Unique: ajXN2rpYOmmjyRMHgXeB2w-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 30D37101A54F; Wed, 22 Mar 2023 10:32:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 192AD492C14; Wed, 22 Mar 2023 10:32:42 +0000 (UTC) From: Kevin Traynor To: Bing Zhao Cc: Matan Azrad , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix hairpin Tx queue reference count' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:32:05 +0000 Message-Id: <20230322103209.456098-18-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 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/24/23. 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/7a7e85c4de66dbbcb0c2db9dee384528ae4057ab Thanks. Kevin --- >From 7a7e85c4de66dbbcb0c2db9dee384528ae4057ab Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Tue, 7 Mar 2023 12:31:08 +0200 Subject: [PATCH] net/mlx5: fix hairpin Tx queue reference count [ upstream commit 9284987a85b07e168b165fc258523a3a4fde58e2 ] When calling the haipin unbind interface, all the hairpin Tx queues of the port will be unbound from the peer Rx queues. If one of the Tx queue is working in the auto bind mode, the interface will return directly. Only when the Tx and peer Rx ports are the same, the auto bind mode is supported. In this condition branch, the Tx queue release is missed and the reference count is not decreased. Then in the port stop stage, the hardware resources of this Tx queue won't be freed. There would be some assertion or failure when starting the port again. With this commit, the reference count will be operated correctly. Fixes: 37cd4501e873 ("net/mlx5: support two ports hairpin mode") Signed-off-by: Bing Zhao Acked-by: Matan Azrad Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_trigger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 4800624ea3..feffcc4ce0 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -895,9 +895,9 @@ mlx5_hairpin_unbind_single_port(struct rte_eth_dev *dev, uint16_t rx_port) /* Indeed, only the first used queue needs to be checked. */ if (txq_ctrl->hairpin_conf.manual_bind == 0) { + mlx5_txq_release(dev, i); if (cur_port != rx_port) { rte_errno = EINVAL; DRV_LOG(ERR, "port %u and port %u are in" " auto-bind mode", cur_port, rx_port); - mlx5_txq_release(dev, i); return -rte_errno; } else { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.372249363 +0000 +++ 0018-net-mlx5-fix-hairpin-Tx-queue-reference-count.patch 2023-03-22 10:30:07.932866584 +0000 @@ -1 +1 @@ -From 9284987a85b07e168b165fc258523a3a4fde58e2 Mon Sep 17 00:00:00 2001 +From 7a7e85c4de66dbbcb0c2db9dee384528ae4057ab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9284987a85b07e168b165fc258523a3a4fde58e2 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 3457bf65d3..bbaa7d2aa0 100644 +index 4800624ea3..feffcc4ce0 100644 @@ -34 +35 @@ -@@ -897,9 +897,9 @@ mlx5_hairpin_unbind_single_port(struct rte_eth_dev *dev, uint16_t rx_port) +@@ -895,9 +895,9 @@ mlx5_hairpin_unbind_single_port(struct rte_eth_dev *dev, uint16_t rx_port)