patch 'event/cnxk: wait for CPT flow control on WQE path' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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/01/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=0a78560065dbab6199f0fbd477fafdffe102024a

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0a78560065dbab6199f0fbd477fafdffe102024a Mon Sep 17 00:00:00 2001
From: Rahul Bhansali <rbhansali at marvell.com>
Date: Thu, 19 Jan 2023 11:23:15 +0530
Subject: [PATCH] event/cnxk: wait for CPT flow control on WQE path
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ]

Wait for CPT flow control on WQE path to avoid CPT queue
overflow and thereby a CPT misc interrupt.

Fixes: 1a7da795f64a ("net/cnxk: support Tx security offload on cn9k")

Signed-off-by: Rahul Bhansali <rbhansali at marvell.com>
---
 drivers/event/cnxk/cn9k_worker.h |  1 +
 drivers/net/cnxk/cn9k_tx.h       | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h
index 4c3932da47..d3c5180fbc 100644
--- a/drivers/event/cnxk/cn9k_worker.h
+++ b/drivers/event/cnxk/cn9k_worker.h
@@ -730,6 +730,7 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,

 	rte_io_wmb();
 	cn9k_sso_txq_fc_wait(txq);
+	cn9k_nix_sec_fc_wait_one(txq);

 	/* Write CPT instruction to lmt line */
 	vst1q_u64(lmt_addr, cmd01);
diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h
index 404edd6aed..7362025a34 100644
--- a/drivers/net/cnxk/cn9k_tx.h
+++ b/drivers/net/cnxk/cn9k_tx.h
@@ -388,6 +388,16 @@ cn9k_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags)
 	roc_lmt_mov(lmt_addr, cmd, cn9k_nix_tx_ext_subs(flags));
 }

+static __rte_always_inline void
+cn9k_nix_sec_fc_wait_one(const struct cn9k_eth_txq *txq)
+{
+	uint64_t nb_desc = txq->cpt_desc;
+	uint64_t *fc = txq->cpt_fc;
+
+	while (nb_desc <= __atomic_load_n(fc, __ATOMIC_RELAXED))
+		;
+}
+
 static __rte_always_inline uint64_t
 cn9k_nix_xmit_submit_lmt(const rte_iova_t io_addr)
 {
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-27 14:08:43.016620200 +0800
+++ 0066-event-cnxk-wait-for-CPT-flow-control-on-WQE-path.patch	2023-02-27 14:08:40.789237000 +0800
@@ -1 +1 @@
-From d6ef4695c3b449259b29225e62bb6116ad420227 Mon Sep 17 00:00:00 2001
+From 0a78560065dbab6199f0fbd477fafdffe102024a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d6ef4695c3b449259b29225e62bb6116ad420227 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org