RE: [EXTERNAL] [RFC v4 1/1] eventdev: add atomic queue to test-eventdev app
> -Original Message- > From: Luka Jankovic > Sent: Monday, January 13, 2025 5:48 PM > To: luka.janko...@ericsson.com > Cc: dev@dpdk.org; mattias.ronnb...@ericsson.com > Subject: [EXTERNAL] [RFC v4 1/1] eventdev: add atomic queue to test-eventdev > app > > Add an atomic queue test based on the order queue test that exclusively uses > atomic queues. This makes it compatible with event devices such as the > distributed software eventdev. The test detects if port maintenance is > required. > To verify atomicity, > Add an atomic queue test based on the order queue test that exclusively uses > atomic queues. > This makes it compatible with event devices such as the distributed software > eventdev. > > The test detects if port maintenance is required. > > To verify atomicity, a spinlock is set up for each combination of queue and > flow. > It is taken whenever an event is dequeued for processing and released when > processing is finished. > The test will fail if a port attempts to take a lock which is already taken. > > Signed-off-by: Luka Jankovic > --- > v4: > * Fix code style issues. > * Remove unused imports. > v3: > * Use struct to avoid bit operations when accessing event u64. > * Changed __rte_always_inline to inline for processing stages. > * Introduce idle timeout constant. > * Formatting and cleanup. > > v2: > * Changed to only check queue, flow combination, not port, queue, flow. > * Lock is only held when a packet is processed. > * Utilize event u64 instead of mbuf. > * General cleanup. > --- > app/test-eventdev/evt_common.h| 9 + > app/test-eventdev/meson.build | 1 + > app/test-eventdev/test_atomic_queue.c | 412 Please update doc/guides/tools/testeventdev.rst
Re: [PATCH v1 2/2] ethdev: fix skip valid port in probing callback
13/01/2025 13:05, lihuisong (C):
> 在 2025/1/13 19:23, lihuisong (C) 写道:
> > 在 2025/1/13 18:57, Thomas Monjalon 写道:
> >> 13/01/2025 10:35, lihuisong (C):
> >>> 在 2025/1/13 16:16, Thomas Monjalon 写道:
> 13/01/2025 03:55, Huisong Li:
> > The event callback in application may use the macro
> > RTE_ETH_FOREACH_DEV to
> > iterate over all enabled ports to do something(like, verifying the
> > port id
> > validity) when receive a probing event. If the ethdev state of a
> > port is
> > not RTE_ETH_DEV_UNUSED, this port will be considered as a valid port.
> >
> > However, this state is set to RTE_ETH_DEV_ATTACHED after pushing
> > probing
> > event. It means that probing callback will skip this port. But this
> > assignment can not move to front of probing notification. See
> > commit be8cd210379a ("ethdev: fix port probing notification")
> >
> > So this patch has to add a new state, RTE_ETH_DEV_ALLOCATED. Set
> > the ethdev
> > state to RTE_ETH_DEV_ALLOCATED before pushing probing event and
> > set it to
> > RTE_ETH_DEV_ATTACHED after definitely probed. And this port is
> > valid if its
> > device state is 'ALLOCATED' or 'ATTACHED'.
>
> If you do that, changing the definition of eth_dev_find_free_port()
> you allow the application using a port before probing is finished.
> >>> Yes, it's not reasonable.
> >>>
> >>> Thinking your comment twice, I feel that the root cause of this
> >>> issue is
> >>> application want to check if the port id is valid.
> >>> However, application just receive the new event from the device and the
> >>> port id of this device must be valid when report new event.
> >>> So application can think the received new event is valid and don't need
> >>> to check, right?
> >>
> >> Yes
> >> Do you think it should be highlighted in the API doc?
> > Security detection is common and always good for application.
> > So I think it's better to highlight that in doc.
> >
> Now I remember why I have to put this patch into the patchset [1] that
> testpmd support multiple process attach and detach port.
> Becase patch 4/5 in this series depands on this patch.
> The setup_attached_port() have to move to eth_event_callback() in
> testpmd to update something.
> And the setup_attached_port() would indirectyly check if this port is
> valid by rte_eth_dev_is_valid_port().
> Their caller stack is as follows:
> eth_event_callback
> -->setup_attached_port
> -->rte_eth_dev_socket_id
> -->rte_eth_dev_is_valid_port
>
> From the testpmd's modification, that is to say, it is possible for
> appllication to call some APIs like rte_eth_dev_socket_id() and
> indirectyly check if this port id is valid in event new callback.
> So should we add this patch? I think there are many like these API in
> ethdev layer. I'm confused a bit now.
Yes rte_eth_dev_is_valid_port() is used in many API functions,
so that's a valid concern.
I would say we should not call much of these functions in the "new port"
event callback.
But the case of rte_eth_dev_socket_id() is concerning.
I suggest to update rte_eth_dev_socket_id() to make it work with
a newly allocated port.
I suppose we can use the function eth_dev_is_allocated().
Re: [PATCH v1 2/2] ethdev: fix skip valid port in probing callback
在 2025/1/13 20:30, Thomas Monjalon 写道:
13/01/2025 13:05, lihuisong (C):
在 2025/1/13 19:23, lihuisong (C) 写道:
在 2025/1/13 18:57, Thomas Monjalon 写道:
13/01/2025 10:35, lihuisong (C):
在 2025/1/13 16:16, Thomas Monjalon 写道:
13/01/2025 03:55, Huisong Li:
The event callback in application may use the macro
RTE_ETH_FOREACH_DEV to
iterate over all enabled ports to do something(like, verifying the
port id
validity) when receive a probing event. If the ethdev state of a
port is
not RTE_ETH_DEV_UNUSED, this port will be considered as a valid port.
However, this state is set to RTE_ETH_DEV_ATTACHED after pushing
probing
event. It means that probing callback will skip this port. But this
assignment can not move to front of probing notification. See
commit be8cd210379a ("ethdev: fix port probing notification")
So this patch has to add a new state, RTE_ETH_DEV_ALLOCATED. Set
the ethdev
state to RTE_ETH_DEV_ALLOCATED before pushing probing event and
set it to
RTE_ETH_DEV_ATTACHED after definitely probed. And this port is
valid if its
device state is 'ALLOCATED' or 'ATTACHED'.
If you do that, changing the definition of eth_dev_find_free_port()
you allow the application using a port before probing is finished.
Yes, it's not reasonable.
Thinking your comment twice, I feel that the root cause of this
issue is
application want to check if the port id is valid.
However, application just receive the new event from the device and the
port id of this device must be valid when report new event.
So application can think the received new event is valid and don't need
to check, right?
Yes
Do you think it should be highlighted in the API doc?
Security detection is common and always good for application.
So I think it's better to highlight that in doc.
Now I remember why I have to put this patch into the patchset [1] that
testpmd support multiple process attach and detach port.
Becase patch 4/5 in this series depands on this patch.
The setup_attached_port() have to move to eth_event_callback() in
testpmd to update something.
And the setup_attached_port() would indirectyly check if this port is
valid by rte_eth_dev_is_valid_port().
Their caller stack is as follows:
eth_event_callback
-->setup_attached_port
-->rte_eth_dev_socket_id
-->rte_eth_dev_is_valid_port
From the testpmd's modification, that is to say, it is possible for
appllication to call some APIs like rte_eth_dev_socket_id() and
indirectyly check if this port id is valid in event new callback.
So should we add this patch? I think there are many like these API in
ethdev layer. I'm confused a bit now.
Yes rte_eth_dev_is_valid_port() is used in many API functions,
so that's a valid concern.
I would say we should not call much of these functions in the "new port"
event callback.
But the case of rte_eth_dev_socket_id() is concerning.
I suggest to update rte_eth_dev_socket_id() to make it work with
a newly allocated port.
I suppose we can use the function eth_dev_is_allocated().
What you mean is doing it like the following code?
-->
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -635,8 +635,10 @@ int
rte_eth_dev_socket_id(uint16_t port_id)
{
int socket_id = SOCKET_ID_ANY;
+ struct rte_eth_dev *ethdev;
- if (!rte_eth_dev_is_valid_port(port_id)) {
+ ethdev = &rte_eth_devices[port_id];
+ if (!eth_dev_is_allocated(ethdev)) {
rte_errno = EINVAL;
} else {
socket_id = rte_eth_devices[port_id].data->numa_node;
.
Re: [PATCH v1 2/2] ethdev: fix skip valid port in probing callback
在 2025/1/13 21:14, Thomas Monjalon 写道:
13/01/2025 13:47, lihuisong (C):
在 2025/1/13 20:30, Thomas Monjalon 写道:
13/01/2025 13:05, lihuisong (C):
在 2025/1/13 19:23, lihuisong (C) 写道:
在 2025/1/13 18:57, Thomas Monjalon 写道:
13/01/2025 10:35, lihuisong (C):
在 2025/1/13 16:16, Thomas Monjalon 写道:
13/01/2025 03:55, Huisong Li:
The event callback in application may use the macro
RTE_ETH_FOREACH_DEV to
iterate over all enabled ports to do something(like, verifying the
port id
validity) when receive a probing event. If the ethdev state of a
port is
not RTE_ETH_DEV_UNUSED, this port will be considered as a valid port.
However, this state is set to RTE_ETH_DEV_ATTACHED after pushing
probing
event. It means that probing callback will skip this port. But this
assignment can not move to front of probing notification. See
commit be8cd210379a ("ethdev: fix port probing notification")
So this patch has to add a new state, RTE_ETH_DEV_ALLOCATED. Set
the ethdev
state to RTE_ETH_DEV_ALLOCATED before pushing probing event and
set it to
RTE_ETH_DEV_ATTACHED after definitely probed. And this port is
valid if its
device state is 'ALLOCATED' or 'ATTACHED'.
If you do that, changing the definition of eth_dev_find_free_port()
you allow the application using a port before probing is finished.
Yes, it's not reasonable.
Thinking your comment twice, I feel that the root cause of this
issue is
application want to check if the port id is valid.
However, application just receive the new event from the device and the
port id of this device must be valid when report new event.
So application can think the received new event is valid and don't need
to check, right?
Yes
Do you think it should be highlighted in the API doc?
Security detection is common and always good for application.
So I think it's better to highlight that in doc.
Now I remember why I have to put this patch into the patchset [1] that
testpmd support multiple process attach and detach port.
Becase patch 4/5 in this series depands on this patch.
The setup_attached_port() have to move to eth_event_callback() in
testpmd to update something.
And the setup_attached_port() would indirectyly check if this port is
valid by rte_eth_dev_is_valid_port().
Their caller stack is as follows:
eth_event_callback
-->setup_attached_port
-->rte_eth_dev_socket_id
-->rte_eth_dev_is_valid_port
From the testpmd's modification, that is to say, it is possible for
appllication to call some APIs like rte_eth_dev_socket_id() and
indirectyly check if this port id is valid in event new callback.
So should we add this patch? I think there are many like these API in
ethdev layer. I'm confused a bit now.
Yes rte_eth_dev_is_valid_port() is used in many API functions,
so that's a valid concern.
I would say we should not call much of these functions in the "new port"
event callback.
But the case of rte_eth_dev_socket_id() is concerning.
I suggest to update rte_eth_dev_socket_id() to make it work with
a newly allocated port.
I suppose we can use the function eth_dev_is_allocated().
What you mean is doing it like the following code?
-->
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -635,8 +635,10 @@ int
rte_eth_dev_socket_id(uint16_t port_id)
{
int socket_id = SOCKET_ID_ANY;
+ struct rte_eth_dev *ethdev;
- if (!rte_eth_dev_is_valid_port(port_id)) {
+ ethdev = &rte_eth_devices[port_id];
+ if (!eth_dev_is_allocated(ethdev)) {
rte_errno = EINVAL;
} else {
socket_id = rte_eth_devices[port_id].data->numa_node;
Yes. Would it work?
I think it can work for this API.
From the disscussion for this patch, we've come to an aggreement that
application can think port is valid in new event.
Now that the port id is valid, the new event callback of application may
call other API, for example, rte_eth_dev_info_get().
(Apllication may call rte_eth_dev_info_get to get someting in new event
callback)
Note: patch 4/5 modified in the series[1] also used this API.
-->
eth_event_callback
-->setup_attached_port
-->reconfig
-->init_config_port_offloads
-->eth_dev_info_get_print_err
---
There is RTE_ETH_VALID_PORTID_OR_ERR_RET to check port_id is valid in
rte_eth_dev_info_get.
Application also happen to this issue like rte_eth_dev_socket_id, right?
This macro is also widely used in ethdev layer. We probability need to
filter out all these interfaces which can be used in new event callback.
And then handle the check for port_id in these interfaces like
rte_eth_dev_socket_id.
What do you think? Are there any other similar interfaces in ethdev layer?
.
[PATCH v15 54/60] table: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/table/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/table/meson.build b/lib/table/meson.build index 9b3d9ac759..f15796f063 100644 --- a/lib/table/meson.build +++ b/lib/table/meson.build @@ -1,6 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'rte_swx_keycmp.c', 'rte_swx_table_em.c', -- 2.47.0.vfs.0.3
Re: [PATCH 1/2] lib/ipsec: compile ipsec on Windows
On Thu, Jan 09, 2025 at 05:27:11PM +, Konstantin Ananyev wrote:
>
>
> > Removed VLA for compatibility with MSVC (which does not support VLAs).
> > Used alloca when a constant fixed length that can be used instead is
> > not known.
> >
> ...
>
> > Signed-off-by: Andre Muezerie
> > ---
>
> ...
>
> > diff --git a/lib/ipsec/esp_inb.c b/lib/ipsec/esp_inb.c
> > index f159bf7460..305ac48dc5 100644
> > --- a/lib/ipsec/esp_inb.c
> > +++ b/lib/ipsec/esp_inb.c
> > @@ -370,8 +370,9 @@ esp_inb_pkt_prepare(const struct rte_ipsec_session *ss,
> > struct rte_mbuf *mb[],
> > struct rte_cryptodev_sym_session *cs;
> > struct replay_sqn *rsn;
> > union sym_op_data icv;
> > - uint32_t dr[num];
> > + uint32_t *dr;
>
> I understand the intention, but obviously as the lib maintainer, I am no
> very happy with mechanic replacement of VLAs with alloca() calls.
> Again, while it helps to make MSVC happy, it doesn't really solve a potential
> problem
> with using VLAs here - I we can end-up with stack overflowed if someone will
> call
> one of these functions with input arrays of huge size.
> It would be much better to re-work the internal functions to work over
> fixed-size array
> an then call them in a loop.
> The main issue here is that by API convention we need to re-arrange input
> array by
> moving bad (not processed) mbuf after the good ones.
> But even with that splitting processing into multiple iterations over small
> chunks
> might help I think.
Understood. I'll focus on the other patches being reviewed and revisit this one
at some other time.
>
> > + dr = alloca(sizeof(uint32_t) * num);
> > sa = ss->sa;
> > cs = ss->crypto.ses;
> > rsn = rsn_acquire(sa);
> > @@ -576,12 +577,16 @@ tun_process(struct rte_ipsec_sa *sa, struct rte_mbuf
> > *mb[],
> > uint32_t sqn[], uint32_t dr[], uint16_t num, uint8_t sqh_len)
> > {
> > uint32_t adj, i, k, tl, bytes;
> > - uint32_t hl[num], to[num];
> > - struct rte_esp_tail espt[num];
> > - struct rte_mbuf *ml[num];
> > + uint32_t *hl, *to;
> > + struct rte_esp_tail *espt;
> > + struct rte_mbuf **ml;
> > const void *outh;
> > void *inh;
> >
> > + hl = alloca(sizeof(uint32_t) * num);
> > + to = alloca(sizeof(uint32_t) * num);
> > + espt = alloca(sizeof(struct rte_esp_tail) * num);
> > + ml = alloca(sizeof(struct rte_mbuf *) * num);
> > /*
> > * remove icv, esp trailer and high-order
> > * 32 bits of esn from packet length
[PATCH v15 13/60] test: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Acked-by: Chengwen Feng
---
app/test/test.c | 2 +-
app/test/test_cmdline_string.c| 2 +-
app/test/test_cryptodev.c | 34 +--
app/test/test_cryptodev_blockcipher.c | 4 +--
app/test/test_cryptodev_crosscheck.c | 2 +-
app/test/test_dmadev.c| 9 +++--
app/test/test_hash.c | 14
app/test/test_mempool.c | 25 +++---
app/test/test_reorder.c | 48 +++
app/test/test_service_cores.c | 9 +++--
app/test/test_thash.c | 7 ++--
11 files changed, 82 insertions(+), 74 deletions(-)
diff --git a/app/test/test.c b/app/test/test.c
index 680351f6a3..fd653cbbfd 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -105,7 +105,7 @@ int
main(int argc, char **argv)
{
struct cmdline *cl;
- char *tests[argc]; /* store an array of tests to run */
+ char **tests = alloca(sizeof(char *) * argc); /* store an array of
tests to run */
int test_count = 0;
int i;
char *extra_args;
diff --git a/app/test/test_cmdline_string.c b/app/test/test_cmdline_string.c
index 97516c9400..e1cf86020f 100644
--- a/app/test/test_cmdline_string.c
+++ b/app/test/test_cmdline_string.c
@@ -40,7 +40,7 @@ struct string_elt_str string_elt_strs[] = {
#if (CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE) \
|| (CMDLINE_TEST_BUFSIZE < STR_MULTI_TOKEN_SIZE)
#undef CMDLINE_TEST_BUFSIZE
-#define CMDLINE_TEST_BUFSIZE RTE_MAX(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE)
+#define CMDLINE_TEST_BUFSIZE RTE_MAX_T(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE,
size_t)
#endif
struct string_nb_str {
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a33ef574cc..c05d377f0f 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2886,7 +2886,7 @@ create_wireless_algo_hash_session(uint8_t dev_id,
enum rte_crypto_auth_operation op,
enum rte_crypto_auth_algorithm algo)
{
- uint8_t hash_key[key_len];
+ uint8_t *hash_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -2922,7 +2922,7 @@ create_wireless_algo_cipher_session(uint8_t dev_id,
const uint8_t *key, const uint8_t key_len,
uint8_t iv_len)
{
- uint8_t cipher_key[key_len];
+ uint8_t *cipher_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -3074,7 +3074,7 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
const struct wireless_test_data *tdata)
{
const uint8_t key_len = tdata->key.len;
- uint8_t cipher_auth_key[key_len];
+ uint8_t *cipher_auth_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -9078,7 +9078,7 @@ create_aead_session(uint8_t dev_id, enum
rte_crypto_aead_algorithm algo,
const uint16_t aad_len, const uint8_t auth_len,
uint8_t iv_len)
{
- uint8_t aead_key[key_len];
+ uint8_t *aead_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -12989,7 +12989,7 @@ test_cryptodev_error_recover_helper(uint8_t dev_id,
const void *test_data, bool
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
const struct blockcipher_test_data *tdata = test_data;
- uint8_t cipher_key[tdata->cipher_key.len];
+ uint8_t *cipher_key = alloca(tdata->cipher_key.len);
struct rte_crypto_sym_op *sym_op = NULL;
struct rte_crypto_op *op = NULL;
char *dst;
@@ -13343,7 +13343,7 @@ static int
test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
{
struct aead_test_data tdata;
- uint8_t aad[gcm_test_case_7.aad.len];
+ uint8_t *aad = alloca(gcm_test_case_7.aad.len);
int res;
RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
@@ -13732,7 +13732,7 @@ static int
test_AES_GCM_auth_decryption_fail_aad_corrupt(void)
{
struct aead_test_data tdata;
- uint8_t aad[gcm_test_case_7.aad.len];
+ uint8_t *aad = alloca(gcm_test_case_7.aad.len);
int res;
memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
@@ -13984,7 +13984,7 @@ test_authenticated_encryption_sessionless(
int retval;
uint8_t *ciphertext, *auth_
[PATCH v15 32/60] drivers/baseband: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/baseband/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/baseband/meson.build b/drivers/baseband/meson.build index 3420d98564..6aa1b5b17e 100644 --- a/drivers/baseband/meson.build +++ b/drivers/baseband/meson.build @@ -17,3 +17,11 @@ drivers = [ std_deps = [ 'bbdev' ] log_prefix = 'pmd.bb' + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
Re: [PATCH] app/testpmd: add ipv6 extension header parse
Hi, Stephen Hemminger,
On 2025/1/9 1:02, Stephen Hemminger wrote:
On Wed, 8 Jan 2025 10:46:32 +0800
Jie Hai wrote:
From: Jie Hai
To: , , , Aman Singh
CC: , , ,
Subject: [PATCH] app/testpmd: add ipv6 extension header parse
Date: Wed, 8 Jan 2025 10:46:32 +0800
X-Mailer: git-send-email 2.22.0
This patch support parse ipv6 extension header, and
support TSO for ipv6tcp packets with extension header.
Signed-off-by: Jie Hai
---
app/test-pmd/csumonly.c | 47 -
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 2246c22e8e56..a7b11490fe27 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -124,14 +124,59 @@ parse_ipv4(struct rte_ipv4_hdr *ipv4_hdr, struct
testpmd_offload_info *info)
info->l4_len = 0;
}
+static uint16_t
+parse_ipv6_ext(struct rte_ipv6_hdr *ipv6_hdr, uint32_t *off)
+{
+ struct ext_hdr {
+ uint8_t next_hdr;
+ uint8_t len;
+ };
+ struct ext_hdr *xh;
+ uint16_t proto;
+ char *xh_fst;
+ uint16_t i;
+
+ proto = ipv6_hdr->proto;
+ xh_fst = (char *)ipv6_hdr + sizeof(*ipv6_hdr);
+#define MAX_EXT_HDRS 9
+ for (i = 0; i < MAX_EXT_HDRS; i++) {
+ switch (proto) {
+ case IPPROTO_HOPOPTS:
+ case IPPROTO_ROUTING:
+ case IPPROTO_DSTOPTS:
+ xh = (struct ext_hdr *)(xh_fst + *off);
+ *off += (xh->len + 1) * 8;
+ proto = xh->next_hdr;
+ break;
+ case IPPROTO_AH:
+ xh = (struct ext_hdr *)(xh_fst + *off);
+ *off += (xh->len + 2) * 4;
+ proto = xh->next_hdr;
+ break;
+ case IPPROTO_FRAGMENT:
+ xh = (struct ext_hdr *)(xh_fst + *off);
+ *off += 8;
+ proto = xh->next_hdr;
+ return proto; /* this is always the last ext hdr */
+ case IPPROTO_NONE:
+ return proto;
+ default:
+ return proto;
+ }
+ }
+ return proto;
+}
+
Why copy/paste of rte_net_skip_ip6_ext, why not use that?
Having two copies of same codes means that bugs need to be fixed in two places
later.
.
Thanks for your review.
rte_net_skip_ip6_ext uses mbuf as a parameter, but its upper-layer
function does not pass this parameter, and it is difficult to deduce the
mbuf address. It would also be strange to pass only the mbuf address and
not use it.
My idea is to replace the packet identification in csum fwd with
'rte_net_get_ptype()'. In this case, 'rte_net_get_ptype' needs to be
updated to adapt to the packet types supported by csum fwd. This may
affect the ptype of packets identified by the current software.
I'm not sure how big the impact is, which is why I didn't use it.
Maybe I can send it out later for review.
Thanks,
Jie Hai
[PATCH v15 04/60] ethdev: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/ethdev/rte_ethdev.c:3244:16
: warning: ISO C90 forbids variable length array ‘xstats_names’
2) ./lib/ethdev/rte_ethdev.c:3345:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
3) ./lib/ethdev/rte_ethdev.c:3538:16
: warning: ISO C90 forbids variable length array ‘xstats’
4) ./lib/ethdev/rte_ethdev.c:3554:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
For 1) and 3) - just replaced VLA with arrays allocated from heap.
As I understand xstats extraction belongs to control-path, so extra
calloc/free is hopefully acceptable.
Also ethdev xstats already doing that within
rte_eth_xstats_get_id_by_name().
For 2) and 4) changed the code to use fixed size array and call
appropriate devops function several times, if needed.
Signed-off-by: Konstantin Ananyev
---
lib/ethdev/rte_ethdev.c | 183 +---
1 file changed, 113 insertions(+), 70 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..09cc4764c3 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -36,6 +36,8 @@
#include "ethdev_trace.h"
#include "sff_telemetry.h"
+#define ETH_XSTATS_ITER_NUM0x100
+
struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
/* public fast-path API */
@@ -3308,7 +3310,8 @@ int
rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
uint64_t *id)
{
- int cnt_xstats, idx_xstat;
+ int cnt_xstats, idx_xstat, rc;
+ struct rte_eth_xstat_name *xstats_names;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3334,26 +3337,33 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const
char *xstat_name,
}
/* Get id-name lookup table */
- struct rte_eth_xstat_name xstats_names[cnt_xstats];
+ xstats_names = calloc(cnt_xstats, sizeof(xstats_names[0]));
+ if (xstats_names == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
+ }
if (cnt_xstats != rte_eth_xstats_get_names_by_id(
port_id, xstats_names, cnt_xstats, NULL)) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot get xstats lookup");
+ free(xstats_names);
return -1;
}
+ rc = -EINVAL;
for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
if (!strcmp(xstats_names[idx_xstat].name, xstat_name)) {
*id = idx_xstat;
rte_eth_trace_xstats_get_id_by_name(port_id,
xstat_name, *id);
-
- return 0;
+ rc = 0;
+ break;
};
}
- return -EINVAL;
+ free(xstats_names);
+ return rc;
}
/* retrieve basic stats names */
@@ -3399,6 +3409,38 @@ eth_basic_stats_get_names(struct rte_eth_dev *dev,
return cnt_used_entries;
}
+static int
+eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names, uint32_t size,
+ uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+* Convert ids to xstats ids that PMD knows.
+* ids known by user are basic + extended stats.
+*/
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy,
+ xstats_names + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
+
/* retrieve ethdev extended statistics names */
int
rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -3406,9 +3448,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
uint64_t *ids)
{
struct rte_eth_xstat_name *xstats_names_copy;
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
unsigned int expected_entries;
+ unsigned int nb_basic_stats;
unsigned int basic_count;
struct rte_eth_dev *dev;
unsigned int i;
@@ -3434,27 +3475,18 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
if (ids && !xstats_names)
return -EINVAL;
- if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
- uint64_t ids_copy[size];
-
- for (i = 0; i < size; i++) {
- if (ids[i] < basic_count) {
- no_basic_stat_requested = 0;
- break;
- }
-
-
[PATCH v15 00/60] remove use of VLAs for Windows
As per guidance technical board meeting 2024/04/17. This series removes the use of VLAs from code built for Windows for all 3 toolchains. If there are additional opportunities to convert VLAs to regular C arrays please provide the details for incorporation into the series. MSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK. v15: * inverted some of the logic added during v14: add -Wvla to meson build files in app and lib directories, adding -Wno-vla to the few subdirectories which are not yet VLA free v14: * add -Wvla to meson build for directories that are VLA free under app, lib, drivers. This is to ensure that new VLAs are not added to these directories in the future. v13: * increase stack allocated buffer size in ipv4_reassembly_interleaved_flows_perf and ipv6_reassembly_interleaved_flows_perf to avoid STATUS_STACK_BUFFER_OVERRUN on Windows using MSVC v12: * update commit message for patch 06/21 to avoid warning v11: * add include stdlib.h for alloca() declaration on FreeBSD * zero-initialize array without code loop * increase maximum tuple length v10: * add ifdef to scope gcc's diagnostic error down to gcc only v9: * fix sender's email address * fix gcc's diagnostic error string to make clang happy v8: * rebase * reduce scope for disabling error "-Warray-bounds=" to only the place that needs it * remove parentesis around numbers from defines in test_bitset.c v7: * remove use of VLA from new file which sneaked in during review v6: * remove use of VLA from new test code added recently * fix title for patch 08/20 v5: * add patches for net/ice, net/ixgbe and gro from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=* * address debug_autotest ASan failure * address array-bound error in bitset_autotest with gcc-13 v4: * rebase and adapt for changes made in main since v3 was sent * use fixed maximum array size instead of VLA when doable v3: * address checkpatch/check git log warnings (minor typos) v2: * replace patches for ethdev, hash, rcu and include new patches for eal from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31781 Andre Muezerie (42): test: remove use of VLAs for Windows built code in bitset tests app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd hash: remove use of VLAs by using standard arrays app/pdump: disable warning about use of VLAs app/proc-info: disable warning about use of VLAs app/test: disable warning about use of VLAs app/test-acl: disable warning about use of VLAs app/test-bbdev: disable warning about use of VLAs app/test-crypto-perf: disable warning about use of VLAs app/test-dma-perf: disable warning about use of VLAs app/test-eventdev: disable warning about use of VLAs app/flow-perf: add compile warning about use of VLAs app/test-pmd: check compiler supports flag when adding to set app/test-sad: disable warning about use of VLAs drivers/baseband: add compile warning about use of VLAs drivers/bus: add compile warning about use of VLAs drivers/common: add compile warning about use of VLAs drivers/compress: add compile warning about use of VLAs drivers/gpu: add compile warning about use of VLAs drivers/mempool: add compile warning about use of VLAs drivers/ml: add compile warning about use of VLAs drivers/power: add compile warning about use of VLAs drivers/raw: add compile warning about use of VLAs drivers/vdpa: add compile warning about use of VLAs drivers/regex: add compile warning about use of VLAs acl: disable warning about use of VLAs bpf: disable warning about use of VLAs dispatcher: disable warning about use of VLAs eventdev: disable warning about use of VLAs ipsec: disable warning about use of VLAs member: disable warning about use of VLAs metrics: disable warning about use of VLAs pdcp: disable warning about use of VLAs pdump: disable warning about use of VLAs pipeline: disable warning about use of VLAs power: disable warning about use of VLAs table: disable warning about use of VLAs vhost: disable warning about use of VLAs drivers/common: add compile warning about use of VLAs drivers/net: add compile warning about use of VLAs app: add compile warning about use of VLAs lib: add compile warning about use of VLAs Konstantin Ananyev (10): eal/linux: remove use of VLAs eal/common: remove use of VLAs ethdev: remove use of VLAs for Windows built code hash: remove use of VLAs for Windows built code hash/thash: remove use of VLAs for Windows built rcu: remove use of VLAs for Windows built code gro: fix overwrite unprocessed packets gro: remove use of VLAs net/ixgbe: remove use of VLAs net/ice: remove use of VLAs Tyler Retzlaff (8): eal: include header required for a
[PATCH v15 02/60] eal/linux: remove use of VLAs
From: Konstantin Ananyev
1) ./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
MSVC does not support VLAs. Use alloca() to allocate the memory on
the stack.
2) ./lib/eal/linux/eal_interrupts.c:1319:16
: warning: ISO C90 forbids variable length array ‘evs’
make eal_epoll_wait() use a fixed size array and use it though multiple
iterations to process up to @maxevents events.
Note that technically it is not one to one replacement, as here we might
reduce number of events returned by first call to epoll_wait(..., timeout);
Signed-off-by: Konstantin Ananyev
---
lib/eal/linux/eal_interrupts.c | 32 +++-
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 6436f796eb..23039964fc 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -34,6 +34,8 @@
#define EAL_INTR_EPOLL_WAIT_FOREVER (-1)
#define NB_OTHER_INTR 1
+#define MAX_ITER_EVNUM RTE_EVENT_ETH_INTR_RING_SIZE
+
static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
/**
@@ -1070,7 +1072,7 @@ eal_intr_process_interrupts(struct epoll_event *events,
int nfds)
static void
eal_intr_handle_interrupts(int pfd, unsigned totalfds)
{
- struct epoll_event events[totalfds];
+ struct epoll_event *events = alloca(sizeof(struct epoll_event) *
totalfds);
int nfds = 0;
for(;;) {
@@ -1316,8 +1318,9 @@ static int
eal_epoll_wait(int epfd, struct rte_epoll_event *events,
int maxevents, int timeout, bool interruptible)
{
- struct epoll_event evs[maxevents];
int rc;
+ uint32_t i, k, n, num;
+ struct epoll_event evs[MAX_ITER_EVNUM];
if (!events) {
EAL_LOG(ERR, "rte_epoll_event can't be NULL");
@@ -1328,12 +1331,31 @@ eal_epoll_wait(int epfd, struct rte_epoll_event *events,
if (epfd == RTE_EPOLL_PER_THREAD)
epfd = rte_intr_tls_epfd();
+ num = maxevents;
+ n = RTE_MIN(RTE_DIM(evs), num);
+
+ /* Process events in chunks of MAX_ITER_EVNUM */
+
while (1) {
- rc = epoll_wait(epfd, evs, maxevents, timeout);
+ rc = epoll_wait(epfd, evs, n, timeout);
if (likely(rc > 0)) {
+
/* epoll_wait has at least one fd ready to read */
- rc = eal_epoll_process_event(evs, rc, events);
- break;
+ for (i = 0, k = 0; rc > 0;) {
+ k += rc;
+ rc = eal_epoll_process_event(evs, rc,
+ events + i);
+ i += rc;
+
+ /*
+* try to read more events that are already
+* available (up to maxevents in total).
+*/
+ n = RTE_MIN(RTE_DIM(evs), num - k);
+ rc = (n == 0) ? 0 : epoll_wait(epfd, evs, n, 0);
+ }
+ return i;
+
} else if (rc < 0) {
if (errno == EINTR) {
if (interruptible)
--
2.47.0.vfs.0.3
[PATCH v15 08/60] gro: fix overwrite unprocessed packets
From: Konstantin Ananyev
gro_vxlan_tcp4_tbl_timeout_flush() is called without taking into account
that first entries in pkts[] can be already occupied by
un-processed packets.
Fixes: 74080d7dcf31 ("gro: support IPv6 for TCP")
Cc: sta...@dpdk.org
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/rte_gro.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index d824eebd93..db86117609 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -327,7 +327,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
i += gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl,
- 0, pkts, nb_pkts);
+ 0, &pkts[i], nb_pkts - i);
}
if (do_vxlan_udp_gro) {
--
2.47.0.vfs.0.3
[PATCH v15 01/60] eal: include header required for alloca
From: Tyler Retzlaff Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca(). Signed-off-by: Tyler Retzlaff --- lib/eal/freebsd/include/rte_os.h | 1 + lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h index 62e70dc15b..94b9275beb 100644 --- a/lib/eal/freebsd/include/rte_os.h +++ b/lib/eal/freebsd/include/rte_os.h @@ -11,6 +11,7 @@ */ #include +#include /* Declares alloca() */ #include /* These macros are compatible with system's sys/queue.h. */ diff --git a/lib/eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h index 35c07c70cb..20eff0409a 100644 --- a/lib/eal/linux/include/rte_os.h +++ b/lib/eal/linux/include/rte_os.h @@ -10,6 +10,7 @@ * which is not supported natively or named differently in Linux. */ +#include #include #include diff --git a/lib/eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h index 9d69467aaa..d09adeb3b4 100644 --- a/lib/eal/windows/include/rte_os.h +++ b/lib/eal/windows/include/rte_os.h @@ -13,6 +13,7 @@ #include #include #include +#include #include -- 2.47.0.vfs.0.3
[PATCH v15 05/60] hash: remove use of VLAs for Windows built code
From: Konstantin Ananyev 1) ./lib/hash/rte_cuckoo_hash.c:2362:9 : warning: ISO C90 forbids variable length array ‘positions’ 2) ../lib/hash/rte_cuckoo_hash.c:2478:9 : warning: ISO C90 forbids variable length array ‘positions’ Both rte_hash_lookup_bulk_data() and rte_hash_lookup_with_hash_bulk_data() expect @num_keys <= RTE_HASH_LOOKUP_BULK_MAX. So, for both cases it should be safe to replace VLA with fixed size array. Signed-off-by: Konstantin Ananyev Reviewed-by: Bruce Richardson Acked-by: Vladimir Medvedkin Acked-by: Chengwen Feng --- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 9575e8aa0c..fc93182efe 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -2418,7 +2418,7 @@ rte_hash_lookup_bulk_data(const struct rte_hash *h, const void **keys, (num_keys > RTE_HASH_LOOKUP_BULK_MAX) || (hit_mask == NULL)), -EINVAL); - int32_t positions[num_keys]; + int32_t positions[RTE_HASH_LOOKUP_BULK_MAX]; __rte_hash_lookup_bulk(h, keys, num_keys, positions, hit_mask, data); @@ -2534,7 +2534,7 @@ rte_hash_lookup_with_hash_bulk_data(const struct rte_hash *h, (num_keys > RTE_HASH_LOOKUP_BULK_MAX) || (hit_mask == NULL)), -EINVAL); - int32_t positions[num_keys]; + int32_t positions[RTE_HASH_LOOKUP_BULK_MAX]; __rte_hash_lookup_with_hash_bulk(h, keys, sig, num_keys, positions, hit_mask, data); -- 2.47.0.vfs.0.3
[PATCH v15 03/60] eal/common: remove use of VLAs
From: Konstantin Ananyev 1) ../lib/eal/common/eal_common_proc.c:695:15 : warning: variable length array used As msg->num_fds should not exceed RTE_MP_MAX_FD_NUM, replaced it with fixed size array. Signed-off-by: Konstantin Ananyev Acked-by: Stephen Hemminger --- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index d24093937c..201973c5db 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -692,7 +692,8 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) struct sockaddr_un dst; struct mp_msg_internal m; int fd_size = msg->num_fds * sizeof(int); - char control[CMSG_SPACE(fd_size)]; + const int32_t control_sz = CMSG_SPACE(fd_size); + char control[CMSG_SPACE(sizeof(msg->fds))]; m.type = type; memcpy(&m.msg, msg, sizeof(*msg)); @@ -712,7 +713,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = control; - msgh.msg_controllen = sizeof(control); + msgh.msg_controllen = control_sz; cmsg = CMSG_FIRSTHDR(&msgh); cmsg->cmsg_len = CMSG_LEN(fd_size); -- 2.47.0.vfs.0.3
Re: [PATCH v14 03/81] eal/common: remove use of VLAs
On Fri, Jan 10, 2025 at 05:14:05PM -0800, Stephen Hemminger wrote: > On Fri, 10 Jan 2025 12:22:22 -0800 > Andre Muezerie wrote: > > > diff --git a/lib/eal/meson.build b/lib/eal/meson.build > > index e1d6c4cf17..352db049e9 100644 > > --- a/lib/eal/meson.build > > +++ b/lib/eal/meson.build > > @@ -31,3 +31,11 @@ endif > > if is_freebsd > > annotate_locks = false > > endif > > + > > +warning_flags = ['-Wvla'] > > + > > +foreach arg: warning_flags > > +if cc.has_argument(arg) > > +cflags += arg > > +endif > > +endforeach > > -- > > Could we enable it for all libs and only turn it off as required? Yes. Although the data types in meson are additive only, we can add -Wno-vla to cancel a -Wvla already present. Let me send out a new series with this change.
[PATCH v1] dts: fix pass rate edge case in results json
Add condition to results.json pass rate generation
method which returns 0 as the pass rate when the suite
is skipped, rather than causing a divide by 0 error.
Fixes: 9f8a257235ac ("dts: improve test run result statistics")
Signed-off-by: Dean Marx
---
dts/framework/test_result.py | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py
index ba7c1c9804..aed20981b2 100644
--- a/dts/framework/test_result.py
+++ b/dts/framework/test_result.py
@@ -324,13 +324,15 @@ def generate_pass_rate_dict(self, test_run_summary) ->
dict[str, float]:
Returns:
A dictionary with the PASS/FAIL ratio of all test cases.
"""
-return {
-"PASS_RATE": (
-float(test_run_summary[Result.PASS.name])
-* 100
-/ sum(test_run_summary[result.name] for result in Result if
result != Result.SKIP)
-)
-}
+cases_not_skipped = sum(
+test_run_summary[result.name] for result in Result if result !=
Result.SKIP
+)
+if cases_not_skipped == 0:
+return {"PASS_RATE": 0.0}
+else:
+return {
+"PASS_RATE": (float(test_run_summary[Result.PASS.name]) * 100
/ cases_not_skipped)
+}
class DTSResult(BaseResult):
--
2.44.0
[PATCH v15 55/60] vhost: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/vhost/meson.build | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build
index 51bcf17244..4539bedab4 100644
--- a/lib/vhost/meson.build
+++ b/lib/vhost/meson.build
@@ -16,11 +16,19 @@ elif (toolchain == 'icc' and
cc.version().version_compare('>=16.0.0'))
cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
endif
dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
cc.has_header('linux/userfaultfd.h'))
-cflags += [
-'-fno-strict-aliasing',
-'-Wno-address-of-packed-member',
+
+extra_flags = [
+'-fno-strict-aliasing',
+'-Wno-address-of-packed-member',
+'-Wno-vla'
]
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files(
'fd_man.c',
'iotlb.c',
--
2.47.0.vfs.0.3
[PATCH v15 60/60] lib: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/meson.build | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/meson.build b/lib/meson.build
index ce92cb5537..43a92be5fa 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -111,9 +111,13 @@ default_cflags = machine_args
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
default_cflags += ['-DALLOW_INTERNAL_API']
-if cc.has_argument('-Wno-format-truncation')
-default_cflags += '-Wno-format-truncation'
-endif
+extra_flags = ['-Wno-format-truncation', '-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+default_cflags += arg
+endif
+endforeach
foreach l:libraries
build = true
--
2.47.0.vfs.0.3
[PATCH v15 44/60] bpf: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/bpf/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index aa258a9061..f3cc18efa8 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32')
build = false
reason = 'not supported on 32-bit x86'
--
2.47.0.vfs.0.3
[PATCH v15 42/60] drivers/regex: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/regex/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build index ff2a8fea89..06614f34e2 100644 --- a/drivers/regex/meson.build +++ b/drivers/regex/meson.build @@ -6,3 +6,11 @@ drivers = [ 'cn9k', ] std_deps = ['ethdev', 'kvargs', 'regexdev'] # 'ethdev' also pulls in mbuf, net, eal etc + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 57/60] drivers/net: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/net/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/net/meson.build b/drivers/net/meson.build index dafd637ba4..170e7339e5 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -68,3 +68,11 @@ drivers = [ std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev']# same with vdev bus + +warning_flags = ['-Wvla'] + +foreach arg: warning_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 40/60] drivers/raw: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/raw/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build index d173ac6097..726a786e0d 100644 --- a/drivers/raw/meson.build +++ b/drivers/raw/meson.build @@ -16,3 +16,11 @@ drivers = [ 'skeleton', ] std_deps = ['rawdev'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 34/60] drivers/common: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
drivers/common/nfp/meson.build | 8
drivers/common/nitrox/meson.build | 8
drivers/common/sfc_efx/meson.build | 1 +
3 files changed, 17 insertions(+)
diff --git a/drivers/common/nfp/meson.build b/drivers/common/nfp/meson.build
index a09d1e25e2..165be4a868 100644
--- a/drivers/common/nfp/meson.build
+++ b/drivers/common/nfp/meson.build
@@ -14,3 +14,11 @@ sources = files(
)
deps += ['bus_pci', 'net']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/drivers/common/nitrox/meson.build
b/drivers/common/nitrox/meson.build
index f3cb42f006..46cd8ba65c 100644
--- a/drivers/common/nitrox/meson.build
+++ b/drivers/common/nitrox/meson.build
@@ -17,3 +17,11 @@ sources += files(
includes += include_directories('../../crypto/nitrox')
includes += include_directories('../../compress/nitrox')
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/drivers/common/sfc_efx/meson.build
b/drivers/common/sfc_efx/meson.build
index 0cf0a23bf8..e3b90f670a 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -26,6 +26,7 @@ extra_flags += [
extra_flags += [
'-Waggregate-return',
'-Wbad-function-cast',
+'-Wvla',
]
foreach flag: extra_flags
--
2.47.0.vfs.0.3
[PATCH v15 41/60] drivers/vdpa: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/vdpa/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build index 896e8e0304..49e94584bc 100644 --- a/drivers/vdpa/meson.build +++ b/drivers/vdpa/meson.build @@ -13,3 +13,11 @@ drivers = [ ] std_deps = ['bus_pci', 'kvargs'] std_deps += ['vhost'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 39/60] drivers/power: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/power/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/power/meson.build b/drivers/power/meson.build index 0a703bce38..e7c16e2d47 100644 --- a/drivers/power/meson.build +++ b/drivers/power/meson.build @@ -12,3 +12,11 @@ drivers = [ ] std_deps = ['power'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 36/60] drivers/gpu: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/gpu/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/meson.build b/drivers/gpu/meson.build index b6edd12678..610151e9b1 100644 --- a/drivers/gpu/meson.build +++ b/drivers/gpu/meson.build @@ -4,3 +4,11 @@ drivers = [ 'cuda' ] std_deps = [ 'gpudev' ] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 56/60] drivers/common: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/common/meson.build | 8 drivers/common/mlx5/meson.build | 1 + drivers/common/qat/meson.build | 8 3 files changed, 17 insertions(+) diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 8734af36aa..79ba0a3001 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -11,3 +11,11 @@ drivers = [ 'mvep', 'octeontx', ] + +warning_flags = ['-Wvla'] + +foreach arg: warning_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build index 1eefc02f06..a6a67fbb85 100644 --- a/drivers/common/mlx5/meson.build +++ b/drivers/common/mlx5/meson.build @@ -26,6 +26,7 @@ sources += files( cflags_options = [ '-std=c11', +'-Wvla', '-Wno-strict-prototypes', '-D_BSD_SOURCE', '-D_DEFAULT_SOURCE', diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 5a8de16fe0..8dd38e9abd 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -119,3 +119,11 @@ if qat_crypto deps += ['security'] cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM'] endif + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 38/60] drivers/ml: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/ml/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/ml/meson.build b/drivers/ml/meson.build index 54bc394c47..ae07c5292e 100644 --- a/drivers/ml/meson.build +++ b/drivers/ml/meson.build @@ -6,3 +6,11 @@ drivers = [ ] std_deps = ['mldev'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v15 52/60] pipeline: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/pipeline/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/pipeline/meson.build b/lib/pipeline/meson.build index fd5e0dc6bb..4027a26e61 100644 --- a/lib/pipeline/meson.build +++ b/lib/pipeline/meson.build @@ -7,6 +7,14 @@ if is_windows subdir_done() endif +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'rte_pipeline.c', 'rte_port_in_action.c', -- 2.47.0.vfs.0.3
[PATCH v15 46/60] eventdev: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/eventdev/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build index a04bb86f0f..04b81f1e9e 100644 --- a/lib/eventdev/meson.build +++ b/lib/eventdev/meson.build @@ -7,6 +7,14 @@ if is_windows subdir_done() endif +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'eventdev_private.c', 'eventdev_trace_points.c', -- 2.47.0.vfs.0.3
[PATCH v15 45/60] dispatcher: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/dispatcher/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/dispatcher/meson.build b/lib/dispatcher/meson.build
index ffaef26a6d..0e13bb4824 100644
--- a/lib/dispatcher/meson.build
+++ b/lib/dispatcher/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('rte_dispatcher.c')
headers = files('rte_dispatcher.h')
--
2.47.0.vfs.0.3
[PATCH v15 58/60] build: enable vla warnings on Windows built code
From: Tyler Retzlaff MSVC does not support optional C11 VLAs. When building for Windows enable -Wvla so that mingw and clang also fail if a VLA is used. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson Acked-by: Chengwen Feng --- config/meson.build | 4 1 file changed, 4 insertions(+) diff --git a/config/meson.build b/config/meson.build index 6aaad6d8a4..ebca19b4e5 100644 --- a/config/meson.build +++ b/config/meson.build @@ -342,6 +342,10 @@ if cc.get_id() == 'intel' warning_flags += '-diag-disable=@0@'.format(i) endforeach endif +# no VLAs in code built on Windows +if is_windows +warning_flags += '-Wvla' +endif foreach arg: warning_flags if cc.has_argument(arg) add_project_arguments(arg, language: 'c') -- 2.47.0.vfs.0.3
[PATCH v15 50/60] pdcp: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/pdcp/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/pdcp/meson.build b/lib/pdcp/meson.build index f4f9246bcb..78d26d637b 100644 --- a/lib/pdcp/meson.build +++ b/lib/pdcp/meson.build @@ -7,6 +7,14 @@ if is_windows subdir_done() endif +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'pdcp_cnt.c', 'pdcp_crypto.c', -- 2.47.0.vfs.0.3
[PATCH v15 53/60] power: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/power/meson.build | 9 + 1 file changed, 9 insertions(+) diff --git a/lib/power/meson.build b/lib/power/meson.build index b3a7bc7b2e..c52433f21e 100644 --- a/lib/power/meson.build +++ b/lib/power/meson.build @@ -11,6 +11,15 @@ if not is_linux build = false reason = 'only supported on Linux' endif + +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'power_common.c', 'rte_power_cpufreq.c', -- 2.47.0.vfs.0.3
[PATCH v15 51/60] pdump: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/pdump/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/pdump/meson.build b/lib/pdump/meson.build
index da8d51b616..4d2a7e1b2c 100644
--- a/lib/pdump/meson.build
+++ b/lib/pdump/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('rte_pdump.c')
headers = files('rte_pdump.h')
deps += ['ethdev', 'bpf', 'pcapng']
--
2.47.0.vfs.0.3
[PATCH v15 47/60] ipsec: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/ipsec/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/ipsec/meson.build b/lib/ipsec/meson.build
index 5c5a4aae78..ba14d1315d 100644
--- a/lib/ipsec/meson.build
+++ b/lib/ipsec/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('esp_inb.c', 'esp_outb.c',
'sa.c', 'ses.c', 'ipsec_sad.c',
'ipsec_telemetry.c')
--
2.47.0.vfs.0.3
[PATCH v15 48/60] member: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/member/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/member/meson.build b/lib/member/meson.build
index 02ef59795e..b28c2fd522 100644
--- a/lib/member/meson.build
+++ b/lib/member/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
headers = files('rte_member.h')
sources = files(
--
2.47.0.vfs.0.3
[PATCH v15 59/60] app: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/meson.build | 9 +
1 file changed, 9 insertions(+)
diff --git a/app/meson.build b/app/meson.build
index e2db888ae1..894d126dde 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -45,6 +45,15 @@ if get_option('tests')
endif
default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+default_cflags += arg
+endif
+endforeach
+
default_ldflags = []
if get_option('default_library') == 'static' and not is_windows
default_ldflags += ['-Wl,--export-dynamic']
--
2.47.0.vfs.0.3
[PATCH v15 49/60] metrics: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/metrics/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/metrics/meson.build b/lib/metrics/meson.build
index 8c1c4b4b49..11314d8373 100644
--- a/lib/metrics/meson.build
+++ b/lib/metrics/meson.build
@@ -9,3 +9,11 @@ if dpdk_conf.has('RTE_HAS_JANSSON')
endif
deps += ['ethdev', 'telemetry']
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 59/60] app: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/meson.build | 9 +
1 file changed, 9 insertions(+)
diff --git a/app/meson.build b/app/meson.build
index e2db888ae1..894d126dde 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -45,6 +45,15 @@ if get_option('tests')
endif
default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+default_cflags += arg
+endif
+endforeach
+
default_ldflags = []
if get_option('default_library') == 'static' and not is_windows
default_ldflags += ['-Wl,--export-dynamic']
--
2.47.0.vfs.0.3
[PATCH v16 42/60] drivers/regex: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/regex/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build index ff2a8fea89..06614f34e2 100644 --- a/drivers/regex/meson.build +++ b/drivers/regex/meson.build @@ -6,3 +6,11 @@ drivers = [ 'cn9k', ] std_deps = ['ethdev', 'kvargs', 'regexdev'] # 'ethdev' also pulls in mbuf, net, eal etc + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 05/60] hash: remove use of VLAs for Windows built code
From: Konstantin Ananyev 1) ./lib/hash/rte_cuckoo_hash.c:2362:9 : warning: ISO C90 forbids variable length array ‘positions’ 2) ../lib/hash/rte_cuckoo_hash.c:2478:9 : warning: ISO C90 forbids variable length array ‘positions’ Both rte_hash_lookup_bulk_data() and rte_hash_lookup_with_hash_bulk_data() expect @num_keys <= RTE_HASH_LOOKUP_BULK_MAX. So, for both cases it should be safe to replace VLA with fixed size array. Signed-off-by: Konstantin Ananyev Reviewed-by: Bruce Richardson Acked-by: Vladimir Medvedkin Acked-by: Chengwen Feng --- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 9575e8aa0c..fc93182efe 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -2418,7 +2418,7 @@ rte_hash_lookup_bulk_data(const struct rte_hash *h, const void **keys, (num_keys > RTE_HASH_LOOKUP_BULK_MAX) || (hit_mask == NULL)), -EINVAL); - int32_t positions[num_keys]; + int32_t positions[RTE_HASH_LOOKUP_BULK_MAX]; __rte_hash_lookup_bulk(h, keys, num_keys, positions, hit_mask, data); @@ -2534,7 +2534,7 @@ rte_hash_lookup_with_hash_bulk_data(const struct rte_hash *h, (num_keys > RTE_HASH_LOOKUP_BULK_MAX) || (hit_mask == NULL)), -EINVAL); - int32_t positions[num_keys]; + int32_t positions[RTE_HASH_LOOKUP_BULK_MAX]; __rte_hash_lookup_with_hash_bulk(h, keys, sig, num_keys, positions, hit_mask, data); -- 2.47.0.vfs.0.3
[PATCH v16 11/60] net/ice: remove use of VLAs
From: Konstantin Ananyev
../drivers/net/ice/ice_rxtx.c:1871:29: warning:
variable length array used [-Wvla]
Here VLA is used as a temp array for mbufs that will be used as a split
RX data buffers.
As at any given time only one thread can do RX from particular queue,
at rx_queue_setup() we can allocate extra space for that array, and then
safely use it at RX fast-path.
Signed-off-by: Konstantin Ananyev
Acked-by: Anatoly Burakov
---
drivers/net/ice/ice_rxtx.c | 18 --
drivers/net/ice/ice_rxtx.h | 2 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 0c7106c7e0..578453ec89 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1186,7 +1186,7 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
struct ice_vsi *vsi = pf->main_vsi;
struct ice_rx_queue *rxq;
const struct rte_memzone *rz;
- uint32_t ring_size;
+ uint32_t ring_size, tlen;
uint16_t len;
int use_def_burst_func = 1;
uint64_t offloads;
@@ -1294,9 +1294,14 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
/* always reserve more for bulk alloc */
len = (uint16_t)(nb_desc + ICE_RX_MAX_BURST);
+ /* allocate extra entries for SW split buffer */
+ tlen = ((rxq->offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT) != 0) ?
+ rxq->rx_free_thresh : 0;
+ tlen += len;
+
/* Allocate the software ring. */
rxq->sw_ring = rte_zmalloc_socket(NULL,
- sizeof(struct ice_rx_entry) * len,
+ sizeof(struct ice_rx_entry) * tlen,
RTE_CACHE_LINE_SIZE,
socket_id);
if (!rxq->sw_ring) {
@@ -1305,6 +1310,8 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
return -ENOMEM;
}
+ rxq->sw_split_buf = (tlen == len) ? NULL : rxq->sw_ring + len;
+
ice_reset_rx_queue(rxq);
rxq->q_set = true;
dev->data->rx_queues[queue_idx] = rxq;
@@ -1883,7 +1890,6 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
uint64_t dma_addr;
int diag, diag_pay;
uint64_t pay_addr;
- struct rte_mbuf *mbufs_pay[rxq->rx_free_thresh];
/* Allocate buffers in bulk */
alloc_idx = (uint16_t)(rxq->rx_free_trigger -
@@ -1898,7 +1904,7 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
if (rxq->offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT) {
diag_pay = rte_mempool_get_bulk(rxq->rxseg[1].mp,
- (void *)mbufs_pay, rxq->rx_free_thresh);
+ (void *)rxq->sw_split_buf, rxq->rx_free_thresh);
if (unlikely(diag_pay != 0)) {
PMD_RX_LOG(ERR, "Failed to get payload mbufs in bulk");
return -ENOMEM;
@@ -1923,8 +1929,8 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
rxdp[i].read.hdr_addr = 0;
rxdp[i].read.pkt_addr = dma_addr;
} else {
- mb->next = mbufs_pay[i];
- pay_addr =
rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbufs_pay[i]));
+ mb->next = rxq->sw_split_buf[i].mbuf;
+ pay_addr =
rte_cpu_to_le_64(rte_mbuf_data_iova_default(mb->next));
rxdp[i].read.hdr_addr = dma_addr;
rxdp[i].read.pkt_addr = pay_addr;
}
diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
index 45f25b3609..20ee325c2b 100644
--- a/drivers/net/ice/ice_rxtx.h
+++ b/drivers/net/ice/ice_rxtx.h
@@ -139,6 +139,8 @@ struct ice_rx_queue {
uint32_t hw_time_high; /* high 32 bits of timestamp */
uint32_t hw_time_low; /* low 32 bits of timestamp */
uint64_t hw_time_update; /* SW time of HW record updating */
+ struct ice_rx_entry *sw_split_buf;
+ /* address of temp buffer for RX split mbufs */
struct rte_eth_rxseg_split rxseg[ICE_RX_MAX_NSEG];
uint32_t rxseg_nb;
bool ts_enable; /* if rxq timestamp is enabled */
--
2.47.0.vfs.0.3
[PATCH v16 07/60] rcu: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/rcu/rte_rcu_qsbr.c:359:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
2) ./lib/rcu/rte_rcu_qsbr.c:422:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
In both cases we allocate VLA for one element from RCU deferred queue.
Right now, size of element in RCU queue is not limited by API.
The approach is to introduce some reasonable limitation on RCU DQ
element size.
Choose 128B for now.
With that in place we can replace both VLA occurencies with fixed size
array.
Note that such change need to be treated as API change.
So can be applied only at 24.11.
Signed-off-by: Konstantin Ananyev
---
lib/rcu/rte_rcu_qsbr.c | 7 ---
lib/rcu/rte_rcu_qsbr.h | 5 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index dbf31501a6..fe68d16326 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -245,7 +245,8 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
if (params == NULL || params->free_fn == NULL ||
params->v == NULL || params->name == NULL ||
params->size == 0 || params->esize == 0 ||
- (params->esize % 4 != 0)) {
+ (params->esize % 4 != 0) ||
+ params->esize > RTE_QSBR_ESIZE_MAX) {
RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
@@ -323,7 +324,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq,
void *e)
return 1;
}
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;
/* Start the grace period */
dq_elem->token = rte_rcu_qsbr_start(dq->v);
@@ -386,7 +387,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq,
unsigned int n,
cnt = 0;
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
/* Check reader threads quiescent state and reclaim resources */
while (cnt < n &&
rte_ring_dequeue_bulk_elem_start(dq->r, &data,
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 550fadf56a..abcbd78914 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -86,6 +86,11 @@ struct __rte_cache_aligned rte_rcu_qsbr_cnt {
#define __RTE_QSBR_CNT_MAX ((uint64_t)~0)
#define __RTE_QSBR_TOKEN_SIZE sizeof(uint64_t)
+/**
+ * Max allowable size (in bytes) of each element in the defer queue
+ */
+#define RTE_QSBR_ESIZE_MAX (2 * RTE_CACHE_LINE_MIN_SIZE)
+
/* RTE Quiescent State variable structure.
* This structure has two elements that vary in size based on the
* 'max_threads' parameter.
--
2.47.0.vfs.0.3
[PATCH v16 06/60] hash/thash: remove use of VLAs for Windows built
From: Konstantin Ananyev
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’
The tuple can exceed sizeof(union rte_thash_tuple), for example if any
tunneling header is used in the RSS hash calculation.
The longest RSS hash key currently supported is 52 bytes. Technically, the
longest tuple with such a key should be (52 - sizeof(uint32_t)), so this
can be used as a size of the tmp_tuple array.
Signed-off-by: Konstantin Ananyev
---
lib/hash/rte_thash.c | 2 +-
lib/hash/rte_thash.h | 7 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 336c228e64..fa78787143 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -761,7 +761,7 @@ rte_thash_adjust_tuple(struct rte_thash_ctx *ctx,
uint32_t desired_value, unsigned int attempts,
rte_thash_check_tuple_t fn, void *userdata)
{
- uint32_t tmp_tuple[tuple_len / sizeof(uint32_t)];
+ uint32_t tmp_tuple[RTE_THASH_TUPLE_LEN_MAX];
unsigned int i, j, ret = 0;
uint32_t hash, adj_bits;
const uint8_t *hash_key;
diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h
index c0af5968df..04f9f1875c 100644
--- a/lib/hash/rte_thash.h
+++ b/lib/hash/rte_thash.h
@@ -121,6 +121,13 @@ __rte_internal
uint32_t
thash_get_rand_poly(uint32_t poly_degree);
+/**
+ * Longest RSS hash key currently supported
+ */
+#define RTE_THASH_KEY_LEN_MAX 52
+
+#define RTE_THASH_TUPLE_LEN_MAX (RTE_THASH_KEY_LEN_MAX - sizeof(uint32_t))
+
/**
* Prepare special converted key to use with rte_softrss_be()
* @param orig
--
2.47.0.vfs.0.3
[PATCH v16 15/60] net/i40e: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Reviewed-by: Bruce Richardson
---
drivers/net/i40e/i40e_testpmd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_testpmd.c b/drivers/net/i40e/i40e_testpmd.c
index b6ef5d6e42..21f596297b 100644
--- a/drivers/net/i40e/i40e_testpmd.c
+++ b/drivers/net/i40e/i40e_testpmd.c
@@ -2168,8 +2168,7 @@ cmd_ptype_mapping_get_parsed(void *parsed_result,
{
struct cmd_ptype_mapping_get_result *res = parsed_result;
int ret = -ENOTSUP;
- int max_ptype_num = 256;
- struct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num];
+ struct rte_pmd_i40e_ptype_mapping mapping[256];
uint16_t count;
int i;
@@ -2178,7 +2177,7 @@ cmd_ptype_mapping_get_parsed(void *parsed_result,
ret = rte_pmd_i40e_ptype_mapping_get(res->port_id,
mapping,
- max_ptype_num,
+ RTE_DIM(mapping),
&count,
res->valid_only);
switch (ret) {
--
2.47.0.vfs.0.3
[PATCH v16 12/60] app/testpmd: remove use of VLAs for Windows built
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Acked-by: Chengwen Feng
---
app/test-pmd/cmdline.c | 2 +-
app/test-pmd/cmdline_flow.c | 15 ++-
app/test-pmd/config.c | 16 +---
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7e0666e9f6..2897e44c34 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -13274,7 +13274,7 @@ cmd_set_port_ptypes_parsed(
return;
}
- uint32_t ptypes[ret];
+ uint32_t *ptypes = alloca(sizeof(uint32_t) * ret);
ret = rte_eth_dev_set_ptypes(port_id, ptype_mask, ptypes, ret);
if (ret < 0) {
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 9e4fc2d95d..e1720e54d7 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -11707,8 +11707,7 @@ parse_hex(struct context *ctx, const struct token
*token,
char tmp[16]; /* Ought to be enough. */
int ret;
unsigned int hexlen = len;
- unsigned int length = 256;
- uint8_t hex_tmp[length];
+ uint8_t hex_tmp[256];
/* Arguments are expected. */
if (!arg_data)
@@ -11735,7 +11734,7 @@ parse_hex(struct context *ctx, const struct token
*token,
str += 2;
hexlen -= 2;
}
- if (hexlen > length)
+ if (hexlen > RTE_DIM(hex_tmp))
goto error;
ret = parse_hex_string(str, hex_tmp, &hexlen);
if (ret < 0)
@@ -11868,10 +11867,13 @@ parse_ipv4_addr(struct context *ctx, const struct
token *token,
void *buf, unsigned int size)
{
const struct arg *arg = pop_args(ctx);
- char str2[len + 1];
+ char str2[INET_ADDRSTRLEN];
struct in_addr tmp;
int ret;
+ /* Length is longer than the max length an IPv4 address can have. */
+ if (len >= INET_ADDRSTRLEN)
+ return -1;
/* Argument is expected. */
if (!arg)
return -1;
@@ -11914,11 +11916,14 @@ parse_ipv6_addr(struct context *ctx, const struct
token *token,
void *buf, unsigned int size)
{
const struct arg *arg = pop_args(ctx);
- char str2[len + 1];
+ char str2[INET6_ADDRSTRLEN];
struct rte_ipv6_addr tmp;
int ret;
(void)token;
+ /* Length is longer than the max length an IPv6 address can have. */
+ if (len >= INET6_ADDRSTRLEN)
+ return -1;
/* Argument is expected. */
if (!arg)
return -1;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 4e7fb69183..b19df95321 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1802,7 +1802,8 @@ port_flow_configure(portid_t port_id,
{
struct rte_port *port;
struct rte_flow_error error;
- const struct rte_flow_queue_attr *attr_list[nb_queue];
+ const struct rte_flow_queue_attr **attr_list =
+ alloca(sizeof(struct rte_flow_queue_attr *) * nb_queue);
int std_queue;
if (port_id_is_invalid(port_id, ENABLED_WARN) ||
@@ -2616,10 +2617,10 @@ port_flow_template_table_create(portid_t port_id,
uint32_t id,
int ret;
uint32_t i;
struct rte_flow_error error;
- struct rte_flow_pattern_template
- *flow_pattern_templates[nb_pattern_templates];
- struct rte_flow_actions_template
- *flow_actions_templates[nb_actions_templates];
+ struct rte_flow_pattern_template **flow_pattern_templates =
+ alloca(sizeof(struct rte_flow_pattern_template *) *
nb_pattern_templates);
+ struct rte_flow_actions_template **flow_actions_templates =
+ alloca(sizeof(struct rte_flow_actions_template *) *
nb_actions_templates);
if (port_id_is_invalid(port_id, ENABLED_WARN) ||
port_id == (portid_t)RTE_PORT_ALL)
@@ -5551,7 +5552,7 @@ parse_port_list(const char *list, unsigned int *values,
unsigned int maxsize)
char *end = NULL;
int min, max;
int value, i;
- unsigned int marked[maxsize];
+ unsigned int *marked = alloca(sizeof(unsigned int) * maxsize);
if (list == NULL || values == NULL)
return 0;
@@ -7292,7 +7293,8 @@ show_macs(portid_t port_id)
if (eth_dev_info_get_print_err(port_id, &dev_info))
return;
- struct rte_ether_addr addr[dev_info.max_mac_addrs];
+ struct rte_ether_addr *addr =
+ alloca(sizeof(struct rte_ether_addr) * dev_info.max_mac_addrs);
rc = rte_eth_macaddrs_get(port_id, addr, dev_info.max_mac_addrs);
if (rc < 0)
return;
--
2.47.0.vfs.0.3
[PATCH v16 09/60] gro: remove use of VLAs
From: Konstantin Ananyev
../lib/gro/rte_gro.c:182:34: warning:
variable length array used [-Wvla]
../lib/gro/rte_gro.c:363:34: warning:
variable length array used [-Wvla]
In both cases the pattern is the same: we use unprocess_pkts[nb_pkts] to
collect un-used by GRO packets, and then copy them to the start of
input/output pkts[] array.
In both cases, we can safely copy pkts[i] into already
processed entry at the same array, i.e. into pkts[unprocess_num].
Such change eliminates need of temporary VLA: unprocess_pkts[nb_pkts].
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/rte_gro.c | 40 ++--
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index db86117609..6d5aadf32a 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -179,7 +179,6 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM]
= {{{0}} };
- struct rte_mbuf *unprocess_pkts[nb_pkts];
uint32_t item_num;
int32_t ret;
uint16_t i, unprocess_num = 0, nb_after_gro = nb_pkts;
@@ -275,7 +274,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_VXLAN_UDP4_PKT(pkts[i]->packet_type) &&
do_vxlan_udp_gro) {
ret = gro_vxlan_udp4_reassemble(pkts[i],
@@ -284,7 +283,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_TCP_PKT(pkts[i]->packet_type) &&
do_tcp4_gro) {
ret = gro_tcp4_reassemble(pkts[i], &tcp_tbl, 0);
@@ -292,7 +291,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_UDP_PKT(pkts[i]->packet_type) &&
do_udp4_gro) {
ret = gro_udp4_reassemble(pkts[i], &udp_tbl, 0);
@@ -300,7 +299,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV6_TCP_PKT(pkts[i]->packet_type) &&
do_tcp6_gro) {
ret = gro_tcp6_reassemble(pkts[i], &tcp6_tbl, 0);
@@ -308,21 +307,15 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
}
if ((nb_after_gro < nb_pkts)
|| (unprocess_num < nb_pkts)) {
- i = 0;
- /* Copy unprocessed packets */
- if (unprocess_num > 0) {
- memcpy(&pkts[i], unprocess_pkts,
- sizeof(struct rte_mbuf *) *
- unprocess_num);
- i = unprocess_num;
- }
+
+ i = unprocess_num;
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
@@ -360,7 +353,6 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
uint16_t nb_pkts,
void *ctx)
{
- struct rte_mbuf *unprocess_pkts[nb_pkts];
struct gro_ctx *gro_ctx = ctx;
void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_udp_tbl, *tcp6_tbl;
uint64_t current_time;
@@ -396,33 +388,29 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
do_vxlan_tcp_gro) {
if (gro_vxlan_tcp4_reassemble(pkts[i], vxlan_tcp_tbl,
[PATCH v16 10/60] net/ixgbe: remove use of VLAs
From: Konstantin Ananyev
1) ../drivers/net/ixgbe/ixgbe_ethdev.c:3556:46: warning:
variable length array used [-Wvla]
2) ../drivers/net/ixgbe/ixgbe_ethdev.c:3739:23: warning:
variable length array used [-Wvla]
3) ../drivers/net/ixgbe/ixgbe_rxtx_vec_common.h:17:24: warning:
variable length array used [-Wvla]
For first two cases: in fact ixgbe_xstats_calc_num() always returns
constant value, so it should be safe to replace that function invocation
just with a macro that performs same calculations.
For case #3: reassemble_packets() is invoked only by
ixgbe_recv_scattered_burst_vec().
And in turn, ixgbe_recv_scattered_burst_vec() operates only on fixed
max amount of packets per call: RTE_IXGBE_MAX_RX_BURST.
So, it should be safe to replace VLA with fixed size array.
Signed-off-by: Konstantin Ananyev
Acked-by: Anatoly Burakov
---
drivers/net/ixgbe/ixgbe_ethdev.c | 21 +
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 4 +++-
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 8bee97d191..47b0acd7b1 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -3437,11 +3437,16 @@ ixgbe_dev_stats_reset(struct rte_eth_dev *dev)
}
/* This function calculates the number of xstats based on the current config */
+
+#define IXGBE_XSTATS_CALC_NUM \
+ (IXGBE_NB_HW_STATS + IXGBE_NB_MACSEC_STATS + \
+ (IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) + \
+ (IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES))
+
static unsigned
-ixgbe_xstats_calc_num(void) {
- return IXGBE_NB_HW_STATS + IXGBE_NB_MACSEC_STATS +
- (IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) +
- (IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES);
+ixgbe_xstats_calc_num(void)
+{
+ return IXGBE_XSTATS_CALC_NUM;
}
static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
@@ -3557,8 +3562,8 @@ static int ixgbe_dev_xstats_get_names_by_id(
}
uint16_t i;
- uint16_t size = ixgbe_xstats_calc_num();
- struct rte_eth_xstat_name xstats_names_copy[size];
+ struct rte_eth_xstat_name xstats_names_copy[IXGBE_XSTATS_CALC_NUM];
+ const uint16_t size = RTE_DIM(xstats_names_copy);
ixgbe_dev_xstats_get_names_by_id(dev, NULL, xstats_names_copy,
size);
@@ -3740,8 +3745,8 @@ ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const
uint64_t *ids,
}
uint16_t i;
- uint16_t size = ixgbe_xstats_calc_num();
- uint64_t values_copy[size];
+ uint64_t values_copy[IXGBE_XSTATS_CALC_NUM];
+ const uint16_t size = RTE_DIM(values_copy);
ixgbe_dev_xstats_get_by_id(dev, NULL, values_copy, size);
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index a4d9ec9b08..c1cf0a581a 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -14,11 +14,13 @@ static inline uint16_t
reassemble_packets(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_bufs,
uint16_t nb_bufs, uint8_t *split_flags)
{
- struct rte_mbuf *pkts[nb_bufs]; /*finished pkts*/
+ struct rte_mbuf *pkts[RTE_IXGBE_MAX_RX_BURST]; /*finished pkts*/
struct rte_mbuf *start = rxq->pkt_first_seg;
struct rte_mbuf *end = rxq->pkt_last_seg;
unsigned int pkt_idx, buf_idx;
+ RTE_ASSERT(nb_bufs <= RTE_DIM(pkts));
+
for (buf_idx = 0, pkt_idx = 0; buf_idx < nb_bufs; buf_idx++) {
if (end != NULL) {
/* processing a split packet */
--
2.47.0.vfs.0.3
[PATCH v16 17/60] net/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/net/mlx5/mlx5.c | 5 ++---
drivers/net/mlx5/mlx5_flow.c | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6e4473e2f4..979e54686b 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1598,14 +1598,13 @@ void
mlx5_rt_timestamp_config(struct mlx5_dev_ctx_shared *sh,
struct mlx5_hca_attr *hca_attr)
{
- uint32_t dw_cnt = MLX5_ST_SZ_DW(register_mtutc);
- uint32_t reg[dw_cnt];
+ uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
int ret = ENOTSUP;
if (hca_attr->access_register_user)
ret = mlx5_devx_cmd_register_read(sh->cdev->ctx,
MLX5_REGISTER_ID_MTUTC, 0,
- reg, dw_cnt);
+ reg, RTE_DIM(reg));
if (!ret) {
uint32_t ts_mode;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 16ddd05448..37b5402447 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1479,8 +1479,8 @@ mlx5_flow_item_acceptable(const struct rte_eth_dev *dev,
"mask/last without a spec is not"
" supported");
if (item->spec && item->last && !range_accepted) {
- uint8_t spec[size];
- uint8_t last[size];
+ uint8_t *spec = alloca(size);
+ uint8_t *last = alloca(size);
unsigned int i;
int ret;
@@ -8477,7 +8477,7 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
.type = RTE_FLOW_ITEM_TYPE_END,
},
};
- uint16_t queue[priv->reta_idx_n];
+ uint16_t *queue = alloca(sizeof(uint16_t) * priv->reta_idx_n);
struct rte_flow_action_rss action_rss = {
.func = RTE_ETH_HASH_FUNCTION_DEFAULT,
.level = 0,
--
2.47.0.vfs.0.3
[PATCH v16 18/60] test: remove use of VLAs for Windows built code in bitset tests
1) MSVC does not support VLAs. Use standard fixed C arrays of
maximum size required instead.
2) ../usr/lib/gcc/x86_64-redhat-linux/13/include/emmintrin.h:742:8:
error: array subscript 9 is outside array bounds of 'uint64_t[16]'
{aka 'long unsigned int[16]'} [-Werror=array-bounds=]
3695 742 | *__P = __B;
Compile with -Wno-array-bounds to avoid false positives when
using gcc version 11 or newer (gcc compiler bug/limitation).
Signed-off-by: Andre Muezerie
---
app/test/test_bitset.c | 69 -
app/test/test_lcore_var_perf.c | 2 +-
app/test/test_reassembly_perf.c | 22 ++-
3 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/app/test/test_bitset.c b/app/test/test_bitset.c
index 50b8bf0da4..45460204c1 100644
--- a/app/test/test_bitset.c
+++ b/app/test/test_bitset.c
@@ -99,11 +99,13 @@ typedef void clear_fun(uint64_t *bitset, size_t bit_num);
typedef void assign_fun(uint64_t *bitset, size_t bit_num, bool value);
typedef void flip_fun(uint64_t *bitset, size_t bit_num);
+#define RAND_SET_MAX_SIZE 1000
+
static int
test_set_clear_size(test_fun test_fun, set_fun set_fun, clear_fun clear_fun,
size_t size)
{
size_t i;
- bool reference[size];
+ bool reference[RAND_SET_MAX_SIZE];
uint64_t *bitset;
rand_bool_ary(reference, size);
@@ -131,8 +133,7 @@ test_set_clear_size(test_fun test_fun, set_fun set_fun,
clear_fun clear_fun, siz
return TEST_SUCCESS;
}
-#define RAND_ITERATIONS (1)
-#define RAND_SET_MAX_SIZE (1000)
+#define RAND_ITERATIONS 1
static int
test_set_clear_fun(test_fun test_fun, set_fun set_fun, clear_fun clear_fun)
@@ -168,10 +169,20 @@ test_flip_size(test_fun test_fun, assign_fun assign_fun,
flip_fun flip_fun, size
rand_bitset(bitset, size);
for (i = 0; i < size; i++) {
- RTE_BITSET_DECLARE(reference, size);
+ RTE_BITSET_DECLARE(reference, RAND_SET_MAX_SIZE);
+
+#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 11)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+ /* gcc is giving false positives here when code is optimized */
rte_bitset_copy(reference, bitset, size);
+#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 11)
+#pragma GCC diagnostic pop
+#endif
+
bool value = test_fun(bitset, i);
flip_fun(bitset, i);
@@ -282,13 +293,13 @@ find_clear(const bool *ary, size_t num_bools, size_t
start, size_t len)
return find(ary, num_bools, start, len, false);
}
-#define FFS_ITERATIONS (100)
+#define FFS_ITERATIONS 100
static int
test_find_size(size_t size, bool set)
{
uint64_t *bitset;
- bool reference[size];
+ bool reference[RAND_SET_MAX_SIZE];
size_t i;
bitset = alloc_bitset(size);
@@ -388,8 +399,8 @@ record_match(ssize_t match_idx, size_t size, int *calls)
static int
test_foreach_size(ssize_t size, bool may_wrap, bool set)
{
- bool reference[size];
- int calls[size];
+ bool reference[RAND_SET_MAX_SIZE];
+ int calls[RAND_SET_MAX_SIZE];
uint64_t *bitset;
ssize_t i;
ssize_t start_bit;
@@ -633,17 +644,19 @@ test_define(void)
typedef void bitset_op(uint64_t *dst, const uint64_t *a, const uint64_t *b,
size_t bit_num);
typedef bool bool_op(bool a, bool b);
+#define LOGIC_MAX_SET_SIZE 200
+
static int
test_logic_op(bitset_op bitset_op, bool_op bool_op)
{
- const size_t size = 1 + rte_rand_max(200);
- RTE_BITSET_DECLARE(bitset_a, size);
- RTE_BITSET_DECLARE(bitset_b, size);
- RTE_BITSET_DECLARE(bitset_d, size);
+ const size_t size = 1 + rte_rand_max(LOGIC_MAX_SET_SIZE);
+ RTE_BITSET_DECLARE(bitset_a, LOGIC_MAX_SET_SIZE);
+ RTE_BITSET_DECLARE(bitset_b, LOGIC_MAX_SET_SIZE);
+ RTE_BITSET_DECLARE(bitset_d, LOGIC_MAX_SET_SIZE);
- bool ary_a[size];
- bool ary_b[size];
- bool ary_d[size];
+ bool ary_a[LOGIC_MAX_SET_SIZE];
+ bool ary_b[LOGIC_MAX_SET_SIZE];
+ bool ary_d[LOGIC_MAX_SET_SIZE];
rand_bool_ary(ary_a, size);
rand_bool_ary(ary_b, size);
@@ -708,14 +721,14 @@ test_complement(void)
for (i = 0; i < RAND_ITERATIONS; i++) {
const size_t size = 1 + rte_rand_max(RAND_SET_MAX_SIZE - 1);
- RTE_BITSET_DECLARE(src, size);
+ RTE_BITSET_DECLARE(src, RAND_SET_MAX_SIZE);
rand_bitset(src, size);
bool bit_idx = rte_rand_max(size);
bool bit_value = rte_bitset_test(src, bit_idx);
- RTE_BITSET_DECLARE(dst, size);
+ RTE_BITSET_DECLARE(dst, RAND_SET_MAX_SIZE);
rte_bitset_complement(dst, src, size);
@@ -726,6 +739,8 @@ test_complement(void)
return TEST_SUCCESS;
}
+#define SHIFT_SET_MAX_SIZE 500
+
static int
test_shift(bool right)
{
@@ -734,12 +749,12 @@ test_shift
[PATCH v16 33/60] drivers/bus: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/bus/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build index d67db8576b..59af0f920e 100644 --- a/drivers/bus/meson.build +++ b/drivers/bus/meson.build @@ -17,3 +17,11 @@ drivers = [ std_deps = ['eal'] log_prefix = 'bus' + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 34/60] drivers/common: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
drivers/common/nfp/meson.build | 8
drivers/common/nitrox/meson.build | 8
drivers/common/sfc_efx/meson.build | 1 +
3 files changed, 17 insertions(+)
diff --git a/drivers/common/nfp/meson.build b/drivers/common/nfp/meson.build
index a09d1e25e2..165be4a868 100644
--- a/drivers/common/nfp/meson.build
+++ b/drivers/common/nfp/meson.build
@@ -14,3 +14,11 @@ sources = files(
)
deps += ['bus_pci', 'net']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/drivers/common/nitrox/meson.build
b/drivers/common/nitrox/meson.build
index f3cb42f006..46cd8ba65c 100644
--- a/drivers/common/nitrox/meson.build
+++ b/drivers/common/nitrox/meson.build
@@ -17,3 +17,11 @@ sources += files(
includes += include_directories('../../crypto/nitrox')
includes += include_directories('../../compress/nitrox')
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/drivers/common/sfc_efx/meson.build
b/drivers/common/sfc_efx/meson.build
index 0cf0a23bf8..e3b90f670a 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -26,6 +26,7 @@ extra_flags += [
extra_flags += [
'-Waggregate-return',
'-Wbad-function-cast',
+'-Wvla',
]
foreach flag: extra_flags
--
2.47.0.vfs.0.3
[PATCH v16 16/60] common/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/common/mlx5/mlx5_common.h| 4 ++--
drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 1abd1e8239..f29f06a86e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -125,10 +125,10 @@ mlx5_fp_debug_enabled(void)
/* Allocate a buffer on the stack and fill it with a printf format string. */
#define MKSTR(name, ...) \
int mkstr_size_##name = snprintf(NULL, 0, "" __VA_ARGS__); \
- char name[mkstr_size_##name + 1]; \
+ char *name = alloca(mkstr_size_##name + 1); \
\
memset(name, 0, mkstr_size_##name + 1); \
- snprintf(name, sizeof(name), "" __VA_ARGS__)
+ snprintf(name, mkstr_size_##name + 1, "" __VA_ARGS__)
enum {
PCI_VENDOR_ID_MELLANOX = 0x15b3,
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index a75f011750..804ee67cd6 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -284,10 +284,9 @@ mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_obj *dcs,
void *cmd_comp,
uint64_t async_id)
{
- int out_len = MLX5_ST_SZ_BYTES(query_flow_counter_out) +
- MLX5_ST_SZ_BYTES(traffic_counter);
- uint32_t out[out_len];
+ uint32_t out[MLX5_ST_SZ_BYTES(query_flow_counter_out) +
MLX5_ST_SZ_BYTES(traffic_counter)];
uint32_t in[MLX5_ST_SZ_DW(query_flow_counter_in)] = {0};
+ const int out_len = RTE_DIM(out);
void *stats;
int rc;
@@ -346,7 +345,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
int klm_num = attr->klm_num;
int in_size_dw = MLX5_ST_SZ_DW(create_mkey_in) +
(klm_num ? RTE_ALIGN(klm_num, 4) : 0) * MLX5_ST_SZ_DW(klm);
- uint32_t in[in_size_dw];
+ uint32_t *in = alloca(sizeof(uint32_t) * in_size_dw);
uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
void *mkc;
struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
--
2.47.0.vfs.0.3
[PATCH v16 20/60] hash: remove use of VLAs by using standard arrays
MSVC does not support VLAs, replace VLAs with standard C arrays.
Signed-off-by: Andre Muezerie
---
lib/hash/rte_thash_gf2_poly_math.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/hash/rte_thash_gf2_poly_math.c
b/lib/hash/rte_thash_gf2_poly_math.c
index 1c62974e71..825da4382f 100644
--- a/lib/hash/rte_thash_gf2_poly_math.c
+++ b/lib/hash/rte_thash_gf2_poly_math.c
@@ -8,6 +8,7 @@
#include
#include
+#define MAX_POLY_DEGREE 32
#define MAX_TOEPLITZ_KEY_LENGTH 64
RTE_LOG_REGISTER_SUFFIX(thash_poly_logtype, thash_poly, INFO);
#define RTE_LOGTYPE_HASH thash_poly_logtype
@@ -149,7 +150,7 @@ gf2_pow(uint32_t a, uint32_t pow, uint32_t r, int degree)
static uint32_t
__thash_get_rand_poly(int poly_degree)
{
- uint32_t roots[poly_degree];
+ uint32_t roots[MAX_POLY_DEGREE];
uint32_t rnd;
uint32_t ret_poly = 0;
int i, j;
@@ -194,9 +195,7 @@ __thash_get_rand_poly(int poly_degree)
* Get coefficients of the polynomial for
* (x - roots[0])(x - roots[1])...(x - roots[n])
*/
- uint32_t poly_coefficients[poly_degree + 1];
- for (i = 0; i <= poly_degree; i++)
- poly_coefficients[i] = 0;
+ uint32_t poly_coefficients[MAX_POLY_DEGREE + 1] = {0};
poly_coefficients[0] = 1; /* highest degree term coefficient in the end
*/
for (i = 0; i < (int)poly_degree; i++) {
@@ -247,7 +246,7 @@ thash_get_rand_poly(uint32_t poly_degree)
{
uint32_t ret_poly;
- if (poly_degree > 32) {
+ if (poly_degree > MAX_POLY_DEGREE) {
HASH_LOG(ERR, "Wrong polynomial degree %d, must be in range [1,
32]", poly_degree);
return 0;
}
--
2.47.0.vfs.0.3
[PATCH v16 51/60] pdump: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/pdump/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/pdump/meson.build b/lib/pdump/meson.build
index da8d51b616..4d2a7e1b2c 100644
--- a/lib/pdump/meson.build
+++ b/lib/pdump/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('rte_pdump.c')
headers = files('rte_pdump.h')
deps += ['ethdev', 'bpf', 'pcapng']
--
2.47.0.vfs.0.3
[PATCH v16 52/60] pipeline: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/pipeline/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/pipeline/meson.build b/lib/pipeline/meson.build index fd5e0dc6bb..4027a26e61 100644 --- a/lib/pipeline/meson.build +++ b/lib/pipeline/meson.build @@ -7,6 +7,14 @@ if is_windows subdir_done() endif +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'rte_pipeline.c', 'rte_port_in_action.c', -- 2.47.0.vfs.0.3
[PATCH v16 43/60] acl: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/acl/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/acl/meson.build b/lib/acl/meson.build
index 9cba08321a..eec7138b93 100644
--- a/lib/acl/meson.build
+++ b/lib/acl/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
'rte_acl.c', 'tb_mem.c')
headers = files('rte_acl.h', 'rte_acl_osdep.h')
--
2.47.0.vfs.0.3
[PATCH v16 50/60] pdcp: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/pdcp/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/pdcp/meson.build b/lib/pdcp/meson.build index f4f9246bcb..78d26d637b 100644 --- a/lib/pdcp/meson.build +++ b/lib/pdcp/meson.build @@ -7,6 +7,14 @@ if is_windows subdir_done() endif +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'pdcp_cnt.c', 'pdcp_crypto.c', -- 2.47.0.vfs.0.3
[PATCH v16 57/60] drivers/net: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/net/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/net/meson.build b/drivers/net/meson.build index dafd637ba4..170e7339e5 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -68,3 +68,11 @@ drivers = [ std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev']# same with vdev bus + +warning_flags = ['-Wvla'] + +foreach arg: warning_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 44/60] bpf: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/bpf/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index aa258a9061..f3cc18efa8 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32')
build = false
reason = 'not supported on 32-bit x86'
--
2.47.0.vfs.0.3
[PATCH v16 49/60] metrics: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/metrics/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/metrics/meson.build b/lib/metrics/meson.build
index 8c1c4b4b49..11314d8373 100644
--- a/lib/metrics/meson.build
+++ b/lib/metrics/meson.build
@@ -9,3 +9,11 @@ if dpdk_conf.has('RTE_HAS_JANSSON')
endif
deps += ['ethdev', 'telemetry']
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 48/60] member: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/member/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/member/meson.build b/lib/member/meson.build
index 02ef59795e..b28c2fd522 100644
--- a/lib/member/meson.build
+++ b/lib/member/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
headers = files('rte_member.h')
sources = files(
--
2.47.0.vfs.0.3
[PATCH v16 55/60] vhost: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/vhost/meson.build | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build
index 51bcf17244..4539bedab4 100644
--- a/lib/vhost/meson.build
+++ b/lib/vhost/meson.build
@@ -16,11 +16,19 @@ elif (toolchain == 'icc' and
cc.version().version_compare('>=16.0.0'))
cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
endif
dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
cc.has_header('linux/userfaultfd.h'))
-cflags += [
-'-fno-strict-aliasing',
-'-Wno-address-of-packed-member',
+
+extra_flags = [
+'-fno-strict-aliasing',
+'-Wno-address-of-packed-member',
+'-Wno-vla'
]
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files(
'fd_man.c',
'iotlb.c',
--
2.47.0.vfs.0.3
[PATCH v16 45/60] dispatcher: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/dispatcher/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/dispatcher/meson.build b/lib/dispatcher/meson.build
index ffaef26a6d..0e13bb4824 100644
--- a/lib/dispatcher/meson.build
+++ b/lib/dispatcher/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('rte_dispatcher.c')
headers = files('rte_dispatcher.h')
--
2.47.0.vfs.0.3
[PATCH v16 02/60] eal/linux: remove use of VLAs
From: Konstantin Ananyev
1) ./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
MSVC does not support VLAs. Use alloca() to allocate the memory on
the stack.
2) ./lib/eal/linux/eal_interrupts.c:1319:16
: warning: ISO C90 forbids variable length array ‘evs’
make eal_epoll_wait() use a fixed size array and use it though multiple
iterations to process up to @maxevents events.
Note that technically it is not one to one replacement, as here we might
reduce number of events returned by first call to epoll_wait(..., timeout);
Signed-off-by: Konstantin Ananyev
---
lib/eal/linux/eal_interrupts.c | 32 +++-
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 6436f796eb..23039964fc 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -34,6 +34,8 @@
#define EAL_INTR_EPOLL_WAIT_FOREVER (-1)
#define NB_OTHER_INTR 1
+#define MAX_ITER_EVNUM RTE_EVENT_ETH_INTR_RING_SIZE
+
static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
/**
@@ -1070,7 +1072,7 @@ eal_intr_process_interrupts(struct epoll_event *events,
int nfds)
static void
eal_intr_handle_interrupts(int pfd, unsigned totalfds)
{
- struct epoll_event events[totalfds];
+ struct epoll_event *events = alloca(sizeof(struct epoll_event) *
totalfds);
int nfds = 0;
for(;;) {
@@ -1316,8 +1318,9 @@ static int
eal_epoll_wait(int epfd, struct rte_epoll_event *events,
int maxevents, int timeout, bool interruptible)
{
- struct epoll_event evs[maxevents];
int rc;
+ uint32_t i, k, n, num;
+ struct epoll_event evs[MAX_ITER_EVNUM];
if (!events) {
EAL_LOG(ERR, "rte_epoll_event can't be NULL");
@@ -1328,12 +1331,31 @@ eal_epoll_wait(int epfd, struct rte_epoll_event *events,
if (epfd == RTE_EPOLL_PER_THREAD)
epfd = rte_intr_tls_epfd();
+ num = maxevents;
+ n = RTE_MIN(RTE_DIM(evs), num);
+
+ /* Process events in chunks of MAX_ITER_EVNUM */
+
while (1) {
- rc = epoll_wait(epfd, evs, maxevents, timeout);
+ rc = epoll_wait(epfd, evs, n, timeout);
if (likely(rc > 0)) {
+
/* epoll_wait has at least one fd ready to read */
- rc = eal_epoll_process_event(evs, rc, events);
- break;
+ for (i = 0, k = 0; rc > 0;) {
+ k += rc;
+ rc = eal_epoll_process_event(evs, rc,
+ events + i);
+ i += rc;
+
+ /*
+* try to read more events that are already
+* available (up to maxevents in total).
+*/
+ n = RTE_MIN(RTE_DIM(evs), num - k);
+ rc = (n == 0) ? 0 : epoll_wait(epfd, evs, n, 0);
+ }
+ return i;
+
} else if (rc < 0) {
if (errno == EINTR) {
if (interruptible)
--
2.47.0.vfs.0.3
[PATCH v16 04/60] ethdev: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/ethdev/rte_ethdev.c:3244:16
: warning: ISO C90 forbids variable length array ‘xstats_names’
2) ./lib/ethdev/rte_ethdev.c:3345:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
3) ./lib/ethdev/rte_ethdev.c:3538:16
: warning: ISO C90 forbids variable length array ‘xstats’
4) ./lib/ethdev/rte_ethdev.c:3554:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
For 1) and 3) - just replaced VLA with arrays allocated from heap.
As I understand xstats extraction belongs to control-path, so extra
calloc/free is hopefully acceptable.
Also ethdev xstats already doing that within
rte_eth_xstats_get_id_by_name().
For 2) and 4) changed the code to use fixed size array and call
appropriate devops function several times, if needed.
Signed-off-by: Konstantin Ananyev
---
lib/ethdev/rte_ethdev.c | 183 +---
1 file changed, 113 insertions(+), 70 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..09cc4764c3 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -36,6 +36,8 @@
#include "ethdev_trace.h"
#include "sff_telemetry.h"
+#define ETH_XSTATS_ITER_NUM0x100
+
struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
/* public fast-path API */
@@ -3308,7 +3310,8 @@ int
rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
uint64_t *id)
{
- int cnt_xstats, idx_xstat;
+ int cnt_xstats, idx_xstat, rc;
+ struct rte_eth_xstat_name *xstats_names;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3334,26 +3337,33 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const
char *xstat_name,
}
/* Get id-name lookup table */
- struct rte_eth_xstat_name xstats_names[cnt_xstats];
+ xstats_names = calloc(cnt_xstats, sizeof(xstats_names[0]));
+ if (xstats_names == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
+ }
if (cnt_xstats != rte_eth_xstats_get_names_by_id(
port_id, xstats_names, cnt_xstats, NULL)) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot get xstats lookup");
+ free(xstats_names);
return -1;
}
+ rc = -EINVAL;
for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
if (!strcmp(xstats_names[idx_xstat].name, xstat_name)) {
*id = idx_xstat;
rte_eth_trace_xstats_get_id_by_name(port_id,
xstat_name, *id);
-
- return 0;
+ rc = 0;
+ break;
};
}
- return -EINVAL;
+ free(xstats_names);
+ return rc;
}
/* retrieve basic stats names */
@@ -3399,6 +3409,38 @@ eth_basic_stats_get_names(struct rte_eth_dev *dev,
return cnt_used_entries;
}
+static int
+eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names, uint32_t size,
+ uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+* Convert ids to xstats ids that PMD knows.
+* ids known by user are basic + extended stats.
+*/
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy,
+ xstats_names + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
+
/* retrieve ethdev extended statistics names */
int
rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -3406,9 +3448,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
uint64_t *ids)
{
struct rte_eth_xstat_name *xstats_names_copy;
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
unsigned int expected_entries;
+ unsigned int nb_basic_stats;
unsigned int basic_count;
struct rte_eth_dev *dev;
unsigned int i;
@@ -3434,27 +3475,18 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
if (ids && !xstats_names)
return -EINVAL;
- if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
- uint64_t ids_copy[size];
-
- for (i = 0; i < size; i++) {
- if (ids[i] < basic_count) {
- no_basic_stat_requested = 0;
- break;
- }
-
-
[PATCH v16 01/60] eal: include header required for alloca
From: Tyler Retzlaff Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca(). Signed-off-by: Tyler Retzlaff --- lib/eal/freebsd/include/rte_os.h | 1 + lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h index 62e70dc15b..94b9275beb 100644 --- a/lib/eal/freebsd/include/rte_os.h +++ b/lib/eal/freebsd/include/rte_os.h @@ -11,6 +11,7 @@ */ #include +#include /* Declares alloca() */ #include /* These macros are compatible with system's sys/queue.h. */ diff --git a/lib/eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h index 35c07c70cb..20eff0409a 100644 --- a/lib/eal/linux/include/rte_os.h +++ b/lib/eal/linux/include/rte_os.h @@ -10,6 +10,7 @@ * which is not supported natively or named differently in Linux. */ +#include #include #include diff --git a/lib/eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h index 9d69467aaa..d09adeb3b4 100644 --- a/lib/eal/windows/include/rte_os.h +++ b/lib/eal/windows/include/rte_os.h @@ -13,6 +13,7 @@ #include #include #include +#include #include -- 2.47.0.vfs.0.3
[PATCH v16 00/60] remove use of VLAs for Windows
As per guidance technical board meeting 2024/04/17. This series removes the use of VLAs from code built for Windows for all 3 toolchains. If there are additional opportunities to convert VLAs to regular C arrays please provide the details for incorporation into the series. MSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK. v16: * remove -Wvla from drivers/common/mlx5/meson.build and drivers/common/qat/meson.build v15: * inverted some of the logic added during v14: add -Wvla to meson build files in app and lib directories, adding -Wno-vla to the few subdirectories which are not yet VLA free v14: * add -Wvla to meson build for directories that are VLA free under app, lib, drivers. This is to ensure that new VLAs are not added to these directories in the future. v13: * increase stack allocated buffer size in ipv4_reassembly_interleaved_flows_perf and ipv6_reassembly_interleaved_flows_perf to avoid STATUS_STACK_BUFFER_OVERRUN on Windows using MSVC v12: * update commit message for patch 06/21 to avoid warning v11: * add include stdlib.h for alloca() declaration on FreeBSD * zero-initialize array without code loop * increase maximum tuple length v10: * add ifdef to scope gcc's diagnostic error down to gcc only v9: * fix sender's email address * fix gcc's diagnostic error string to make clang happy v8: * rebase * reduce scope for disabling error "-Warray-bounds=" to only the place that needs it * remove parentesis around numbers from defines in test_bitset.c v7: * remove use of VLA from new file which sneaked in during review v6: * remove use of VLA from new test code added recently * fix title for patch 08/20 v5: * add patches for net/ice, net/ixgbe and gro from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=* * address debug_autotest ASan failure * address array-bound error in bitset_autotest with gcc-13 v4: * rebase and adapt for changes made in main since v3 was sent * use fixed maximum array size instead of VLA when doable v3: * address checkpatch/check git log warnings (minor typos) v2: * replace patches for ethdev, hash, rcu and include new patches for eal from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31781 Andre Muezerie (42): test: remove use of VLAs for Windows built code in bitset tests app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd hash: remove use of VLAs by using standard arrays app/pdump: disable warning about use of VLAs app/proc-info: disable warning about use of VLAs app/test: disable warning about use of VLAs app/test-acl: disable warning about use of VLAs app/test-bbdev: disable warning about use of VLAs app/test-crypto-perf: disable warning about use of VLAs app/test-dma-perf: disable warning about use of VLAs app/test-eventdev: disable warning about use of VLAs app/flow-perf: add compile warning about use of VLAs app/test-pmd: check compiler supports flag when adding to set app/test-sad: disable warning about use of VLAs drivers/baseband: add compile warning about use of VLAs drivers/bus: add compile warning about use of VLAs drivers/common: add compile warning about use of VLAs drivers/compress: add compile warning about use of VLAs drivers/gpu: add compile warning about use of VLAs drivers/mempool: add compile warning about use of VLAs drivers/ml: add compile warning about use of VLAs drivers/power: add compile warning about use of VLAs drivers/raw: add compile warning about use of VLAs drivers/vdpa: add compile warning about use of VLAs drivers/regex: add compile warning about use of VLAs acl: disable warning about use of VLAs bpf: disable warning about use of VLAs dispatcher: disable warning about use of VLAs eventdev: disable warning about use of VLAs ipsec: disable warning about use of VLAs member: disable warning about use of VLAs metrics: disable warning about use of VLAs pdcp: disable warning about use of VLAs pdump: disable warning about use of VLAs pipeline: disable warning about use of VLAs power: disable warning about use of VLAs table: disable warning about use of VLAs vhost: disable warning about use of VLAs drivers/common: add compile warning about use of VLAs drivers/net: add compile warning about use of VLAs app: add compile warning about use of VLAs lib: add compile warning about use of VLAs Konstantin Ananyev (10): eal/linux: remove use of VLAs eal/common: remove use of VLAs ethdev: remove use of VLAs for Windows built code hash: remove use of VLAs for Windows built code hash/thash: remove use of VLAs for Windows built rcu: remove use of VLAs for Windows built code gro: fix overwrite unprocessed packets gro: remove use of VLAs net/ixgbe: remove
[PATCH v16 03/60] eal/common: remove use of VLAs
From: Konstantin Ananyev 1) ../lib/eal/common/eal_common_proc.c:695:15 : warning: variable length array used As msg->num_fds should not exceed RTE_MP_MAX_FD_NUM, replaced it with fixed size array. Signed-off-by: Konstantin Ananyev Acked-by: Stephen Hemminger --- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index d24093937c..201973c5db 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -692,7 +692,8 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) struct sockaddr_un dst; struct mp_msg_internal m; int fd_size = msg->num_fds * sizeof(int); - char control[CMSG_SPACE(fd_size)]; + const int32_t control_sz = CMSG_SPACE(fd_size); + char control[CMSG_SPACE(sizeof(msg->fds))]; m.type = type; memcpy(&m.msg, msg, sizeof(*msg)); @@ -712,7 +713,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = control; - msgh.msg_controllen = sizeof(control); + msgh.msg_controllen = control_sz; cmsg = CMSG_FIRSTHDR(&msgh); cmsg->cmsg_len = CMSG_LEN(fd_size); -- 2.47.0.vfs.0.3
[PATCH v16 08/60] gro: fix overwrite unprocessed packets
From: Konstantin Ananyev
gro_vxlan_tcp4_tbl_timeout_flush() is called without taking into account
that first entries in pkts[] can be already occupied by
un-processed packets.
Fixes: 74080d7dcf31 ("gro: support IPv6 for TCP")
Cc: sta...@dpdk.org
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/rte_gro.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index d824eebd93..db86117609 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -327,7 +327,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
i += gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl,
- 0, pkts, nb_pkts);
+ 0, &pkts[i], nb_pkts - i);
}
if (do_vxlan_udp_gro) {
--
2.47.0.vfs.0.3
[PATCH v16 13/60] test: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Acked-by: Chengwen Feng
---
app/test/test.c | 2 +-
app/test/test_cmdline_string.c| 2 +-
app/test/test_cryptodev.c | 34 +--
app/test/test_cryptodev_blockcipher.c | 4 +--
app/test/test_cryptodev_crosscheck.c | 2 +-
app/test/test_dmadev.c| 9 +++--
app/test/test_hash.c | 14
app/test/test_mempool.c | 25 +++---
app/test/test_reorder.c | 48 +++
app/test/test_service_cores.c | 9 +++--
app/test/test_thash.c | 7 ++--
11 files changed, 82 insertions(+), 74 deletions(-)
diff --git a/app/test/test.c b/app/test/test.c
index 680351f6a3..fd653cbbfd 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -105,7 +105,7 @@ int
main(int argc, char **argv)
{
struct cmdline *cl;
- char *tests[argc]; /* store an array of tests to run */
+ char **tests = alloca(sizeof(char *) * argc); /* store an array of
tests to run */
int test_count = 0;
int i;
char *extra_args;
diff --git a/app/test/test_cmdline_string.c b/app/test/test_cmdline_string.c
index 97516c9400..e1cf86020f 100644
--- a/app/test/test_cmdline_string.c
+++ b/app/test/test_cmdline_string.c
@@ -40,7 +40,7 @@ struct string_elt_str string_elt_strs[] = {
#if (CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE) \
|| (CMDLINE_TEST_BUFSIZE < STR_MULTI_TOKEN_SIZE)
#undef CMDLINE_TEST_BUFSIZE
-#define CMDLINE_TEST_BUFSIZE RTE_MAX(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE)
+#define CMDLINE_TEST_BUFSIZE RTE_MAX_T(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE,
size_t)
#endif
struct string_nb_str {
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a33ef574cc..c05d377f0f 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2886,7 +2886,7 @@ create_wireless_algo_hash_session(uint8_t dev_id,
enum rte_crypto_auth_operation op,
enum rte_crypto_auth_algorithm algo)
{
- uint8_t hash_key[key_len];
+ uint8_t *hash_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -2922,7 +2922,7 @@ create_wireless_algo_cipher_session(uint8_t dev_id,
const uint8_t *key, const uint8_t key_len,
uint8_t iv_len)
{
- uint8_t cipher_key[key_len];
+ uint8_t *cipher_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -3074,7 +3074,7 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
const struct wireless_test_data *tdata)
{
const uint8_t key_len = tdata->key.len;
- uint8_t cipher_auth_key[key_len];
+ uint8_t *cipher_auth_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -9078,7 +9078,7 @@ create_aead_session(uint8_t dev_id, enum
rte_crypto_aead_algorithm algo,
const uint16_t aad_len, const uint8_t auth_len,
uint8_t iv_len)
{
- uint8_t aead_key[key_len];
+ uint8_t *aead_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -12989,7 +12989,7 @@ test_cryptodev_error_recover_helper(uint8_t dev_id,
const void *test_data, bool
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
const struct blockcipher_test_data *tdata = test_data;
- uint8_t cipher_key[tdata->cipher_key.len];
+ uint8_t *cipher_key = alloca(tdata->cipher_key.len);
struct rte_crypto_sym_op *sym_op = NULL;
struct rte_crypto_op *op = NULL;
char *dst;
@@ -13343,7 +13343,7 @@ static int
test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
{
struct aead_test_data tdata;
- uint8_t aad[gcm_test_case_7.aad.len];
+ uint8_t *aad = alloca(gcm_test_case_7.aad.len);
int res;
RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
@@ -13732,7 +13732,7 @@ static int
test_AES_GCM_auth_decryption_fail_aad_corrupt(void)
{
struct aead_test_data tdata;
- uint8_t aad[gcm_test_case_7.aad.len];
+ uint8_t *aad = alloca(gcm_test_case_7.aad.len);
int res;
memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
@@ -13984,7 +13984,7 @@ test_authenticated_encryption_sessionless(
int retval;
uint8_t *ciphertext, *auth_
[PATCH v16 19/60] app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Andre Muezerie
Acked-by: Chengwen Feng
---
app/test-pmd/shared_rxq_fwd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c
index 623d62da88..b85830b90e 100644
--- a/app/test-pmd/shared_rxq_fwd.c
+++ b/app/test-pmd/shared_rxq_fwd.c
@@ -92,7 +92,7 @@ forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx,
static bool
shared_rxq_fwd(struct fwd_stream *fs)
{
- struct rte_mbuf *pkts_burst[nb_pkt_per_burst];
+ struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
uint16_t nb_rx;
nb_rx = common_fwd_stream_receive(fs, pkts_burst, nb_pkt_per_burst);
--
2.47.0.vfs.0.3
[PATCH v16 14/60] common/idpf: remove use of VLAs for Windows built code
From: Tyler Retzlaff MSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson --- drivers/common/idpf/idpf_common_rxtx.c| 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/common/idpf/idpf_common_rxtx.c b/drivers/common/idpf/idpf_common_rxtx.c index a04e54ce26..e04ab40fa2 100644 --- a/drivers/common/idpf/idpf_common_rxtx.c +++ b/drivers/common/idpf/idpf_common_rxtx.c @@ -569,7 +569,7 @@ idpf_split_rx_bufq_refill(struct idpf_rx_queue *rx_bufq) uint16_t nb_refill = rx_bufq->rx_free_thresh; uint16_t nb_desc = rx_bufq->nb_rx_desc; uint16_t next_avail = rx_bufq->rx_tail; - struct rte_mbuf *nmb[rx_bufq->rx_free_thresh]; + struct rte_mbuf **nmb = alloca(sizeof(struct rte_mbuf *) * rx_bufq->rx_free_thresh); uint64_t dma_addr; uint16_t delta; int i; diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c index b8450b03ae..63e10c542f 100644 --- a/drivers/common/idpf/idpf_common_rxtx_avx512.c +++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c @@ -1002,7 +1002,8 @@ idpf_tx_singleq_free_bufs_avx512(struct idpf_tx_queue *txq) uint32_t n; uint32_t i; int nb_free = 0; - struct rte_mbuf *m, *free[txq->rs_thresh]; + struct rte_mbuf *m; + struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) * txq->rs_thresh); /* check DD bits on threshold descriptor */ if ((txq->tx_ring[txq->next_dd].qw1 & @@ -1326,7 +1327,8 @@ idpf_tx_splitq_free_bufs_avx512(struct idpf_tx_queue *txq) uint32_t n; uint32_t i; int nb_free = 0; - struct rte_mbuf *m, *free[txq->rs_thresh]; + struct rte_mbuf *m; + struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) * txq->rs_thresh); n = txq->rs_thresh; -- 2.47.0.vfs.0.3
[PATCH v16 38/60] drivers/ml: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/ml/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/ml/meson.build b/drivers/ml/meson.build index 54bc394c47..ae07c5292e 100644 --- a/drivers/ml/meson.build +++ b/drivers/ml/meson.build @@ -6,3 +6,11 @@ drivers = [ ] std_deps = ['mldev'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 37/60] drivers/mempool: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/mempool/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build index dc88812585..4f74556eb5 100644 --- a/drivers/mempool/meson.build +++ b/drivers/mempool/meson.build @@ -14,3 +14,11 @@ drivers = [ std_deps = ['mempool'] log_prefix = 'mempool' + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 26/60] app/test-crypto-perf: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/test-crypto-perf/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 7b02b518f0..cf41a22a75 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -23,3 +23,11 @@ deps += ['cryptodev', 'net', 'security']
if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
deps += 'crypto_scheduler'
endif
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 22/60] app/proc-info: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/proc-info/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index 4f83f29a64..cd1399e964 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -12,3 +12,11 @@ deps += ['ethdev', 'security', 'eventdev']
if dpdk_conf.has('RTE_LIB_METRICS')
deps += 'metrics'
endif
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 29/60] app/flow-perf: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- app/test-flow-perf/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build index 766e4516ad..42fe6831d0 100644 --- a/app/test-flow-perf/meson.build +++ b/app/test-flow-perf/meson.build @@ -15,3 +15,11 @@ sources = files( ) deps += ['ethdev'] + +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 30/60] app/test-pmd: check compiler supports flag when adding to set
This is done so that multiple compilers can be supported. Signed-off-by: Andre Muezerie --- app/test-pmd/meson.build | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index f1c36529b4..8de1528428 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -3,7 +3,15 @@ # override default name to drop the hyphen name = 'testpmd' -cflags += '-Wno-deprecated-declarations' + +extra_flags = ['-Wno-deprecated-declarations'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( '5tswap.c', 'cmdline.c', -- 2.47.0.vfs.0.3
[PATCH v16 21/60] app/pdump: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/pdump/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/pdump/meson.build b/app/pdump/meson.build
index fb282bba1f..889d9d1fb3 100644
--- a/app/pdump/meson.build
+++ b/app/pdump/meson.build
@@ -9,3 +9,11 @@ endif
sources = files('main.c')
deps += ['ethdev', 'kvargs', 'pdump']
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 28/60] app/test-eventdev: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- app/test-eventdev/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build index ab8769c755..0eec3ca90f 100644 --- a/app/test-eventdev/meson.build +++ b/app/test-eventdev/meson.build @@ -23,3 +23,11 @@ sources = files( 'test_pipeline_queue.c', ) deps += 'eventdev' + +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 27/60] app/test-dma-perf: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- app/test-dma-perf/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-dma-perf/meson.build b/app/test-dma-perf/meson.build index b1557b8125..d0333c358f 100644 --- a/app/test-dma-perf/meson.build +++ b/app/test-dma-perf/meson.build @@ -13,3 +13,11 @@ sources = files( 'main.c', 'benchmark.c', ) + +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 36/60] drivers/gpu: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/gpu/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/meson.build b/drivers/gpu/meson.build index b6edd12678..610151e9b1 100644 --- a/drivers/gpu/meson.build +++ b/drivers/gpu/meson.build @@ -4,3 +4,11 @@ drivers = [ 'cuda' ] std_deps = [ 'gpudev' ] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 41/60] drivers/vdpa: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/vdpa/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build index 896e8e0304..49e94584bc 100644 --- a/drivers/vdpa/meson.build +++ b/drivers/vdpa/meson.build @@ -13,3 +13,11 @@ drivers = [ ] std_deps = ['bus_pci', 'kvargs'] std_deps += ['vhost'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 40/60] drivers/raw: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/raw/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build index d173ac6097..726a786e0d 100644 --- a/drivers/raw/meson.build +++ b/drivers/raw/meson.build @@ -16,3 +16,11 @@ drivers = [ 'skeleton', ] std_deps = ['rawdev'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 24/60] app/test-acl: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/test-acl/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build
index c0dc4b221a..6e0bd982ac 100644
--- a/app/test-acl/meson.build
+++ b/app/test-acl/meson.build
@@ -9,3 +9,11 @@ endif
sources = files('main.c')
deps += ['acl', 'net']
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 46/60] eventdev: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/eventdev/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build index a04bb86f0f..04b81f1e9e 100644 --- a/lib/eventdev/meson.build +++ b/lib/eventdev/meson.build @@ -7,6 +7,14 @@ if is_windows subdir_done() endif +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'eventdev_private.c', 'eventdev_trace_points.c', -- 2.47.0.vfs.0.3
[PATCH v16 31/60] app/test-sad: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/test-sad/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-sad/meson.build b/app/test-sad/meson.build
index a50616a9c7..e8149a53d9 100644
--- a/app/test-sad/meson.build
+++ b/app/test-sad/meson.build
@@ -9,3 +9,11 @@ endif
sources = files('main.c')
deps += ['ipsec', 'net']
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 39/60] drivers/power: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/power/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/power/meson.build b/drivers/power/meson.build index 0a703bce38..e7c16e2d47 100644 --- a/drivers/power/meson.build +++ b/drivers/power/meson.build @@ -12,3 +12,11 @@ drivers = [ ] std_deps = ['power'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 25/60] app/test-bbdev: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/test-bbdev/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 926e0a5271..18f8b1f526 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -26,3 +26,11 @@ endif
if dpdk_conf.has('RTE_BASEBAND_LA12XX')
deps += ['baseband_la12xx']
endif
+
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v16 23/60] app/test: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
app/test/meson.build | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index d5cb6a7f7a..22b505b2be 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -247,12 +247,18 @@ foreach d:optional_deps
endif
endforeach
-if cc.has_argument('-Wno-format-truncation')
-cflags += '-Wno-format-truncation'
-endif
+extra_flags = [
+# Strict-aliasing rules are violated by uint8_t[] to context size casts.
+'-fno-strict-aliasing',
+'-Wno-format-truncation',
+'-Wno-vla',
+]
-# Strict-aliasing rules are violated by uint8_t[] to context size casts.
-cflags += '-fno-strict-aliasing'
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
# Enable using internal APIs in unit tests
cflags += '-DALLOW_INTERNAL_API'
--
2.47.0.vfs.0.3
[PATCH v16 35/60] drivers/compress: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/compress/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/compress/meson.build b/drivers/compress/meson.build index 91d7800a4a..293ddd5836 100644 --- a/drivers/compress/meson.build +++ b/drivers/compress/meson.build @@ -15,3 +15,11 @@ drivers = [ ] std_deps = ['compressdev'] # compressdev pulls in all other needed deps + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v16 54/60] table: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/table/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/table/meson.build b/lib/table/meson.build index 9b3d9ac759..f15796f063 100644 --- a/lib/table/meson.build +++ b/lib/table/meson.build @@ -1,6 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'rte_swx_keycmp.c', 'rte_swx_table_em.c', -- 2.47.0.vfs.0.3
[PATCH v16 53/60] power: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings issued for VLAs to prevent the build from breaking. Signed-off-by: Andre Muezerie --- lib/power/meson.build | 9 + 1 file changed, 9 insertions(+) diff --git a/lib/power/meson.build b/lib/power/meson.build index b3a7bc7b2e..c52433f21e 100644 --- a/lib/power/meson.build +++ b/lib/power/meson.build @@ -11,6 +11,15 @@ if not is_linux build = false reason = 'only supported on Linux' endif + +extra_flags = ['-Wno-vla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach + sources = files( 'power_common.c', 'rte_power_cpufreq.c', -- 2.47.0.vfs.0.3
[PATCH v16 47/60] ipsec: disable warning about use of VLAs
This path is known to make use of VLAs, so we need to disable warnings
issued for VLAs to prevent the build from breaking.
Signed-off-by: Andre Muezerie
---
lib/ipsec/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/ipsec/meson.build b/lib/ipsec/meson.build
index 5c5a4aae78..ba14d1315d 100644
--- a/lib/ipsec/meson.build
+++ b/lib/ipsec/meson.build
@@ -7,6 +7,14 @@ if is_windows
subdir_done()
endif
+extra_flags = ['-Wno-vla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files('esp_inb.c', 'esp_outb.c',
'sa.c', 'ses.c', 'ipsec_sad.c',
'ipsec_telemetry.c')
--
2.47.0.vfs.0.3
[PATCH v16 60/60] lib: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/meson.build | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lib/meson.build b/lib/meson.build
index ce92cb5537..43a92be5fa 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -111,9 +111,13 @@ default_cflags = machine_args
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
default_cflags += ['-DALLOW_INTERNAL_API']
-if cc.has_argument('-Wno-format-truncation')
-default_cflags += '-Wno-format-truncation'
-endif
+extra_flags = ['-Wno-format-truncation', '-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+default_cflags += arg
+endif
+endforeach
foreach l:libraries
build = true
--
2.47.0.vfs.0.3
[PATCH v16 56/60] drivers/common: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- drivers/common/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 8734af36aa..03debc9731 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -11,3 +11,11 @@ drivers = [ 'mvep', 'octeontx', ] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
