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 D3CB445DB9 for ; Wed, 27 Nov 2024 18:23:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFE84402DE; Wed, 27 Nov 2024 18:23:42 +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 E5F8A40A6E for ; Wed, 27 Nov 2024 18:23:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728219; 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=TiXkInma6IsqQ6DqWVXouy2E/h/lnpgIkr2U5mAnQYI=; b=VmOGKdKDlFRsDFji54q+qOi84fevZpWRqRzceEpCog7ZkGIjZiNKuIsKSrQ/87UgsFXfC7 XsIIH9bZuDvEqYR/cB/LyhZ73ArPF6qcEdZxzcKv16XrgSNjIz9QnCTlCZadHE4IrNAnOf 4zzpzs4zYVN2okjrdS1CjiJGEpjiLbk= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-616-UIqKkEvsNHy8CmEfi1aKeA-1; Wed, 27 Nov 2024 12:23:38 -0500 X-MC-Unique: UIqKkEvsNHy8CmEfi1aKeA-1 X-Mimecast-MFC-AGG-ID: UIqKkEvsNHy8CmEfi1aKeA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EF0FF1956077; Wed, 27 Nov 2024 17:23:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8068D300019E; Wed, 27 Nov 2024 17:23:35 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bruce Richardson , dpdk stable Subject: patch 'test/eal: fix loop coverage for alignment macros' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:19:06 +0000 Message-ID: <20241127171916.690404-119-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EiJ8HX_PhTh7v7TL4zGeh0_pOAM-HDzzvKlexIswL14_1732728217 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/883b3b43f7ca5db2f38197e3946ed59ad418f462 Thanks. Kevin --- >From 883b3b43f7ca5db2f38197e3946ed59ad418f462 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 21 Nov 2024 10:23:27 -0800 Subject: [PATCH] test/eal: fix loop coverage for alignment macros [ upstream commit b3e64fe596a3117edf6d3a79a6c5238a9b92dc4f ] The test loop was much shorter than desired because when MAX_NUM is defined with out paren's the divide operator / takes precedence over shift. But when MAX_NUM is fixed, some tests take too long and have to be modified to avoid running over full N^2 space of 1<<20. Note: this is a very old bug, goes back to 2013. Link: https://pvs-studio.com/en/blog/posts/cpp/1179/ Fixes: 1fb8b07ee511 ("app: add some tests") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- app/test/test_common.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/app/test/test_common.c b/app/test/test_common.c index f89e1eb7ee..372bb8f6ba 100644 --- a/app/test/test_common.c +++ b/app/test/test_common.c @@ -9,9 +9,10 @@ #include #include +#include #include #include "test.h" -#define MAX_NUM 1 << 20 +#define MAX_NUM (1 << 20) #define FAIL(x)\ @@ -218,17 +219,19 @@ test_align(void) } - for (p = 1; p <= MAX_NUM / 2; p++) { - for (i = 1; i <= MAX_NUM / 2; i++) { - val = RTE_ALIGN_MUL_CEIL(i, p); - if (val % p != 0 || val < i) - FAIL_ALIGN("RTE_ALIGN_MUL_CEIL", i, p); - val = RTE_ALIGN_MUL_FLOOR(i, p); - if (val % p != 0 || val > i) - FAIL_ALIGN("RTE_ALIGN_MUL_FLOOR", i, p); - val = RTE_ALIGN_MUL_NEAR(i, p); - if (val % p != 0 || ((val != RTE_ALIGN_MUL_CEIL(i, p)) - & (val != RTE_ALIGN_MUL_FLOOR(i, p)))) - FAIL_ALIGN("RTE_ALIGN_MUL_NEAR", i, p); - } + /* testing the whole space of 2^20^2 takes too long. */ + for (j = 1; j <= MAX_NUM ; j++) { + i = rte_rand_max(MAX_NUM - 1) + 1; + p = rte_rand_max(MAX_NUM - 1) + 1; + + val = RTE_ALIGN_MUL_CEIL(i, p); + if (val % p != 0 || val < i) + FAIL_ALIGN("RTE_ALIGN_MUL_CEIL", i, p); + val = RTE_ALIGN_MUL_FLOOR(i, p); + if (val % p != 0 || val > i) + FAIL_ALIGN("RTE_ALIGN_MUL_FLOOR", i, p); + val = RTE_ALIGN_MUL_NEAR(i, p); + if (val % p != 0 || ((val != RTE_ALIGN_MUL_CEIL(i, p)) + & (val != RTE_ALIGN_MUL_FLOOR(i, p)))) + FAIL_ALIGN("RTE_ALIGN_MUL_NEAR", i, p); } -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.995894895 +0000 +++ 0119-test-eal-fix-loop-coverage-for-alignment-macros.patch 2024-11-27 17:17:38.356270052 +0000 @@ -1 +1 @@ -From b3e64fe596a3117edf6d3a79a6c5238a9b92dc4f Mon Sep 17 00:00:00 2001 +From 883b3b43f7ca5db2f38197e3946ed59ad418f462 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3e64fe596a3117edf6d3a79a6c5238a9b92dc4f ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 21eb2285e1..6dbd7fc9a9 100644 +index f89e1eb7ee..372bb8f6ba 100644 @@ -30,2 +31,2 @@ -@@ -10,9 +10,10 @@ - #include +@@ -9,9 +9,10 @@ + #include @@ -42 +43 @@ -@@ -219,17 +220,19 @@ test_align(void) +@@ -218,17 +219,19 @@ test_align(void)