patch 'net/mana: fix WQE count for ringing RQ doorbell' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 01:58:49 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=17a066c87e0d4e38a5eeaea8393da1255050177e

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 17a066c87e0d4e38a5eeaea8393da1255050177e Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Mon, 10 Jul 2023 16:51:47 -0700
Subject: [PATCH] net/mana: fix WQE count for ringing RQ doorbell
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 304ad3268b66c746d7e6d98840a64f17a3f48e53 ]

The hardware specification specifies that WQE_COUNT should set to 0 for
the Receive Queue. Although currently the hardware doesn't enforce the
check, in the future releases it may check on this value.

Signed-off-by: Long Li <longli at microsoft.com>
---
 drivers/net/mana/mana.h |  2 +-
 drivers/net/mana/rx.c   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h
index b653e1dd82..7dfacd57f3 100644
--- a/drivers/net/mana/mana.h
+++ b/drivers/net/mana/mana.h
@@ -452,7 +452,7 @@ extern int mana_logtype_init;
 
 int mana_ring_doorbell(void *db_page, enum gdma_queue_types queue_type,
 		       uint32_t queue_id, uint32_t tail, uint8_t arm);
-int mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm);
+int mana_rq_ring_doorbell(struct mana_rxq *rxq);
 
 int gdma_post_work_request(struct mana_gdma_queue *queue,
 			   struct gdma_work_request *work_req,
diff --git a/drivers/net/mana/rx.c b/drivers/net/mana/rx.c
index 5c5f609ece..fdb56ce05d 100644
--- a/drivers/net/mana/rx.c
+++ b/drivers/net/mana/rx.c
@@ -22,7 +22,7 @@ static uint8_t mana_rss_hash_key_default[TOEPLITZ_HASH_KEY_SIZE_IN_BYTES] = {
 };
 
 int
-mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm)
+mana_rq_ring_doorbell(struct mana_rxq *rxq)
 {
 	struct mana_priv *priv = rxq->priv;
 	int ret;
@@ -36,10 +36,13 @@ mana_rq_ring_doorbell(struct mana_rxq *rxq, uint8_t arm)
 		db_page = process_priv->db_page;
 	}
 
+	/* Hardware Spec specifies that software client should set 0 for
+	 * wqe_cnt for Receive Queues.
+	 */
 	ret = mana_ring_doorbell(db_page, GDMA_QUEUE_RECEIVE,
 			 rxq->gdma_rq.id,
 			 rxq->gdma_rq.head * GDMA_WQE_ALIGNMENT_UNIT_SIZE,
-			 arm);
+			 0);
 
 	if (ret)
 		DP_LOG(ERR, "failed to ring RX doorbell ret %d", ret);
@@ -120,7 +123,7 @@ mana_alloc_and_post_rx_wqes(struct mana_rxq *rxq)
 		}
 	}
 
-	mana_rq_ring_doorbell(rxq, rxq->num_desc);
+	mana_rq_ring_doorbell(rxq);
 
 	return ret;
 }
@@ -470,7 +473,7 @@ drop:
 	}
 
 	if (wqe_posted)
-		mana_rq_ring_doorbell(rxq, wqe_posted);
+		mana_rq_ring_doorbell(rxq);
 
 	return pkt_received;
 }
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:19.961885400 +0800
+++ 0070-net-mana-fix-WQE-count-for-ringing-RQ-doorbell.patch	2023-08-09 21:51:18.214352000 +0800
@@ -1 +1 @@
-From 304ad3268b66c746d7e6d98840a64f17a3f48e53 Mon Sep 17 00:00:00 2001
+From 17a066c87e0d4e38a5eeaea8393da1255050177e Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 304ad3268b66c746d7e6d98840a64f17a3f48e53 ]
@@ -10,2 +12,0 @@
-Cc: stable at dpdk.org
-
@@ -19 +20 @@
-index dfeda531eb..5801491d75 100644
+index b653e1dd82..7dfacd57f3 100644
@@ -22 +23 @@
-@@ -457,7 +457,7 @@ extern int mana_logtype_init;
+@@ -452,7 +452,7 @@ extern int mana_logtype_init;
@@ -32 +33 @@
-index 6ba0a712ef..14d9085801 100644
+index 5c5f609ece..fdb56ce05d 100644
@@ -68 +69 @@
-@@ -517,7 +520,7 @@ drop:
+@@ -470,7 +473,7 @@ drop:


More information about the stable mailing list