patch 'doc: add traffic manager in features table' has been queued to stable release 21.11.7

Kevin Traynor ktraynor at redhat.com
Thu Apr 4 11:51:32 CEST 2024


Hi,

FYI, your patch has been queued to stable release 21.11.7

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/09/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/4a74870ae48480e826f9eebee4c8bbe7cb2c7118

Thanks.

Kevin

---
>From 4a74870ae48480e826f9eebee4c8bbe7cb2c7118 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 28 Nov 2023 20:40:56 +0800
Subject: [PATCH] doc: add traffic manager in features table

[ upstream commit a905e821007e884355e01289bdc67c3548591fec ]

Add Traffic Manager feature.

Fixes: 5d109deffa87 ("ethdev: add traffic management API")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
---
 doc/guides/nics/features.rst         | 13 +++++++++++++
 doc/guides/nics/features/cnxk.ini    |  1 +
 doc/guides/nics/features/default.ini |  1 +
 doc/guides/nics/features/dpaa2.ini   |  1 +
 doc/guides/nics/features/hns3.ini    |  1 +
 doc/guides/nics/features/i40e.ini    |  1 +
 doc/guides/nics/features/iavf.ini    |  3 ++-
 doc/guides/nics/features/ice.ini     |  1 +
 doc/guides/nics/features/ice_dcf.ini |  1 +
 doc/guides/nics/features/ipn3ke.ini  |  1 +
 doc/guides/nics/features/ixgbe.ini   |  1 +
 doc/guides/nics/features/mvpp2.ini   |  3 ++-
 doc/guides/nics/features/txgbe.ini   |  1 +
 13 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index dc268a19ff..a2e7dc5d28 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -712,4 +712,17 @@ Supports configuring per-queue stat counter mapping.
 
 
+.. _nic_features_traffic_manager:
+
+Traffic manager
+---------------
+
+Supports Traffic manager.
+
+* **[implements] rte_tm_ops**: ``capabilities_get``, ``shaper_profile_add``,
+  ``hierarchy_commit`` and so on.
+* **[related]    API**: ``rte_tm_capabilities_get()``, ``rte_tm_shaper_profile_add()``,
+  ``rte_tm_hierarchy_commit()`` and so on.
+
+
 .. _nic_features_fw_version:
 
diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini
index 1623a1803e..9be71e713f 100644
--- a/doc/guides/nics/features/cnxk.ini
+++ b/doc/guides/nics/features/cnxk.ini
@@ -28,4 +28,5 @@ RSS key update       = Y
 RSS reta update      = Y
 Inner RSS            = Y
+Traffic manager      = Y
 Inline protocol      = Y
 Flow control         = Y
diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini
index 8bd849e96f..d6cd84e2f8 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -42,4 +42,5 @@ VLAN filter          =
 Flow control         =
 Rate limitation      =
+Traffic manager      =
 Inline crypto        =
 Inline protocol      =
diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini
index 09ce66c788..eaee07cf24 100644
--- a/doc/guides/nics/features/dpaa2.ini
+++ b/doc/guides/nics/features/dpaa2.ini
@@ -18,4 +18,5 @@ RSS hash             = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 VLAN offload         = Y
 L3 checksum offload  = Y
diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini
index 338b4e6864..a20ece20e8 100644
--- a/doc/guides/nics/features/hns3.ini
+++ b/doc/guides/nics/features/hns3.ini
@@ -29,4 +29,5 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
index 6e141de326..2e9ae57db6 100644
--- a/doc/guides/nics/features/i40e.ini
+++ b/doc/guides/nics/features/i40e.ini
@@ -28,4 +28,5 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini
index 3860f283d5..0ff4a1c44a 100644
--- a/doc/guides/nics/features/iavf.ini
+++ b/doc/guides/nics/features/iavf.ini
@@ -21,4 +21,6 @@ RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
+Traffic manager      = Y
+Inline crypto        = Y
 CRC offload          = Y
 VLAN offload         = P
@@ -28,5 +30,4 @@ Packet type parsing  = Y
 Rx descriptor status = Y
 Tx descriptor status = Y
-Inline crypto        = Y
 Basic stats          = Y
 Multiprocess aware   = Y
diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
index 0d911590b7..a80401c82d 100644
--- a/doc/guides/nics/features/ice.ini
+++ b/doc/guides/nics/features/ice.ini
@@ -26,4 +26,5 @@ RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/ice_dcf.ini b/doc/guides/nics/features/ice_dcf.ini
index 54073f0b88..02bbbad069 100644
--- a/doc/guides/nics/features/ice_dcf.ini
+++ b/doc/guides/nics/features/ice_dcf.ini
@@ -16,4 +16,5 @@ L4 checksum offload  = P
 Inner L3 checksum    = P
 Inner L4 checksum    = P
+Traffic manager      = Y
 Basic stats          = Y
 Linux                = Y
diff --git a/doc/guides/nics/features/ipn3ke.ini b/doc/guides/nics/features/ipn3ke.ini
index 1f6b780273..e412978820 100644
--- a/doc/guides/nics/features/ipn3ke.ini
+++ b/doc/guides/nics/features/ipn3ke.ini
@@ -26,4 +26,5 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/ixgbe.ini b/doc/guides/nics/features/ixgbe.ini
index e5cef81f9a..dc11d1bddf 100644
--- a/doc/guides/nics/features/ixgbe.ini
+++ b/doc/guides/nics/features/ixgbe.ini
@@ -28,4 +28,5 @@ VLAN filter          = Y
 Flow control         = Y
 Rate limitation      = Y
+Traffic manager      = Y
 Inline crypto        = Y
 CRC offload          = P
diff --git a/doc/guides/nics/features/mvpp2.ini b/doc/guides/nics/features/mvpp2.ini
index 653c9d08cb..ccc2c2d4f8 100644
--- a/doc/guides/nics/features/mvpp2.ini
+++ b/doc/guides/nics/features/mvpp2.ini
@@ -13,6 +13,7 @@ Unicast MAC filter   = Y
 Multicast MAC filter = Y
 RSS hash             = Y
-Flow control         = Y
 VLAN filter          = Y
+Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 L3 checksum offload  = Y
diff --git a/doc/guides/nics/features/txgbe.ini b/doc/guides/nics/features/txgbe.ini
index 958f8ac793..796e7ff313 100644
--- a/doc/guides/nics/features/txgbe.ini
+++ b/doc/guides/nics/features/txgbe.ini
@@ -27,4 +27,5 @@ VLAN filter          = Y
 Flow control         = Y
 Rate limitation      = Y
+Traffic manager      = Y
 Inline crypto        = Y
 CRC offload          = P
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:33.872923565 +0100
+++ 0002-doc-add-traffic-manager-in-features-table.patch	2024-04-04 10:49:33.691457582 +0100
@@ -1 +1 @@
-From a905e821007e884355e01289bdc67c3548591fec Mon Sep 17 00:00:00 2001
+From 4a74870ae48480e826f9eebee4c8bbe7cb2c7118 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a905e821007e884355e01289bdc67c3548591fec ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -33 +34 @@
-index 38eba8742c..b4f7f1ee61 100644
+index dc268a19ff..a2e7dc5d28 100644
@@ -36 +37 @@
-@@ -763,4 +763,17 @@ Supports congestion management.
+@@ -712,4 +712,17 @@ Supports configuring per-queue stat counter mapping.
@@ -55 +56 @@
-index 1c8db1ad13..2de156c695 100644
+index 1623a1803e..9be71e713f 100644
@@ -58 +59,2 @@
-@@ -29,4 +29,5 @@ RSS reta update      = Y
+@@ -28,4 +28,5 @@ RSS key update       = Y
+ RSS reta update      = Y
@@ -60 +61,0 @@
- Congestion management = Y
@@ -65 +66 @@
-index e21725bdea..c06b6fea9a 100644
+index 8bd849e96f..d6cd84e2f8 100644
@@ -68 +69,2 @@
-@@ -43,4 +43,5 @@ Flow control         =
+@@ -42,4 +42,5 @@ VLAN filter          =
+ Flow control         =
@@ -70 +71,0 @@
- Congestion management =
@@ -75 +76 @@
-index 26dc8c2178..f02da463d9 100644
+index 09ce66c788..eaee07cf24 100644
@@ -95 +96 @@
-index e241dad047..2d168199f0 100644
+index 6e141de326..2e9ae57db6 100644
@@ -105 +106 @@
-index db4f92ce71..c59115ae15 100644
+index 3860f283d5..0ff4a1c44a 100644
@@ -108 +109 @@
-@@ -26,4 +26,6 @@ RSS key update       = Y
+@@ -21,4 +21,6 @@ RSS key update       = Y
@@ -115 +116 @@
-@@ -36,5 +38,4 @@ Packet type parsing  = Y
+@@ -28,5 +30,4 @@ Packet type parsing  = Y
@@ -122 +123 @@
-index 13f8871dcc..8febbc4f1e 100644
+index 0d911590b7..a80401c82d 100644
@@ -125 +126 @@
-@@ -27,4 +27,5 @@ RSS key update       = Y
+@@ -26,4 +26,5 @@ RSS key update       = Y
@@ -132 +133 @@
-index 3b11622d4c..0e86338990 100644
+index 54073f0b88..02bbbad069 100644
@@ -135,3 +136,3 @@
-@@ -23,4 +23,5 @@ Allmulticast mode    = Y
- Unicast MAC filter   = Y
- VLAN filter          = Y
+@@ -16,4 +16,5 @@ L4 checksum offload  = P
+ Inner L3 checksum    = P
+ Inner L4 checksum    = P
@@ -139,2 +140,2 @@
- VLAN offload         = Y
- Extended stats       = Y
+ Basic stats          = Y
+ Linux                = Y
@@ -152 +153 @@
-index 8590ac857f..f05fcec455 100644
+index e5cef81f9a..dc11d1bddf 100644
@@ -175 +176 @@
-index e21083052c..3a11fb2037 100644
+index 958f8ac793..796e7ff313 100644



More information about the stable mailing list