From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 132ABA034F for ; Tue, 1 Mar 2022 11:43:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0DEB8426DD; Tue, 1 Mar 2022 11:43:48 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 78BFE407FF for ; Tue, 1 Mar 2022 11:43:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bKINKxeqQfnqSmV60D32p3BRBAgoHOhjXUdJcznVESo=; b=OjpdQ9+b/in/QDAVtH60ClWaJhUDh9NCu2XCYB3AzPN2JYtu2oxZLRsVgcC8yAbDnm2nuU YeW/HoVBpSRCUxRRTzRuGFqEeyydTMcVdxu81K0ChBYQex0BexaeKV/STM1kOaBHBLS3Of LiPpO32ZXwDwJGvmN6O6wwDSEk9Y5Sc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-tcDrm54cOaecl1f3DOPdcg-1; Tue, 01 Mar 2022 05:43:43 -0500 X-MC-Unique: tcDrm54cOaecl1f3DOPdcg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 585E7824FA8; Tue, 1 Mar 2022 10:43:42 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AB696FB02; Tue, 1 Mar 2022 10:43:40 +0000 (UTC) From: Kevin Traynor To: Megha Ajmera Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'examples/qos_sched: fix core mask overflow' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:34 +0000 Message-Id: <20220301104300.334382-18-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Morten Brørup --- 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 +#include #include #include @@ -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 + ++#include + #include + #include +@@ -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)