remove use of VLAs for Windows built code
Subsystems (10)
cover remove use of VLAs for Windows built code
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.
Tyler Retzlaff (16):
eal: include header required for alloca
hash: remove use of VLAs for Windows built code
ethdev: remove use of VLAs for Windows built code
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code
rcu: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built code
app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +++-- app/test-pmd/config.c | 16 +++++---- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++--------- 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 | 8 ++--- app/test/test_mempool.c | 25 +++++++------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++------------ app/test/test_service_cores.c | 9 +++-- app/test/test_thash.c | 7 ++-- config/meson.build | 4 +++ drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++-- drivers/common/mlx5/mlx5_common.h | 4 +-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 ++-- drivers/net/i40e/i40e_testpmd.c | 5 ++- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 ++- drivers/net/mlx5/mlx5_flow.c | 6 ++-- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 9 ++--- lib/gro/rte_gro.c | 4 +-- lib/hash/rte_cuckoo_hash.c | 4 +-- lib/hash/rte_thash.c | 2 +- lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 6 ++-- 36 files changed, 137 insertions(+), 123 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/16 eal: include header required for alloca
Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca().
--- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 2 files changed, 2 insertions(+)
lib/eal/linux/include/rte_os.h +1 -0
@@ -14,6 +14,7 @@* which is not supported natively or named differently in Linux. */ +#include <alloca.h> #include <sched.h> #include <sys/queue.h>
lib/eal/windows/include/rte_os.h +1 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <malloc.h> #include <sched.h>
Signature · 1 line
1.8.3.1
PATCH 2/16 hash: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/hash/rte_cuckoo_hash.c | 4 ++-- lib/hash/rte_thash.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
lib/hash/rte_cuckoo_hash.c +2 -2
@@ -2359,7 +2359,7 @@ struct rte_hash * (num_keys >RTE_HASH_LOOKUP_BULK_MAX ) || (hit_mask == NULL)), -EINVAL); -int32_t positions[num_keys]; +int32_t *positions =alloca (sizeof (int32_t ) * num_keys);__rte_hash_lookup_bulk (h, keys, num_keys, positions, hit_mask, data);
@@ -2475,7 +2475,7 @@ struct rte_hash * (num_keys >RTE_HASH_LOOKUP_BULK_MAX ) || (hit_mask == NULL)), -EINVAL); -int32_t positions[num_keys]; +int32_t *positions =alloca (sizeof (int32_t ) * num_keys);__rte_hash_lookup_with_hash_bulk (h, keys, sig, num_keys, positions, hit_mask, data);
lib/hash/rte_thash.c +1 -1
@@ -771,7 +771,7 @@ struct rte_thash_subtuple_helper * 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 = alloca(tuple_len);unsigned int i, j, ret =0 ;uint32_t hash, adj_bits;const uint8_t *hash_key;
Signature · 1 line
1.8.3.1
RE: [PATCH 02/16] hash: remove use of VLAs for Windows built code
Review
Quoted 2 lines
(quoted diff) +1
-1- int32_t positions[num_keys]; + int32_t *positions = alloca(sizeof(int32_t) * num_keys);
A general comment, using this patch as an example...
I wonder if adding const has any effect on the compilers' optimizers:
int32_t * const positions = alloca(sizeof(int32_t) * num_keys);
Perhaps not in this specific case, but maybe elsewhere.
Especially if passing the array by reference.
We're not good at adding const and restrict to function parameters, so declaring the alloca()'d arrays const might compensate for that.
PATCH 3/16 ethdev: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/ethdev/rte_ethdev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
lib/ethdev/rte_ethdev.c +5 -4
@@ -3241,7 +3241,8 @@ enum { }/* Get id-name lookup table */ -struct rte_eth_xstat_name xstats_names[cnt_xstats]; +struct rte_eth_xstat_name *xstats_names = +alloca (sizeof (struct rte_eth_xstat_name ) * cnt_xstats);if (cnt_xstats !=rte_eth_xstats_get_names_by_id ( port_id, xstats_names, cnt_xstats,NULL )) {
@@ -3342,7 +3343,7 @@ enum {return -EINVAL ;if (ids && dev->dev_ops->xstats_get_names_by_id !=NULL && size >0 ) { -uint64_t ids_copy[size]; +uint64_t *ids_copy =alloca (sizeof (uint64_t ) * size);for (i =0 ; i < size; i++) {if (ids[i] < basic_count) {
@@ -3535,7 +3536,7 @@ enum {if (ret <0 )return ret; expected_entries = (uint16_t )ret; -struct rte_eth_xstat xstats[expected_entries]; +struct rte_eth_xstat *xstats =alloca (sizeof (struct rte_eth_xstat ) * expected_entries); basic_count =eth_dev_get_xstats_basic_count (dev);/* Return max number of stats if no ids given */
@@ -3551,7 +3552,7 @@ enum {if (ids && dev->dev_ops->xstats_get_by_id !=NULL && size) {unsigned int basic_count =eth_dev_get_xstats_basic_count (dev); -uint64_t ids_copy[size]; +uint64_t *ids_copy =alloca (sizeof (uint64_t ) * size);for (i =0 ; i < size; i++) {if (ids[i] < basic_count) {
Signature · 1 line
1.8.3.1
PATCH 4/16 gro: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/gro/rte_gro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/gro/rte_gro.c +2 -2
@@ -179,7 +179,7 @@ struct gro_ctx {struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM ] = {{{0 }} }; -struct rte_mbuf *unprocess_pkts[nb_pkts]; +struct rte_mbuf **unprocess_pkts =alloca (sizeof (struct rte_mbuf *) * nb_pkts);uint32_t item_num;int32_t ret;uint16_t i, unprocess_num =0 , nb_after_gro = nb_pkts;
@@ -360,7 +360,7 @@ struct gro_ctx {uint16_t nb_pkts, void *ctx) { - struct rte_mbuf *unprocess_pkts[nb_pkts]; + struct rte_mbuf **unprocess_pkts = alloca(sizeof(struct rte_mbuf *) * 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;
Signature · 1 line
1.8.3.1
PATCH 5/16 latencystats: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/latencystats/rte_latencystats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/latencystats/rte_latencystats.c +1 -1
@@ -159,7 +159,7 @@ struct latency_stats_nameoff { {unsigned int i, cnt =0 ;uint64_t now; -float latency[nb_pkts]; +float *latency =alloca (sizeof (float ) * nb_pkts);static float prev_latency;/* * Alpha represents degree of weighting decrease in EWMA,
Signature · 1 line
1.8.3.1
PATCH 6/16 lpm: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/lpm/rte_lpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/lpm/rte_lpm.h +1 -1
@@ -337,7 +337,7 @@ struct rte_lpm * uint32_t *next_hops, const unsigned n) { unsigned i; -unsigned tbl24_indexes[n]; +unsigned int *tbl24_indexes = (unsigned int *)alloca (sizeof (unsigned int ) * n);const uint32_t *ptbl;/* DEBUG: Check user input arguments. */
Signature · 1 line
1.8.3.1
PATCH 7/16 rcu: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/rcu/rte_rcu_qsbr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/rcu/rte_rcu_qsbr.c +3 -3
@@ -356,7 +356,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e)return 1 ; } -char data[dq->esize]; +char *data =alloca (dq->esize); dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;/* Start the grace period */ dq_elem->token =rte_rcu_qsbr_start (dq->v);
@@ -419,10 +419,10 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e) cnt =0 ; -char data[dq->esize]; +char *data =alloca (dq->esize);/* Check reader threads quiescent state and reclaim resources */ while (cnt < n && -rte_ring_dequeue_bulk_elem_start (dq->r, &data, +rte_ring_dequeue_bulk_elem_start (dq->r, data, dq->esize,1 , available) !=0 ) { dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;
Signature · 1 line
1.8.3.1
PATCH 8/16 app/testpmd: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 ++++----- app/test-pmd/config.c | 16 +++++++++------- app/test-pmd/shared_rxq_fwd.c | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +1 -1
@@ -12902,7 +12902,7 @@ struct cmd_set_port_ptypes_result {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 ) {
app/test-pmd/cmdline_flow.c +4 -5
@@ -11546,8 +11546,7 @@ struct indlst_conf {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)
@@ -11574,7 +11573,7 @@ struct indlst_conf { 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 )
@@ -11707,7 +11706,7 @@ struct indlst_conf { void *buf, unsigned int size) {const struct arg *arg =pop_args (ctx); -char str2[len +1 ]; +char *str2 =alloca (len +1 );struct in_addr tmp;int ret;
@@ -11753,7 +11752,7 @@ struct indlst_conf { void *buf, unsigned int size) {const struct arg *arg =pop_args (ctx); -char str2[len +1 ]; +char *str2 =alloca (len +1 );struct in6_addr tmp;int ret;
app/test-pmd/config.c +9 -7
@@ -1760,7 +1760,8 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops) {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) ||
@@ -2577,10 +2578,10 @@ struct rte_flow_meter_policy *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 )
@@ -5460,7 +5461,7 @@ struct igb_ring_desc_16_bytes {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 ;
@@ -7201,7 +7202,8 @@ static const char *get_ptype_str(uint32_t ptype)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 ;
app/test-pmd/shared_rxq_fwd.c +1 -1
@@ -92,7 +92,7 @@static bool shared_rxq_fwd (struct fwd_stream *fs) { -struct rte_mbuf *pkts_burst[nb_pkt_per_burst]; +struct rte_mbuf **pkts_burst =alloca (sizeof (struct rte_mbuf *) * nb_pkt_per_burst);uint16_t nb_rx; nb_rx =common_fwd_stream_receive (fs, pkts_burst, nb_pkt_per_burst);
Signature · 1 line
1.8.3.1
PATCH 9/16 test: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++++------------ 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 | 8 +++--- app/test/test_mempool.c | 25 +++++++++--------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++++++---------------- app/test/test_service_cores.c | 9 +++---- app/test/test_thash.c | 7 +++-- 12 files changed, 79 insertions(+), 73 deletions(-)
app/test/test.c +1 -1
@@ -105,7 +105,7 @@ 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;
app/test/test_cmdline_string.c +1 -1
@@ -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 {
app/test/test_cryptodev.c +16 -16
@@ -2686,7 +2686,7 @@ struct crypto_unittest_params {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;
@@ -2722,7 +2722,7 @@ struct crypto_unittest_params { 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;
@@ -2874,7 +2874,7 @@ struct crypto_unittest_params { 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;
@@ -8878,7 +8878,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata) 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;
@@ -12849,7 +12849,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,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" );
@@ -13238,7 +13238,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,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 ));
@@ -13490,7 +13490,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,int retval;uint8_t *ciphertext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -13592,7 +13592,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,int retval;uint8_t *plaintext; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -14895,7 +14895,7 @@ static int create_gmac_session(uint8_t dev_id,const struct gmac_test_data *tdata, enum rte_crypto_auth_operation auth_op) { - uint8_t auth_key[tdata->key.len]; + uint8_t *auth_key = alloca(tdata->key.len);struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -15552,7 +15552,7 @@ struct test_crypto_vector { enum rte_crypto_auth_operation auth_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (auth_key, reference->auth_key.data, reference->auth_key.len);
@@ -15583,8 +15583,8 @@ struct test_crypto_vector { enum rte_crypto_cipher_operation cipher_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (cipher_key, reference->cipher_key.data, reference->cipher_key.len);
@@ -16084,8 +16084,8 @@ struct test_crypto_vector {uint8_t *authciphertext, *plaintext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -16216,8 +16216,8 @@ struct test_crypto_vector {int retval;uint8_t *ciphertext; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
app/test/test_cryptodev_blockcipher.c +2 -2
@@ -85,8 +85,8 @@int status =TEST_SUCCESS ;const struct blockcipher_test_data *tdata = t->test_data; -uint8_t cipher_key[tdata->cipher_key.len]; -uint8_t auth_key[tdata->auth_key.len]; +uint8_t *cipher_key =alloca (tdata->cipher_key.len); +uint8_t *auth_key =alloca (tdata->auth_key.len);uint32_t buf_len = tdata->ciphertext.len;uint32_t digest_len = tdata->digest.len;char *buf_p =NULL ;
app/test/test_cryptodev_crosscheck.c +1 -1
@@ -894,7 +894,7 @@ struct crosscheck_testsuite_params { crosscheck_with_profile_run(const struct crosscheck_test_profile *profile) {struct crosscheck_testsuite_params *ts_params = &testsuite_params; -uint8_t input_text[profile->input_buf_len]; +uint8_t *input_text =alloca (profile->input_buf_len);uint16_t output_len, encrypted_len;uint8_t encrypted_text[MBUF_SIZE ];uint8_t output_text[MBUF_SIZE ];
app/test/test_dmadev.c +6 -3
@@ -417,9 +417,12 @@ struct runtest_param { dst_len = len / n_dst; src_len = len / n_src; -struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge]; -struct rte_mbuf *src[n_sge], *dst[n_sge]; -char *src_data[n_sge], *dst_data[n_sge]; +struct rte_dma_sge *sg_src =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_dma_sge *sg_dst =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_mbuf **src =alloca (sizeof (struct rte_mbuf *) * n_sge); +struct rte_mbuf **dst =alloca (sizeof (struct rte_mbuf *) * n_sge); +char **src_data =alloca (sizeof (char *) * n_sge); +char **dst_data =alloca (sizeof (char *) * n_sge);for (i =0 ; i < len; i++) orig_src[i] =rte_rand () &0xFF ;
app/test/test_hash.c +4 -4
@@ -1930,8 +1930,8 @@ static int test_hash_iteration(uint32_t ext_table) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int *pos =alloca (sizeof (int ) * total_entries); +int *expected_pos =alloca (sizeof (int ) * total_entries);unsigned int i;size_t sz;int32_t status;
@@ -2100,8 +2100,8 @@ static int test_hash_iteration(uint32_t ext_table) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int *pos =alloca (sizeof (int ) * total_entries); +int *expected_pos =alloca (sizeof (int ) * total_entries);unsigned int i;size_t sz;int32_t status;
app/test/test_mempool.c +13 -12
@@ -515,19 +515,20 @@ struct test_mempool_events_data {#undef RTE_TEST_TRACE_FAILURE#define RTE_TEST_TRACE_FAILURE (...) do { goto fail; } while (0) -static const size_t callback_num =3 ; -static const size_t mempool_num =2 ; +#define CALLBACK_NUM 3u +#define MEMPOOL_NUM 2u +static const unsigned int mempool_elt_size =64 ;static const unsigned int mempool_size =64 ; -struct test_mempool_events_data data[callback_num]; -struct rte_mempool *mp[mempool_num], *freed; +struct test_mempool_events_data data[CALLBACK_NUM ]; +struct rte_mempool *mp[MEMPOOL_NUM ], *freed;char name[RTE_MEMPOOL_NAMESIZE ];size_t i, j;int ret;memset (mp,0 ,sizeof (mp)); -for (i =0 ; i < callback_num; i++) { +for (i =0 ; i <CALLBACK_NUM ; i++) { ret =rte_mempool_event_callback_register (test_mempool_events_cb, &data[i]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to register the callback %zu: %s",
@@ -548,7 +549,7 @@ struct test_mempool_events_data { SOCKET_ID_ANY, 0);RTE_TEST_ASSERT_NOT_NULL (mp[0 ],"Cannot create mempool %s: %s" , name,rte_strerror (rte_errno)); -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)RTE_TEST_ASSERT_EQUAL (data[j].invoked, false,"Callback %zu invoked on %s mempool creation" , j, name);
@@ -557,7 +558,7 @@ struct test_mempool_events_data { ret =populate (mp[0 ]);RTE_TEST_ASSERT_EQUAL (ret, (int )mp[0 ]->size,"Failed to populate mempool %s: %s" , name,rte_strerror (-ret)); -for (j =0 ; j < callback_num; j++) { +for (j =0 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s population" , j, name);
@@ -589,7 +590,7 @@ struct test_mempool_events_data {"Unregistered callback 0 invoked on %s mempool populaton" , name); -for (i =0 ; i < mempool_num; i++) { +for (i =0 ; i <MEMPOOL_NUM ; i++) {memset (&data,0 ,sizeof (data));sprintf (name,"empty%zu" , i);rte_mempool_free (mp[i]);
@@ -599,7 +600,7 @@ struct test_mempool_events_data {*/ freed = mp[i]; mp[i] =NULL ; -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s destruction" , j, name);
@@ -615,7 +616,7 @@ struct test_mempool_events_data { name); } -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) { ret =rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to unregister the callback %zu: %s",
@@ -624,10 +625,10 @@ struct test_mempool_events_data {return TEST_SUCCESS ; fail: -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); -for (i =0 ; i < mempool_num; i++) +for (i =0 ; i <MEMPOOL_NUM ; i++)rte_mempool_free (mp[i]);return TEST_FAILED ;
app/test/test_reassembly_perf.c +2 -2
@@ -604,7 +604,7 @@for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf **buf_arr =alloca (sizeof (struct rte_mbuf *) * nb_frags);for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
@@ -815,7 +815,7 @@for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf **buf_arr =alloca (sizeof (struct rte_mbuf *) * nb_frags);for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
app/test/test_reorder.c +26 -22
155 lines not on this page · raw message
app/test/test_service_cores.c +4 -5
@@ -561,9 +561,8 @@ static int32_t dummy_mt_safe_cb(void *args) "Service core count not equal to one");/* retrieve core list, checking lcore ids */ -const uint32_t size =4 ; -uint32_t service_core_ids[size]; -int32_t n =rte_service_lcore_list (service_core_ids, size); +uint32_t service_core_ids[4 ]; +int32_t n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal 1" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list lcore must equal slcore_id" );
@@ -589,7 +588,7 @@ static int32_t dummy_mt_safe_cb(void *args) cores_at_this_point);/* check longer service core list */ - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (3 , n,"Service core list return should equal 3" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list[0] lcore must equal 1" );
@@ -607,7 +606,7 @@ static int32_t dummy_mt_safe_cb(void *args) "Service core add did not return zero");TEST_ASSERT_EQUAL (1 ,rte_service_lcore_count (),"Service core count not equal to one" ); - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal one" ); TEST_ASSERT_EQUAL(slcore_id, service_core_ids[0], "Service core list[0] lcore must equal %d",
app/test/test_thash.c +3 -4
@@ -576,9 +576,8 @@ enum { {struct rte_thash_ctx *ctx;struct rte_thash_subtuple_helper *h; -const int key_len =40 ;int reta_sz =6 ; -uint8_t initial_key[key_len]; +uint8_t initial_key[40 ];const uint8_t *new_key;int ret;union rte_thash_tuple tuple;
@@ -586,9 +585,9 @@ enum {unsigned int desired_value =27 &HASH_MSK (reta_sz);uint16_t port_value =22 ; -memset (initial_key,0 , key_len); +memset (initial_key,0 ,RTE_DIM (initial_key)); - ctx =rte_thash_init_ctx ("test" , key_len, reta_sz, initial_key, + ctx =rte_thash_init_ctx ("test" ,RTE_DIM (initial_key), reta_sz, initial_key,RTE_THASH_MINIMAL_SEQ );RTE_TEST_ASSERT (ctx !=NULL ,"can not create thash ctx\n" );
Signature · 1 line
1.8.3.1
PATCH 10/16 common/idpf: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/common/idpf/idpf_common_rxtx.c +1 -1
@@ -569,7 +569,7 @@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;
drivers/common/idpf/idpf_common_rxtx_avx512.c +4 -2
@@ -1002,7 +1002,8 @@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 &
@@ -1319,7 +1320,8 @@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;
Signature · 1 line
1.8.3.1
PATCH 11/16 net/i40e: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/i40e/i40e_testpmd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/i40e/i40e_testpmd.c +2 -3
@@ -2168,8 +2168,7 @@ struct cmd_ptype_mapping_get_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 @@ struct cmd_ptype_mapping_get_result { ret =rte_pmd_i40e_ptype_mapping_get (res->port_id, mapping, - max_ptype_num, +RTE_DIM (mapping), &count, res->valid_only);switch (ret) {
Signature · 1 line
1.8.3.1
PATCH 12/16 net/ice: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/ice/ice_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ice/ice_rxtx.c +1 -1
@@ -1868,7 +1868,7 @@uint64_t dma_addr;int diag, diag_pay;uint64_t pay_addr; -struct rte_mbuf *mbufs_pay[rxq->rx_free_thresh]; +struct rte_mbuf **mbufs_pay =alloca (sizeof (struct rte_mbuf *) * rxq->rx_free_thresh);/* Allocate buffers in bulk */ alloc_idx = (uint16_t)(rxq->rx_free_trigger -
Signature · 1 line
1.8.3.1
PATCH 13/16 net/ixgbe: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +3 -2
@@ -3553,7 +3553,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 = +alloca (sizeof (struct rte_eth_xstat_name ) * size);ixgbe_dev_xstats_get_names_by_id (dev,NULL , xstats_names_copy, size);
@@ -3736,7 +3737,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,uint16_t i;uint16_t size =ixgbe_xstats_calc_num (); -uint64_t values_copy[size]; +uint64_t *values_copy =alloca (sizeof (uint64_t ) * size);ixgbe_dev_xstats_get_by_id (dev,NULL , values_copy, size);
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +1 -1
@@ -14,7 +14,7 @@ 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 = alloca(sizeof(struct rte_mbuf *) * nb_bufs); /*finished pkts*/struct rte_mbuf *start = rxq->pkt_first_seg;struct rte_mbuf *end = rxq->pkt_last_seg;unsigned int pkt_idx, buf_idx;
Signature · 1 line
1.8.3.1
PATCH 14/16 common/mlx5: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/common/mlx5/mlx5_common.h | 4 ++-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/common/mlx5/mlx5_common.h +2 -2
@@ -112,10 +112,10 @@/* 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 ,
drivers/common/mlx5/mlx5_devx_cmds.c +3 -4
@@ -284,10 +284,9 @@ struct mlx5_devx_obj *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 @@ struct mlx5_devx_obj *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),
Signature · 1 line
1.8.3.1
PATCH 15/16 net/mlx5: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/mlx5/mlx5.c | 5 ++--- drivers/net/mlx5/mlx5_flow.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +2 -3
@@ -1597,14 +1597,13 @@ 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;
drivers/net/mlx5/mlx5_flow.c +3 -3
@@ -1476,8 +1476,8 @@ struct mlx5_flow_tunnel_info {"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;
@@ -8344,7 +8344,7 @@ struct mlx5_flow_workspace* .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,
Signature · 1 line
1.8.3.1
PATCH 16/16 build: enable vla warnings on Windows built code
In reply to Tyler RetzlaffMSVC does not support optional C11 VLAs. When building for Windows enable -Wvla so that mingw and clang also fail if a VLA is used.
--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
config/meson.build +4 -0
@@ -344,6 +344,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')
Signature · 1 line
1.8.3.1
RE: [PATCH 16/16] build: enable vla warnings on Windows built code
Quoted 2 lines
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.
Minor detail, doesn't affect my Ack for the series...
Applications built for Windows with mingw and clang might use VLAs in the application itself.
Perhaps we should let them continue doing that for now.
Quoted 23 lines
Signed-off-by Tyler Retzlaff <[email protected]>--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)config/meson.build +4
-1@@ -344,6 +344,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') --1.8.3.1
Re: [PATCH 16/16] build: enable vla warnings on Windows built code
Quoted 8 lines · Morten Brørup
Quoted 2 lines
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.
Minor detail, doesn't affect my Ack for the series...
Applications built for Windows with mingw and clang might use VLAs in the application itself.
Perhaps we should let them continue doing that for now.
i guess you mean our examples or if dpdk is configured as a sub-project?
for examples i could explicitly suppress in examples with -Wno-vla but that means any that use VLAs could not be built with MSVC.
for sub-module and sub-project of dpdk i feel like these add_project_arguments are not imparted on the application with encapsulating project meson setup no?
anyone know? Bruce? Stephen?
Quoted 25 lines
Quoted 24 lines
Signed-off-by Tyler Retzlaff <[email protected]>--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)config/meson.build +4
-1@@ -344,6 +344,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') --1.8.3.1
Re: [PATCH 16/16] build: enable vla warnings on Windows built code
Quoted 13 lines · Tyler Retzlaff
Quoted 9 lines · Morten Brørup
Quoted 2 lines
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.
Minor detail, doesn't affect my Ack for the series...
Applications built for Windows with mingw and clang might use VLAs in the application itself.
Perhaps we should let them continue doing that for now.
i guess you mean our examples or if dpdk is configured as a sub-project?
Quoted 9 lines
for examples i could explicitly suppress in examples with -Wno-vla but that means any that use VLAs could not be built with MSVC.
for sub-module and sub-project of dpdk i feel like these
add_project_argumentsare not imparted on the application with encapsulating project meson setup no?anyone know? Bruce? Stephen?
Project args are not used when building external applications - either those using DPDK as a subproject or via pkg-config. So therefore, this change should be safe. It will only impact built-in DPDK apps and examples.
/Bruce
RE: [PATCH 16/16] build: enable vla warnings on Windows built code
Quoted 26 lines
From: Bruce Richardson [mailto:[email protected]]
Sent: Thursday, 18 April 2024 17.24Quoted 7 lines · Tyler Retzlaff
Quoted 6 lines · Morten Brørup
Quoted 2 lines
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.
Minor detail, doesn't affect my Ack for the series...
Applications built for Windows with mingw and clang might use VLAs
in
Quoted 5 lines
Quoted 3 lines
the application itself.
Perhaps we should let them continue doing that for now.
i guess you mean our examples or if dpdk is configured as a sub-
project?
Quoted 8 lines
for examples i could explicitly suppress in examples with -Wno-vla but that means any that use VLAs could not be built with MSVC.
for sub-module and sub-project of dpdk i feel like these
add_project_argumentsare not imparted on the application with encapsulating project meson setup no?
Quoted 8 lines
Quoted 2 lines
anyone know? Bruce? Stephen?
Project args are not used when building external applications - either those using DPDK as a subproject or via pkg-config. So therefore, this change should be safe. It will only impact built-in DPDK apps and examples.
/Bruce
Thank you for clarifying, Bruce.
Then my comment was irrelevant. Sorry about the noise. ;-)
Quoted 9 lines
From: Tyler Retzlaff [mailto:[email protected]]
Sent: Thursday, 18 April 2024 01.42As 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.
Quoted 3 lines
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.
Two comments sent in individual mails, don't affect this Ack.
Hi Tyler,
Quoted 5 lines
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.
I submitted the RFC series:
https://patchwork.dpdk.org/project/dpdk/list/?series=31781
that provides alternate approach to VLA removal (without alloca()) for core libs.
Feel free to re-use whatever is appropriate in your series. If time permits, I'll try to look to other libs from your series (probably next week or so).
Konstantin
Quoted 63 lines
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.Tyler Retzlaff (16):
eal: include header required for alloca
hash: remove use of VLAs for Windows built code
ethdev: remove use of VLAs for Windows built code
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code
rcu: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built codeapp/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +++-- app/test-pmd/config.c | 16 +++++---- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++--------- 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 | 8 ++--- app/test/test_mempool.c | 25 +++++++------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++------------ app/test/test_service_cores.c | 9 +++-- app/test/test_thash.c | 7 ++-- config/meson.build | 4 +++ drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++-- drivers/common/mlx5/mlx5_common.h | 4 +-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 ++-- drivers/net/i40e/i40e_testpmd.c | 5 ++- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 ++- drivers/net/mlx5/mlx5_flow.c | 6 ++-- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 9 ++--- lib/gro/rte_gro.c | 4 +-- lib/hash/rte_cuckoo_hash.c | 4 +-- lib/hash/rte_thash.c | 2 +- lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 6 ++-- 36 files changed, 137 insertions(+), 123 deletions(-)--
1.8.3.1
Quoted 8 lines · Konstantin Ananyev
Hi Tyler,
Quoted 5 lines
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.
Quoted 8 lines
I submitted the RFC series:
https://patchwork.dpdk.org/project/dpdk/list/?series=31781
that provides alternate approach to VLA removal (withoutalloca()) for core libs.
Feel free to re-use whatever is appropriate in your series. If time permits, I'll try to look to other libs from your series (probably next week or so).
Konstantin
if there is no objection i'm happy to drop changes in my series and integrate your changes into my series with your signoff.
let me know and i'll roll them together into v2.
thank you!
Quoted 20 lines · Konstantin Ananyev
Quoted 8 lines
Hi Tyler,
Quoted 5 lines
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.
Quoted 8 lines
I submitted the RFC series:
https://patchwork.dpdk.org/project/dpdk/list/?series=31781
that provides alternate approach to VLA removal (withoutalloca()) for core libs.
Feel free to re-use whatever is appropriate in your series. If time permits, I'll try to look to other libs from your series (probably next week or so).
Konstantin
Quoted 4 lines
if there is no objection i'm happy to drop changes in my series and integrate your changes into my series with your signoff.
let me know and i'll roll them together into v2.
Yes absolutely, feel free to go ahead with that.
Thanks
Konstantin
Quoted 2 lines
thank you!
v2 cover remove use of VLAs for Windows
In reply to Tyler RetzlaffAs 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.
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
Konstantin Ananyev (6):
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 code
rcu: remove use of VLAs for Windows built code
Tyler Retzlaff (13):
eal: include header required for alloca
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built code
app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +- app/test-pmd/config.c | 16 ++- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 ++--- 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 | 8 +- app/test/test_mempool.c | 25 ++-- app/test/test_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 +++---- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 59 ++++++++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 ++++++++++++++++---------- lib/gro/rte_gro.c | 4 +- lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++ lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 40 files changed, 314 insertions(+), 198 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/19 eal: include header required for alloca
Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca().
--- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 2 files changed, 2 insertions(+)
lib/eal/linux/include/rte_os.h +1 -0
@@ -14,6 +14,7 @@* which is not supported natively or named differently in Linux. */ +#include <alloca.h> #include <sched.h> #include <sys/queue.h>
lib/eal/windows/include/rte_os.h +1 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <malloc.h> #include <sched.h>
Signature · 1 line
1.8.3.1
PATCH v2 2/19 eal/linux: remove use of VLAs
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
1) ./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
eal_intr_handle_interrupts() is called by eal_intr_thread_main() so it seems ok to simply alloc space for events from heap and reuse the same buffer through the life of the thread.
2) ./lib/eal/linux/eal_interrupts.c:1319:16
: warning: ISO C90 forbids variable length array ‘evs’
make eal_epoll_wait() to use fixed size array and use it though multiple iterations to preocess upt to @maxevents events.
Note that techically it is not one to one raplacement, as here we might reduce number of events returned by first call to epoll_wait(..., timeout);
--- lib/eal/linux/eal_interrupts.c | 59 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 7 deletions(-)
lib/eal/linux/eal_interrupts.c +52 -7
@@ -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 *//**
@@ -1068,9 +1070,9 @@ struct rte_intr_source {* void */ static void -eal_intr_handle_interrupts (int pfd,unsigned totalfds) +eal_intr_handle_interrupts (int pfd,struct epoll_event events[], +unsigned totalfds) { -struct epoll_event events[totalfds];int nfds =0 ;for (;;) {
@@ -1106,6 +1108,12 @@ struct rte_intr_source { static __rte_noreturn uint32_t eal_intr_thread_main(__rte_unused void *arg) { +uint32_t n, nb_event; +struct epoll_event *events, *p; + + nb_event =0 ; + events =NULL ; +/* host thread, never break out */ for (;;) {/* build up the epoll fd with all descriptors we are to
@@ -1159,8 +1167,23 @@ struct rte_intr_source { numfds++; }rte_spinlock_unlock (&intr_lock); + +/* alloc space for events, when necessary */ +if (numfds > nb_event) { + n = numfds +MAX_ITER_EVNUM ; + p =realloc (events, n *sizeof (events[0 ])); +if (p ==NULL ) { +EAL_LOG (ERR ,"failed to allocate %u events" , + numfds); + numfds = nb_event; + }else { + nb_event = n; + events = p; + } + } +/* serve the interrupt */ -eal_intr_handle_interrupts (pfd, numfds); +eal_intr_handle_interrupts (pfd, events, numfds);/** * when we return, we need to rebuild the
@@ -1168,6 +1191,8 @@ struct rte_intr_source {*/ close (pfd); } + +free (events); }int
@@ -1316,8 +1341,9 @@ struct rte_intr_source { 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 +1354,31 @@ struct rte_intr_source {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)
Signature · 1 line
1.8.3.1
PATCH v2 3/19 eal/common: remove use of VLAs
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/eal/common/eal_common_proc.c +3 -2
@@ -692,7 +692,8 @@ enum async_action {struct sockaddr_un dst;struct mp_msg_internal m;int fd_size = msg->num_fds *sizeof (int ); -char control[CMSG_SPACE (fd_size)]; +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 @@ enum async_action { 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);
Signature · 1 line
1.8.3.1
PATCH v2 4/19 ethdev: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/ethdev/rte_ethdev.c | 183 ++++++++++++++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 70 deletions(-)
lib/ethdev/rte_ethdev.c +113 -70
@@ -36,6 +36,8 @@#include "ethdev_trace.h" #include "sff_telemetry.h" +#define ETH_XSTATS_ITER_NUM 0x100 +struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS ];/* public fast-path API */
@@ -3215,7 +3217,8 @@ enum { 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 );
@@ -3241,26 +3244,33 @@ enum { }/* 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 */
@@ -3306,6 +3316,38 @@ enum {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,
@@ -3313,9 +3355,8 @@ enum { 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;
@@ -3341,27 +3382,18 @@ enum {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 ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_names_by_id)(dev, - ids_copy, xstats_names, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } +/* no baisc stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_names_by_id !=NULL ) +return eth_xstats_get_by_name_by_id (dev, ids, xstats_names, + size, basic_count); +/* Retrieve all stats */ if (!ids) { int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
@@ -3380,17 +3412,8 @@ enum {return -ENOMEM ; } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } - } -/* Fill xstats_names_copy structure */ -if (ids && no_ext_stat_requested) { +if (ids && nb_basic_stats == size) {eth_basic_stats_get_names (dev, xstats_names_copy); }else { ret = rte_eth_xstats_get_names(port_id, xstats_names_copy,
@@ -3514,17 +3537,47 @@ enum {return count; } +static int +eth_xtats_get_by_id (struct rte_eth_dev *dev,const uint64_t *ids, +uint64_t *values,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_by_id)(dev, ids_copy, + values + m, k); +if (rc <0 ) +return rc; + m += rc; + } + +return m; +} +/* retrieve ethdev extended statistics */ int rte_eth_xstats_get_by_id (uint16_t port_id,const uint64_t *ids,uint64_t *values,unsigned int size) { -unsigned int no_basic_stat_requested =1 ; -unsigned int no_ext_stat_requested =1 ; +unsigned int nb_basic_stats;unsigned int num_xstats_filled;unsigned int basic_count;uint16_t expected_entries;struct rte_eth_dev *dev; +struct rte_eth_xstat *xstats;unsigned int i;int ret;
@@ -3535,7 +3588,6 @@ enum {if (ret <0 )return ret; expected_entries = (uint16_t )ret; -struct rte_eth_xstat xstats[expected_entries]; basic_count =eth_dev_get_xstats_basic_count (dev);/* Return max number of stats if no ids given */
@@ -3549,51 +3601,41 @@ enum {if (ids && !values)return -EINVAL ; -if (ids && dev->dev_ops->xstats_get_by_id !=NULL && size) { -unsigned int basic_count =eth_dev_get_xstats_basic_count (dev); -uint64_t ids_copy[size]; - -for (i =0 ; i < size; i++) { -if (ids[i] < basic_count) { - no_basic_stat_requested =0 ; -break ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } +/* no baisc stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_by_id !=NULL ) +return eth_xtats_get_by_id (dev, ids, values, size, basic_count); + + xstats =calloc (expected_entries,sizeof (xstats[0 ])); +if (xstats ==NULL ) { +RTE_ETHDEV_LOG_LINE (ERR ,"Can't allocate memory" ); +return -ENOMEM ; }/* Fill the xstats structure */ -if (ids && no_ext_stat_requested) +if (ids && nb_basic_stats == size) ret =eth_basic_stats_get (port_id, xstats);else ret =rte_eth_xstats_get (port_id, xstats, expected_entries); -if (ret <0 ) +if (ret <0 ) { +free (xstats);return ret; + } num_xstats_filled = (unsigned int )ret;/* Return all stats */ if (!ids) {for (i =0 ; i < num_xstats_filled; i++) values[i] = xstats[i].value; + +free (xstats);return expected_entries; }
@@ -3601,14 +3643,15 @@ enum {for (i =0 ; i < size; i++) {if (ids[i] >= expected_entries) {RTE_ETHDEV_LOG_LINE (ERR ,"Id value isn't valid" ); -return -1 ; +break ; } values[i] = xstats[ids[i]].value; }rte_eth_trace_xstats_get_by_id (port_id, ids, values, size); -return size; +free (xstats); +return (i == size) ? (int32_t )size :-1 ; }int
Signature · 1 line
1.8.3.1
PATCH v2 5/19 hash: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/hash/rte_cuckoo_hash.c +2 -2
@@ -2359,7 +2359,7 @@ struct rte_hash * (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);
@@ -2475,7 +2475,7 @@ struct rte_hash * (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);
Signature · 1 line
1.8.3.1
PATCH v2 6/19 hash/thash: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’ [-Wvla]
From my understanding, tuple size here should never exceed sizeof(union rte_thash_tuple), so it should be safe to replace VLA with fixed size array.
--- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
lib/hash/rte_thash.c +1 -1
@@ -771,7 +771,7 @@ struct rte_thash_subtuple_helper * 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_MAX_L4_LEN];unsigned int i, j, ret =0 ;uint32_t hash, adj_bits;const uint8_t *hash_key;
lib/hash/rte_thash.h +8 -0
@@ -109,6 +109,14 @@ union __rte_aligned(XMM_SIZE) rte_thash_tuple { };/** +* maximum length in dwords of input tuple to +* calculate hash of ipv(4|6) header + +* transport header +*/ +#define RTE_THASH_MAX_L4_LEN \ + ((sizeof(union rte_thash_tuple)) / sizeof(uint32_t)) + +/** * Prepare special converted key to use with rte_softrss_be() * @param orig * pointer to original RSS key
Signature · 1 line
1.8.3.1
PATCH v2 7/19 rcu: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/rcu/rte_rcu_qsbr.c | 7 ++++--- lib/rcu/rte_rcu_qsbr.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-)
lib/rcu/rte_rcu_qsbr.c +4 -3
@@ -278,7 +278,8 @@ struct rte_rcu_qsbr_dq *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 ;
@@ -356,7 +357,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);
@@ -419,7 +420,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e) 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,
lib/rcu/rte_rcu_qsbr.h +5 -0
@@ -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.
Signature · 1 line
1.8.3.1
PATCH v2 8/19 gro: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/gro/rte_gro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/gro/rte_gro.c +2 -2
@@ -179,7 +179,7 @@ struct gro_ctx {struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM ] = {{{0 }} }; -struct rte_mbuf *unprocess_pkts[nb_pkts]; +struct rte_mbuf **unprocess_pkts =alloca (sizeof (struct rte_mbuf *) * nb_pkts);uint32_t item_num;int32_t ret;uint16_t i, unprocess_num =0 , nb_after_gro = nb_pkts;
@@ -360,7 +360,7 @@ struct gro_ctx {uint16_t nb_pkts, void *ctx) { - struct rte_mbuf *unprocess_pkts[nb_pkts]; + struct rte_mbuf **unprocess_pkts = alloca(sizeof(struct rte_mbuf *) * 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;
Signature · 1 line
1.8.3.1
PATCH v2 9/19 latencystats: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/latencystats/rte_latencystats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/latencystats/rte_latencystats.c +1 -1
@@ -159,7 +159,7 @@ struct latency_stats_nameoff { {unsigned int i, cnt =0 ;uint64_t now; -float latency[nb_pkts]; +float *latency =alloca (sizeof (float ) * nb_pkts);static float prev_latency;/* * Alpha represents degree of weighting decrease in EWMA,
Signature · 1 line
1.8.3.1
PATCH v2 10/19 lpm: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/lpm/rte_lpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/lpm/rte_lpm.h +1 -1
@@ -337,7 +337,7 @@ struct rte_lpm * uint32_t *next_hops, const unsigned n) { unsigned i; -unsigned tbl24_indexes[n]; +unsigned int *tbl24_indexes = (unsigned int *)alloca (sizeof (unsigned int ) * n);const uint32_t *ptbl;/* DEBUG: Check user input arguments. */
Signature · 1 line
1.8.3.1
PATCH v2 11/19 app/testpmd: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 ++++----- app/test-pmd/config.c | 16 +++++++++------- app/test-pmd/shared_rxq_fwd.c | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +1 -1
@@ -12902,7 +12902,7 @@ struct cmd_set_port_ptypes_result {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 ) {
app/test-pmd/cmdline_flow.c +4 -5
@@ -11546,8 +11546,7 @@ struct indlst_conf {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)
@@ -11574,7 +11573,7 @@ struct indlst_conf { 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 )
@@ -11707,7 +11706,7 @@ struct indlst_conf { void *buf, unsigned int size) {const struct arg *arg =pop_args (ctx); -char str2[len +1 ]; +char *str2 =alloca (len +1 );struct in_addr tmp;int ret;
@@ -11753,7 +11752,7 @@ struct indlst_conf { void *buf, unsigned int size) {const struct arg *arg =pop_args (ctx); -char str2[len +1 ]; +char *str2 =alloca (len +1 );struct in6_addr tmp;int ret;
app/test-pmd/config.c +9 -7
@@ -1760,7 +1760,8 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops) {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) ||
@@ -2577,10 +2578,10 @@ struct rte_flow_meter_policy *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 )
@@ -5460,7 +5461,7 @@ struct igb_ring_desc_16_bytes {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 ;
@@ -7201,7 +7202,8 @@ static const char *get_ptype_str(uint32_t ptype)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 ;
app/test-pmd/shared_rxq_fwd.c +1 -1
@@ -92,7 +92,7 @@static bool shared_rxq_fwd (struct fwd_stream *fs) { -struct rte_mbuf *pkts_burst[nb_pkt_per_burst]; +struct rte_mbuf **pkts_burst =alloca (sizeof (struct rte_mbuf *) * nb_pkt_per_burst);uint16_t nb_rx; nb_rx =common_fwd_stream_receive (fs, pkts_burst, nb_pkt_per_burst);
Signature · 1 line
1.8.3.1
PATCH v2 12/19 test: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++++------------ 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 | 8 +++--- app/test/test_mempool.c | 25 +++++++++--------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++++++---------------- app/test/test_service_cores.c | 9 +++---- app/test/test_thash.c | 7 +++-- 12 files changed, 79 insertions(+), 73 deletions(-)
app/test/test.c +1 -1
@@ -105,7 +105,7 @@ 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;
app/test/test_cmdline_string.c +1 -1
@@ -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 {
app/test/test_cryptodev.c +16 -16
@@ -2686,7 +2686,7 @@ struct crypto_unittest_params {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;
@@ -2722,7 +2722,7 @@ struct crypto_unittest_params { 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;
@@ -2874,7 +2874,7 @@ struct crypto_unittest_params { 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;
@@ -8878,7 +8878,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata) 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;
@@ -12849,7 +12849,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,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" );
@@ -13238,7 +13238,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,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 ));
@@ -13490,7 +13490,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,int retval;uint8_t *ciphertext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -13592,7 +13592,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,int retval;uint8_t *plaintext; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -14895,7 +14895,7 @@ static int create_gmac_session(uint8_t dev_id,const struct gmac_test_data *tdata, enum rte_crypto_auth_operation auth_op) { - uint8_t auth_key[tdata->key.len]; + uint8_t *auth_key = alloca(tdata->key.len);struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -15552,7 +15552,7 @@ struct test_crypto_vector { enum rte_crypto_auth_operation auth_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (auth_key, reference->auth_key.data, reference->auth_key.len);
@@ -15583,8 +15583,8 @@ struct test_crypto_vector { enum rte_crypto_cipher_operation cipher_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (cipher_key, reference->cipher_key.data, reference->cipher_key.len);
@@ -16084,8 +16084,8 @@ struct test_crypto_vector {uint8_t *authciphertext, *plaintext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -16216,8 +16216,8 @@ struct test_crypto_vector {int retval;uint8_t *ciphertext; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
app/test/test_cryptodev_blockcipher.c +2 -2
@@ -85,8 +85,8 @@int status =TEST_SUCCESS ;const struct blockcipher_test_data *tdata = t->test_data; -uint8_t cipher_key[tdata->cipher_key.len]; -uint8_t auth_key[tdata->auth_key.len]; +uint8_t *cipher_key =alloca (tdata->cipher_key.len); +uint8_t *auth_key =alloca (tdata->auth_key.len);uint32_t buf_len = tdata->ciphertext.len;uint32_t digest_len = tdata->digest.len;char *buf_p =NULL ;
app/test/test_cryptodev_crosscheck.c +1 -1
@@ -894,7 +894,7 @@ struct crosscheck_testsuite_params { crosscheck_with_profile_run(const struct crosscheck_test_profile *profile) {struct crosscheck_testsuite_params *ts_params = &testsuite_params; -uint8_t input_text[profile->input_buf_len]; +uint8_t *input_text =alloca (profile->input_buf_len);uint16_t output_len, encrypted_len;uint8_t encrypted_text[MBUF_SIZE ];uint8_t output_text[MBUF_SIZE ];
app/test/test_dmadev.c +6 -3
@@ -417,9 +417,12 @@ struct runtest_param { dst_len = len / n_dst; src_len = len / n_src; -struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge]; -struct rte_mbuf *src[n_sge], *dst[n_sge]; -char *src_data[n_sge], *dst_data[n_sge]; +struct rte_dma_sge *sg_src =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_dma_sge *sg_dst =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_mbuf **src =alloca (sizeof (struct rte_mbuf *) * n_sge); +struct rte_mbuf **dst =alloca (sizeof (struct rte_mbuf *) * n_sge); +char **src_data =alloca (sizeof (char *) * n_sge); +char **dst_data =alloca (sizeof (char *) * n_sge);for (i =0 ; i < len; i++) orig_src[i] =rte_rand () &0xFF ;
app/test/test_hash.c +4 -4
@@ -1930,8 +1930,8 @@ static int test_hash_iteration(uint32_t ext_table) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int *pos =alloca (sizeof (int ) * total_entries); +int *expected_pos =alloca (sizeof (int ) * total_entries);unsigned int i;size_t sz;int32_t status;
@@ -2100,8 +2100,8 @@ static int test_hash_iteration(uint32_t ext_table) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int *pos =alloca (sizeof (int ) * total_entries); +int *expected_pos =alloca (sizeof (int ) * total_entries);unsigned int i;size_t sz;int32_t status;
app/test/test_mempool.c +13 -12
@@ -515,19 +515,20 @@ struct test_mempool_events_data {#undef RTE_TEST_TRACE_FAILURE#define RTE_TEST_TRACE_FAILURE (...) do { goto fail; } while (0) -static const size_t callback_num =3 ; -static const size_t mempool_num =2 ; +#define CALLBACK_NUM 3u +#define MEMPOOL_NUM 2u +static const unsigned int mempool_elt_size =64 ;static const unsigned int mempool_size =64 ; -struct test_mempool_events_data data[callback_num]; -struct rte_mempool *mp[mempool_num], *freed; +struct test_mempool_events_data data[CALLBACK_NUM ]; +struct rte_mempool *mp[MEMPOOL_NUM ], *freed;char name[RTE_MEMPOOL_NAMESIZE ];size_t i, j;int ret;memset (mp,0 ,sizeof (mp)); -for (i =0 ; i < callback_num; i++) { +for (i =0 ; i <CALLBACK_NUM ; i++) { ret =rte_mempool_event_callback_register (test_mempool_events_cb, &data[i]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to register the callback %zu: %s",
@@ -548,7 +549,7 @@ struct test_mempool_events_data { SOCKET_ID_ANY, 0);RTE_TEST_ASSERT_NOT_NULL (mp[0 ],"Cannot create mempool %s: %s" , name,rte_strerror (rte_errno)); -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)RTE_TEST_ASSERT_EQUAL (data[j].invoked, false,"Callback %zu invoked on %s mempool creation" , j, name);
@@ -557,7 +558,7 @@ struct test_mempool_events_data { ret =populate (mp[0 ]);RTE_TEST_ASSERT_EQUAL (ret, (int )mp[0 ]->size,"Failed to populate mempool %s: %s" , name,rte_strerror (-ret)); -for (j =0 ; j < callback_num; j++) { +for (j =0 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s population" , j, name);
@@ -589,7 +590,7 @@ struct test_mempool_events_data {"Unregistered callback 0 invoked on %s mempool populaton" , name); -for (i =0 ; i < mempool_num; i++) { +for (i =0 ; i <MEMPOOL_NUM ; i++) {memset (&data,0 ,sizeof (data));sprintf (name,"empty%zu" , i);rte_mempool_free (mp[i]);
@@ -599,7 +600,7 @@ struct test_mempool_events_data {*/ freed = mp[i]; mp[i] =NULL ; -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s destruction" , j, name);
@@ -615,7 +616,7 @@ struct test_mempool_events_data { name); } -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) { ret =rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to unregister the callback %zu: %s",
@@ -624,10 +625,10 @@ struct test_mempool_events_data {return TEST_SUCCESS ; fail: -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); -for (i =0 ; i < mempool_num; i++) +for (i =0 ; i <MEMPOOL_NUM ; i++)rte_mempool_free (mp[i]);return TEST_FAILED ;
app/test/test_reassembly_perf.c +2 -2
@@ -604,7 +604,7 @@for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf **buf_arr =alloca (sizeof (struct rte_mbuf *) * nb_frags);for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
@@ -815,7 +815,7 @@for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf **buf_arr =alloca (sizeof (struct rte_mbuf *) * nb_frags);for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
app/test/test_reorder.c +26 -22
155 lines not on this page · raw message
app/test/test_service_cores.c +4 -5
@@ -561,9 +561,8 @@ static int32_t dummy_mt_safe_cb(void *args) "Service core count not equal to one");/* retrieve core list, checking lcore ids */ -const uint32_t size =4 ; -uint32_t service_core_ids[size]; -int32_t n =rte_service_lcore_list (service_core_ids, size); +uint32_t service_core_ids[4 ]; +int32_t n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal 1" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list lcore must equal slcore_id" );
@@ -589,7 +588,7 @@ static int32_t dummy_mt_safe_cb(void *args) cores_at_this_point);/* check longer service core list */ - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (3 , n,"Service core list return should equal 3" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list[0] lcore must equal 1" );
@@ -607,7 +606,7 @@ static int32_t dummy_mt_safe_cb(void *args) "Service core add did not return zero");TEST_ASSERT_EQUAL (1 ,rte_service_lcore_count (),"Service core count not equal to one" ); - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal one" ); TEST_ASSERT_EQUAL(slcore_id, service_core_ids[0], "Service core list[0] lcore must equal %d",
app/test/test_thash.c +3 -4
@@ -576,9 +576,8 @@ enum { {struct rte_thash_ctx *ctx;struct rte_thash_subtuple_helper *h; -const int key_len =40 ;int reta_sz =6 ; -uint8_t initial_key[key_len]; +uint8_t initial_key[40 ];const uint8_t *new_key;int ret;union rte_thash_tuple tuple;
@@ -586,9 +585,9 @@ enum {unsigned int desired_value =27 &HASH_MSK (reta_sz);uint16_t port_value =22 ; -memset (initial_key,0 , key_len); +memset (initial_key,0 ,RTE_DIM (initial_key)); - ctx =rte_thash_init_ctx ("test" , key_len, reta_sz, initial_key, + ctx =rte_thash_init_ctx ("test" ,RTE_DIM (initial_key), reta_sz, initial_key,RTE_THASH_MINIMAL_SEQ );RTE_TEST_ASSERT (ctx !=NULL ,"can not create thash ctx\n" );
Signature · 1 line
1.8.3.1
PATCH v2 13/19 common/idpf: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/common/idpf/idpf_common_rxtx.c +1 -1
@@ -569,7 +569,7 @@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;
drivers/common/idpf/idpf_common_rxtx_avx512.c +4 -2
@@ -1002,7 +1002,8 @@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 &
@@ -1319,7 +1320,8 @@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;
Signature · 1 line
1.8.3.1
PATCH v2 14/19 net/i40e: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/i40e/i40e_testpmd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/i40e/i40e_testpmd.c +2 -3
@@ -2168,8 +2168,7 @@ struct cmd_ptype_mapping_get_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 @@ struct cmd_ptype_mapping_get_result { ret =rte_pmd_i40e_ptype_mapping_get (res->port_id, mapping, - max_ptype_num, +RTE_DIM (mapping), &count, res->valid_only);switch (ret) {
Signature · 1 line
1.8.3.1
PATCH v2 15/19 net/ice: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/ice/ice_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ice/ice_rxtx.c +1 -1
@@ -1868,7 +1868,7 @@uint64_t dma_addr;int diag, diag_pay;uint64_t pay_addr; -struct rte_mbuf *mbufs_pay[rxq->rx_free_thresh]; +struct rte_mbuf **mbufs_pay =alloca (sizeof (struct rte_mbuf *) * rxq->rx_free_thresh);/* Allocate buffers in bulk */ alloc_idx = (uint16_t)(rxq->rx_free_trigger -
Signature · 1 line
1.8.3.1
PATCH v2 16/19 net/ixgbe: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +3 -2
@@ -3553,7 +3553,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 = +alloca (sizeof (struct rte_eth_xstat_name ) * size);ixgbe_dev_xstats_get_names_by_id (dev,NULL , xstats_names_copy, size);
@@ -3736,7 +3737,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,uint16_t i;uint16_t size =ixgbe_xstats_calc_num (); -uint64_t values_copy[size]; +uint64_t *values_copy =alloca (sizeof (uint64_t ) * size);ixgbe_dev_xstats_get_by_id (dev,NULL , values_copy, size);
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +1 -1
@@ -14,7 +14,7 @@ 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 = alloca(sizeof(struct rte_mbuf *) * nb_bufs); /*finished pkts*/struct rte_mbuf *start = rxq->pkt_first_seg;struct rte_mbuf *end = rxq->pkt_last_seg;unsigned int pkt_idx, buf_idx;
Signature · 1 line
1.8.3.1
PATCH v2 17/19 common/mlx5: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/common/mlx5/mlx5_common.h | 4 ++-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/common/mlx5/mlx5_common.h +2 -2
@@ -112,10 +112,10 @@/* 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 ,
drivers/common/mlx5/mlx5_devx_cmds.c +3 -4
@@ -284,10 +284,9 @@ struct mlx5_devx_obj *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 @@ struct mlx5_devx_obj *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),
Signature · 1 line
1.8.3.1
PATCH v2 18/19 net/mlx5: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/mlx5/mlx5.c | 5 ++--- drivers/net/mlx5/mlx5_flow.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +2 -3
@@ -1597,14 +1597,13 @@ 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;
drivers/net/mlx5/mlx5_flow.c +3 -3
@@ -1476,8 +1476,8 @@ struct mlx5_flow_tunnel_info {"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;
@@ -8344,7 +8344,7 @@ struct mlx5_flow_workspace* .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,
Signature · 1 line
1.8.3.1
PATCH v2 19/19 build: enable vla warnings on Windows built code
In reply to Tyler RetzlaffMSVC does not support optional C11 VLAs. When building for Windows enable -Wvla so that mingw and clang also fail if a VLA is used.
--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
config/meson.build +4 -0
@@ -344,6 +344,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')
Signature · 1 line
1.8.3.1
v3 cover remove use of VLAs for Windows
In reply to Tyler RetzlaffAs 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.
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
Konstantin Ananyev (6):
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 code
rcu: remove use of VLAs for Windows built code
Tyler Retzlaff (13):
eal: include header required for alloca
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built code
app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +- app/test-pmd/config.c | 16 ++- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 ++--- 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 | 8 +- app/test/test_mempool.c | 25 ++-- app/test/test_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 +++---- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 59 ++++++++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 ++++++++++++++++---------- lib/gro/rte_gro.c | 4 +- lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++ lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 40 files changed, 314 insertions(+), 198 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v3 1/19 eal: include header required for alloca
Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca().
--- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 2 files changed, 2 insertions(+)
lib/eal/linux/include/rte_os.h +1 -0
@@ -14,6 +14,7 @@* which is not supported natively or named differently in Linux. */ +#include <alloca.h> #include <sched.h> #include <sys/queue.h>
lib/eal/windows/include/rte_os.h +1 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <malloc.h> #include <sched.h>
Signature · 1 line
1.8.3.1
PATCH v3 2/19 eal/linux: remove use of VLAs
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
1) ./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
eal_intr_handle_interrupts() is called by eal_intr_thread_main() so it seems ok to simply alloc space for events from heap and reuse the same buffer through the life of the thread.
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);
--- lib/eal/linux/eal_interrupts.c | 59 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 7 deletions(-)
lib/eal/linux/eal_interrupts.c +52 -7
@@ -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 *//**
@@ -1068,9 +1070,9 @@ struct rte_intr_source {* void */ static void -eal_intr_handle_interrupts (int pfd,unsigned totalfds) +eal_intr_handle_interrupts (int pfd,struct epoll_event events[], +unsigned int totalfds) { -struct epoll_event events[totalfds];int nfds =0 ;for (;;) {
@@ -1106,6 +1108,12 @@ struct rte_intr_source { static __rte_noreturn uint32_t eal_intr_thread_main(__rte_unused void *arg) { +uint32_t n, nb_event; +struct epoll_event *events, *p; + + nb_event =0 ; + events =NULL ; +/* host thread, never break out */ for (;;) {/* build up the epoll fd with all descriptors we are to
@@ -1159,8 +1167,23 @@ struct rte_intr_source { numfds++; }rte_spinlock_unlock (&intr_lock); + +/* alloc space for events, when necessary */ +if (numfds > nb_event) { + n = numfds +MAX_ITER_EVNUM ; + p =realloc (events, n *sizeof (events[0 ])); +if (p ==NULL ) { +EAL_LOG (ERR ,"failed to allocate %u events" , + numfds); + numfds = nb_event; + }else { + nb_event = n; + events = p; + } + } +/* serve the interrupt */ -eal_intr_handle_interrupts (pfd, numfds); +eal_intr_handle_interrupts (pfd, events, numfds);/** * when we return, we need to rebuild the
@@ -1168,6 +1191,8 @@ struct rte_intr_source {*/ close (pfd); } + +free (events); }int
@@ -1316,8 +1341,9 @@ struct rte_intr_source { 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 +1354,31 @@ struct rte_intr_source {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)
Signature · 1 line
1.8.3.1
PATCH v3 3/19 eal/common: remove use of VLAs
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/eal/common/eal_common_proc.c +3 -2
@@ -692,7 +692,8 @@ enum async_action {struct sockaddr_un dst;struct mp_msg_internal m;int fd_size = msg->num_fds *sizeof (int ); -char control[CMSG_SPACE (fd_size)]; +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 @@ enum async_action { 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);
Signature · 1 line
1.8.3.1
Re: [PATCH v3 03/19] eal/common: remove use of VLAs
Quoted 10 lines · On Mon, 6 May 2024 11:18:35 -0700 Tyler Retzlaff…
From: Konstantin Ananyev <[email protected]>
1)
../lib/eal/common/eal_common_proc.c:695:15
: warning: variable length array usedAs
msg->num_fdsshould not exceedRTE_MP_MAX_FD_NUM, replaced it with fixed size array.Signed-off-by Konstantin Ananyev <[email protected]>---
PATCH v3 4/19 ethdev: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/ethdev/rte_ethdev.c | 183 ++++++++++++++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 70 deletions(-)
lib/ethdev/rte_ethdev.c +113 -70
@@ -36,6 +36,8 @@#include "ethdev_trace.h" #include "sff_telemetry.h" +#define ETH_XSTATS_ITER_NUM 0x100 +struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS ];/* public fast-path API */
@@ -3215,7 +3217,8 @@ enum { 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 );
@@ -3241,26 +3244,33 @@ enum { }/* 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 */
@@ -3306,6 +3316,38 @@ enum {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,
@@ -3313,9 +3355,8 @@ enum { 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;
@@ -3341,27 +3382,18 @@ enum {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 ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_names_by_id)(dev, - ids_copy, xstats_names, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_names_by_id !=NULL ) +return eth_xstats_get_by_name_by_id (dev, ids, xstats_names, + size, basic_count); +/* Retrieve all stats */ if (!ids) { int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
@@ -3380,17 +3412,8 @@ enum {return -ENOMEM ; } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } - } -/* Fill xstats_names_copy structure */ -if (ids && no_ext_stat_requested) { +if (ids && nb_basic_stats == size) {eth_basic_stats_get_names (dev, xstats_names_copy); }else { ret = rte_eth_xstats_get_names(port_id, xstats_names_copy,
@@ -3514,17 +3537,47 @@ enum {return count; } +static int +eth_xtats_get_by_id (struct rte_eth_dev *dev,const uint64_t *ids, +uint64_t *values,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_by_id)(dev, ids_copy, + values + m, k); +if (rc <0 ) +return rc; + m += rc; + } + +return m; +} +/* retrieve ethdev extended statistics */ int rte_eth_xstats_get_by_id (uint16_t port_id,const uint64_t *ids,uint64_t *values,unsigned int size) { -unsigned int no_basic_stat_requested =1 ; -unsigned int no_ext_stat_requested =1 ; +unsigned int nb_basic_stats;unsigned int num_xstats_filled;unsigned int basic_count;uint16_t expected_entries;struct rte_eth_dev *dev; +struct rte_eth_xstat *xstats;unsigned int i;int ret;
@@ -3535,7 +3588,6 @@ enum {if (ret <0 )return ret; expected_entries = (uint16_t )ret; -struct rte_eth_xstat xstats[expected_entries]; basic_count =eth_dev_get_xstats_basic_count (dev);/* Return max number of stats if no ids given */
@@ -3549,51 +3601,41 @@ enum {if (ids && !values)return -EINVAL ; -if (ids && dev->dev_ops->xstats_get_by_id !=NULL && size) { -unsigned int basic_count =eth_dev_get_xstats_basic_count (dev); -uint64_t ids_copy[size]; - -for (i =0 ; i < size; i++) { -if (ids[i] < basic_count) { - no_basic_stat_requested =0 ; -break ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_by_id !=NULL ) +return eth_xtats_get_by_id (dev, ids, values, size, basic_count); + + xstats =calloc (expected_entries,sizeof (xstats[0 ])); +if (xstats ==NULL ) { +RTE_ETHDEV_LOG_LINE (ERR ,"Can't allocate memory" ); +return -ENOMEM ; }/* Fill the xstats structure */ -if (ids && no_ext_stat_requested) +if (ids && nb_basic_stats == size) ret =eth_basic_stats_get (port_id, xstats);else ret =rte_eth_xstats_get (port_id, xstats, expected_entries); -if (ret <0 ) +if (ret <0 ) { +free (xstats);return ret; + } num_xstats_filled = (unsigned int )ret;/* Return all stats */ if (!ids) {for (i =0 ; i < num_xstats_filled; i++) values[i] = xstats[i].value; + +free (xstats);return expected_entries; }
@@ -3601,14 +3643,15 @@ enum {for (i =0 ; i < size; i++) {if (ids[i] >= expected_entries) {RTE_ETHDEV_LOG_LINE (ERR ,"Id value isn't valid" ); -return -1 ; +break ; } values[i] = xstats[ids[i]].value; }rte_eth_trace_xstats_get_by_id (port_id, ids, values, size); -return size; +free (xstats); +return (i == size) ? (int32_t )size :-1 ; }int
Signature · 1 line
1.8.3.1
PATCH v3 5/19 hash: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/hash/rte_cuckoo_hash.c +2 -2
@@ -2359,7 +2359,7 @@ struct rte_hash * (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);
@@ -2475,7 +2475,7 @@ struct rte_hash * (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);
Signature · 1 line
1.8.3.1
PATCH v3 6/19 hash/thash: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’
From my understanding, tuple size here should never exceed sizeof(union rte_thash_tuple), so it should be safe to replace VLA with fixed size array.
--- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
lib/hash/rte_thash.c +1 -1
@@ -771,7 +771,7 @@ struct rte_thash_subtuple_helper * 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_MAX_L4_LEN];unsigned int i, j, ret =0 ;uint32_t hash, adj_bits;const uint8_t *hash_key;
lib/hash/rte_thash.h +8 -0
@@ -109,6 +109,14 @@ union __rte_aligned(XMM_SIZE) rte_thash_tuple { };/** +* maximum length in dwords of input tuple to +* calculate hash of ipv(4|6) header + +* transport header +*/ +#define RTE_THASH_MAX_L4_LEN \ + ((sizeof(union rte_thash_tuple)) / sizeof(uint32_t)) + +/** * Prepare special converted key to use with rte_softrss_be() * @param orig * pointer to original RSS key
Signature · 1 line
1.8.3.1
PATCH v3 7/19 rcu: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/rcu/rte_rcu_qsbr.c | 7 ++++--- lib/rcu/rte_rcu_qsbr.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-)
lib/rcu/rte_rcu_qsbr.c +4 -3
@@ -278,7 +278,8 @@ struct rte_rcu_qsbr_dq *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 ;
@@ -356,7 +357,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);
@@ -419,7 +420,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e) 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,
lib/rcu/rte_rcu_qsbr.h +5 -0
@@ -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.
Signature · 1 line
1.8.3.1
PATCH v3 8/19 gro: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/gro/rte_gro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/gro/rte_gro.c +2 -2
@@ -179,7 +179,7 @@ struct gro_ctx {struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM ] = {{{0 }} }; -struct rte_mbuf *unprocess_pkts[nb_pkts]; +struct rte_mbuf **unprocess_pkts =alloca (sizeof (struct rte_mbuf *) * nb_pkts);uint32_t item_num;int32_t ret;uint16_t i, unprocess_num =0 , nb_after_gro = nb_pkts;
@@ -360,7 +360,7 @@ struct gro_ctx {uint16_t nb_pkts, void *ctx) { - struct rte_mbuf *unprocess_pkts[nb_pkts]; + struct rte_mbuf **unprocess_pkts = alloca(sizeof(struct rte_mbuf *) * 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;
Signature · 1 line
1.8.3.1
Re: [PATCH v3 08/19] gro: remove use of VLAs for Windows built code
Quoted 23 lines · On Mon, 6 May 2024 11:18:40 -0700 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 <[email protected]>--- lib/gro/rte_gro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)lib/gro/rte_gro.c +1
-1@@ -179,7 +179,7 @@ struct gro_ctx {struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM ] = {{{0 }} }; -struct rte_mbuf *unprocess_pkts[nb_pkts]; +struct rte_mbuf **unprocess_pkts =alloca (sizeof (struct rte_mbuf *) * nb_pkts);uint32_t item_num;int32_t ret;uint16_t i, unprocess_num =0 , nb_after_gro = nb_pkts;
lib/gro/rte_gro.c struct gro_ctx { · line 366
Quoted 8 lines
lib/gro/rte_gro.c +1
-1@@ -360,7 +360,7 @@ struct gro_ctx {uint16_t nb_pkts, void *ctx) { - struct rte_mbuf *unprocess_pkts[nb_pkts]; + struct rte_mbuf **unprocess_pkts = alloca(sizeof(struct rte_mbuf *) * 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;
According to rte_gro.h the maximum supported burst size is
#define RTE_GRO_MAX_BURST_ITEM_NUM 128U
/**< the max number of packets that rte_gro_reassemble_burst()
And it looks like the code already truncates at that.
PATCH v3 9/19 latencystats: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/latencystats/rte_latencystats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/latencystats/rte_latencystats.c +1 -1
@@ -159,7 +159,7 @@ struct latency_stats_nameoff { {unsigned int i, cnt =0 ;uint64_t now; -float latency[nb_pkts]; +float *latency =alloca (sizeof (float ) * nb_pkts);static float prev_latency;/* * Alpha represents degree of weighting decrease in EWMA,
Signature · 1 line
1.8.3.1
Re: [PATCH v3 09/19] latencystats: remove use of VLAs for Windows built code
Quoted 5 lines · On Mon, 6 May 2024 11:18:41 -0700 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 <[email protected]>
See the alternate patch, the temporary array is unneeded.
PATCH v3 10/19 lpm: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- lib/lpm/rte_lpm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/lpm/rte_lpm.h +1 -1
@@ -337,7 +337,7 @@ struct rte_lpm * uint32_t *next_hops, const unsigned n) { unsigned i; -unsigned tbl24_indexes[n]; +unsigned int *tbl24_indexes = (unsigned int *)alloca (sizeof (unsigned int ) * n);const uint32_t *ptbl;/* DEBUG: Check user input arguments. */
Signature · 1 line
1.8.3.1
PATCH v3 11/19 app/testpmd: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 ++++----- app/test-pmd/config.c | 16 +++++++++------- app/test-pmd/shared_rxq_fwd.c | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +1 -1
@@ -12902,7 +12902,7 @@ struct cmd_set_port_ptypes_result {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 ) {
app/test-pmd/cmdline_flow.c +4 -5
@@ -11546,8 +11546,7 @@ struct indlst_conf {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)
@@ -11574,7 +11573,7 @@ struct indlst_conf { 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 )
@@ -11707,7 +11706,7 @@ struct indlst_conf { void *buf, unsigned int size) {const struct arg *arg =pop_args (ctx); -char str2[len +1 ]; +char *str2 =alloca (len +1 );struct in_addr tmp;int ret;
@@ -11753,7 +11752,7 @@ struct indlst_conf { void *buf, unsigned int size) {const struct arg *arg =pop_args (ctx); -char str2[len +1 ]; +char *str2 =alloca (len +1 );struct in6_addr tmp;int ret;
app/test-pmd/config.c +9 -7
@@ -1760,7 +1760,8 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops) {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) ||
@@ -2577,10 +2578,10 @@ struct rte_flow_meter_policy *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 )
@@ -5460,7 +5461,7 @@ struct igb_ring_desc_16_bytes {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 ;
@@ -7201,7 +7202,8 @@ static const char *get_ptype_str(uint32_t ptype)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 ;
app/test-pmd/shared_rxq_fwd.c +1 -1
@@ -92,7 +92,7 @@static bool shared_rxq_fwd (struct fwd_stream *fs) { -struct rte_mbuf *pkts_burst[nb_pkt_per_burst]; +struct rte_mbuf **pkts_burst =alloca (sizeof (struct rte_mbuf *) * nb_pkt_per_burst);uint16_t nb_rx; nb_rx =common_fwd_stream_receive (fs, pkts_burst, nb_pkt_per_burst);
Signature · 1 line
1.8.3.1
PATCH v3 12/19 test: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++++------------ 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 | 8 +++--- app/test/test_mempool.c | 25 +++++++++--------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++++++---------------- app/test/test_service_cores.c | 9 +++---- app/test/test_thash.c | 7 +++-- 12 files changed, 79 insertions(+), 73 deletions(-)
app/test/test.c +1 -1
@@ -105,7 +105,7 @@ 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;
app/test/test_cmdline_string.c +1 -1
@@ -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 {
app/test/test_cryptodev.c +16 -16
@@ -2686,7 +2686,7 @@ struct crypto_unittest_params {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;
@@ -2722,7 +2722,7 @@ struct crypto_unittest_params { 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;
@@ -2874,7 +2874,7 @@ struct crypto_unittest_params { 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;
@@ -8878,7 +8878,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata) 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;
@@ -12849,7 +12849,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,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" );
@@ -13238,7 +13238,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,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 ));
@@ -13490,7 +13490,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,int retval;uint8_t *ciphertext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -13592,7 +13592,7 @@ static int test_pdcp_proto(int i, int oop, enum rte_crypto_cipher_operation opc,int retval;uint8_t *plaintext; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -14895,7 +14895,7 @@ static int create_gmac_session(uint8_t dev_id,const struct gmac_test_data *tdata, enum rte_crypto_auth_operation auth_op) { - uint8_t auth_key[tdata->key.len]; + uint8_t *auth_key = alloca(tdata->key.len);struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -15552,7 +15552,7 @@ struct test_crypto_vector { enum rte_crypto_auth_operation auth_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (auth_key, reference->auth_key.data, reference->auth_key.len);
@@ -15583,8 +15583,8 @@ struct test_crypto_vector { enum rte_crypto_cipher_operation cipher_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (cipher_key, reference->cipher_key.data, reference->cipher_key.len);
@@ -16084,8 +16084,8 @@ struct test_crypto_vector {uint8_t *authciphertext, *plaintext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -16216,8 +16216,8 @@ struct test_crypto_vector {int retval;uint8_t *ciphertext; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
app/test/test_cryptodev_blockcipher.c +2 -2
@@ -85,8 +85,8 @@int status =TEST_SUCCESS ;const struct blockcipher_test_data *tdata = t->test_data; -uint8_t cipher_key[tdata->cipher_key.len]; -uint8_t auth_key[tdata->auth_key.len]; +uint8_t *cipher_key =alloca (tdata->cipher_key.len); +uint8_t *auth_key =alloca (tdata->auth_key.len);uint32_t buf_len = tdata->ciphertext.len;uint32_t digest_len = tdata->digest.len;char *buf_p =NULL ;
app/test/test_cryptodev_crosscheck.c +1 -1
@@ -894,7 +894,7 @@ struct crosscheck_testsuite_params { crosscheck_with_profile_run(const struct crosscheck_test_profile *profile) {struct crosscheck_testsuite_params *ts_params = &testsuite_params; -uint8_t input_text[profile->input_buf_len]; +uint8_t *input_text =alloca (profile->input_buf_len);uint16_t output_len, encrypted_len;uint8_t encrypted_text[MBUF_SIZE ];uint8_t output_text[MBUF_SIZE ];
app/test/test_dmadev.c +6 -3
@@ -417,9 +417,12 @@ struct runtest_param { dst_len = len / n_dst; src_len = len / n_src; -struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge]; -struct rte_mbuf *src[n_sge], *dst[n_sge]; -char *src_data[n_sge], *dst_data[n_sge]; +struct rte_dma_sge *sg_src =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_dma_sge *sg_dst =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_mbuf **src =alloca (sizeof (struct rte_mbuf *) * n_sge); +struct rte_mbuf **dst =alloca (sizeof (struct rte_mbuf *) * n_sge); +char **src_data =alloca (sizeof (char *) * n_sge); +char **dst_data =alloca (sizeof (char *) * n_sge);for (i =0 ; i < len; i++) orig_src[i] =rte_rand () &0xFF ;
app/test/test_hash.c +4 -4
@@ -1930,8 +1930,8 @@ static int test_hash_iteration(uint32_t ext_table) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int *pos =alloca (sizeof (int ) * total_entries); +int *expected_pos =alloca (sizeof (int ) * total_entries);unsigned int i;size_t sz;int32_t status;
@@ -2100,8 +2100,8 @@ static int test_hash_iteration(uint32_t ext_table) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int *pos =alloca (sizeof (int ) * total_entries); +int *expected_pos =alloca (sizeof (int ) * total_entries);unsigned int i;size_t sz;int32_t status;
app/test/test_mempool.c +13 -12
@@ -515,19 +515,20 @@ struct test_mempool_events_data {#undef RTE_TEST_TRACE_FAILURE#define RTE_TEST_TRACE_FAILURE (...) do { goto fail; } while (0) -static const size_t callback_num =3 ; -static const size_t mempool_num =2 ; +#define CALLBACK_NUM 3u +#define MEMPOOL_NUM 2u +static const unsigned int mempool_elt_size =64 ;static const unsigned int mempool_size =64 ; -struct test_mempool_events_data data[callback_num]; -struct rte_mempool *mp[mempool_num], *freed; +struct test_mempool_events_data data[CALLBACK_NUM ]; +struct rte_mempool *mp[MEMPOOL_NUM ], *freed;char name[RTE_MEMPOOL_NAMESIZE ];size_t i, j;int ret;memset (mp,0 ,sizeof (mp)); -for (i =0 ; i < callback_num; i++) { +for (i =0 ; i <CALLBACK_NUM ; i++) { ret =rte_mempool_event_callback_register (test_mempool_events_cb, &data[i]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to register the callback %zu: %s",
@@ -548,7 +549,7 @@ struct test_mempool_events_data { SOCKET_ID_ANY, 0);RTE_TEST_ASSERT_NOT_NULL (mp[0 ],"Cannot create mempool %s: %s" , name,rte_strerror (rte_errno)); -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)RTE_TEST_ASSERT_EQUAL (data[j].invoked, false,"Callback %zu invoked on %s mempool creation" , j, name);
@@ -557,7 +558,7 @@ struct test_mempool_events_data { ret =populate (mp[0 ]);RTE_TEST_ASSERT_EQUAL (ret, (int )mp[0 ]->size,"Failed to populate mempool %s: %s" , name,rte_strerror (-ret)); -for (j =0 ; j < callback_num; j++) { +for (j =0 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s population" , j, name);
@@ -589,7 +590,7 @@ struct test_mempool_events_data {"Unregistered callback 0 invoked on %s mempool populaton" , name); -for (i =0 ; i < mempool_num; i++) { +for (i =0 ; i <MEMPOOL_NUM ; i++) {memset (&data,0 ,sizeof (data));sprintf (name,"empty%zu" , i);rte_mempool_free (mp[i]);
@@ -599,7 +600,7 @@ struct test_mempool_events_data {*/ freed = mp[i]; mp[i] =NULL ; -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s destruction" , j, name);
@@ -615,7 +616,7 @@ struct test_mempool_events_data { name); } -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) { ret =rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to unregister the callback %zu: %s",
@@ -624,10 +625,10 @@ struct test_mempool_events_data {return TEST_SUCCESS ; fail: -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); -for (i =0 ; i < mempool_num; i++) +for (i =0 ; i <MEMPOOL_NUM ; i++)rte_mempool_free (mp[i]);return TEST_FAILED ;
app/test/test_reassembly_perf.c +2 -2
@@ -604,7 +604,7 @@for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf **buf_arr =alloca (sizeof (struct rte_mbuf *) * nb_frags);for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
@@ -815,7 +815,7 @@for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf **buf_arr =alloca (sizeof (struct rte_mbuf *) * nb_frags);for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
app/test/test_reorder.c +26 -22
155 lines not on this page · raw message
app/test/test_service_cores.c +4 -5
@@ -561,9 +561,8 @@ static int32_t dummy_mt_safe_cb(void *args) "Service core count not equal to one");/* retrieve core list, checking lcore ids */ -const uint32_t size =4 ; -uint32_t service_core_ids[size]; -int32_t n =rte_service_lcore_list (service_core_ids, size); +uint32_t service_core_ids[4 ]; +int32_t n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal 1" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list lcore must equal slcore_id" );
@@ -589,7 +588,7 @@ static int32_t dummy_mt_safe_cb(void *args) cores_at_this_point);/* check longer service core list */ - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (3 , n,"Service core list return should equal 3" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list[0] lcore must equal 1" );
@@ -607,7 +606,7 @@ static int32_t dummy_mt_safe_cb(void *args) "Service core add did not return zero");TEST_ASSERT_EQUAL (1 ,rte_service_lcore_count (),"Service core count not equal to one" ); - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal one" ); TEST_ASSERT_EQUAL(slcore_id, service_core_ids[0], "Service core list[0] lcore must equal %d",
app/test/test_thash.c +3 -4
@@ -576,9 +576,8 @@ enum { {struct rte_thash_ctx *ctx;struct rte_thash_subtuple_helper *h; -const int key_len =40 ;int reta_sz =6 ; -uint8_t initial_key[key_len]; +uint8_t initial_key[40 ];const uint8_t *new_key;int ret;union rte_thash_tuple tuple;
@@ -586,9 +585,9 @@ enum {unsigned int desired_value =27 &HASH_MSK (reta_sz);uint16_t port_value =22 ; -memset (initial_key,0 , key_len); +memset (initial_key,0 ,RTE_DIM (initial_key)); - ctx =rte_thash_init_ctx ("test" , key_len, reta_sz, initial_key, + ctx =rte_thash_init_ctx ("test" ,RTE_DIM (initial_key), reta_sz, initial_key,RTE_THASH_MINIMAL_SEQ );RTE_TEST_ASSERT (ctx !=NULL ,"can not create thash ctx\n" );
Signature · 1 line
1.8.3.1
PATCH v3 13/19 common/idpf: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/common/idpf/idpf_common_rxtx.c +1 -1
@@ -569,7 +569,7 @@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;
drivers/common/idpf/idpf_common_rxtx_avx512.c +4 -2
@@ -1002,7 +1002,8 @@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 &
@@ -1319,7 +1320,8 @@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;
Signature · 1 line
1.8.3.1
PATCH v3 14/19 net/i40e: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/i40e/i40e_testpmd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/i40e/i40e_testpmd.c +2 -3
@@ -2168,8 +2168,7 @@ struct cmd_ptype_mapping_get_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 @@ struct cmd_ptype_mapping_get_result { ret =rte_pmd_i40e_ptype_mapping_get (res->port_id, mapping, - max_ptype_num, +RTE_DIM (mapping), &count, res->valid_only);switch (ret) {
Signature · 1 line
1.8.3.1
PATCH v3 15/19 net/ice: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/ice/ice_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ice/ice_rxtx.c +1 -1
@@ -1868,7 +1868,7 @@uint64_t dma_addr;int diag, diag_pay;uint64_t pay_addr; -struct rte_mbuf *mbufs_pay[rxq->rx_free_thresh]; +struct rte_mbuf **mbufs_pay =alloca (sizeof (struct rte_mbuf *) * rxq->rx_free_thresh);/* Allocate buffers in bulk */ alloc_idx = (uint16_t)(rxq->rx_free_trigger -
Signature · 1 line
1.8.3.1
PATCH v3 16/19 net/ixgbe: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +3 -2
@@ -3553,7 +3553,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 = +alloca (sizeof (struct rte_eth_xstat_name ) * size);ixgbe_dev_xstats_get_names_by_id (dev,NULL , xstats_names_copy, size);
@@ -3736,7 +3737,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,uint16_t i;uint16_t size =ixgbe_xstats_calc_num (); -uint64_t values_copy[size]; +uint64_t *values_copy =alloca (sizeof (uint64_t ) * size);ixgbe_dev_xstats_get_by_id (dev,NULL , values_copy, size);
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +1 -1
@@ -14,7 +14,7 @@ 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 = alloca(sizeof(struct rte_mbuf *) * nb_bufs); /*finished pkts*/struct rte_mbuf *start = rxq->pkt_first_seg;struct rte_mbuf *end = rxq->pkt_last_seg;unsigned int pkt_idx, buf_idx;
Signature · 1 line
1.8.3.1
PATCH v3 17/19 common/mlx5: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/common/mlx5/mlx5_common.h | 4 ++-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/common/mlx5/mlx5_common.h +2 -2
@@ -112,10 +112,10 @@/* 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 ,
drivers/common/mlx5/mlx5_devx_cmds.c +3 -4
@@ -284,10 +284,9 @@ struct mlx5_devx_obj *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 @@ struct mlx5_devx_obj *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),
Signature · 1 line
1.8.3.1
PATCH v3 18/19 net/mlx5: remove use of VLAs for Windows built code
In reply to Tyler RetzlaffMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- drivers/net/mlx5/mlx5.c | 5 ++--- drivers/net/mlx5/mlx5_flow.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +2 -3
@@ -1597,14 +1597,13 @@ 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;
drivers/net/mlx5/mlx5_flow.c +3 -3
@@ -1476,8 +1476,8 @@ struct mlx5_flow_tunnel_info {"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;
@@ -8344,7 +8344,7 @@ struct mlx5_flow_workspace* .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,
Signature · 1 line
1.8.3.1
PATCH v3 19/19 build: enable vla warnings on Windows built code
In reply to Tyler RetzlaffMSVC does not support optional C11 VLAs. When building for Windows enable -Wvla so that mingw and clang also fail if a VLA is used.
--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
config/meson.build +4 -0
@@ -344,6 +344,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')
Signature · 1 line
1.8.3.1
PATCH 1/2 lpm: remove unnecessary temporary VLA
In reply to Tyler RetzlaffDo not need to recompute all the table indices.
--- lib/lpm/rte_lpm.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
lib/lpm/rte_lpm.h +2 -5
@@ -337,7 +337,6 @@ rte_lpm_lookup_bulk_func(const struct rte_lpm *lpm, const uint32_t *ips, uint32_t *next_hops, const unsigned n) {unsigned i; -unsigned tbl24_indexes[n];const uint32_t *ptbl;/* DEBUG: Check user input arguments. */
@@ -345,12 +344,10 @@ rte_lpm_lookup_bulk_func(const struct rte_lpm *lpm, const uint32_t *ips, (next_hops == NULL)), -EINVAL);for (i =0 ; i < n; i++) { - tbl24_indexes[i] = ips[i] >>8 ; - } +unsigned int tbl24_index = ips[i] >>8 ; -for (i =0 ; i < n; i++) {/* Simply copy tbl24 entry to output */ - ptbl = (const uint32_t *)&lpm->tbl24[tbl24_indexes[i]]; + ptbl = (const uint32_t *)&lpm->tbl24[tbl24_index]; next_hops[i] = *ptbl;/* Overwrite output with tbl8 entry if needed */
Signature · 1 line
2.43.0
PATCH 2/2 latencystats: replace use of VLA
The temporary array latencystats is not needed if the algorithm is converted into one pass.
--- lib/latencystats/rte_latencystats.c | 31 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-)
lib/latencystats/rte_latencystats.c +16 -15
@@ -157,9 +157,9 @@ calc_latency(uint16_t pid __rte_unused,uint16_t nb_pkts, void *_ __rte_unused) { - unsigned int i, cnt = 0; + unsigned int i;uint64_t now; -float latency[nb_pkts]; +float latency;static float prev_latency;/* * Alpha represents degree of weighting decrease in EWMA,
@@ -169,13 +169,14 @@ calc_latency(uint16_t pid __rte_unused,const float alpha =0.2 ; now =rte_rdtsc (); -for (i =0 ; i < nb_pkts; i++) { -if (pkts[i]->ol_flags & timestamp_dynflag) - latency[cnt++] = now - *timestamp_dynfield (pkts[i]); - }rte_spinlock_lock (&glob_stats->lock); -for (i =0 ; i < cnt; i++) { +for (i =0 ; i < nb_pkts; i++) { +if (!(pkts[i]->ol_flags & timestamp_dynflag)) +continue ; + + latency = now - *timestamp_dynfield (pkts[i]); +/* * The jitter is calculated as statistical mean of interpacket * delay variation. The "jitter estimate" is computed by taking
@@ -187,22 +188,22 @@ calc_latency(uint16_t pid __rte_unused,* Reference: Calculated as per RFC 5481, sec 4.1, * RFC 3393 sec 4.5, RFC 1889 sec. */ - glob_stats->jitter += (fabsf (prev_latency - latency[i]) + glob_stats->jitter += (fabsf (prev_latency - latency) - glob_stats->jitter)/16 ;if (glob_stats->min_latency ==0 ) - glob_stats->min_latency = latency[i]; -else if (latency[i] < glob_stats->min_latency) - glob_stats->min_latency = latency[i]; -else if (latency[i] > glob_stats->max_latency) - glob_stats->max_latency = latency[i]; + glob_stats->min_latency = latency; +else if (latency < glob_stats->min_latency) + glob_stats->min_latency = latency; +else if (latency > glob_stats->max_latency) + glob_stats->max_latency = latency;/* * The average latency is measured using exponential moving * average, i.e. using EWMA * https://en.wikipedia.org/wiki/Moving_average */ glob_stats->avg_latency += - alpha * (latency[i] - glob_stats->avg_latency); - prev_latency = latency[i]; + alpha * (latency - glob_stats->avg_latency); + prev_latency = latency; }rte_spinlock_unlock (&glob_stats->lock);
Signature · 1 line
2.43.0
Re: [PATCH 2/2] latencystats: replace use of VLA
Quoted 7 lines · Stephen Hemminger
The temporary array latencystats is not needed if the algorithm is converted into one pass.
Signed-off-by Stephen Hemminger <[email protected]>Acked-by Morten Brørup <[email protected]>Acked-by Tyler Retzlaff <[email protected]>
Series applied, thanks for the cleanup.
Signature · 1 line
David Marchand
Re: [PATCH 1/2] lpm: remove unnecessary temporary VLA
In reply to Stephen HemmingerQuoted 3 lines · Stephen Hemminger
Do not need to recompute all the table indices.
Signed-off-by Stephen Hemminger <[email protected]>
Re: [PATCH v3 00/19] remove use of VLAs for Windows
In reply to Tyler RetzlaffHello guys,
Quoted 75 lines · Tyler Retzlaff
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.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=31781Konstantin Ananyev (6):
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 code
rcu: remove use of VLAs for Windows built codeTyler Retzlaff (13):
eal: include header required for alloca
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built codeapp/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +- app/test-pmd/config.c | 16 ++- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 ++--- 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 | 8 +- app/test/test_mempool.c | 25 ++-- app/test/test_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 +++---- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 59 ++++++++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 ++++++++++++++++---------- lib/gro/rte_gro.c | 4 +-
Quoted 8 lines
lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++ lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 40 files changed, 314 insertions(+), 198 deletions(-)
I see discussions on patches for some net drivers and the gro library. Can you please sync and summarize which patches goes though next-net, though main etc..?
In any case, I think this cleanup can wait 24.11.
For now, I merged Stephen alternatives for lpm and latencystats as the patches looked clean and were acked.
Thanks.
Signature · 1 line
David Marchand
Quoted 57 lines · On Wed, 17 Apr 2024 16:41:43 -0700 Tyler Retzlaff…
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.Tyler Retzlaff (16):
eal: include header required for alloca
hash: remove use of VLAs for Windows built code
ethdev: remove use of VLAs for Windows built code
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code
rcu: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built codeapp/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +++-- app/test-pmd/config.c | 16 +++++---- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++--------- 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 | 8 ++--- app/test/test_mempool.c | 25 +++++++------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++------------ app/test/test_service_cores.c | 9 +++-- app/test/test_thash.c | 7 ++-- config/meson.build | 4 +++ drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++-- drivers/common/mlx5/mlx5_common.h | 4 +-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 ++-- drivers/net/i40e/i40e_testpmd.c | 5 ++- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 ++- drivers/net/mlx5/mlx5_flow.c | 6 ++-- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 +
Quoted 8 lines
lib/ethdev/rte_ethdev.c | 9 ++--- lib/gro/rte_gro.c | 4 +-- lib/hash/rte_cuckoo_hash.c | 4 +-- lib/hash/rte_thash.c | 2 +- lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 6 ++-- 36 files changed, 137 insertions(+), 123 deletions(-)
Looks good:
Series needs to be rebased to current master, some parts have changed.
Quoted 69 lines · Stephen Hemminger
Quoted 57 lines · On Wed, 17 Apr 2024 16:41:43 -0700 Tyler Retzlaff…
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.Tyler Retzlaff (16):
eal: include header required for alloca
hash: remove use of VLAs for Windows built code
ethdev: remove use of VLAs for Windows built code
gro: remove use of VLAs for Windows built code
latencystats: remove use of VLAs for Windows built code
lpm: remove use of VLAs for Windows built code
rcu: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built code
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built codeapp/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 9 +++-- app/test-pmd/config.c | 16 +++++---- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_cmdline_string.c | 2 +- app/test/test_cryptodev.c | 32 +++++++++--------- 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 | 8 ++--- app/test/test_mempool.c | 25 +++++++------- app/test/test_reassembly_perf.c | 4 +-- app/test/test_reorder.c | 48 +++++++++++++++------------ app/test/test_service_cores.c | 9 +++-- app/test/test_thash.c | 7 ++-- config/meson.build | 4 +++ drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++-- drivers/common/mlx5/mlx5_common.h | 4 +-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 ++-- drivers/net/i40e/i40e_testpmd.c | 5 ++- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 ++- drivers/net/mlx5/mlx5_flow.c | 6 ++-- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 +Quoted 8 lines
lib/ethdev/rte_ethdev.c | 9 ++--- lib/gro/rte_gro.c | 4 +-- lib/hash/rte_cuckoo_hash.c | 4 +-- lib/hash/rte_thash.c | 2 +- lib/latencystats/rte_latencystats.c | 2 +- lib/lpm/rte_lpm.h | 2 +- lib/rcu/rte_rcu_qsbr.c | 6 ++-- 36 files changed, 137 insertions(+), 123 deletions(-)
Quoted 6 lines
Looks good:
Series-Acked-by Stephen Hemminger <[email protected]>Series needs to be rebased to current master, some parts have changed.
Hi Stephen, I'll continue the work Tyler was doing on this front.
You can expect a new rebased patch soon. I'll also adapt it for the parts that have changed.
v4 cover remove use of VLAs for Windows
In reply to Tyler RetzlaffAs 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.
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 (2):
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
Konstantin Ananyev (6):
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
Tyler Retzlaff (11):
eal: include header required for alloca
gro: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built code
app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 15 +- app/test-pmd/config.c | 16 +- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_bitset.c | 55 +++--- 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_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 ++--- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 59 +++++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 +++++++++++------- lib/gro/rte_gro.c | 4 +- lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 + lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 39 files changed, 354 insertions(+), 223 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/19 eal: include header required for alloca
From: Tyler Retzlaff <[email protected]>
Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca().
--- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 2 files changed, 2 insertions(+)
lib/eal/linux/include/rte_os.h +1 -0
@@ -10,6 +10,7 @@* which is not supported natively or named differently in Linux. */ +#include <alloca.h> #include <sched.h> #include <sys/queue.h>
lib/eal/windows/include/rte_os.h +1 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <malloc.h> #include <sched.h>
Signature · 1 line
2.34.1
PATCH v4 2/19 eal/linux: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
1) ./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
eal_intr_handle_interrupts() is called by eal_intr_thread_main() so it seems ok to simply alloc space for events from heap and reuse the same buffer through the life of the thread.
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);
--- lib/eal/linux/eal_interrupts.c | 59 ++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 7 deletions(-)
lib/eal/linux/eal_interrupts.c +52 -7
@@ -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 *//**
@@ -1068,9 +1070,9 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds)* void */ static void -eal_intr_handle_interrupts (int pfd,unsigned totalfds) +eal_intr_handle_interrupts (int pfd,struct epoll_event events[], +unsigned int totalfds) { -struct epoll_event events[totalfds];int nfds =0 ;for (;;) {
@@ -1106,6 +1108,12 @@ eal_intr_handle_interrupts(int pfd, unsigned totalfds) static __rte_noreturn uint32_t eal_intr_thread_main(__rte_unused void *arg) { +uint32_t n, nb_event; +struct epoll_event *events, *p; + + nb_event =0 ; + events =NULL ; +/* host thread, never break out */ for (;;) {/* build up the epoll fd with all descriptors we are to
@@ -1159,8 +1167,23 @@ eal_intr_thread_main(__rte_unused void *arg) numfds++; }rte_spinlock_unlock (&intr_lock); + +/* alloc space for events, when necessary */ +if (numfds > nb_event) { + n = numfds +MAX_ITER_EVNUM ; + p =realloc (events, n *sizeof (events[0 ])); +if (p ==NULL ) { +EAL_LOG (ERR ,"failed to allocate %u events" , + numfds); + numfds = nb_event; + }else { + nb_event = n; + events = p; + } + } +/* serve the interrupt */ -eal_intr_handle_interrupts (pfd, numfds); +eal_intr_handle_interrupts (pfd, events, numfds);/** * when we return, we need to rebuild the
@@ -1168,6 +1191,8 @@ eal_intr_thread_main(__rte_unused void *arg)*/ close (pfd); } + +free (events); }int
@@ -1316,8 +1341,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 +1354,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)
Signature · 1 line
2.34.1
Re: [PATCH v4 02/19] eal/linux: remove use of VLAs
Hello Andre,
Thanks for taking over this series.
Quoted 9 lines · Andre Muezerie
From: Konstantin Ananyev <[email protected]>
1)
./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
eal_intr_handle_interrupts()is called byeal_intr_thread_main()so it seems ok to simply alloc space for events from heap and reuse the same buffer through the life of the thread.
ASan reports this allocation as a leak because nothing releases it when terminating the interrupt thread.
=================================================================
==83289==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 12300 byte(s) in 1 object(s) allocated from:
#0 0x55903c9a54b6 in __interceptor_realloc
(/home/runner/work/dpdk/dpdk/build/app/dpdk-test+0x2744b6) (BuildId:
e8a4f6c67f5c6afc20efb5f168c0df885d4c6493)
#1 0x7f0011ee8873 in eal_intr_thread_main
/home/runner/work/dpdk/dpdk/build/../lib/eal/linux/eal_interrupts.c:1174:8
#2 0x7f0010694ac2 in start_thread nptl/./nptl/pthread_create.c:442:8SUMMARY: AddressSanitizer: 12300 byte(s) leaked in 1 allocation(s).
------------------------------------------------------------------------------
It will need some rework.
Signature · 1 line
David Marchand
Re: [PATCH v4 02/19] eal/linux: remove use of VLAs
Quoted 30 lines · David Marchand
Hello Andre,
Thanks for taking over this series.
Quoted 9 lines · Andre Muezerie
From: Konstantin Ananyev <[email protected]>
1)
./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
eal_intr_handle_interrupts()is called byeal_intr_thread_main()so it seems ok to simply alloc space for events from heap and reuse the same buffer through the life of the thread.ASan reports this allocation as a leak because nothing releases it when terminating the interrupt thread.
=================================================================
==83289==ERROR: LeakSanitizer: detected memory leaksDirect leak of 12300 byte(s) in 1 object(s) allocated from:
#0 0x55903c9a54b6 in __interceptor_realloc (/home/runner/work/dpdk/dpdk/build/app/dpdk-test+0x2744b6) (BuildId: e8a4f6c67f5c6afc20efb5f168c0df885d4c6493) #1 0x7f0011ee8873 in eal_intr_thread_main /home/runner/work/dpdk/dpdk/build/../lib/eal/linux/eal_interrupts.c:1174:8 #2 0x7f0010694ac2 in start_thread nptl/./nptl/pthread_create.c:442:8
Quoted 8 lines
SUMMARY: AddressSanitizer: 12300 byte(s) leaked in 1 allocation(s).
------------------------------------------------------------------------------It will need some rework.
Signature · 1 line
David Marchand
Thanks David, I'll look into this.
RE: [PATCH v4 02/19] eal/linux: remove use of VLAs
Quoted 33 lines · David Marchand
Quoted 30 lines
Hello Andre,
Thanks for taking over this series.
Quoted 9 lines · Andre Muezerie
From: Konstantin Ananyev <[email protected]>
1)
./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
eal_intr_handle_interrupts()is called byeal_intr_thread_main()so it seems ok to simply alloc space for events from heap and reuse the same buffer through the life of the thread.ASan reports this allocation as a leak because nothing releases it when terminating the interrupt thread.
=================================================================
==83289==ERROR: LeakSanitizer: detected memory leaksDirect leak of 12300 byte(s) in 1 object(s) allocated from:
#0 0x55903c9a54b6 in __interceptor_realloc (/home/runner/work/dpdk/dpdk/build/app/dpdk-test+0x2744b6) (BuildId: e8a4f6c67f5c6afc20efb5f168c0df885d4c6493) #1 0x7f0011ee8873 in eal_intr_thread_main /home/runner/work/dpdk/dpdk/build/../lib/eal/linux/eal_interrupts.c:1174:8 #2 0x7f0010694ac2 in start_thread nptl/./nptl/pthread_create.c:442:8
Quoted 4 lines
Quoted 4 lines
SUMMARY: AddressSanitizer: 12300 byte(s) leaked in 1 allocation(s).
------------------------------------------------------------------------------It will need some rework.
My bad, forgot that interrupt thread never exits normally. As I saw Andre already updated a patch with revering back to alloca(), which I suppose is ok.
Though I wonder would pthread_cleanup_push() and keeping realloc() be a good alternative here?
PATCH v4 3/19 eal/common: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/eal/common/eal_common_proc.c +3 -2
@@ -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);
Signature · 1 line
2.34.1
PATCH v4 4/19 ethdev: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/ethdev/rte_ethdev.c | 183 +++++++++++++++++++++++++--------------- 1 file changed, 113 insertions(+), 70 deletions(-)
lib/ethdev/rte_ethdev.c +113 -70
@@ -36,6 +36,8 @@#include "ethdev_trace.h" #include "sff_telemetry.h" +#define ETH_XSTATS_ITER_NUM 0x100 +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 ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_names_by_id)(dev, - ids_copy, xstats_names, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_names_by_id !=NULL ) +return eth_xstats_get_by_name_by_id (dev, ids, xstats_names, + size, basic_count); +/* Retrieve all stats */ if (!ids) { int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
@@ -3473,17 +3505,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,return -ENOMEM ; } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } - } -/* Fill xstats_names_copy structure */ -if (ids && no_ext_stat_requested) { +if (ids && nb_basic_stats == size) {eth_basic_stats_get_names (dev, xstats_names_copy); }else { ret = rte_eth_xstats_get_names(port_id, xstats_names_copy,
@@ -3607,17 +3630,47 @@ eth_basic_stats_get(uint16_t port_id, struct rte_eth_xstat *xstats)return count; } +static int +eth_xtats_get_by_id (struct rte_eth_dev *dev,const uint64_t *ids, +uint64_t *values,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_by_id)(dev, ids_copy, + values + m, k); +if (rc <0 ) +return rc; + m += rc; + } + +return m; +} +/* retrieve ethdev extended statistics */ int rte_eth_xstats_get_by_id (uint16_t port_id,const uint64_t *ids,uint64_t *values,unsigned int size) { -unsigned int no_basic_stat_requested =1 ; -unsigned int no_ext_stat_requested =1 ; +unsigned int nb_basic_stats;unsigned int num_xstats_filled;unsigned int basic_count;uint16_t expected_entries;struct rte_eth_dev *dev; +struct rte_eth_xstat *xstats;unsigned int i;int ret;
@@ -3628,7 +3681,6 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,if (ret <0 )return ret; expected_entries = (uint16_t )ret; -struct rte_eth_xstat xstats[expected_entries]; basic_count =eth_dev_get_xstats_basic_count (dev);/* Return max number of stats if no ids given */
@@ -3642,51 +3694,41 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,if (ids && !values)return -EINVAL ; -if (ids && dev->dev_ops->xstats_get_by_id !=NULL && size) { -unsigned int basic_count =eth_dev_get_xstats_basic_count (dev); -uint64_t ids_copy[size]; - -for (i =0 ; i < size; i++) { -if (ids[i] < basic_count) { - no_basic_stat_requested =0 ; -break ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_by_id !=NULL ) +return eth_xtats_get_by_id (dev, ids, values, size, basic_count); + + xstats =calloc (expected_entries,sizeof (xstats[0 ])); +if (xstats ==NULL ) { +RTE_ETHDEV_LOG_LINE (ERR ,"Can't allocate memory" ); +return -ENOMEM ; }/* Fill the xstats structure */ -if (ids && no_ext_stat_requested) +if (ids && nb_basic_stats == size) ret =eth_basic_stats_get (port_id, xstats);else ret =rte_eth_xstats_get (port_id, xstats, expected_entries); -if (ret <0 ) +if (ret <0 ) { +free (xstats);return ret; + } num_xstats_filled = (unsigned int )ret;/* Return all stats */ if (!ids) {for (i =0 ; i < num_xstats_filled; i++) values[i] = xstats[i].value; + +free (xstats);return expected_entries; }
@@ -3694,14 +3736,15 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,for (i =0 ; i < size; i++) {if (ids[i] >= expected_entries) {RTE_ETHDEV_LOG_LINE (ERR ,"Id value isn't valid" ); -return -1 ; +break ; } values[i] = xstats[ids[i]].value; }rte_eth_trace_xstats_get_by_id (port_id, ids, values, size); -return size; +free (xstats); +return (i == size) ? (int32_t )size :-1 ; }int
Signature · 1 line
2.34.1
PATCH v4 5/19 hash: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/hash/rte_cuckoo_hash.c +2 -2
@@ -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);
Signature · 1 line
2.34.1
PATCH v4 6/19 hash/thash: remove use of VLAs for Windows built
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’
From my understanding, tuple size here should never exceed sizeof(union rte_thash_tuple), so it should be safe to replace VLA with fixed size array.
--- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
lib/hash/rte_thash.c +1 -1
@@ -795,7 +795,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_MAX_L4_LEN];unsigned int i, j, ret =0 ;uint32_t hash, adj_bits;const uint8_t *hash_key;
lib/hash/rte_thash.h +8 -0
@@ -108,6 +108,14 @@ union rte_thash_tuple {struct rte_ipv6_tuple v6; }; +/** +* maximum length in dwords of input tuple to +* calculate hash of ipv(4|6) header + +* transport header +*/ +#define RTE_THASH_MAX_L4_LEN \ + ((sizeof(union rte_thash_tuple)) / sizeof(uint32_t)) +/** * Prepare special converted key to use with rte_softrss_be() * @param orig
Signature · 1 line
2.34.1
PATCH v4 7/19 rcu: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/rcu/rte_rcu_qsbr.c | 7 ++++--- lib/rcu/rte_rcu_qsbr.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-)
lib/rcu/rte_rcu_qsbr.c +4 -3
@@ -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,
lib/rcu/rte_rcu_qsbr.h +5 -0
@@ -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.
Signature · 1 line
2.34.1
PATCH v4 8/19 gro: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- lib/gro/rte_gro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/gro/rte_gro.c +2 -2
@@ -179,7 +179,7 @@ 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]; +struct rte_mbuf **unprocess_pkts =alloca (sizeof (struct rte_mbuf *) * nb_pkts);uint32_t item_num;int32_t ret;uint16_t i, unprocess_num =0 , nb_after_gro = nb_pkts;
@@ -360,7 +360,7 @@ rte_gro_reassemble(struct rte_mbuf **pkts,uint16_t nb_pkts, void *ctx) { - struct rte_mbuf *unprocess_pkts[nb_pkts]; + struct rte_mbuf **unprocess_pkts = alloca(sizeof(struct rte_mbuf *) * 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;
Signature · 1 line
2.34.1
PATCH v4 9/19 app/testpmd: remove use of VLAs for Windows built
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- 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(-)
app/test-pmd/cmdline.c +1 -1
@@ -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 ) {
app/test-pmd/cmdline_flow.c +10 -5
@@ -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 ;
app/test-pmd/config.c +9 -7
@@ -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 )
@@ -5529,7 +5530,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 ;
@@ -7270,7 +7271,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 ;
Signature · 1 line
2.34.1
PATCH v4 10/19 test: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- 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(-)
app/test/test.c +1 -1
@@ -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;
app/test/test_cmdline_string.c +1 -1
@@ -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 {
app/test/test_cryptodev.c +17 -17
@@ -2885,7 +2885,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;
@@ -2921,7 +2921,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;
@@ -3073,7 +3073,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;
@@ -9077,7 +9077,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;
@@ -12991,7 +12991,7 @@ test_cryptodev_error_recover_helper(uint8_t dev_id, const void *test_data, boolstruct 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;
@@ -13345,7 +13345,7 @@ static inttest_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" );
@@ -13734,7 +13734,7 @@ static inttest_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 ));
@@ -13986,7 +13986,7 @@ test_authenticated_encryption_sessionless(int retval;uint8_t *ciphertext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -14088,7 +14088,7 @@ test_authenticated_decryption_sessionless(int retval;uint8_t *plaintext; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -15473,7 +15473,7 @@ static int create_gmac_session(uint8_t dev_id,const struct gmac_test_data *tdata, enum rte_crypto_auth_operation auth_op) { - uint8_t auth_key[tdata->key.len]; + uint8_t *auth_key = alloca(tdata->key.len);struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -16130,7 +16130,7 @@ create_auth_session(struct crypto_unittest_params *ut_params, enum rte_crypto_auth_operation auth_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (auth_key, reference->auth_key.data, reference->auth_key.len);
@@ -16161,8 +16161,8 @@ create_auth_cipher_session(struct crypto_unittest_params *ut_params, enum rte_crypto_cipher_operation cipher_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (cipher_key, reference->cipher_key.data, reference->cipher_key.len);
@@ -16662,8 +16662,8 @@ test_authenticated_encrypt_with_esn(uint8_t *authciphertext, *plaintext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -16794,8 +16794,8 @@ test_authenticated_decrypt_with_esn(int retval;uint8_t *ciphertext; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
app/test/test_cryptodev_blockcipher.c +2 -2
@@ -85,8 +85,8 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,int status =TEST_SUCCESS ;const struct blockcipher_test_data *tdata = t->test_data; -uint8_t cipher_key[tdata->cipher_key.len]; -uint8_t auth_key[tdata->auth_key.len]; +uint8_t *cipher_key =alloca (tdata->cipher_key.len); +uint8_t *auth_key =alloca (tdata->auth_key.len);uint32_t buf_len = tdata->ciphertext.len;uint32_t digest_len = tdata->digest.len;char *buf_p =NULL ;
app/test/test_cryptodev_crosscheck.c +1 -1
@@ -894,7 +894,7 @@ static int crosscheck_with_profile_run(const struct crosscheck_test_profile *profile) {struct crosscheck_testsuite_params *ts_params = &testsuite_params; -uint8_t input_text[profile->input_buf_len]; +uint8_t *input_text =alloca (profile->input_buf_len);uint16_t output_len, encrypted_len;uint8_t encrypted_text[MBUF_SIZE ];uint8_t output_text[MBUF_SIZE ];
app/test/test_dmadev.c +6 -3
@@ -417,9 +417,12 @@ test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan) dst_len = len / n_dst; src_len = len / n_src; -struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge]; -struct rte_mbuf *src[n_sge], *dst[n_sge]; -char *src_data[n_sge], *dst_data[n_sge]; +struct rte_dma_sge *sg_src =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_dma_sge *sg_dst =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_mbuf **src =alloca (sizeof (struct rte_mbuf *) * n_sge); +struct rte_mbuf **dst =alloca (sizeof (struct rte_mbuf *) * n_sge); +char **src_data =alloca (sizeof (char *) * n_sge); +char **dst_data =alloca (sizeof (char *) * n_sge);for (i =0 ; i < len; i++) orig_src[i] =rte_rand () &0xFF ;
app/test/test_hash.c +8 -6
@@ -1947,6 +1947,8 @@ test_hash_rcu_qsbr_add(void)return 0 ; } +#define HASH_RCU_QSBR_MAX_TOTAL_ENTRIES 9 +/* * rte_hash_rcu_qsbr_add DQ mode functional test. * Reader and writer are in the same thread in this test.
@@ -1966,7 +1968,7 @@ test_hash_rcu_qsbr_add(void)static int test_hash_rcu_qsbr_dq_mode (uint8_t ext_bkt) { -uint32_t total_entries = (ext_bkt ==0 ) ?8 :9 ; +const uint32_t total_entries = (ext_bkt ==0 ) ?8 :HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ;uint8_t hash_extra_flag =RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF ;
@@ -1982,8 +1984,8 @@ test_hash_rcu_qsbr_dq_mode(uint8_t ext_bkt) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ]; +int expected_pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ];unsigned int i;size_t sz;int32_t status;
@@ -2136,7 +2138,7 @@ test_hash_rcu_qsbr_reader(void *arg)static int test_hash_rcu_qsbr_sync_mode (uint8_t ext_bkt) { -uint32_t total_entries = (ext_bkt ==0 ) ?8 :9 ; +const uint32_t total_entries = (ext_bkt ==0 ) ?8 :HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ;uint8_t hash_extra_flag =RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF ;
@@ -2152,8 +2154,8 @@ test_hash_rcu_qsbr_sync_mode(uint8_t ext_bkt) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ]; +int expected_pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ];unsigned int i;size_t sz;int32_t status;
app/test/test_mempool.c +13 -12
@@ -515,19 +515,20 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))#undef RTE_TEST_TRACE_FAILURE#define RTE_TEST_TRACE_FAILURE (...) do { goto fail; } while (0) -static const size_t callback_num =3 ; -static const size_t mempool_num =2 ; +#define CALLBACK_NUM 3u +#define MEMPOOL_NUM 2u +static const unsigned int mempool_elt_size =64 ;static const unsigned int mempool_size =64 ; -struct test_mempool_events_data data[callback_num]; -struct rte_mempool *mp[mempool_num], *freed; +struct test_mempool_events_data data[CALLBACK_NUM ]; +struct rte_mempool *mp[MEMPOOL_NUM ], *freed;char name[RTE_MEMPOOL_NAMESIZE ];size_t i, j;int ret;memset (mp,0 ,sizeof (mp)); -for (i =0 ; i < callback_num; i++) { +for (i =0 ; i <CALLBACK_NUM ; i++) { ret =rte_mempool_event_callback_register (test_mempool_events_cb, &data[i]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to register the callback %zu: %s",
@@ -548,7 +549,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp)) SOCKET_ID_ANY, 0);RTE_TEST_ASSERT_NOT_NULL (mp[0 ],"Cannot create mempool %s: %s" , name,rte_strerror (rte_errno)); -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)RTE_TEST_ASSERT_EQUAL (data[j].invoked, false,"Callback %zu invoked on %s mempool creation" , j, name);
@@ -557,7 +558,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp)) ret =populate (mp[0 ]);RTE_TEST_ASSERT_EQUAL (ret, (int )mp[0 ]->size,"Failed to populate mempool %s: %s" , name,rte_strerror (-ret)); -for (j =0 ; j < callback_num; j++) { +for (j =0 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s population" , j, name);
@@ -589,7 +590,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))"Unregistered callback 0 invoked on %s mempool populaton" , name); -for (i =0 ; i < mempool_num; i++) { +for (i =0 ; i <MEMPOOL_NUM ; i++) {memset (&data,0 ,sizeof (data));sprintf (name,"empty%zu" , i);rte_mempool_free (mp[i]);
@@ -599,7 +600,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))*/ freed = mp[i]; mp[i] =NULL ; -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s destruction" , j, name);
@@ -615,7 +616,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp)) name); } -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) { ret =rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to unregister the callback %zu: %s",
@@ -624,10 +625,10 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))return TEST_SUCCESS ; fail: -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); -for (i =0 ; i < mempool_num; i++) +for (i =0 ; i <MEMPOOL_NUM ; i++)rte_mempool_free (mp[i]);return TEST_FAILED ;
app/test/test_reorder.c +26 -22
155 lines not on this page · raw message
app/test/test_service_cores.c +4 -5
@@ -603,9 +603,8 @@ service_lcore_add_del(void) "Service core count not equal to one");/* retrieve core list, checking lcore ids */ -const uint32_t size =4 ; -uint32_t service_core_ids[size]; -int32_t n =rte_service_lcore_list (service_core_ids, size); +uint32_t service_core_ids[4 ]; +int32_t n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal 1" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list lcore must equal slcore_id" );
@@ -631,7 +630,7 @@ service_lcore_add_del(void) cores_at_this_point);/* check longer service core list */ - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (3 , n,"Service core list return should equal 3" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list[0] lcore must equal 1" );
@@ -649,7 +648,7 @@ service_lcore_add_del(void) "Service core add did not return zero");TEST_ASSERT_EQUAL (1 ,rte_service_lcore_count (),"Service core count not equal to one" ); - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal one" ); TEST_ASSERT_EQUAL(slcore_id, service_core_ids[0], "Service core list[0] lcore must equal %d",
app/test/test_thash.c +3 -4
@@ -564,9 +564,8 @@ test_predictable_rss_min_seq(void) {struct rte_thash_ctx *ctx;struct rte_thash_subtuple_helper *h; -const int key_len =40 ;int reta_sz =6 ; -uint8_t initial_key[key_len]; +uint8_t initial_key[40 ];const uint8_t *new_key;int ret;union rte_thash_tuple tuple;
@@ -574,9 +573,9 @@ test_predictable_rss_min_seq(void)unsigned int desired_value =27 &HASH_MSK (reta_sz);uint16_t port_value =22 ; -memset (initial_key,0 , key_len); +memset (initial_key,0 ,RTE_DIM (initial_key)); - ctx =rte_thash_init_ctx ("test" , key_len, reta_sz, initial_key, + ctx =rte_thash_init_ctx ("test" ,RTE_DIM (initial_key), reta_sz, initial_key,RTE_THASH_MINIMAL_SEQ );RTE_TEST_ASSERT (ctx !=NULL ,"can not create thash ctx\n" );
Signature · 1 line
2.34.1
PATCH v4 11/19 common/idpf: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/common/idpf/idpf_common_rxtx.c +1 -1
@@ -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;
drivers/common/idpf/idpf_common_rxtx_avx512.c +4 -2
@@ -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;
Signature · 1 line
2.34.1
PATCH v4 12/19 net/i40e: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/net/i40e/i40e_testpmd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/i40e/i40e_testpmd.c +2 -3
@@ -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) {
Signature · 1 line
2.34.1
PATCH v4 13/19 net/ice: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/net/ice/ice_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ice/ice_rxtx.c +1 -1
@@ -1873,7 +1873,7 @@ 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]; +struct rte_mbuf **mbufs_pay =alloca (sizeof (struct rte_mbuf *) * rxq->rx_free_thresh);/* Allocate buffers in bulk */ alloc_idx = (uint16_t)(rxq->rx_free_trigger -
Signature · 1 line
2.34.1
PATCH v4 14/19 net/ixgbe: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++-- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +3 -2
@@ -3556,7 +3556,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 = +alloca (sizeof (struct rte_eth_xstat_name ) * size);ixgbe_dev_xstats_get_names_by_id (dev,NULL , xstats_names_copy, size);
@@ -3739,7 +3740,7 @@ 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 =alloca (sizeof (uint64_t ) * size);ixgbe_dev_xstats_get_by_id (dev,NULL , values_copy, size);
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +1 -1
@@ -14,7 +14,7 @@ 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 = alloca(sizeof(struct rte_mbuf *) * nb_bufs); /*finished pkts*/struct rte_mbuf *start = rxq->pkt_first_seg;struct rte_mbuf *end = rxq->pkt_last_seg;unsigned int pkt_idx, buf_idx;
Signature · 1 line
2.34.1
PATCH v4 15/19 common/mlx5: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/common/mlx5/mlx5_common.h | 4 ++-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/common/mlx5/mlx5_common.h +2 -2
@@ -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 ,
drivers/common/mlx5/mlx5_devx_cmds.c +3 -4
@@ -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),
Signature · 1 line
2.34.1
PATCH v4 16/19 net/mlx5: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/net/mlx5/mlx5.c | 5 ++--- drivers/net/mlx5/mlx5_flow.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +2 -3
@@ -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;
drivers/net/mlx5/mlx5_flow.c +3 -3
@@ -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;
@@ -8474,7 +8474,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,
Signature · 1 line
2.34.1
PATCH v4 17/19 build: enable vla warnings on Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
config/meson.build +4 -0
@@ -339,6 +339,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')
Signature · 1 line
2.34.1
PATCH v4 18/19 test: remove use of VLAs for Windows built code in bitset tests
In reply to Andre MuezerieMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test/test_bitset.c | 55 +++++++++++++++++++-------------- app/test/test_reassembly_perf.c | 4 +-- 2 files changed, 33 insertions(+), 26 deletions(-)
app/test/test_bitset.c +31 -24
@@ -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);
@@ -132,7 +134,6 @@ test_set_clear_size(test_fun test_fun, set_fun set_fun, clear_fun clear_fun, siz }#define RAND_ITERATIONS (10000) -#define RAND_SET_MAX_SIZE (1000)static int test_set_clear_fun (test_fun test_fun,set_fun set_fun,clear_fun clear_fun)
@@ -168,7 +169,7 @@ test_flip_size(test_fun test_fun, assign_fun assign_fun, flip_fun flip_fun, sizerand_bitset (bitset, size);for (i =0 ; i < size; i++) { -RTE_BITSET_DECLARE (reference, size); +RTE_BITSET_DECLARE (reference,RAND_SET_MAX_SIZE );rte_bitset_copy (reference, bitset, size);
@@ -288,7 +289,7 @@ 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 +389,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 +634,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 +711,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 +729,8 @@ test_complement(void)return TEST_SUCCESS ; } +#define SHIFT_SET_MAX_SIZE 500 +static int test_shift (bool right) {
@@ -734,12 +739,12 @@ test_shift(bool right)const char *direction = right ?"right" :"left" ;for (i =0 ; i <10000 ; i++) { -const int size =1 + (int )rte_rand_max (500 ); +const int size =1 + (int )rte_rand_max (SHIFT_SET_MAX_SIZE );const int shift_count = (int )rte_rand_max (1.5 * size);int src_idx; -RTE_BITSET_DECLARE (src, size); -RTE_BITSET_DECLARE (reference, size); +RTE_BITSET_DECLARE (src,SHIFT_SET_MAX_SIZE ); +RTE_BITSET_DECLARE (reference,SHIFT_SET_MAX_SIZE );rte_bitset_init (src, size);rte_bitset_init (reference, size);
@@ -788,12 +793,14 @@ test_shift_left(void)return test_shift (false); } +#define EQUAL_SET_MAX_SIZE 100 +static int test_equal (void ) { -const size_t size =100 ; -RTE_BITSET_DECLARE (bitset_a, size); -RTE_BITSET_DECLARE (bitset_b, size); +const size_t size =EQUAL_SET_MAX_SIZE ; +RTE_BITSET_DECLARE (bitset_a,EQUAL_SET_MAX_SIZE ); +RTE_BITSET_DECLARE (bitset_b,EQUAL_SET_MAX_SIZE );rand_buf (bitset_a,RTE_BITSET_SIZE (size));rand_buf (bitset_b,RTE_BITSET_SIZE (size));
@@ -821,9 +828,9 @@ test_equal(void)static int test_copy (void ) { -const size_t size =100 ; -RTE_BITSET_DECLARE (bitset_a, size); -RTE_BITSET_DECLARE (bitset_b, size); +const size_t size =EQUAL_SET_MAX_SIZE ; +RTE_BITSET_DECLARE (bitset_a,EQUAL_SET_MAX_SIZE ); +RTE_BITSET_DECLARE (bitset_b,EQUAL_SET_MAX_SIZE );rand_buf (bitset_a,RTE_BITSET_SIZE (size));rand_buf (bitset_b,RTE_BITSET_SIZE (size));
app/test/test_reassembly_perf.c +2 -2
@@ -577,7 +577,7 @@ ipv4_reassembly_interleaved_flows_perf(uint8_t nb_frags)for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf *buf_arr[MAX_FRAGMENTS ];for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
@@ -788,7 +788,7 @@ ipv6_reassembly_interleaved_flows_perf(int8_t nb_frags)for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf *buf_arr[MAX_FRAGMENTS ];for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
Signature · 1 line
2.34.1
Re: [PATCH v4 18/19] test: remove use of VLAs for Windows built code in bitset tests
Quoted 4 lines · Andre Muezerie
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.
This commitlog does not reflect what is being changed in the patch.
Quoted 1 line
Signed-off-by Andre Muezerie <[email protected]>
gcc 13 (at least) complains about this patch.
https://github.com/ovsrobot/dpdk/actions/runs/11677008675/job/32514228727#step:12:3658
I suspect you may have to change some "static" bitset into a dynamically allocated one.
Signature · 1 line
David Marchand
Re: [PATCH v4 18/19] test: remove use of VLAs for Windows built code in bitset tests
Quoted 9 lines · David Marchand
Quoted 4 lines · Andre Muezerie
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.This commitlog does not reflect what is being changed in the patch.
Quoted 11 lines
Quoted 1 line
Signed-off-by Andre Muezerie <[email protected]>gcc 13 (at least) complains about this patch.
https://github.com/ovsrobot/dpdk/actions/runs/11677008675/job/32514228727#step:12:3658I suspect you may have to change some "static" bitset into a dynamically allocated one.
Signature · 1 line
David Marchand
Thanks David, I'll address this.
PATCH v4 19/19 app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd
In reply to Andre MuezerieMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test-pmd/shared_rxq_fwd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
app/test-pmd/shared_rxq_fwd.c +1 -1
@@ -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);
Signature · 1 line
2.34.1
RE: [PATCH v4 00/19] remove use of VLAs for Windows
In reply to Andre MuezerieHi Andre,
Quoted 10 lines
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.
Can you also include these patches:
https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=*
into your series?
Should help to minimize cases with alloca() approach. Thanks
Konstantin
Quoted 81 lines
v4:
* rebase and adapt for changes made in main since v3 was sent
* use fixed maximum array size instead of VLA when doablev3:
* 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=31781Andre Muezerie (2):
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_fwdKonstantin Ananyev (6):
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 codeTyler Retzlaff (11):
eal: include header required for alloca
gro: remove use of VLAs for Windows built code app/testpmd: remove use of VLAs for Windows built
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code net/ice: remove use of VLAs for Windows built code net/ixgbe: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built codeapp/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 15 +- app/test-pmd/config.c | 16 +- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/test.c | 2 +- app/test/test_bitset.c | 55 +++--- 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_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 ++--- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 5 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 59 +++++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 +++++++++++------- lib/gro/rte_gro.c | 4 +- lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 + lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 39 files changed, 354 insertions(+), 223 deletions(-)--
2.34.1
v5 cover remove use of VLAs for Windows
In reply to Tyler RetzlaffAs 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.
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 (2):
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
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 net/ice: remove use of VLAs for Windows built code
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 alloca app/testpmd: remove use of VLAs for Windows built
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built code
app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 15 +- app/test-pmd/config.c | 16 +- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/meson.build | 5 + app/test/test.c | 2 +- app/test/test_bitset.c | 55 +++--- 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_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 ++--- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 18 +- drivers/net/ice/ice_rxtx.h | 2 + drivers/net/ixgbe/ixgbe_ethdev.c | 21 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 4 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 32 ++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 +++++++++++------- lib/gro/rte_gro.c | 42 ++-- lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 + lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 41 files changed, 372 insertions(+), 257 deletions(-)
--
2.34.1
PATCH v5 1/20 eal: include header required for alloca
From: Tyler Retzlaff <[email protected]>
Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca().
--- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 2 files changed, 2 insertions(+)
lib/eal/linux/include/rte_os.h +1 -0
@@ -10,6 +10,7 @@* which is not supported natively or named differently in Linux. */ +#include <alloca.h> #include <sched.h> #include <sys/queue.h>
lib/eal/windows/include/rte_os.h +1 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <malloc.h> #include <sched.h>
Signature · 1 line
2.34.1
PATCH v5 2/20 eal/linux: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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);
--- lib/eal/linux/eal_interrupts.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
lib/eal/linux/eal_interrupts.c +27 -5
@@ -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)
Signature · 1 line
2.34.1
PATCH v5 3/20 eal/common: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/eal/common/eal_common_proc.c +3 -2
@@ -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);
Signature · 1 line
2.34.1
PATCH v5 4/20 ethdev: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/ethdev/rte_ethdev.c | 183 +++++++++++++++++++++++++--------------- 1 file changed, 113 insertions(+), 70 deletions(-)
lib/ethdev/rte_ethdev.c +113 -70
@@ -36,6 +36,8 @@#include "ethdev_trace.h" #include "sff_telemetry.h" +#define ETH_XSTATS_ITER_NUM 0x100 +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 ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_names_by_id)(dev, - ids_copy, xstats_names, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_names_by_id !=NULL ) +return eth_xstats_get_by_name_by_id (dev, ids, xstats_names, + size, basic_count); +/* Retrieve all stats */ if (!ids) { int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
@@ -3473,17 +3505,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,return -ENOMEM ; } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } - } -/* Fill xstats_names_copy structure */ -if (ids && no_ext_stat_requested) { +if (ids && nb_basic_stats == size) {eth_basic_stats_get_names (dev, xstats_names_copy); }else { ret = rte_eth_xstats_get_names(port_id, xstats_names_copy,
@@ -3607,17 +3630,47 @@ eth_basic_stats_get(uint16_t port_id, struct rte_eth_xstat *xstats)return count; } +static int +eth_xtats_get_by_id (struct rte_eth_dev *dev,const uint64_t *ids, +uint64_t *values,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_by_id)(dev, ids_copy, + values + m, k); +if (rc <0 ) +return rc; + m += rc; + } + +return m; +} +/* retrieve ethdev extended statistics */ int rte_eth_xstats_get_by_id (uint16_t port_id,const uint64_t *ids,uint64_t *values,unsigned int size) { -unsigned int no_basic_stat_requested =1 ; -unsigned int no_ext_stat_requested =1 ; +unsigned int nb_basic_stats;unsigned int num_xstats_filled;unsigned int basic_count;uint16_t expected_entries;struct rte_eth_dev *dev; +struct rte_eth_xstat *xstats;unsigned int i;int ret;
@@ -3628,7 +3681,6 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,if (ret <0 )return ret; expected_entries = (uint16_t )ret; -struct rte_eth_xstat xstats[expected_entries]; basic_count =eth_dev_get_xstats_basic_count (dev);/* Return max number of stats if no ids given */
@@ -3642,51 +3694,41 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,if (ids && !values)return -EINVAL ; -if (ids && dev->dev_ops->xstats_get_by_id !=NULL && size) { -unsigned int basic_count =eth_dev_get_xstats_basic_count (dev); -uint64_t ids_copy[size]; - -for (i =0 ; i < size; i++) { -if (ids[i] < basic_count) { - no_basic_stat_requested =0 ; -break ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_by_id !=NULL ) +return eth_xtats_get_by_id (dev, ids, values, size, basic_count); + + xstats =calloc (expected_entries,sizeof (xstats[0 ])); +if (xstats ==NULL ) { +RTE_ETHDEV_LOG_LINE (ERR ,"Can't allocate memory" ); +return -ENOMEM ; }/* Fill the xstats structure */ -if (ids && no_ext_stat_requested) +if (ids && nb_basic_stats == size) ret =eth_basic_stats_get (port_id, xstats);else ret =rte_eth_xstats_get (port_id, xstats, expected_entries); -if (ret <0 ) +if (ret <0 ) { +free (xstats);return ret; + } num_xstats_filled = (unsigned int )ret;/* Return all stats */ if (!ids) {for (i =0 ; i < num_xstats_filled; i++) values[i] = xstats[i].value; + +free (xstats);return expected_entries; }
@@ -3694,14 +3736,15 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,for (i =0 ; i < size; i++) {if (ids[i] >= expected_entries) {RTE_ETHDEV_LOG_LINE (ERR ,"Id value isn't valid" ); -return -1 ; +break ; } values[i] = xstats[ids[i]].value; }rte_eth_trace_xstats_get_by_id (port_id, ids, values, size); -return size; +free (xstats); +return (i == size) ? (int32_t )size :-1 ; }int
Signature · 1 line
2.34.1
PATCH v5 5/20 hash: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/hash/rte_cuckoo_hash.c +2 -2
@@ -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);
Signature · 1 line
2.34.1
PATCH v5 6/20 hash/thash: remove use of VLAs for Windows built
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’
From my understanding, tuple size here should never exceed sizeof(union rte_thash_tuple), so it should be safe to replace VLA with fixed size array.
--- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
lib/hash/rte_thash.c +1 -1
@@ -795,7 +795,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_MAX_L4_LEN];unsigned int i, j, ret =0 ;uint32_t hash, adj_bits;const uint8_t *hash_key;
lib/hash/rte_thash.h +8 -0
@@ -108,6 +108,14 @@ union rte_thash_tuple {struct rte_ipv6_tuple v6; }; +/** +* maximum length in dwords of input tuple to +* calculate hash of ipv(4|6) header + +* transport header +*/ +#define RTE_THASH_MAX_L4_LEN \ + ((sizeof(union rte_thash_tuple)) / sizeof(uint32_t)) +/** * Prepare special converted key to use with rte_softrss_be() * @param orig
Signature · 1 line
2.34.1
PATCH v5 7/20 rcu: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/rcu/rte_rcu_qsbr.c | 7 ++++--- lib/rcu/rte_rcu_qsbr.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-)
lib/rcu/rte_rcu_qsbr.c +4 -3
@@ -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,
lib/rcu/rte_rcu_qsbr.h +5 -0
@@ -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.
Signature · 1 line
2.34.1
PATCH v5 8/20 net/ice: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/gro/rte_gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/gro/rte_gro.c +1 -1
@@ -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) {
Signature · 1 line
2.34.1
Re: [PATCH v5 08/20] net/ice: remove use of VLAs for Windows built code
Title for this patch is incorrect. Does it belong merged with the next patch in series?
Quoted 31 lines · Andre Muezerie
From: Konstantin Ananyev <[email protected]>
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")Signed-off-by Konstantin Ananyev <[email protected]>Acked-by Ferruh Yigit <[email protected]>--- lib/gro/rte_gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/gro/rte_gro.c +1
-1@@ -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) {Signature · 1 line
2.34.1
RE: [PATCH v5 08/20] net/ice: remove use of VLAs for Windows built code
Quoted 5 lines
Title for this patch is incorrect. Does it belong merged with the next patch in series?
Yes, seems like oringianl title get lost, I think it needs to be:
gro: fix overwrite unprocessed packets
https://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
Quoted 33 lines · Andre Muezerie
Quoted 31 lines
From: Konstantin Ananyev <[email protected]>
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")Signed-off-by Konstantin Ananyev <[email protected]>Acked-by Ferruh Yigit <[email protected]>--- lib/gro/rte_gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/gro/rte_gro.c +1
-2@@ -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.34.1
Re: [PATCH v5 08/20] net/ice: remove use of VLAs for Windows built code
Quoted 10 lines · Konstantin Ananyev
Quoted 5 lines
Title for this patch is incorrect. Does it belong merged with the next patch in series?
Yes, seems like oringianl title get lost, I think it needs to be:
gro: fix overwrite unprocessed packets
https://patchwork.dpdk.org/project/dpdk/patch/[email protected]/
Yes, I made a mistake. I'll fix it in v6 alonmg with other small changes.
Quoted 33 lines
Quoted 33 lines · Andre Muezerie
Quoted 31 lines
From: Konstantin Ananyev <[email protected]>
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")Signed-off-by Konstantin Ananyev <[email protected]>Acked-by Ferruh Yigit <[email protected]>--- lib/gro/rte_gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/gro/rte_gro.c +1
-2@@ -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.34.1
Re: [PATCH v5 08/20] net/ice: remove use of VLAs for Windows built code
In reply to Bruce RichardsonQuoted 2 lines · Bruce Richardson
Title for this patch is incorrect. Does it belong merged with the next patch in series?
Indeed, I used the wrong title for this patch. I'll fix it in v6.
Quoted 33 lines · Andre Muezerie
Quoted 31 lines
From: Konstantin Ananyev <[email protected]>
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")Signed-off-by Konstantin Ananyev <[email protected]>Acked-by Ferruh Yigit <[email protected]>--- lib/gro/rte_gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/gro/rte_gro.c +1
-1@@ -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) {Signature · 1 line
2.34.1
PATCH v5 9/20 gro: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
../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].
--- lib/gro/rte_gro.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-)
lib/gro/rte_gro.c +14 -26
@@ -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, current_time) <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) {if (gro_vxlan_udp4_reassemble (pkts[i], vxlan_udp_tbl, current_time) <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) {if (gro_tcp4_reassemble (pkts[i], tcp_tbl, current_time) <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) {if (gro_udp4_reassemble (pkts[i], udp_tbl, current_time) <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) {if (gro_tcp6_reassemble (pkts[i], tcp6_tbl, current_time) <0 ) - unprocess_pkts[unprocess_num++] = pkts[i]; + pkts[unprocess_num++] = pkts[i]; } else - unprocess_pkts[unprocess_num++] = pkts[i]; - } -if (unprocess_num >0 ) { -memcpy (pkts, unprocess_pkts,sizeof (struct rte_mbuf *) * - unprocess_num); + pkts[unprocess_num++] = pkts[i]; }return unprocess_num;
Signature · 1 line
2.34.1
PATCH v5 10/20 net/ixgbe: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- drivers/net/ixgbe/ixgbe_ethdev.c | 21 +++++++++++++-------- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 4 +++- 2 files changed, 16 insertions(+), 9 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +13 -8
@@ -3435,11 +3435,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,
@@ -3555,8 +3560,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);
@@ -3738,8 +3743,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);
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +3 -1
@@ -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 */
Signature · 1 line
2.34.1
PATCH v5 11/20 net/ice: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
../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.
--- drivers/net/ice/ice_rxtx.c | 18 ++++++++++++------ drivers/net/ice/ice_rxtx.h | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/ice/ice_rxtx.c +12 -6
@@ -1176,7 +1176,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;
@@ -1284,9 +1284,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) {
@@ -1295,6 +1300,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;
@@ -1873,7 +1880,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 -
@@ -1888,7 +1894,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 ;
@@ -1913,8 +1919,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; }
drivers/net/ice/ice_rxtx.h +2 -0
@@ -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 */
Signature · 1 line
2.34.1
PATCH v5 12/20 app/testpmd: remove use of VLAs for Windows built
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- 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(-)
app/test-pmd/cmdline.c +1 -1
@@ -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 ) {
app/test-pmd/cmdline_flow.c +10 -5
@@ -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 ;
app/test-pmd/config.c +9 -7
@@ -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 )
@@ -5529,7 +5530,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 ;
@@ -7270,7 +7271,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 ;
Signature · 1 line
2.34.1
PATCH v5 13/20 test: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- 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(-)
app/test/test.c +1 -1
@@ -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;
app/test/test_cmdline_string.c +1 -1
@@ -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 {
app/test/test_cryptodev.c +17 -17
@@ -2885,7 +2885,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;
@@ -2921,7 +2921,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;
@@ -3073,7 +3073,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;
@@ -9077,7 +9077,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;
@@ -12991,7 +12991,7 @@ test_cryptodev_error_recover_helper(uint8_t dev_id, const void *test_data, boolstruct 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;
@@ -13345,7 +13345,7 @@ static inttest_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" );
@@ -13734,7 +13734,7 @@ static inttest_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 ));
@@ -13986,7 +13986,7 @@ test_authenticated_encryption_sessionless(int retval;uint8_t *ciphertext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -14088,7 +14088,7 @@ test_authenticated_decryption_sessionless(int retval;uint8_t *plaintext; -uint8_t key[tdata->key.len +1 ]; +uint8_t *key =alloca (tdata->key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -15473,7 +15473,7 @@ static int create_gmac_session(uint8_t dev_id,const struct gmac_test_data *tdata, enum rte_crypto_auth_operation auth_op) { - uint8_t auth_key[tdata->key.len]; + uint8_t *auth_key = alloca(tdata->key.len);struct crypto_testsuite_params *ts_params = &testsuite_params;struct crypto_unittest_params *ut_params = &unittest_params;
@@ -16130,7 +16130,7 @@ create_auth_session(struct crypto_unittest_params *ut_params, enum rte_crypto_auth_operation auth_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (auth_key, reference->auth_key.data, reference->auth_key.len);
@@ -16161,8 +16161,8 @@ create_auth_cipher_session(struct crypto_unittest_params *ut_params, enum rte_crypto_cipher_operation cipher_op) {struct crypto_testsuite_params *ts_params = &testsuite_params; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );memcpy (cipher_key, reference->cipher_key.data, reference->cipher_key.len);
@@ -16662,8 +16662,8 @@ test_authenticated_encrypt_with_esn(uint8_t *authciphertext, *plaintext, *auth_tag;uint16_t plaintext_pad_len; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
@@ -16794,8 +16794,8 @@ test_authenticated_decrypt_with_esn(int retval;uint8_t *ciphertext; -uint8_t cipher_key[reference->cipher_key.len +1 ]; -uint8_t auth_key[reference->auth_key.len +1 ]; +uint8_t *cipher_key =alloca (reference->cipher_key.len +1 ); +uint8_t *auth_key =alloca (reference->auth_key.len +1 );struct rte_cryptodev_info dev_info;rte_cryptodev_info_get (ts_params->valid_devs[0 ], &dev_info);
app/test/test_cryptodev_blockcipher.c +2 -2
@@ -85,8 +85,8 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,int status =TEST_SUCCESS ;const struct blockcipher_test_data *tdata = t->test_data; -uint8_t cipher_key[tdata->cipher_key.len]; -uint8_t auth_key[tdata->auth_key.len]; +uint8_t *cipher_key =alloca (tdata->cipher_key.len); +uint8_t *auth_key =alloca (tdata->auth_key.len);uint32_t buf_len = tdata->ciphertext.len;uint32_t digest_len = tdata->digest.len;char *buf_p =NULL ;
app/test/test_cryptodev_crosscheck.c +1 -1
@@ -894,7 +894,7 @@ static int crosscheck_with_profile_run(const struct crosscheck_test_profile *profile) {struct crosscheck_testsuite_params *ts_params = &testsuite_params; -uint8_t input_text[profile->input_buf_len]; +uint8_t *input_text =alloca (profile->input_buf_len);uint16_t output_len, encrypted_len;uint8_t encrypted_text[MBUF_SIZE ];uint8_t output_text[MBUF_SIZE ];
app/test/test_dmadev.c +6 -3
@@ -417,9 +417,12 @@ test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan) dst_len = len / n_dst; src_len = len / n_src; -struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge]; -struct rte_mbuf *src[n_sge], *dst[n_sge]; -char *src_data[n_sge], *dst_data[n_sge]; +struct rte_dma_sge *sg_src =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_dma_sge *sg_dst =alloca (sizeof (struct rte_dma_sge ) * n_sge); +struct rte_mbuf **src =alloca (sizeof (struct rte_mbuf *) * n_sge); +struct rte_mbuf **dst =alloca (sizeof (struct rte_mbuf *) * n_sge); +char **src_data =alloca (sizeof (char *) * n_sge); +char **dst_data =alloca (sizeof (char *) * n_sge);for (i =0 ; i < len; i++) orig_src[i] =rte_rand () &0xFF ;
app/test/test_hash.c +8 -6
@@ -1947,6 +1947,8 @@ test_hash_rcu_qsbr_add(void)return 0 ; } +#define HASH_RCU_QSBR_MAX_TOTAL_ENTRIES 9 +/* * rte_hash_rcu_qsbr_add DQ mode functional test. * Reader and writer are in the same thread in this test.
@@ -1966,7 +1968,7 @@ test_hash_rcu_qsbr_add(void)static int test_hash_rcu_qsbr_dq_mode (uint8_t ext_bkt) { -uint32_t total_entries = (ext_bkt ==0 ) ?8 :9 ; +const uint32_t total_entries = (ext_bkt ==0 ) ?8 :HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ;uint8_t hash_extra_flag =RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF ;
@@ -1982,8 +1984,8 @@ test_hash_rcu_qsbr_dq_mode(uint8_t ext_bkt) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ]; +int expected_pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ];unsigned int i;size_t sz;int32_t status;
@@ -2136,7 +2138,7 @@ test_hash_rcu_qsbr_reader(void *arg)static int test_hash_rcu_qsbr_sync_mode (uint8_t ext_bkt) { -uint32_t total_entries = (ext_bkt ==0 ) ?8 :9 ; +const uint32_t total_entries = (ext_bkt ==0 ) ?8 :HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ;uint8_t hash_extra_flag =RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF ;
@@ -2152,8 +2154,8 @@ test_hash_rcu_qsbr_sync_mode(uint8_t ext_bkt) .socket_id = 0, .extra_flag = hash_extra_flag, }; -int pos[total_entries]; -int expected_pos[total_entries]; +int pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ]; +int expected_pos[HASH_RCU_QSBR_MAX_TOTAL_ENTRIES ];unsigned int i;size_t sz;int32_t status;
app/test/test_mempool.c +13 -12
@@ -515,19 +515,20 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))#undef RTE_TEST_TRACE_FAILURE#define RTE_TEST_TRACE_FAILURE (...) do { goto fail; } while (0) -static const size_t callback_num =3 ; -static const size_t mempool_num =2 ; +#define CALLBACK_NUM 3u +#define MEMPOOL_NUM 2u +static const unsigned int mempool_elt_size =64 ;static const unsigned int mempool_size =64 ; -struct test_mempool_events_data data[callback_num]; -struct rte_mempool *mp[mempool_num], *freed; +struct test_mempool_events_data data[CALLBACK_NUM ]; +struct rte_mempool *mp[MEMPOOL_NUM ], *freed;char name[RTE_MEMPOOL_NAMESIZE ];size_t i, j;int ret;memset (mp,0 ,sizeof (mp)); -for (i =0 ; i < callback_num; i++) { +for (i =0 ; i <CALLBACK_NUM ; i++) { ret =rte_mempool_event_callback_register (test_mempool_events_cb, &data[i]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to register the callback %zu: %s",
@@ -548,7 +549,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp)) SOCKET_ID_ANY, 0);RTE_TEST_ASSERT_NOT_NULL (mp[0 ],"Cannot create mempool %s: %s" , name,rte_strerror (rte_errno)); -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)RTE_TEST_ASSERT_EQUAL (data[j].invoked, false,"Callback %zu invoked on %s mempool creation" , j, name);
@@ -557,7 +558,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp)) ret =populate (mp[0 ]);RTE_TEST_ASSERT_EQUAL (ret, (int )mp[0 ]->size,"Failed to populate mempool %s: %s" , name,rte_strerror (-ret)); -for (j =0 ; j < callback_num; j++) { +for (j =0 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s population" , j, name);
@@ -589,7 +590,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))"Unregistered callback 0 invoked on %s mempool populaton" , name); -for (i =0 ; i < mempool_num; i++) { +for (i =0 ; i <MEMPOOL_NUM ; i++) {memset (&data,0 ,sizeof (data));sprintf (name,"empty%zu" , i);rte_mempool_free (mp[i]);
@@ -599,7 +600,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))*/ freed = mp[i]; mp[i] =NULL ; -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) {RTE_TEST_ASSERT_EQUAL (data[j].invoked, true,"Callback %zu not invoked on mempool %s destruction" , j, name);
@@ -615,7 +616,7 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp)) name); } -for (j =1 ; j < callback_num; j++) { +for (j =1 ; j <CALLBACK_NUM ; j++) { ret =rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); RTE_TEST_ASSERT_EQUAL(ret, 0, "Failed to unregister the callback %zu: %s",
@@ -624,10 +625,10 @@ test_mempool_events(int (*populate)(struct rte_mempool *mp))return TEST_SUCCESS ; fail: -for (j =0 ; j < callback_num; j++) +for (j =0 ; j <CALLBACK_NUM ; j++)rte_mempool_event_callback_unregister (test_mempool_events_cb, &data[j]); -for (i =0 ; i < mempool_num; i++) +for (i =0 ; i <MEMPOOL_NUM ; i++)rte_mempool_free (mp[i]);return TEST_FAILED ;
app/test/test_reorder.c +26 -22
155 lines not on this page · raw message
app/test/test_service_cores.c +4 -5
@@ -603,9 +603,8 @@ service_lcore_add_del(void) "Service core count not equal to one");/* retrieve core list, checking lcore ids */ -const uint32_t size =4 ; -uint32_t service_core_ids[size]; -int32_t n =rte_service_lcore_list (service_core_ids, size); +uint32_t service_core_ids[4 ]; +int32_t n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal 1" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list lcore must equal slcore_id" );
@@ -631,7 +630,7 @@ service_lcore_add_del(void) cores_at_this_point);/* check longer service core list */ - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (3 , n,"Service core list return should equal 3" );TEST_ASSERT_EQUAL (slcore_id, service_core_ids[0 ],"Service core list[0] lcore must equal 1" );
@@ -649,7 +648,7 @@ service_lcore_add_del(void) "Service core add did not return zero");TEST_ASSERT_EQUAL (1 ,rte_service_lcore_count (),"Service core count not equal to one" ); - n =rte_service_lcore_list (service_core_ids, size); + n =rte_service_lcore_list (service_core_ids,RTE_DIM (service_core_ids));TEST_ASSERT_EQUAL (1 , n,"Service core list return should equal one" ); TEST_ASSERT_EQUAL(slcore_id, service_core_ids[0], "Service core list[0] lcore must equal %d",
app/test/test_thash.c +3 -4
@@ -564,9 +564,8 @@ test_predictable_rss_min_seq(void) {struct rte_thash_ctx *ctx;struct rte_thash_subtuple_helper *h; -const int key_len =40 ;int reta_sz =6 ; -uint8_t initial_key[key_len]; +uint8_t initial_key[40 ];const uint8_t *new_key;int ret;union rte_thash_tuple tuple;
@@ -574,9 +573,9 @@ test_predictable_rss_min_seq(void)unsigned int desired_value =27 &HASH_MSK (reta_sz);uint16_t port_value =22 ; -memset (initial_key,0 , key_len); +memset (initial_key,0 ,RTE_DIM (initial_key)); - ctx =rte_thash_init_ctx ("test" , key_len, reta_sz, initial_key, + ctx =rte_thash_init_ctx ("test" ,RTE_DIM (initial_key), reta_sz, initial_key,RTE_THASH_MINIMAL_SEQ );RTE_TEST_ASSERT (ctx !=NULL ,"can not create thash ctx\n" );
Signature · 1 line
2.34.1
PATCH v5 14/20 common/idpf: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/common/idpf/idpf_common_rxtx.c +1 -1
@@ -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;
drivers/common/idpf/idpf_common_rxtx_avx512.c +4 -2
@@ -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;
Signature · 1 line
2.34.1
Re: [PATCH v5 14/20] common/idpf: remove use of VLAs for Windows built code
Quoted 7 lines · Andre Muezerie
From: Tyler Retzlaff <[email protected]>
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 <[email protected]>
PATCH v5 15/20 net/i40e: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/net/i40e/i40e_testpmd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/i40e/i40e_testpmd.c +2 -3
@@ -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) {
Signature · 1 line
2.34.1
Re: [PATCH v5 15/20] net/i40e: remove use of VLAs for Windows built code
Quoted 7 lines · Andre Muezerie
From: Tyler Retzlaff <[email protected]>
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 <[email protected]>
Quoted 30 lines
--- drivers/net/i40e/i40e_testpmd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/net/i40e/i40e_testpmd.c +2
-3@@ -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) {Signature · 1 line
2.34.1
PATCH v5 16/20 common/mlx5: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/common/mlx5/mlx5_common.h | 4 ++-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/common/mlx5/mlx5_common.h +2 -2
@@ -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 ,
drivers/common/mlx5/mlx5_devx_cmds.c +3 -4
@@ -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),
Signature · 1 line
2.34.1
PATCH v5 17/20 net/mlx5: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- drivers/net/mlx5/mlx5.c | 5 ++--- drivers/net/mlx5/mlx5_flow.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/mlx5/mlx5.c +2 -3
@@ -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;
drivers/net/mlx5/mlx5_flow.c +3 -3
@@ -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;
@@ -8474,7 +8474,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,
Signature · 1 line
2.34.1
PATCH v5 18/20 build: enable vla warnings on Windows built code
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- config/meson.build | 4 ++++ 1 file changed, 4 insertions(+)
config/meson.build +4 -0
@@ -339,6 +339,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')
Signature · 1 line
2.34.1
PATCH v5 19/20 test: remove use of VLAs for Windows built code in bitset tests
In reply to Andre Muezerie1) 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).
--- app/test/meson.build | 5 +++ app/test/test_bitset.c | 55 +++++++++++++++++++-------------- app/test/test_reassembly_perf.c | 4 +-- 3 files changed, 38 insertions(+), 26 deletions(-)
app/test/meson.build +5 -0
@@ -247,6 +247,11 @@ foreach d:optional_deps endif endforeach +# Bugzilla ID: 678 +if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0')) + cflags += '-Wno-array-bounds' +endif + if cc.has_argument('-Wno-format-truncation') cflags += '-Wno-format-truncation' endif
app/test/test_bitset.c +31 -24
141 lines not on this page · raw message
app/test/test_reassembly_perf.c +2 -2
@@ -577,7 +577,7 @@ ipv4_reassembly_interleaved_flows_perf(uint8_t nb_frags)for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf *buf_arr[MAX_FRAGMENTS ];for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
@@ -788,7 +788,7 @@ ipv6_reassembly_interleaved_flows_perf(int8_t nb_frags)for (j =0 ; j <4 ; j++) nb_frags += frag_per_flow[i + j]; -struct rte_mbuf *buf_arr[nb_frags]; +struct rte_mbuf *buf_arr[MAX_FRAGMENTS ];for (j =0 ; j <4 ; j++) {join_array (buf_arr, mbufs[i + j], prev, frag_per_flow[i + j]);
Signature · 1 line
2.34.1
PATCH v5 20/20 app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd
In reply to Andre MuezerieMSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK.
--- app/test-pmd/shared_rxq_fwd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
app/test-pmd/shared_rxq_fwd.c +1 -1
@@ -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);
Signature · 1 line
2.34.1
v6 cover remove use of VLAs for Windows
In reply to Tyler RetzlaffAs 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.
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 (2):
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
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 alloca app/testpmd: remove use of VLAs for Windows built
test: remove use of VLAs for Windows built code common/idpf: remove use of VLAs for Windows built code net/i40e: remove use of VLAs for Windows built code common/mlx5: remove use of VLAs for Windows built code net/mlx5: remove use of VLAs for Windows built code
build: enable vla warnings on Windows built code
app/test-pmd/cmdline.c | 2 +- app/test-pmd/cmdline_flow.c | 15 +- app/test-pmd/config.c | 16 +- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test/meson.build | 5 + app/test/test.c | 2 +- app/test/test_bitset.c | 55 +++--- 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_lcore_var_perf.c | 2 +- app/test/test_mempool.c | 25 +-- app/test/test_reassembly_perf.c | 4 +- app/test/test_reorder.c | 48 ++--- app/test/test_service_cores.c | 9 +- app/test/test_thash.c | 7 +- config/meson.build | 4 + drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 +- drivers/common/mlx5/mlx5_common.h | 4 +- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +- drivers/net/i40e/i40e_testpmd.c | 5 +- drivers/net/ice/ice_rxtx.c | 18 +- drivers/net/ice/ice_rxtx.h | 2 + drivers/net/ixgbe/ixgbe_ethdev.c | 21 +- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 4 +- drivers/net/mlx5/mlx5.c | 5 +- drivers/net/mlx5/mlx5_flow.c | 6 +- lib/eal/common/eal_common_proc.c | 5 +- lib/eal/linux/eal_interrupts.c | 32 ++- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + lib/ethdev/rte_ethdev.c | 183 +++++++++++------- lib/gro/rte_gro.c | 42 ++-- lib/hash/rte_cuckoo_hash.c | 4 +- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 + lib/rcu/rte_rcu_qsbr.c | 7 +- lib/rcu/rte_rcu_qsbr.h | 5 + 42 files changed, 373 insertions(+), 258 deletions(-)
--
2.34.1
PATCH v6 1/20 eal: include header required for alloca
From: Tyler Retzlaff <[email protected]>
Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca().
--- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 2 files changed, 2 insertions(+)
lib/eal/linux/include/rte_os.h +1 -0
@@ -10,6 +10,7 @@* which is not supported natively or named differently in Linux. */ +#include <alloca.h> #include <sched.h> #include <sys/queue.h>
lib/eal/windows/include/rte_os.h +1 -0
@@ -13,6 +13,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <malloc.h> #include <sched.h>
Signature · 1 line
2.34.1
PATCH v6 2/20 eal/linux: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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);
--- lib/eal/linux/eal_interrupts.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
lib/eal/linux/eal_interrupts.c +27 -5
@@ -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)
Signature · 1 line
2.34.1
PATCH v6 3/20 eal/common: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/eal/common/eal_common_proc.c +3 -2
@@ -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);
Signature · 1 line
2.34.1
PATCH v6 4/20 ethdev: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/ethdev/rte_ethdev.c | 183 +++++++++++++++++++++++++--------------- 1 file changed, 113 insertions(+), 70 deletions(-)
lib/ethdev/rte_ethdev.c +113 -70
@@ -36,6 +36,8 @@#include "ethdev_trace.h" #include "sff_telemetry.h" +#define ETH_XSTATS_ITER_NUM 0x100 +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 ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_names_by_id)(dev, - ids_copy, xstats_names, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_names_by_id !=NULL ) +return eth_xstats_get_by_name_by_id (dev, ids, xstats_names, + size, basic_count); +/* Retrieve all stats */ if (!ids) { int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
@@ -3473,17 +3505,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,return -ENOMEM ; } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } - } -/* Fill xstats_names_copy structure */ -if (ids && no_ext_stat_requested) { +if (ids && nb_basic_stats == size) {eth_basic_stats_get_names (dev, xstats_names_copy); }else { ret = rte_eth_xstats_get_names(port_id, xstats_names_copy,
@@ -3607,17 +3630,47 @@ eth_basic_stats_get(uint16_t port_id, struct rte_eth_xstat *xstats)return count; } +static int +eth_xtats_get_by_id (struct rte_eth_dev *dev,const uint64_t *ids, +uint64_t *values,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_by_id)(dev, ids_copy, + values + m, k); +if (rc <0 ) +return rc; + m += rc; + } + +return m; +} +/* retrieve ethdev extended statistics */ int rte_eth_xstats_get_by_id (uint16_t port_id,const uint64_t *ids,uint64_t *values,unsigned int size) { -unsigned int no_basic_stat_requested =1 ; -unsigned int no_ext_stat_requested =1 ; +unsigned int nb_basic_stats;unsigned int num_xstats_filled;unsigned int basic_count;uint16_t expected_entries;struct rte_eth_dev *dev; +struct rte_eth_xstat *xstats;unsigned int i;int ret;
@@ -3628,7 +3681,6 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,if (ret <0 )return ret; expected_entries = (uint16_t )ret; -struct rte_eth_xstat xstats[expected_entries]; basic_count =eth_dev_get_xstats_basic_count (dev);/* Return max number of stats if no ids given */
@@ -3642,51 +3694,41 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,if (ids && !values)return -EINVAL ; -if (ids && dev->dev_ops->xstats_get_by_id !=NULL && size) { -unsigned int basic_count =eth_dev_get_xstats_basic_count (dev); -uint64_t ids_copy[size]; - -for (i =0 ; i < size; i++) { -if (ids[i] < basic_count) { - no_basic_stat_requested =0 ; -break ; - } - -/* -* Convert ids to xstats ids that PMD knows. -* ids known by user are basic + extended stats. -*/ - ids_copy[i] = ids[i] - basic_count; - } - -if (no_basic_stat_requested) -return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values, size); + nb_basic_stats =0 ; +if (ids !=NULL ) { +for (i =0 ; i < size; i++) + nb_basic_stats += (ids[i] < basic_count); } -if (ids) { -for (i =0 ; i < size; i++) { -if (ids[i] >= basic_count) { - no_ext_stat_requested =0 ; -break ; - } - } +/* no basic stats requested, devops function provided */ +if (nb_basic_stats ==0 && ids !=NULL && size !=0 && + dev->dev_ops->xstats_get_by_id !=NULL ) +return eth_xtats_get_by_id (dev, ids, values, size, basic_count); + + xstats =calloc (expected_entries,sizeof (xstats[0 ])); +if (xstats ==NULL ) { +RTE_ETHDEV_LOG_LINE (ERR ,"Can't allocate memory" ); +return -ENOMEM ; }/* Fill the xstats structure */ -if (ids && no_ext_stat_requested) +if (ids && nb_basic_stats == size) ret =eth_basic_stats_get (port_id, xstats);else ret =rte_eth_xstats_get (port_id, xstats, expected_entries); -if (ret <0 ) +if (ret <0 ) { +free (xstats);return ret; + } num_xstats_filled = (unsigned int )ret;/* Return all stats */ if (!ids) {for (i =0 ; i < num_xstats_filled; i++) values[i] = xstats[i].value; + +free (xstats);return expected_entries; }
@@ -3694,14 +3736,15 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,for (i =0 ; i < size; i++) {if (ids[i] >= expected_entries) {RTE_ETHDEV_LOG_LINE (ERR ,"Id value isn't valid" ); -return -1 ; +break ; } values[i] = xstats[ids[i]].value; }rte_eth_trace_xstats_get_by_id (port_id, ids, values, size); -return size; +free (xstats); +return (i == size) ? (int32_t )size :-1 ; }int
Signature · 1 line
2.34.1
PATCH v6 5/20 hash: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/hash/rte_cuckoo_hash.c +2 -2
@@ -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);
Signature · 1 line
2.34.1
PATCH v6 6/20 hash/thash: remove use of VLAs for Windows built
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’
From my understanding, tuple size here should never exceed sizeof(union rte_thash_tuple), so it should be safe to replace VLA with fixed size array.
--- lib/hash/rte_thash.c | 2 +- lib/hash/rte_thash.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
lib/hash/rte_thash.c +1 -1
@@ -795,7 +795,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_MAX_L4_LEN];unsigned int i, j, ret =0 ;uint32_t hash, adj_bits;const uint8_t *hash_key;
lib/hash/rte_thash.h +8 -0
@@ -108,6 +108,14 @@ union rte_thash_tuple {struct rte_ipv6_tuple v6; }; +/** +* maximum length in dwords of input tuple to +* calculate hash of ipv(4|6) header + +* transport header +*/ +#define RTE_THASH_MAX_L4_LEN \ + ((sizeof(union rte_thash_tuple)) / sizeof(uint32_t)) +/** * Prepare special converted key to use with rte_softrss_be() * @param orig
Signature · 1 line
2.34.1
PATCH v6 7/20 rcu: remove use of VLAs for Windows built code
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/rcu/rte_rcu_qsbr.c | 7 ++++--- lib/rcu/rte_rcu_qsbr.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-)
lib/rcu/rte_rcu_qsbr.c +4 -3
@@ -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,
lib/rcu/rte_rcu_qsbr.h +5 -0
@@ -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.
Signature · 1 line
2.34.1
PATCH v6 8/20 gro: fix overwrite unprocessed packets
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- lib/gro/rte_gro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/gro/rte_gro.c +1 -1
@@ -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) {
Signature · 1 line
2.34.1
PATCH v6 9/20 gro: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
../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].
--- lib/gro/rte_gro.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-)
lib/gro/rte_gro.c +14 -26
@@ -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, current_time) <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) {if (gro_vxlan_udp4_reassemble (pkts[i], vxlan_udp_tbl, current_time) <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) {if (gro_tcp4_reassemble (pkts[i], tcp_tbl, current_time) <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) {if (gro_udp4_reassemble (pkts[i], udp_tbl, current_time) <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) {if (gro_tcp6_reassemble (pkts[i], tcp6_tbl, current_time) <0 ) - unprocess_pkts[unprocess_num++] = pkts[i]; + pkts[unprocess_num++] = pkts[i]; } else - unprocess_pkts[unprocess_num++] = pkts[i]; - } -if (unprocess_num >0 ) { -memcpy (pkts, unprocess_pkts,sizeof (struct rte_mbuf *) * - unprocess_num); + pkts[unprocess_num++] = pkts[i]; }return unprocess_num;
Signature · 1 line
2.34.1
PATCH v6 10/20 net/ixgbe: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
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.
--- drivers/net/ixgbe/ixgbe_ethdev.c | 21 +++++++++++++-------- drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 4 +++- 2 files changed, 16 insertions(+), 9 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +13 -8
@@ -3435,11 +3435,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,
@@ -3555,8 +3560,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);
@@ -3738,8 +3743,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);
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +3 -1
@@ -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 */
Signature · 1 line
2.34.1
Re: [PATCH v6 10/20] net/ixgbe: remove use of VLAs
Quoted 13 lines · Andre Muezerie
From: Konstantin Ananyev <[email protected]>
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.
Quoted 8 lines
For case #3:
reassemble_packets()is invoked only byixgbe_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 <[email protected]>---
Signature · 2 lines
Thanks, Anatoly
PATCH v6 11/20 net/ice: remove use of VLAs
In reply to Andre MuezerieFrom: Konstantin Ananyev <[email protected]>
../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.
--- drivers/net/ice/ice_rxtx.c | 18 ++++++++++++------ drivers/net/ice/ice_rxtx.h | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/ice/ice_rxtx.c +12 -6
@@ -1176,7 +1176,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;
@@ -1284,9 +1284,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) {
@@ -1295,6 +1300,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;
@@ -1873,7 +1880,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 -
@@ -1888,7 +1894,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 ;
@@ -1913,8 +1919,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; }
drivers/net/ice/ice_rxtx.h +2 -0
@@ -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 */
Signature · 1 line
2.34.1
Re: [PATCH v6 11/20] net/ice: remove use of VLAs
Quoted 5 lines · Andre Muezerie
From: Konstantin Ananyev <[email protected]>
../drivers/net/ice/ice_rxtx.c:1871:29: warning:
variable length array used [-Wvla]
Quoted 8 lines
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, atrx_queue_setup()we can allocate extra space for that array, and then safely use it at RX fast-path.Signed-off-by Konstantin Ananyev <[email protected]>---
Signature · 2 lines
Thanks, Anatoly
PATCH v6 12/20 app/testpmd: remove use of VLAs for Windows built
In reply to Andre MuezerieFrom: Tyler Retzlaff <[email protected]>
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.
--- 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(-)
app/test-pmd/cmdline.c +1 -1
@@ -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 ) {
app/test-pmd/cmdline_flow.c +10 -5
@@ -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 ;
app/test-pmd/config.c +9 -7
@@ -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 )
@@ -5529,7 +5530,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 ;
@@ -7270,7 +7271,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 ;
Signature · 1 line
2.34.1