patch 'doc: fix aging poll frequency option in cnxk guide' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:48:44 CEST 2024


Hi,

FYI, your patch has been queued to stable release 23.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 04/15/24. 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=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=2368f82fd89fc132b9d9b701c04860b2e9a9e307

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2368f82fd89fc132b9d9b701c04860b2e9a9e307 Mon Sep 17 00:00:00 2001
From: Ankur Dwivedi <adwivedi at marvell.com>
Date: Mon, 4 Mar 2024 20:00:06 +0530
Subject: [PATCH] doc: fix aging poll frequency option in cnxk guide
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 7fcf4e8a03c4b0d2c6cec11ddd18c7bf88ba0384 ]

The information for CNXK NPC MCAM aging poll frequency devargs is moved to
runtime config options section for ethdev device. Initially it was
incorrectly placed in runtime config options section for inline device.

Fixes: a44775505911 ("net/cnxk: support flow aging")

Signed-off-by: Ankur Dwivedi <adwivedi at marvell.com>
---
 doc/guides/nics/cnxk.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/guides/nics/cnxk.rst b/doc/guides/nics/cnxk.rst
index 9ec52e380f..28d54be16d 100644
--- a/doc/guides/nics/cnxk.rst
+++ b/doc/guides/nics/cnxk.rst
@@ -416,6 +416,18 @@ Runtime Config Options
    With the above configuration, PMD would allocate meta buffers of size 512 for
    inline inbound IPsec processing second pass.
 
+- ``NPC MCAM Aging poll frequency in seconds`` (default ``10``)
+
+   Poll frequency for aging control thread can be specified by
+   ``aging_poll_freq`` devargs parameter.
+
+   For example::
+
+      -a 0002:01:00.2,aging_poll_freq=50
+
+   With the above configuration, driver would poll for aging flows
+   every 50 seconds.
+
 .. note::
 
    Above devarg parameters are configurable per device, user needs to pass the
@@ -601,18 +613,6 @@ Runtime Config Options for inline device
    With the above configuration, driver would poll for soft expiry events every
    1000 usec.
 
-- ``NPC MCAM Aging poll frequency in seconds`` (default ``10``)
-
-   Poll frequency for aging control thread can be specified by
-   ``aging_poll_freq`` ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:01:00.2,aging_poll_freq=50
-
-   With the above configuration, driver would poll for aging flows every 50
-   seconds.
-
 Debugging Options
 -----------------
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:06.414337581 +0800
+++ 0044-doc-fix-aging-poll-frequency-option-in-cnxk-guide.patch	2024-04-13 20:43:04.957753984 +0800
@@ -1 +1 @@
-From 7fcf4e8a03c4b0d2c6cec11ddd18c7bf88ba0384 Mon Sep 17 00:00:00 2001
+From 2368f82fd89fc132b9d9b701c04860b2e9a9e307 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7fcf4e8a03c4b0d2c6cec11ddd18c7bf88ba0384 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index f11fb59439..f5f296ee36 100644
+index 9ec52e380f..28d54be16d 100644
@@ -22 +24 @@
-@@ -419,6 +419,18 @@ Runtime Config Options
+@@ -416,6 +416,18 @@ Runtime Config Options
@@ -38 +40 @@
- - ``Rx Inject Enable inbound inline IPsec for second pass`` (default ``0``)
+ .. note::
@@ -40,2 +42,2 @@
-    Rx packet inject feature for inbound inline IPsec processing can be enabled
-@@ -617,18 +629,6 @@ Runtime Config Options for inline device
+    Above devarg parameters are configurable per device, user needs to pass the
+@@ -601,18 +613,6 @@ Runtime Config Options for inline device
@@ -57 +59,2 @@
- - ``Rx Inject Enable inbound inline IPsec for second pass`` (default ``0``)
+ Debugging Options
+ -----------------
@@ -59 +61,0 @@
-    Rx packet inject feature for inbound inline IPsec processing can be enabled


More information about the stable mailing list