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 D1179A0093 for ; Fri, 24 Jun 2022 17:02:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC5CB4281B; Fri, 24 Jun 2022 17:02:22 +0200 (CEST) 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 6B85D415D7 for ; Fri, 24 Jun 2022 17:02:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082941; 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=fkNT3LCwP+D6yLsIDAdBaXFt82N81+FkQdwzaxyodKI=; b=BWwvsLYlHMMeE3iQNEv4S12nWvADyL4XFVvQVG+fqrCdsbx/uw8cbmI9t+jh2P/axSMeCO EaPikcXxWiN44GWYQEUmF+qwdbEk4Iq4SO1zvs62wp3onVjhmjRumEngg0kHzuh3zzsKIF ObkzePSzzENVyxDiaHrhsQ4oMLaJzvo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-664-7nRobBReOCGHmK7GIei-YQ-1; Fri, 24 Jun 2022 11:02:17 -0400 X-MC-Unique: 7nRobBReOCGHmK7GIei-YQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 98B5A3C025B1 for ; Fri, 24 Jun 2022 15:02:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDE4818EAC; Fri, 24 Jun 2022 15:02:16 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Subject: patch 'test/ipsec: fix build with GCC 12' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:21 +0100 Message-Id: <20220624150148.1855580-13-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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.2 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/27/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/9445fcf1388068915ae4c0cebbac527482b39215 Thanks. Kevin --- >From 9445fcf1388068915ae4c0cebbac527482b39215 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 16 Jun 2022 11:33:20 +0200 Subject: [PATCH] test/ipsec: fix build with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 6e108b6a7c0c0699e6304f7b5706736b34d32607 ] GCC 12 raises the following warning: In function ‘_mm256_loadu_si256’, inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:319:9, inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:344:2, inlined from ‘rte_memcpy_generic’ at ../lib/eal/x86/include/rte_memcpy.h:438:4, inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:882:10, inlined from ‘setup_test_string.constprop’ at ../app/test/test_ipsec.c:572:4: /usr/lib/gcc/x86_64-redhat-linux/12/include/avxintrin.h:929:10: error: array subscript ‘__m256i_u[3]’ is partly outside array bounds of ‘const char[108]’ [-Werror=array-bounds] 929 | return *__P; | ^~~~ ../app/test/test_ipsec.c: In function ‘setup_test_string.constprop’: ../app/test/test_ipsec.c:539:12: note: at offset 96 into object ‘null_plain_data’ of size 108 539 | const char null_plain_data[] = | ^~~~~~~~~~~~~~~ Add a hint so that the compiler understands the copied data is within the passed string boundaries. Bugzilla ID: 848 Fixes: 05fe65eb66b2 ("test/ipsec: introduce functional test") Signed-off-by: David Marchand --- app/test/test_ipsec.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c index bc2a3dbc2e..3c6dcdc604 100644 --- a/app/test/test_ipsec.c +++ b/app/test/test_ipsec.c @@ -544,10 +544,12 @@ struct rte_ipv4_hdr ipv4_outer = { static struct rte_mbuf * -setup_test_string(struct rte_mempool *mpool, - const char *string, size_t len, uint8_t blocksize) +setup_test_string(struct rte_mempool *mpool, const char *string, + size_t string_len, size_t len, uint8_t blocksize) { struct rte_mbuf *m = rte_pktmbuf_alloc(mpool); size_t t_len = len - (blocksize ? (len % blocksize) : 0); + RTE_VERIFY(len <= string_len); + if (m) { memset(m->buf_addr, 0, m->buf_len); @@ -1355,5 +1357,6 @@ test_ipsec_crypto_outb_burst_null_null(int i) for (j = 0; j < num_pkts && rc == 0; j++) { ut_params->ibuf[j] = setup_test_string(ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + null_plain_data, sizeof(null_plain_data), + test_cfg[i].pkt_sz, 0); if (ut_params->ibuf[j] == NULL) rc = TEST_FAILED; @@ -1473,5 +1476,6 @@ test_ipsec_inline_crypto_inb_burst_null_null(int i) ut_params->obuf[j] = setup_test_string( ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + null_plain_data, sizeof(null_plain_data), + test_cfg[i].pkt_sz, 0); if (ut_params->obuf[j] == NULL) rc = TEST_FAILED; @@ -1541,7 +1545,7 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) /* Generate inbound mbuf data */ for (j = 0; j < num_pkts && rc == 0; j++) { - ut_params->ibuf[j] = setup_test_string( - ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + ut_params->ibuf[j] = setup_test_string(ts_params->mbuf_pool, + null_plain_data, sizeof(null_plain_data), + test_cfg[i].pkt_sz, 0); if (ut_params->ibuf[j] == NULL) rc = TEST_FAILED; @@ -1550,5 +1554,6 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) ut_params->obuf[j] = setup_test_string( ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + null_plain_data, sizeof(null_plain_data), + test_cfg[i].pkt_sz, 0); if (ut_params->obuf[j] == NULL) rc = TEST_FAILED; @@ -1650,5 +1655,6 @@ test_ipsec_inline_crypto_outb_burst_null_null(int i) for (j = 0; j < num_pkts && rc == 0; j++) { ut_params->ibuf[j] = setup_test_string(ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + null_plain_data, sizeof(null_plain_data), + test_cfg[i].pkt_sz, 0); if (ut_params->ibuf[0] == NULL) rc = TEST_FAILED; @@ -1728,5 +1734,6 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) for (j = 0; j < num_pkts && rc == 0; j++) { ut_params->ibuf[j] = setup_test_string(ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + null_plain_data, sizeof(null_plain_data), + test_cfg[i].pkt_sz, 0); if (ut_params->ibuf[0] == NULL) rc = TEST_FAILED; @@ -1735,6 +1742,7 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) /* Generate test tunneled mbuf data for comparison */ ut_params->obuf[j] = setup_test_string( - ts_params->mbuf_pool, - null_plain_data, test_cfg[i].pkt_sz, 0); + ts_params->mbuf_pool, null_plain_data, + sizeof(null_plain_data), test_cfg[i].pkt_sz, + 0); if (ut_params->obuf[j] == NULL) rc = TEST_FAILED; @@ -1805,5 +1813,6 @@ test_ipsec_lksd_proto_inb_burst_null_null(int i) /* packet with sequence number 0 is invalid */ ut_params->ibuf[j] = setup_test_string(ts_params->mbuf_pool, - null_encrypted_data, test_cfg[i].pkt_sz, 0); + null_encrypted_data, sizeof(null_encrypted_data), + test_cfg[i].pkt_sz, 0); if (ut_params->ibuf[j] == NULL) rc = TEST_FAILED; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.347085849 +0100 +++ 0013-test-ipsec-fix-build-with-GCC-12.patch 2022-06-24 15:51:08.860984052 +0100 @@ -1 +1 @@ -From 6e108b6a7c0c0699e6304f7b5706736b34d32607 Mon Sep 17 00:00:00 2001 +From 9445fcf1388068915ae4c0cebbac527482b39215 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 6e108b6a7c0c0699e6304f7b5706736b34d32607 ] + @@ -38 +39,0 @@ -Cc: stable@dpdk.org @@ -46 +47 @@ -index 8da025bf66..7047e17960 100644 +index bc2a3dbc2e..3c6dcdc604 100644 @@ -49 +50 @@ -@@ -555,10 +555,12 @@ struct rte_ipv4_hdr ipv4_outer = { +@@ -544,10 +544,12 @@ struct rte_ipv4_hdr ipv4_outer = { @@ -64 +65 @@ -@@ -1366,5 +1368,6 @@ test_ipsec_crypto_outb_burst_null_null(int i) +@@ -1355,5 +1357,6 @@ test_ipsec_crypto_outb_burst_null_null(int i) @@ -72 +73 @@ -@@ -1484,5 +1487,6 @@ test_ipsec_inline_crypto_inb_burst_null_null(int i) +@@ -1473,5 +1476,6 @@ test_ipsec_inline_crypto_inb_burst_null_null(int i) @@ -80 +81 @@ -@@ -1552,7 +1556,7 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) +@@ -1541,7 +1545,7 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) @@ -91 +92 @@ -@@ -1561,5 +1565,6 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) +@@ -1550,5 +1554,6 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) @@ -99 +100 @@ -@@ -1661,5 +1666,6 @@ test_ipsec_inline_crypto_outb_burst_null_null(int i) +@@ -1650,5 +1655,6 @@ test_ipsec_inline_crypto_outb_burst_null_null(int i) @@ -107 +108 @@ -@@ -1739,5 +1745,6 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) +@@ -1728,5 +1734,6 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) @@ -115 +116 @@ -@@ -1746,6 +1753,7 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) +@@ -1735,6 +1742,7 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) @@ -125 +126 @@ -@@ -1816,5 +1824,6 @@ test_ipsec_lksd_proto_inb_burst_null_null(int i) +@@ -1805,5 +1813,6 @@ test_ipsec_lksd_proto_inb_burst_null_null(int i)