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 9A07246468 for ; Mon, 24 Mar 2025 17:18:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 954C540DCA; Mon, 24 Mar 2025 17:18:04 +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 5D88D40A71 for ; Mon, 24 Mar 2025 17:18:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833081; 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=SSW5iQ2+/Hx0gI+GDr0HYmbEPPi+nw1hKns77CBLk6k=; b=MFYzJKq9A9KOsHl1BbxIez8EZ+xS7j8qyKIZ4cCHr8WBK7xUikpO/9+SgYGs6gZsxTFNUq eTiR1MwOivIawUfxSEMUvrC7F8/LrOsetvvYogmbS+RT9yYZFFO2CEKnL5LmVSXV5dDLsO Gxq8z100nKbssgTHUuJppWdnH8NdZe8= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-42-RxAveVZZOpaqmaLocfVq1g-1; Mon, 24 Mar 2025 12:17:59 -0400 X-MC-Unique: RxAveVZZOpaqmaLocfVq1g-1 X-Mimecast-MFC-AGG-ID: RxAveVZZOpaqmaLocfVq1g_1742833078 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 520071955DA4; Mon, 24 Mar 2025 16:17:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.16]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BF1033001D0F; Mon, 24 Mar 2025 16:17:56 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix hairpin queue release' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:15 +0000 Message-ID: <20250324161731.63950-8-ktraynor@redhat.com> In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com> References: <20250324161731.63950-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: vpyAbGo4dmzV_vZTugnrR26J4zkwhzH86QDHx5OwZ4A_1742833078 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 24.11.2 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/28/25. 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/3d96eb2c96a25adc97ad9977916af10a01f95680 Thanks. Kevin --- >From 3d96eb2c96a25adc97ad9977916af10a01f95680 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 27 Feb 2025 12:14:14 +0200 Subject: [PATCH] net/mlx5: fix hairpin queue release [ upstream commit 6886b5f39d66770fb7e233fa1c8fc74ed1935116 ] Fix an assert failure that occurs when releasing a hairpin queue. The issue arises from incorrect handling of shared Rx queues during release. Fixes: 09c2555303be ("net/mlx5: support shared Rx queue") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_flow.c | 4 ++-- drivers/net/mlx5/mlx5_rx.h | 1 + drivers/net/mlx5/mlx5_rxq.c | 12 ++++++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 89d277b523..21df917d6f 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -2005,4 +2005,5 @@ struct mlx5_priv { rte_spinlock_t flow_list_lock; struct mlx5_obj_ops obj_ops; /* HW objects operations. */ + LIST_HEAD(rxq, mlx5_rxq_ctrl) rxqsctrl; /* DPDK Rx queues. */ LIST_HEAD(rxqobj, mlx5_rxq_obj) rxqsobj; /* Verbs/DevX Rx queues. */ struct mlx5_list *hrxqs; /* Hash Rx queues. */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 936a82e524..9678c94ff3 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1649,5 +1649,5 @@ flow_rxq_mark_flag_set(struct rte_eth_dev *dev) opriv->mark_enabled) continue; - LIST_FOREACH(rxq_ctrl, &opriv->sh->shared_rxqs, share_entry) { + LIST_FOREACH(rxq_ctrl, &opriv->rxqsctrl, next) { rxq_ctrl->rxq.mark = 1; } @@ -1655,5 +1655,5 @@ flow_rxq_mark_flag_set(struct rte_eth_dev *dev) } } else { - LIST_FOREACH(rxq_ctrl, &priv->sh->shared_rxqs, share_entry) { + LIST_FOREACH(rxq_ctrl, &priv->rxqsctrl, next) { rxq_ctrl->rxq.mark = 1; } diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h index 1a6f174c40..6c48a37be7 100644 --- a/drivers/net/mlx5/mlx5_rx.h +++ b/drivers/net/mlx5/mlx5_rx.h @@ -152,4 +152,5 @@ struct __rte_cache_aligned mlx5_rxq_data { struct mlx5_rxq_ctrl { struct mlx5_rxq_data rxq; /* Data path structure. */ + LIST_ENTRY(mlx5_rxq_ctrl) next; /* Pointer to the next element. */ LIST_HEAD(priv, mlx5_rxq_priv) owners; /* Owner rxq list. */ struct mlx5_rxq_obj *obj; /* Verbs/DevX elements. */ diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 126b1970e6..6047529535 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1038,4 +1038,5 @@ mlx5_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t idx, return -rte_errno; } + rte_atomic_fetch_add_explicit(&rxq_ctrl->ctrl_ref, 1, rte_memory_order_relaxed); DRV_LOG(DEBUG, "port %u adding hairpin Rx queue %u to list", dev->data->port_id, idx); @@ -1971,6 +1972,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, tmpl->share_group = conf->share_group; tmpl->share_qid = conf->share_qid; + LIST_INSERT_HEAD(&priv->sh->shared_rxqs, tmpl, share_entry); } - LIST_INSERT_HEAD(&priv->sh->shared_rxqs, tmpl, share_entry); + LIST_INSERT_HEAD(&priv->rxqsctrl, tmpl, next); rte_atomic_store_explicit(&tmpl->ctrl_ref, 1, rte_memory_order_relaxed); return tmpl; @@ -2026,5 +2028,5 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq, rxq->hairpin_conf = *hairpin_conf; mlx5_rxq_ref(dev, idx); - LIST_INSERT_HEAD(&priv->sh->shared_rxqs, tmpl, share_entry); + LIST_INSERT_HEAD(&priv->rxqsctrl, tmpl, next); rte_atomic_store_explicit(&tmpl->ctrl_ref, 1, rte_memory_order_relaxed); return tmpl; @@ -2301,5 +2303,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) mlx5_mr_btree_free (&rxq_ctrl->rxq.mr_ctrl.cache_bh); - LIST_REMOVE(rxq_ctrl, share_entry); + if (rxq_ctrl->rxq.shared) + LIST_REMOVE(rxq_ctrl, share_entry); + LIST_REMOVE(rxq_ctrl, next); mlx5_free(rxq_ctrl); } @@ -2327,5 +2331,5 @@ mlx5_rxq_verify(struct rte_eth_dev *dev) int ret = 0; - LIST_FOREACH(rxq_ctrl, &priv->sh->shared_rxqs, share_entry) { + LIST_FOREACH(rxq_ctrl, &priv->rxqsctrl, next) { DRV_LOG(DEBUG, "port %u Rx Queue %u still referenced", dev->data->port_id, rxq_ctrl->rxq.idx); -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.098927283 +0000 +++ 0008-net-mlx5-fix-hairpin-queue-release.patch 2025-03-24 16:15:14.724735394 +0000 @@ -1 +1 @@ -From 6886b5f39d66770fb7e233fa1c8fc74ed1935116 Mon Sep 17 00:00:00 2001 +From 3d96eb2c96a25adc97ad9977916af10a01f95680 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6886b5f39d66770fb7e233fa1c8fc74ed1935116 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 545ba48b3c..6df99c25e2 100644 +index 89d277b523..21df917d6f 100644 @@ -25 +26 @@ -@@ -2024,4 +2024,5 @@ struct mlx5_priv { +@@ -2005,4 +2005,5 @@ struct mlx5_priv { @@ -32 +33 @@ -index f8b3e504b3..6169ebc13f 100644 +index 936a82e524..9678c94ff3 100644 @@ -50 +51 @@ -index f80a2e3227..6380895502 100644 +index 1a6f174c40..6c48a37be7 100644 @@ -53 +54 @@ -@@ -170,4 +170,5 @@ struct __rte_cache_aligned mlx5_rxq_data { +@@ -152,4 +152,5 @@ struct __rte_cache_aligned mlx5_rxq_data { @@ -60 +61 @@ -index a5971b5cdd..5cf7d4971b 100644 +index 126b1970e6..6047529535 100644 @@ -69 +70 @@ -@@ -2007,6 +2008,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, +@@ -1971,6 +1972,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, @@ -78 +79 @@ -@@ -2062,5 +2064,5 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq, +@@ -2026,5 +2028,5 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq, @@ -85 +86 @@ -@@ -2337,5 +2339,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) +@@ -2301,5 +2303,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) @@ -94 +95 @@ -@@ -2363,5 +2367,5 @@ mlx5_rxq_verify(struct rte_eth_dev *dev) +@@ -2327,5 +2331,5 @@ mlx5_rxq_verify(struct rte_eth_dev *dev)