patch 'sched: fix alignment of structs in subport' 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 02/28/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/818b598bfdc8e8885280c6825fcb29b09c5c63b0

Thanks.

Kevin

---
>From 818b598bfdc8e8885280c6825fcb29b09c5c63b0 Mon Sep 17 00:00:00 2001
From: Megha Ajmera <megha.ajmera at intel.com>
Date: Tue, 7 Feb 2023 06:10:08 +0000
Subject: [PATCH] sched: fix alignment of structs in subport

[ upstream commit bc3b950d80941420873b40d56ee387867fc34dad ]

Big structures like bitmap, pipes and queues in subport are addressed
using offset of 'memory' field in subport structures. This means no other
variable should be added after 'memory' variable or else addressing of such
structs like bitmap etc. become incorrect.

Realigned tc_ov_enabled variable in subport structure.

Fixes: f5e60154ade ("sched: enable traffic class oversubscription conditionally")

Signed-off-by: Megha Ajmera <megha.ajmera at intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
---
 lib/sched/rte_sched.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index f9924d5f2f..b9494ec31e 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -215,4 +215,7 @@ struct rte_sched_subport {
 	uint32_t qsize_sum;
 
+	/* TC oversubscription activation */
+	int tc_ov_enabled;
+
 	struct rte_sched_pipe *pipe;
 	struct rte_sched_queue *queue;
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:25.954074854 +0000
+++ 0089-sched-fix-alignment-of-structs-in-subport.patch	2023-02-23 14:46:23.883236360 +0000
@@ -1 +1 @@
-From bc3b950d80941420873b40d56ee387867fc34dad Mon Sep 17 00:00:00 2001
+From 818b598bfdc8e8885280c6825fcb29b09c5c63b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc3b950d80941420873b40d56ee387867fc34dad ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -19,2 +20,2 @@
- lib/sched/rte_sched.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ lib/sched/rte_sched.c | 3 +++
+ 1 file changed, 3 insertions(+)
@@ -23 +24 @@
-index c91697131d..19768d8c38 100644
+index f9924d5f2f..b9494ec31e 100644
@@ -26 +27 @@
-@@ -203,4 +203,7 @@ struct rte_sched_subport {
+@@ -215,4 +215,7 @@ struct rte_sched_subport {
@@ -34,8 +34,0 @@
-@@ -210,7 +213,4 @@ struct rte_sched_subport {
- 	struct rte_mbuf **queue_array;
- 	uint8_t memory[0] __rte_cache_aligned;
--
--	/* TC oversubscription activation */
--	int tc_ov_enabled;
- } __rte_cache_aligned;
-