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 0CD77A0350 for ; Mon, 28 Feb 2022 22:21:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07A55411AE; Mon, 28 Feb 2022 22:21:27 +0100 (CET) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by mails.dpdk.org (Postfix) with ESMTP id 21A61411AE for ; Mon, 28 Feb 2022 22:21:26 +0100 (CET) Received: by mail-ej1-f45.google.com with SMTP id a23so27468512eju.3 for ; Mon, 28 Feb 2022 13:21:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fDuiEeDccmAHo1wPyisRXf2OrWRxdVRXhPk0a6EzSvI=; b=EKHMRGi2bDtSnFbpMYQzQaJCHcgNDEP+msBhjgOE4N/GM0tkVfceUADfdmH75T3eqm 1ALBGc8sG0MSWjpfZMTlEFUM2y63BsOtkLbOG7R0VV9M4UTIDvEFZNYKfQrpZabfmtuF i5Nt5Nki4oN4OyUxER3xXjntwlKqNnL/gFkGMDtlJZ72slYaC1mc0yWDFpoA759hNdSL P90brVSv/nsmE17l7ZzGxxX3qBq9gHjTFQoJEfDPmhdzBKBmVTiqeL5L8Ahu9A0CB/Ew uXzflKYsSyk0/mmqvEB/uHnxwlJbjazDJlfVvs/iiXy9fRfcfTpft9RJZHWbamtHb0L5 XtGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fDuiEeDccmAHo1wPyisRXf2OrWRxdVRXhPk0a6EzSvI=; b=6ORwiRAV4z19BY3hTKyTPBCB5Ds58kCGrxxFYS/nYwzVgw3ssTr5aXHjFEEnv9QnMk G2ni+pG57uWCELTr5iCvtduRNYi58iZMlbmyIrZBzDKAJOCg107poFHsjNMKa6h7HmSO g2sn3Gi+XLRK6xEjrZlJE18od3XAHe9WwtNuye1EW/SUpzhpMD1YWXg4KV/X0WVrz46H e0dEOGIsmCRkZ7DUNds0VM5h5NI3/uVp155otJ6iUoKivK2JRTCaH8qfFyMckuh1UmIo n64fsiG+RtItwS0w/bzuLpk8IEfM7tIE4inFKkapgyFf785qO9m7ULL8aWN7WrCc+RIZ mTDA== X-Gm-Message-State: AOAM533EtTHBpSwU0arr5jNSHL9aoY1IMU3+P0CuVrPLzp3OJAN8Z9Xk 92zr/6m/kmq0OoqkwHxIBrA= X-Google-Smtp-Source: ABdhPJwBHoh3FoBUmEWmGBpgT+sK3yXToalJ0WddrStIVyLgvY4VO6RArvAIbc4ZFMI4pt/UKVmucQ== X-Received: by 2002:a17:906:b804:b0:6cf:bb48:5a9b with SMTP id dv4-20020a170906b80400b006cfbb485a9bmr17314341ejb.187.1646083284656; Mon, 28 Feb 2022 13:21:24 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id s14-20020aa7cb0e000000b00410bf015567sm6251901edt.92.2022.02.28.13.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:24 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.5 Date: Mon, 28 Feb 2022 21:20:09 +0000 Message-Id: <20220228212047.3341966-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a7aa7d8812abe4034027363036a0ec297574f49d Thanks. Luca Boccassi --- >From a7aa7d8812abe4034027363036a0ec297574f49d 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c index c369ba9b4d..891cfb2809 100644 --- a/examples/qos_sched/args.c +++ b/examples/qos_sched/args.c @@ -410,13 +410,13 @@ 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); return -1; } } - 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()) || (app_main_core != rte_get_main_lcore())) { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:55.022866035 +0000 +++ 0013-examples-qos_sched-fix-core-mask-overflow.patch 2022-02-28 21:17:53.820928793 +0000 @@ -1 +1 @@ -From 9c9fad3dfa042ae4b7a045cb1731f8701f8210e6 Mon Sep 17 00:00:00 2001 +From a7aa7d8812abe4034027363036a0ec297574f49d Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 9c9fad3dfa042ae4b7a045cb1731f8701f8210e6 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 10ca7bea61..b2959499ae 100644 +index c369ba9b4d..891cfb2809 100644 @@ -31 +32 @@ -@@ -427,13 +427,13 @@ app_parse_args(int argc, char **argv) +@@ -410,13 +410,13 @@ app_parse_args(int argc, char **argv)