From: Kevin Traynor <ktraynor@redhat.com>
To: David Marchand <david.marchand@redhat.com>
Cc: dpdk stable <stable@dpdk.org>
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 [thread overview]
Message-ID: <20220624150148.1855580-13-ktraynor@redhat.com> (raw)
In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com>
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 <david.marchand@redhat.com>
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 <david.marchand@redhat.com>
---
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)
next prev parent reply other threads:[~2022-06-24 15:02 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 15:01 patch 'trace: fix init with long file prefix' " Kevin Traynor
2022-06-24 15:01 ` patch 'test: drop reference to removed tests' " Kevin Traynor
2022-06-24 15:01 ` patch 'sched: remove unnecessary floating point' " Kevin Traynor
2022-06-24 15:01 ` patch 'eal/x86: drop export of internal alignment macro' " Kevin Traynor
2022-06-24 16:42 ` Kevin Traynor
2022-06-24 15:01 ` patch 'baseband/acc100: update companion PF configure function' " Kevin Traynor
2022-06-24 15:01 ` patch 'baseband/acc100: add protection for some negative scenario' " Kevin Traynor
2022-06-24 15:01 ` patch 'ipsec: fix NAT-T ports and length' " Kevin Traynor
2022-06-24 15:01 ` patch 'examples/ipsec-secgw: fix NAT-T header fields' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/iavf: fix NAT-T payload length' " Kevin Traynor
2022-06-24 15:01 ` patch 'examples/ipsec-secgw: fix ESN setting' " Kevin Traynor
2022-06-24 15:01 ` patch 'common/cpt: fix build with GCC 12' " Kevin Traynor
2022-06-24 15:01 ` patch 'crypto/cnxk: " Kevin Traynor
2022-06-24 15:01 ` Kevin Traynor [this message]
2022-06-24 15:01 ` patch 'crypto/scheduler: fix queue pair in scheduler failover' " Kevin Traynor
2022-06-24 15:01 ` patch 'test/crypto: fix cipher offset for ZUC' " Kevin Traynor
2022-06-24 15:01 ` patch 'test/ipsec: fix performance test' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/octeontx: fix SSO fast path' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/dlb2: rework queue drain handling' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/dlb2: fix check of QID in-flight' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/cnxk: fix QoS parameter handling' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/cnxk: fix Tx adapter enqueue return for CN10K' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/dlb2: fix advertized capabilities' " Kevin Traynor
2022-06-24 15:01 ` patch 'eventdev/eth_tx: fix adapter creation' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/bonding: fix RSS inconsistency between ports' " Kevin Traynor
2022-06-24 15:01 ` patch 'test/bonding: fix RSS test when disable RSS' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix an unreasonable memset' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: remove duplicate definition' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix code check warning' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix return value for unsupported tuple' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix crash from secondary process' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix TM capability' " Kevin Traynor
2022-06-24 15:01 ` patch 'app/testpmd: add help messages for multi-process' " Kevin Traynor
2022-06-24 15:01 ` patch 'app/testpmd: fix bonding slave devices not released' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/txgbe: fix register polling' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/ngbe: add more packet statistics' " Kevin Traynor
2022-06-24 15:01 ` patch 'app/testpmd: revert MAC update in checksum forwarding' " Kevin Traynor
2022-06-24 15:01 ` patch 'vhost: fix missing enqueue pseudo-header calculation' " Kevin Traynor
2022-06-24 15:01 ` patch 'vhost/crypto: fix build with GCC 12' " Kevin Traynor
2022-06-24 15:01 ` patch 'vhost/crypto: fix descriptor processing' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/virtio: unmap PCI device in secondary process' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220624150148.1855580-13-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=david.marchand@redhat.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).