patch 'examples/qos_sched: fix config entries in wrong sections' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

Thanks.

Kevin

---
>From a2a827725722a853d51f54f16c9ad1b7e9fc7df6 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 21 Mar 2023 13:13:49 +0000
Subject: [PATCH] examples/qos_sched: fix config entries in wrong sections

[ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ]

When specifying the QoS config, the profiles to be used for each pipe
within a subport must be specified in the subport section, not in the
section for the subport profile itself. Similarly for subport profiles,
those should be specified in the port section.

Fixes: de3cfa2c9823 ("sched: initial import")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
---
 examples/qos_sched/profile.cfg    | 4 ++--
 examples/qos_sched/profile_ov.cfg | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg
index 8da5777538..20b8b20f23 100644
--- a/examples/qos_sched/profile.cfg
+++ b/examples/qos_sched/profile.cfg
@@ -27,4 +27,6 @@ number of pipes per subport = 4096
 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
 
+pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
+
 [subport profile 0]
 tb rate = 1250000000           ; Bytes per second
@@ -47,6 +49,4 @@ tc 12 rate = 1250000000        ; Bytes per second
 tc period = 10                 ; Milliseconds
 
-pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
-
 ; Pipe configuration
 [pipe profile 0]
diff --git a/examples/qos_sched/profile_ov.cfg b/examples/qos_sched/profile_ov.cfg
index 14c89ae340..b6fe21ee1e 100644
--- a/examples/qos_sched/profile_ov.cfg
+++ b/examples/qos_sched/profile_ov.cfg
@@ -7,4 +7,6 @@ frame overhead = 24
 number of subports per port = 1
 
+subport 0-8 = 0
+
 ; Subport configuration
 [subport 0]
@@ -12,5 +14,5 @@ number of pipes per subport = 32
 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
 
-subport 0-8 = 0
+pipe 0-31 = 0               ; These pipes are configured with pipe profile 0
 
 [subport profile 0]
@@ -33,6 +35,4 @@ tc 12 rate = 8400000         ; Bytes per second
 tc period = 10              ; Milliseconds
 
-pipe 0-31 = 0               ; These pipes are configured with pipe profile 0
-
 ; Pipe configuration
 [pipe profile 0]
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.297194890 +0100
+++ 0001-examples-qos_sched-fix-config-entries-in-wrong-secti.patch	2023-03-30 09:30:45.228229225 +0100
@@ -1 +1 @@
-From 86dfed2a8ed704e013f054985a92d46f07ff48d1 Mon Sep 17 00:00:00 2001
+From a2a827725722a853d51f54f16c9ad1b7e9fc7df6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,5 +18,3 @@
- examples/qos_sched/profile.cfg     | 6 +++---
- examples/qos_sched/profile_ov.cfg  | 6 +++---
- examples/qos_sched/profile_pie.cfg | 6 +++---
- examples/qos_sched/profile_red.cfg | 6 +++---
- 4 files changed, 12 insertions(+), 12 deletions(-)
+ examples/qos_sched/profile.cfg    | 4 ++--
+ examples/qos_sched/profile_ov.cfg | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
@@ -24 +23 @@
-index e8de101b6c..00d4c7c1a5 100644
+index 8da5777538..20b8b20f23 100644
@@ -41,6 +39,0 @@
-@@ -72,3 +72,3 @@ tc period = 40                ; Milliseconds
- tc 12 oversubscription weight = 1
- 
--tc 12 wrr weights = 1 1 1 1
-\ No newline at end of file
-+tc 12 wrr weights = 1 1 1 1
@@ -69,50 +61,0 @@
--
- ; Pipe configuration
- [pipe profile 0]
-diff --git a/examples/qos_sched/profile_pie.cfg b/examples/qos_sched/profile_pie.cfg
-index 241f748b33..bbc09d912b 100644
---- a/examples/qos_sched/profile_pie.cfg
-+++ b/examples/qos_sched/profile_pie.cfg
-@@ -22,4 +22,6 @@ frame overhead = 24
- number of subports per port = 1
- 
-+subport 0-8 = 0                ; These subports are configured with subport profile 0
-+
- ; Subport configuration
- [subport 0]
-@@ -27,5 +29,5 @@ number of pipes per subport = 4096
- queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
- 
--subport 0-8 = 0                ; These subports are configured with subport profile 0
-+pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
- 
- [subport profile 0]
-@@ -49,6 +51,4 @@ tc 12 rate = 1250000000        ; Bytes per second
- tc period = 10                 ; Milliseconds
- 
--pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
--
- ; Pipe configuration
- [pipe profile 0]
-diff --git a/examples/qos_sched/profile_red.cfg b/examples/qos_sched/profile_red.cfg
-index 4486d2799e..cee1470fd7 100644
---- a/examples/qos_sched/profile_red.cfg
-+++ b/examples/qos_sched/profile_red.cfg
-@@ -22,4 +22,6 @@ frame overhead = 24
- number of subports per port = 1
- 
-+subport 0-8 = 0                ; These subports are configured with subport profile 0
-+
- ; Subport configuration
- [subport 0]
-@@ -27,5 +29,5 @@ number of pipes per subport = 4096
- queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
- 
--subport 0-8 = 0                ; These subports are configured with subport profile 0
-+pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
- 
- [subport profile 0]
-@@ -49,6 +51,4 @@ tc 12 rate = 1250000000        ; Bytes per second
- tc period = 10                 ; Milliseconds
- 
--pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0