patch 'examples/qos_sched: fix core mask overflow' has been queued to stable release 21.11.1

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.1

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/06/22. 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/d33bb6bd28406944b31ad53ba90199ca5f2f114f

Thanks.

Kevin

---
From d33bb6bd28406944b31ad53ba90199ca5f2f114f Mon Sep 17 00:00:00 2001
From: Megha Ajmera <megha.ajmera@intel.com>
Date: Wed, 23 Feb 2022 17:36:30 +0000
Subject: [PATCH] examples/qos_sched: fix core mask overflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 9c9fad3dfa042ae4b7a045cb1731f8701f8210e6 ]

Masking of core mask was incorrect. Instead of using 1U for shifting, it
should be using 1LU as the result is assigned to uint64.

CID 375859: Potentially overflowing expression "1U << app_main_core" with
type "unsigned int" (32 bits, unsigned) is evaluated using 32-bit
arithmetic, and then used in a context that expects an expression of
type "uint64_t" (64 bits, unsigned).

Coverity issue: 375859
Fixes: de3cfa2c9823 ("sched: initial import")

Signed-off-by: Megha Ajmera <megha.ajmera@intel.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 examples/qos_sched/args.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 10ca7bea61..ff51d0215a 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -12,4 +12,5 @@
 #include <getopt.h>
 
+#include <rte_bitops.h>
 #include <rte_log.h>
 #include <rte_eal.h>
@@ -428,5 +429,5 @@ app_parse_args(int argc, char **argv)
 	/* check main core index validity */
 	for (i = 0; i <= app_main_core; i++) {
-		if (app_used_core_mask & (1u << app_main_core)) {
+		if (app_used_core_mask & RTE_BIT64(app_main_core)) {
 			RTE_LOG(ERR, APP, "Main core index is not configured properly\n");
 			app_usage(prgname);
@@ -434,5 +435,5 @@ app_parse_args(int argc, char **argv)
 		}
 	}
-	app_used_core_mask |= 1u << app_main_core;
+	app_used_core_mask |= RTE_BIT64(app_main_core);
 
 	if ((app_used_core_mask != app_eal_core_mask()) ||
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:01.884306256 +0000
+++ 0018-examples-qos_sched-fix-core-mask-overflow.patch	2022-03-01 10:41:01.252244087 +0000
@@ -1 +1 @@
-From 9c9fad3dfa042ae4b7a045cb1731f8701f8210e6 Mon Sep 17 00:00:00 2001
+From d33bb6bd28406944b31ad53ba90199ca5f2f114f Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 9c9fad3dfa042ae4b7a045cb1731f8701f8210e6 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -24,2 +25,2 @@
- examples/qos_sched/args.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ examples/qos_sched/args.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
@@ -28 +29 @@
-index 10ca7bea61..b2959499ae 100644
+index 10ca7bea61..ff51d0215a 100644
@@ -31 +32,7 @@
-@@ -428,5 +428,5 @@ app_parse_args(int argc, char **argv)
+@@ -12,4 +12,5 @@
+ #include <getopt.h>
+ 
++#include <rte_bitops.h>
+ #include <rte_log.h>
+ #include <rte_eal.h>
+@@ -428,5 +429,5 @@ app_parse_args(int argc, char **argv)
@@ -38 +45 @@
-@@ -434,5 +434,5 @@ app_parse_args(int argc, char **argv)
+@@ -434,5 +435,5 @@ app_parse_args(int argc, char **argv)