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 01D9EA0C45 for ; Thu, 10 Jun 2021 14:08:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED5D94003C; Thu, 10 Jun 2021 14:08:19 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 909294003C for ; Thu, 10 Jun 2021 14:08:19 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTv-0000CH-Bc; Thu, 10 Jun 2021 12:08:19 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: dpdk stable Date: Thu, 10 Jun 2021 14:06:29 +0200 Message-Id: <20210610120641.885862-41-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/table: fix build with GCC 11' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 06/12/21. 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/57a0b62dc4e166bdbf413aa9602cd88b7a0b4eac Thanks. Christian Ehrhardt --- >From 57a0b62dc4e166bdbf413aa9602cd88b7a0b4eac Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Mon, 17 May 2021 16:57:39 +0100 Subject: [PATCH] test/table: fix build with GCC 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 33c12ac5ba5f09727c6de807e71403dd260a7bbc ] Build error: ../app/test/test_table_tables.c: In function ‘test_table_stub’: ../app/test/test_table_tables.c:31:9: warning: ‘memset’ offset [0, 31] is out of the bounds [0, 0] [-Warray-bounds] memset((uint8_t *)mbuf + sizeof(struct rte_mbuf) + 32, 0, 32); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../app/test/test_table_tables.c:151:25: note: in expansion of macro ‘PREPARE_PACKET’ 151 | PREPARE_PACKET(mbufs[i], 0xadadadad); | ^~~~~~~~~~~~~~ 'key' points to mbuf header + 32 bytes, and memset clears next 32 bytes of 'key', so overall there needs to be 64 bytes after mbuf header. Adding a mbuf size check before memset. The original code has an assumption that mbuf data buffer follows mbuf header, this patch accepts same assumption. Bugzilla ID: 677 Fixes: 5205954791cb ("app/test: packet framework unit tests") Signed-off-by: Ferruh Yigit --- app/test/test_table_tables.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test/test_table_tables.c b/app/test/test_table_tables.c index 1aa269f95d..4ff6ab16aa 100644 --- a/app/test/test_table_tables.c +++ b/app/test/test_table_tables.c @@ -28,7 +28,8 @@ table_test table_tests[] = { APP_METADATA_OFFSET(0)); \ key = RTE_MBUF_METADATA_UINT8_PTR(mbuf, \ APP_METADATA_OFFSET(32)); \ - memset(key, 0, 32); \ + if (mbuf->priv_size + mbuf->buf_len >= 64) \ + memset(key, 0, 32); \ k32 = (uint32_t *) key; \ k32[0] = (value); \ *signature = pipeline_test_hash(key, NULL, 0, 0); \ -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.994794547 +0200 +++ 0041-test-table-fix-build-with-GCC-11.patch 2021-06-10 14:04:58.070024673 +0200 @@ -1 +1 @@ -From 33c12ac5ba5f09727c6de807e71403dd260a7bbc Mon Sep 17 00:00:00 2001 +From 57a0b62dc4e166bdbf413aa9602cd88b7a0b4eac Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 33c12ac5ba5f09727c6de807e71403dd260a7bbc ] + @@ -30 +31,0 @@ -Cc: stable@dpdk.org