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 92109A0093 for ; Wed, 9 Mar 2022 12:02:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B1DA40150; Wed, 9 Mar 2022 12:02:57 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 6215F40150 for ; Wed, 9 Mar 2022 12:02:56 +0100 (CET) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2CE8A3F79C for ; Wed, 9 Mar 2022 11:02:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823775; bh=TLoYN20zz6T8Cmg4mAMWJ8ISFmHN7mZgD8L6c0qUrEU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s87ds/M3bUlBC0rsMcwUjGaNoCmF4OXf33qajx7zyLwjpHKfQa6xmFkEBCS5K1QoD Clpkr9caHzLZYBK8r7NEFPGhDVonLs5FzwT2wz4pjbfxPHYxEEI8iRWzVymsvnTRoT cFRKryC76BRxw8l6eNYEi6ombVPwfXrOasXNOQbYQw+H9NjxhUxeDCMU/u3tfjpsQp zYHGWYrK/VIqcB7KntBOdRDJM8je9K2iSKYgd8NuyQ+xZH9MNHOLuJbW9fZOkHYHz9 hbKeHTGhAQ1KeAJyJR5pLKg1W+qXsMJDga2pB0tyK3cer5tk4EIoHzXaLecO9eQWbg CZoCDjcTQtUPg== Received: by mail-wm1-f69.google.com with SMTP id r133-20020a1c448b000000b00385c3f3defaso662825wma.3 for ; Wed, 09 Mar 2022 03:02:55 -0800 (PST) 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=TLoYN20zz6T8Cmg4mAMWJ8ISFmHN7mZgD8L6c0qUrEU=; b=E4vQz52Bgp67gAR972X40Vwyp66R+/FP6mngt5l+2uBS2hoXm+RPiCxrtIHvksHHT7 Asj3/v84Hlij2lmxdfxHedLHhUCuZOWYkNnR4h4gmtDZLRh2Z6iMWKu5qQHpOfKfnOAN lUaLcKdT2QbdST8DjH2pSoKwSTOmpXDmR2sC03qjGy1HiQqs5D2ksCIbGlLTdkSOJOL1 VTzvvQwCinMAqzsx3s3BxaK5akgRrxqUc/AG+o/L6O/x1ed92CLFKqQh2YVIl+gYGTJI 0VCVMY/gfYHNxm2/QM+22zevgiFk9R+LQ8YaB4JVo0GwrSW4+fgKCkiwIxUbWEpRpZwp oD+Q== X-Gm-Message-State: AOAM531J5RMkUhDQASDzVWlnbo3vBTn2UWJmEw+eLRdcz0h69/LVKUvE 8HrkbMjG28e5Au2omqTUV3MxFfM1Hkm5gpRqRKB2aKRnMXLhkj1VCdhdpqn9mclyXPr2p2A3ChB McDdJZPM+YHOBxg09WuBpAOcW X-Received: by 2002:adf:e84c:0:b0:1f0:1191:b4ab with SMTP id d12-20020adfe84c000000b001f01191b4abmr15024586wrn.675.1646823774130; Wed, 09 Mar 2022 03:02:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCVhK78J2+mTsJxqEmsRSZExvdT9LdVICXeTo2wDqvknMBg6wUCGFukDzURbe1jwkFUMNePw== X-Received: by 2002:adf:e84c:0:b0:1f0:1191:b4ab with SMTP id d12-20020adfe84c000000b001f01191b4abmr15024578wrn.675.1646823773924; Wed, 09 Mar 2022 03:02:53 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id u4-20020adfdb84000000b001e8d8ac5394sm1412993wri.110.2022.03.09.03.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:02:53 -0800 (PST) From: christian.ehrhardt@canonical.com To: Pablo de Lara Cc: Yipeng Wang , dpdk stable Subject: patch 'test/efd: fix sockets mask size' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:57 +0100 Message-Id: <20220309110116.1295395-26-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 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 19.11.12 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/11/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/9facdc79656ee67aa7f30b62af57a200cd0de20c Thanks. Christian Ehrhardt --- >From 9facdc79656ee67aa7f30b62af57a200cd0de20c Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Fri, 25 Feb 2022 09:27:44 +0000 Subject: [PATCH] test/efd: fix sockets mask size [ upstream commit 3b0e34e80b55bbd683f4aa8257e25cbea029489b ] Constant value 1 has a size of 32 bits, and shifting it more than 32 bits to the left overflows. 1ULL is needed to be able to get a 64-bit value. Coverity ID: 375846 Fixes: 8751a7e9832b ("efd: allow more CPU sockets in table creation") Signed-off-by: Pablo de Lara Acked-by: Yipeng Wang --- app/test/test_efd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_efd.c b/app/test/test_efd.c index 1f443c7d92..459ec44d0d 100644 --- a/app/test/test_efd.c +++ b/app/test/test_efd.c @@ -103,7 +103,7 @@ static inline uint64_t efd_get_all_sockets_bitmask(void) unsigned int next_lcore = rte_get_master_lcore(); const int val_true = 1, val_false = 0; for (i = 0; i < rte_lcore_count(); i++) { - all_cpu_sockets_bitmask |= 1 << rte_lcore_to_socket_id(next_lcore); + all_cpu_sockets_bitmask |= 1ULL << rte_lcore_to_socket_id(next_lcore); next_lcore = rte_get_next_lcore(next_lcore, val_false, val_true); } -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:44.739776718 +0100 +++ 0026-test-efd-fix-sockets-mask-size.patch 2022-03-09 11:57:43.392938381 +0100 @@ -1 +1 @@ -From 3b0e34e80b55bbd683f4aa8257e25cbea029489b Mon Sep 17 00:00:00 2001 +From 9facdc79656ee67aa7f30b62af57a200cd0de20c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3b0e34e80b55bbd683f4aa8257e25cbea029489b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 7bea674086..fa29e8f97a 100644 +index 1f443c7d92..459ec44d0d 100644 @@ -23,2 +24,2 @@ -@@ -107,7 +107,7 @@ static inline uint64_t efd_get_all_sockets_bitmask(void) - unsigned int next_lcore = rte_get_main_lcore(); +@@ -103,7 +103,7 @@ static inline uint64_t efd_get_all_sockets_bitmask(void) + unsigned int next_lcore = rte_get_master_lcore();