[PATCH 1/2] examples/qos_sched: fix config entries in wrong sections

[Bruce Richardson]

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")
Cc: stable at dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 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(-)

diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg
index e8de101b6c..00d4c7c1a5 100644
--- a/examples/qos_sched/profile.cfg
+++ b/examples/qos_sched/profile.cfg
@@ -26,6 +26,8 @@ number of subports per port = 1
 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
 tb size = 1000000              ; Bytes
@@ -46,8 +48,6 @@ 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]
 tb rate = 305175               ; Bytes per second
@@ -71,4 +71,4 @@ 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
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
@@ -6,12 +6,14 @@
 frame overhead = 24
 number of subports per port = 1

+subport 0-8 = 0
+
 ; Subport configuration
 [subport 0]
 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]
 tb rate = 8400000           ; Bytes per second
@@ -32,8 +34,6 @@ tc 11 rate = 8400000         ; Bytes per second
 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]
 tb rate = 16800000             ; Bytes per second
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
@@ -21,12 +21,14 @@
 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]
 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]
 tb rate = 1250000000           ; Bytes per second
@@ -48,8 +50,6 @@ 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]
 tb rate = 305175               ; Bytes per second
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
@@ -21,12 +21,14 @@
 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]
 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]
 tb rate = 1250000000           ; Bytes per second
@@ -48,8 +50,6 @@ 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]
 tb rate = 305175               ; Bytes per second
--
2.37.2