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

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Mar 18 16:38:55 CET 2024


Hi,

FYI, your patch has been queued to stable release 22.11.5

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/20/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/d50c5dfbf4e3951e899677e4ef166e6389fe9962

Thanks.

Luca Boccassi

---
>From d50c5dfbf4e3951e899677e4ef166e6389fe9962 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 1a1dc16c1e..e93b97a5b8 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -740,6 +740,19 @@ Supports congestion management.
   ``rte_eth_cman_config_set()``, ``rte_eth_cman_config_get()``.
 
 
+.. _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:
 
 FW version
diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini
index f81628da77..f0ead29134 100644
--- a/doc/guides/nics/features/cnxk.ini
+++ b/doc/guides/nics/features/cnxk.ini
@@ -28,6 +28,7 @@ RSS key update       = Y
 RSS reta update      = Y
 Inner RSS            = Y
 Congestion management = Y
+Traffic manager      = Y
 Inline protocol      = Y
 Flow control         = Y
 Scattered Rx         = Y
diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini
index 510cc6679d..94582c7dc3 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -42,6 +42,7 @@ VLAN filter          =
 Flow control         =
 Rate limitation      =
 Congestion management =
+Traffic manager      =
 Inline crypto        =
 Inline protocol      =
 CRC offload          =
diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini
index 26dc8c2178..f02da463d9 100644
--- a/doc/guides/nics/features/dpaa2.ini
+++ b/doc/guides/nics/features/dpaa2.ini
@@ -17,6 +17,7 @@ Unicast MAC filter   = Y
 RSS hash             = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 VLAN offload         = Y
 L3 checksum offload  = Y
 L4 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
@@ -28,6 +28,7 @@ RSS reta update      = Y
 DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
 FEC                  = Y
diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
index e241dad047..2d168199f0 100644
--- a/doc/guides/nics/features/i40e.ini
+++ b/doc/guides/nics/features/i40e.ini
@@ -27,6 +27,7 @@ SR-IOV               = Y
 DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
 QinQ offload         = P
diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini
index 5cdf0ddee6..c7f8ace499 100644
--- a/doc/guides/nics/features/iavf.ini
+++ b/doc/guides/nics/features/iavf.ini
@@ -20,6 +20,8 @@ RSS hash             = Y
 RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
+Traffic manager      = Y
+Inline crypto        = Y
 CRC offload          = Y
 VLAN offload         = P
 L3 checksum offload  = P
@@ -30,7 +32,6 @@ Inner L4 checksum    = P
 Packet type parsing  = Y
 Rx descriptor status = Y
 Tx descriptor status = Y
-Inline crypto        = Y
 Basic stats          = Y
 Multiprocess aware   = Y
 FreeBSD              = Y
diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
index 13f8871dcc..8febbc4f1e 100644
--- a/doc/guides/nics/features/ice.ini
+++ b/doc/guides/nics/features/ice.ini
@@ -26,6 +26,7 @@ RSS hash             = Y
 RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
 QinQ offload         = P
diff --git a/doc/guides/nics/features/ice_dcf.ini b/doc/guides/nics/features/ice_dcf.ini
index 3b11622d4c..0e86338990 100644
--- a/doc/guides/nics/features/ice_dcf.ini
+++ b/doc/guides/nics/features/ice_dcf.ini
@@ -22,6 +22,7 @@ Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
 VLAN filter          = Y
+Traffic manager      = Y
 VLAN offload         = Y
 Extended stats       = Y
 Basic stats          = 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
@@ -25,6 +25,7 @@ SR-IOV               = Y
 DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
 QinQ offload         = Y
diff --git a/doc/guides/nics/features/ixgbe.ini b/doc/guides/nics/features/ixgbe.ini
index 8590ac857f..f05fcec455 100644
--- a/doc/guides/nics/features/ixgbe.ini
+++ b/doc/guides/nics/features/ixgbe.ini
@@ -27,6 +27,7 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
 Rate limitation      = Y
+Traffic manager      = Y
 Inline crypto        = Y
 CRC offload          = P
 VLAN 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
@@ -12,8 +12,9 @@ Allmulticast mode    = Y
 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
 L4 checksum offload  = Y
diff --git a/doc/guides/nics/features/txgbe.ini b/doc/guides/nics/features/txgbe.ini
index e21083052c..3a11fb2037 100644
--- a/doc/guides/nics/features/txgbe.ini
+++ b/doc/guides/nics/features/txgbe.ini
@@ -26,6 +26,7 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
 Rate limitation      = Y
+Traffic manager      = Y
 Inline crypto        = Y
 CRC offload          = P
 VLAN offload         = P
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-18 12:58:39.477257001 +0000
+++ 0005-doc-add-traffic-manager-in-features-table.patch	2024-03-18 12:58:39.095344227 +0000
@@ -1 +1 @@
-From a905e821007e884355e01289bdc67c3548591fec Mon Sep 17 00:00:00 2001
+From d50c5dfbf4e3951e899677e4ef166e6389fe9962 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 1a1dc16c1e..e93b97a5b8 100644
@@ -36 +37 @@
-@@ -762,6 +762,19 @@ Supports congestion management.
+@@ -740,6 +740,19 @@ Supports congestion management.
@@ -57 +58 @@
-index 1c8db1ad13..2de156c695 100644
+index f81628da77..f0ead29134 100644
@@ -69 +70 @@
-index e21725bdea..c06b6fea9a 100644
+index 510cc6679d..94582c7dc3 100644
@@ -117 +118 @@
-index db4f92ce71..c59115ae15 100644
+index 5cdf0ddee6..c7f8ace499 100644
@@ -120 +121 @@
-@@ -25,6 +25,8 @@ RSS hash             = Y
+@@ -20,6 +20,8 @@ RSS hash             = Y
@@ -128,2 +129,2 @@
- L3 checksum offload  = Y
-@@ -35,7 +37,6 @@ Inner L4 checksum    = Y
+ L3 checksum offload  = P
+@@ -30,7 +32,6 @@ Inner L4 checksum    = P


More information about the stable mailing list