[PATCH v11 19/30] examples/ip-pipeline: remove packed attributes
Removed packed attributes from structs that are naturally packed
already, or don't require packing.
Signed-off-by: Andre Muezerie
---
examples/ip_pipeline/cli.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index 92dfacdeb0..766fc8e46e 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -2571,7 +2571,7 @@ struct pkt_key_qinq {
uint16_t svlan;
uint16_t ethertype_cvlan;
uint16_t cvlan;
-} __rte_packed;
+};
struct pkt_key_ipv4_5tuple {
uint8_t time_to_live;
@@ -2581,7 +2581,7 @@ struct pkt_key_ipv4_5tuple {
uint32_t da;
uint16_t sp;
uint16_t dp;
-} __rte_packed;
+};
struct pkt_key_ipv6_5tuple {
uint16_t payload_length;
@@ -2591,15 +2591,15 @@ struct pkt_key_ipv6_5tuple {
struct rte_ipv6_addr da;
uint16_t sp;
uint16_t dp;
-} __rte_packed;
+};
struct pkt_key_ipv4_addr {
uint32_t addr;
-} __rte_packed;
+};
struct pkt_key_ipv6_addr {
struct rte_ipv6_addr addr;
-} __rte_packed;
+};
static uint32_t
parse_match(char **tokens,
--
2.47.0.vfs.0.3
[PATCH v11 28/30] pipeline: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
lib/pipeline/rte_table_action.c | 64 -
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
index a431f8f128..3a408e81b8 100644
--- a/lib/pipeline/rte_table_action.c
+++ b/lib/pipeline/rte_table_action.c
@@ -60,9 +60,9 @@ lb_cfg_check(struct rte_table_action_lb_config *cfg)
return 0;
}
-struct lb_data {
+struct __rte_packed_begin lb_data {
uint32_t out[RTE_TABLE_ACTION_LB_TABLE_SIZE];
-} __rte_packed;
+} __rte_packed_end;
static int
lb_apply(struct lb_data *data,
@@ -356,10 +356,10 @@ tm_cfg_check(struct rte_table_action_tm_config *tm)
return 0;
}
-struct tm_data {
+struct __rte_packed_begin tm_data {
uint32_t queue_id;
uint32_t reserved;
-} __rte_packed;
+} __rte_packed_end;
static int
tm_apply_check(struct rte_table_action_tm_params *p,
@@ -465,11 +465,11 @@ struct encap_qinq_data {
uint64_t)(s)) & 0x1LLU) << 8) |\
(((uint64_t)(ttl)) & 0xFFLLU)))
-struct __rte_aligned(2) encap_mpls_data {
+struct __rte_aligned(2) __rte_packed_begin encap_mpls_data {
struct rte_ether_hdr ether;
uint32_t mpls[RTE_TABLE_ACTION_MPLS_LABELS_MAX];
uint32_t mpls_count;
-} __rte_packed;
+} __rte_packed_end;
#define PPP_PROTOCOL_IP0x0021
@@ -487,42 +487,42 @@ struct encap_pppoe_data {
#define IP_PROTO_UDP 17
-struct __rte_aligned(2) encap_vxlan_ipv4_data {
+struct __rte_aligned(2) __rte_packed_begin encap_vxlan_ipv4_data {
struct rte_ether_hdr ether;
struct rte_ipv4_hdr ipv4;
struct rte_udp_hdr udp;
struct rte_vxlan_hdr vxlan;
-} __rte_packed;
+} __rte_packed_end;
-struct __rte_aligned(2) encap_vxlan_ipv4_vlan_data {
+struct __rte_aligned(2) __rte_packed_begin encap_vxlan_ipv4_vlan_data {
struct rte_ether_hdr ether;
struct rte_vlan_hdr vlan;
struct rte_ipv4_hdr ipv4;
struct rte_udp_hdr udp;
struct rte_vxlan_hdr vxlan;
-} __rte_packed;
+} __rte_packed_end;
-struct __rte_aligned(2) encap_vxlan_ipv6_data {
+struct __rte_aligned(2) __rte_packed_begin encap_vxlan_ipv6_data {
struct rte_ether_hdr ether;
struct rte_ipv6_hdr ipv6;
struct rte_udp_hdr udp;
struct rte_vxlan_hdr vxlan;
-} __rte_packed;
+} __rte_packed_end;
-struct __rte_aligned(2) encap_vxlan_ipv6_vlan_data {
+struct __rte_aligned(2) __rte_packed_begin encap_vxlan_ipv6_vlan_data {
struct rte_ether_hdr ether;
struct rte_vlan_hdr vlan;
struct rte_ipv6_hdr ipv6;
struct rte_udp_hdr udp;
struct rte_vxlan_hdr vxlan;
-} __rte_packed;
+} __rte_packed_end;
-struct __rte_aligned(2) encap_qinq_pppoe_data {
+struct __rte_aligned(2) __rte_packed_begin encap_qinq_pppoe_data {
struct rte_ether_hdr ether;
struct rte_vlan_hdr svlan;
struct rte_vlan_hdr cvlan;
struct pppoe_ppp_hdr pppoe_ppp;
-} __rte_packed;
+} __rte_packed_end;
static size_t
encap_data_size(struct rte_table_action_encap_config *encap)
@@ -1196,15 +1196,15 @@ nat_cfg_check(struct rte_table_action_nat_config *nat)
return 0;
}
-struct nat_ipv4_data {
+struct __rte_packed_begin nat_ipv4_data {
uint32_t addr;
uint16_t port;
-} __rte_packed;
+} __rte_packed_end;
-struct nat_ipv6_data {
+struct __rte_packed_begin nat_ipv6_data {
struct rte_ipv6_addr addr;
uint16_t port;
-} __rte_packed;
+} __rte_packed_end;
static size_t
nat_data_size(struct rte_table_action_nat_config *nat __rte_unused,
@@ -1493,9 +1493,9 @@ ttl_cfg_check(struct rte_table_action_ttl_config *ttl)
return 0;
}
-struct ttl_data {
+struct __rte_packed_begin ttl_data {
uint32_t n_packets;
-} __rte_packed;
+} __rte_packed_end;
#define TTL_INIT(data, decrement) \
((data)->n_packets = (decrement) ? 1 : 0)
@@ -1576,10 +1576,10 @@ stats_cfg_check(struct rte_table_action_stats_config
*stats)
return 0;
}
-struct stats_data {
+struct __rte_packed_begin stats_data {
uint64_t n_packets;
uint64_t n_bytes;
-} __rte_packed;
+} __rte_packed_end;
static int
stats_apply(struct stats_data *data,
@@ -1602,9 +1602,9 @@ pkt_work_stats(struct stats_data *data,
/**
* RTE_TABLE_ACTION_TIME
*/
-struct time_data {
+struct __rte_packed_begin time_data {
uint64_t time;
-} __rte_packed;
+} __rte_packed_en
[PATCH v11 22/30] examples/l3fwd: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
examples/l3fwd/l3fwd_route.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/l3fwd/l3fwd_route.h b/examples/l3fwd/l3fwd_route.h
index 62263c3540..b02b9cc11c 100644
--- a/examples/l3fwd/l3fwd_route.h
+++ b/examples/l3fwd/l3fwd_route.h
@@ -36,21 +36,21 @@ struct ipv6_l3fwd_route {
uint8_t if_out;
};
-struct ipv4_5tuple {
+struct __rte_packed_begin ipv4_5tuple {
uint32_t ip_dst;
uint32_t ip_src;
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
-struct ipv6_5tuple {
+struct __rte_packed_begin ipv6_5tuple {
uint8_t ip_dst[IPV6_ADDR_LEN];
uint8_t ip_src[IPV6_ADDR_LEN];
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
struct lpm_route_rule {
union {
--
2.47.0.vfs.0.3
[PATCH v11 26/30] ipsec: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
lib/ipsec/crypto.h | 44 ++--
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/ipsec/crypto.h b/lib/ipsec/crypto.h
index 93d200..dc6210a49a 100644
--- a/lib/ipsec/crypto.h
+++ b/lib/ipsec/crypto.h
@@ -15,11 +15,11 @@
* AES-CTR counter block format.
*/
-struct aesctr_cnt_blk {
+struct __rte_packed_begin aesctr_cnt_blk {
uint32_t nonce;
uint64_t iv;
uint32_t cnt;
-} __rte_packed;
+} __rte_packed_end;
/*
* CHACHA20-POLY1305 devices have some specific requirements
@@ -27,13 +27,13 @@ struct aesctr_cnt_blk {
* Ideally that to be done by the driver itself.
*/
-struct aead_chacha20_poly1305_iv {
+struct __rte_packed_begin aead_chacha20_poly1305_iv {
uint32_t salt;
uint64_t iv;
uint32_t cnt;
-} __rte_packed;
+} __rte_packed_end;
-struct aead_chacha20_poly1305_aad {
+struct __rte_packed_begin aead_chacha20_poly1305_aad {
uint32_t spi;
/*
* RFC 4106, section 5:
@@ -45,25 +45,25 @@ struct aead_chacha20_poly1305_aad {
uint64_t u64;
} sqn;
uint32_t align0; /* align to 16B boundary */
-} __rte_packed;
+} __rte_packed_end;
-struct chacha20_poly1305_esph_iv {
+struct __rte_packed_begin chacha20_poly1305_esph_iv {
struct rte_esp_hdr esph;
uint64_t iv;
-} __rte_packed;
+} __rte_packed_end;
/*
* AES-GCM devices have some specific requirements for IV and AAD formats.
* Ideally that to be done by the driver itself.
*/
-struct aead_gcm_iv {
+struct __rte_packed_begin aead_gcm_iv {
uint32_t salt;
uint64_t iv;
uint32_t cnt;
-} __rte_packed;
+} __rte_packed_end;
-struct aead_gcm_aad {
+struct __rte_packed_begin aead_gcm_aad {
uint32_t spi;
/*
* RFC 4106, section 5:
@@ -75,34 +75,34 @@ struct aead_gcm_aad {
uint64_t u64;
} sqn;
uint32_t align0; /* align to 16B boundary */
-} __rte_packed;
+} __rte_packed_end;
-struct gcm_esph_iv {
+struct __rte_packed_begin gcm_esph_iv {
struct rte_esp_hdr esph;
uint64_t iv;
-} __rte_packed;
+} __rte_packed_end;
/*
* AES-CCM devices have some specific requirements for IV and AAD formats.
* Ideally that to be done by the driver itself.
*/
-union aead_ccm_salt {
+union __rte_packed_begin aead_ccm_salt {
uint32_t salt;
struct inner {
uint8_t salt8[3];
uint8_t ccm_flags;
} inner;
-} __rte_packed;
+} __rte_packed_end;
-struct aead_ccm_iv {
+struct __rte_packed_begin aead_ccm_iv {
uint8_t ccm_flags;
uint8_t salt[3];
uint64_t iv;
uint32_t cnt;
-} __rte_packed;
+} __rte_packed_end;
-struct aead_ccm_aad {
+struct __rte_packed_begin aead_ccm_aad {
uint8_t padding[18];
uint32_t spi;
/*
@@ -115,12 +115,12 @@ struct aead_ccm_aad {
uint64_t u64;
} sqn;
uint32_t align0; /* align to 16B boundary */
-} __rte_packed;
+} __rte_packed_end;
-struct ccm_esph_iv {
+struct __rte_packed_begin ccm_esph_iv {
struct rte_esp_hdr esph;
uint64_t iv;
-} __rte_packed;
+} __rte_packed_end;
static inline void
--
2.47.0.vfs.0.3
[PATCH v11 30/30] eal/include: deprecate macro __rte_packed
Macro __rte_packed was marked as deprecated. Signed-off-by: Andre Muezerie --- lib/eal/include/rte_common.h | 13 + 1 file changed, 13 insertions(+) diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index d72f8590bd..40592f71b1 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -99,6 +99,19 @@ typedef uint32_t unaligned_uint32_t; typedef uint16_t unaligned_uint16_t; #endif +/** + * @deprecated + * @see __rte_packed_begin + * @see __rte_packed_end + * + * Force a structure to be packed + */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_packed RTE_DEPRECATED(__rte_packed) +#else +#define __rte_packed (RTE_DEPRECATED(__rte_packed) __attribute__((__packed__))) +#endif + /** * Force a structure to be packed * Usage: -- 2.47.0.vfs.0.3
[PATCH v11 29/30] vhost: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
lib/vhost/vhost_user.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h
index edf7adb3c0..9a905ee5f4 100644
--- a/lib/vhost/vhost_user.h
+++ b/lib/vhost/vhost_user.h
@@ -143,7 +143,7 @@ struct vhost_user_config {
uint8_t region[VHOST_USER_MAX_CONFIG_SIZE];
};
-typedef struct VhostUserMsg {
+typedef struct __rte_packed_begin VhostUserMsg {
union {
uint32_t frontend; /* a VhostUserRequest value */
uint32_t backend; /* a VhostUserBackendRequest value*/
@@ -169,16 +169,16 @@ typedef struct VhostUserMsg {
struct vhost_user_config cfg;
} payload;
/* Nothing should be added after the payload */
-} __rte_packed VhostUserMsg;
+} __rte_packed_end VhostUserMsg;
/* Note: this structure and VhostUserMsg can't be changed carelessly as
* external message handlers rely on them.
*/
-struct __rte_packed vhu_msg_context {
+struct __rte_packed_begin vhu_msg_context {
VhostUserMsg msg;
int fds[VHOST_MEMORY_MAX_NREGIONS];
int fd_num;
-};
+} __rte_packed_end;
#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
--
2.47.0.vfs.0.3
[PATCH v11 25/30] eal: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Removed the packed attributes from some structures that don't need
them.
Signed-off-by: Andre Muezerie
---
lib/eal/common/eal_private.h | 2 +-
lib/eal/include/rte_memory.h | 4 ++--
lib/eal/include/rte_memzone.h | 4 ++--
lib/eal/include/rte_trace_point.h | 2 +-
lib/eal/x86/include/rte_memcpy.h | 12 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index bb315dab04..3b94e01b5b 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -62,7 +62,7 @@ struct rte_config {
* DPDK instances
*/
struct rte_mem_config *mem_config;
-} __rte_packed;
+};
/**
* Get the global configuration structure.
diff --git a/lib/eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
index dbd0a6bedc..249e0f5690 100644
--- a/lib/eal/include/rte_memory.h
+++ b/lib/eal/include/rte_memory.h
@@ -46,7 +46,7 @@ extern "C" {
/**
* Physical memory segment descriptor.
*/
-struct rte_memseg {
+struct __rte_packed_begin rte_memseg {
rte_iova_t iova;/**< Start IO address. */
union {
void *addr; /**< Start virtual address. */
@@ -58,7 +58,7 @@ struct rte_memseg {
uint32_t nchannel; /**< Number of channels. */
uint32_t nrank; /**< Number of ranks. */
uint32_t flags; /**< Memseg-specific flags */
-} __rte_packed;
+} __rte_packed_end;
/**
* memseg list is a special case as we need to store a bunch of other data
diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index e1563994d5..5a0e1b8a15 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -45,7 +45,7 @@ extern "C" {
* A structure describing a memzone, which is a contiguous portion of
* physical memory identified by a name.
*/
-struct rte_memzone {
+struct __rte_packed_begin rte_memzone {
#define RTE_MEMZONE_NAMESIZE 32 /**< Maximum length of memory zone
name.*/
char name[RTE_MEMZONE_NAMESIZE]; /**< Name of the memory zone. */
@@ -62,7 +62,7 @@ struct rte_memzone {
int32_t socket_id;/**< NUMA socket ID. */
uint32_t flags; /**< Characteristics of this memzone.
*/
-} __rte_packed;
+} __rte_packed_end;
/**
* Set the maximum number of memzones.
diff --git a/lib/eal/include/rte_trace_point.h
b/lib/eal/include/rte_trace_point.h
index 87b5f43c3c..b24db3b6da 100644
--- a/lib/eal/include/rte_trace_point.h
+++ b/lib/eal/include/rte_trace_point.h
@@ -298,7 +298,7 @@ struct __rte_trace_stream_header {
rte_uuid_t uuid;
uint32_t lcore_id;
char thread_name[__RTE_TRACE_EMIT_STRING_LEN_MAX];
-} __rte_packed;
+};
struct __rte_trace_header {
uint32_t offset;
diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
index 42058e4a3f..46d34b8081 100644
--- a/lib/eal/x86/include/rte_memcpy.h
+++ b/lib/eal/x86/include/rte_memcpy.h
@@ -67,15 +67,15 @@ rte_mov15_or_less(void *dst, const void *src, size_t n)
* Use the following structs to avoid violating C standard
* alignment requirements and to avoid strict aliasing bugs
*/
- struct rte_uint64_alias {
+ struct __rte_packed_begin rte_uint64_alias {
uint64_t val;
- } __rte_packed __rte_may_alias;
- struct rte_uint32_alias {
+ } __rte_packed_end __rte_may_alias;
+ struct __rte_packed_begin rte_uint32_alias {
uint32_t val;
- } __rte_packed __rte_may_alias;
- struct rte_uint16_alias {
+ } __rte_packed_end __rte_may_alias;
+ struct __rte_packed_begin rte_uint16_alias {
uint16_t val;
- } __rte_packed __rte_may_alias;
+ } __rte_packed_end __rte_may_alias;
void *ret = dst;
if (n & 8) {
--
2.47.0.vfs.0.3
[PATCH v11 21/30] examples/l3fwd-power: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
examples/l3fwd-power/main.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index ae8b55924e..d279e664b3 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -282,21 +282,21 @@ static struct rte_mempool * pktmbuf_pool[NB_SOCKETS];
#define DEFAULT_HASH_FUNC rte_jhash
#endif
-struct ipv4_5tuple {
+struct __rte_packed_begin ipv4_5tuple {
uint32_t ip_dst;
uint32_t ip_src;
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
-struct ipv6_5tuple {
+struct __rte_packed_begin ipv6_5tuple {
uint8_t ip_dst[IPV6_ADDR_LEN];
uint8_t ip_src[IPV6_ADDR_LEN];
uint16_t port_dst;
uint16_t port_src;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
struct ipv4_l3fwd_route {
struct ipv4_5tuple key;
--
2.47.0.vfs.0.3
[PATCH v11 23/30] examples/ptpclient: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
examples/ptpclient/ptpclient.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c
index 7b6862d951..9c64313fa9 100644
--- a/examples/ptpclient/ptpclient.c
+++ b/examples/ptpclient/ptpclient.c
@@ -56,22 +56,22 @@ static const struct rte_ether_addr ether_multicast = {
};
/* Structs used for PTP handling. */
-struct tstamp {
+struct __rte_packed_begin tstamp {
uint16_t sec_msb;
uint32_t sec_lsb;
uint32_t ns;
-} __rte_packed;
+} __rte_packed_end;
struct clock_id {
uint8_t id[8];
};
-struct port_id {
+struct __rte_packed_begin port_id {
struct clock_idclock_id;
uint16_t port_number;
-} __rte_packed;
+} __rte_packed_end;
-struct ptp_header {
+struct __rte_packed_begin ptp_header {
uint8_t msg_type;
uint8_t ver;
uint16_t message_length;
@@ -84,39 +84,39 @@ struct ptp_header {
uint16_t seq_id;
uint8_t control;
int8_t log_message_interval;
-} __rte_packed;
+} __rte_packed_end;
-struct sync_msg {
+struct __rte_packed_begin sync_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
-} __rte_packed;
+} __rte_packed_end;
-struct follow_up_msg {
+struct __rte_packed_begin follow_up_msg {
struct ptp_header hdr;
struct tstamp precise_origin_tstamp;
uint8_t suffix[];
-} __rte_packed;
+} __rte_packed_end;
-struct delay_req_msg {
+struct __rte_packed_begin delay_req_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
-} __rte_packed;
+} __rte_packed_end;
-struct delay_resp_msg {
+struct __rte_packed_begin delay_resp_msg {
struct ptp_headerhdr;
struct tstamprx_tstamp;
struct port_id req_port_id;
uint8_t suffix[];
-} __rte_packed;
+} __rte_packed_end;
struct ptp_message {
- union {
+ union __rte_packed_begin {
struct ptp_header header;
struct sync_msgsync;
struct delay_req_msg delay_req;
struct follow_up_msg follow_up;
struct delay_resp_msg delay_resp;
- } __rte_packed;
+ } __rte_packed_end;
};
struct ptpv2_time_receiver_ordinary {
--
2.47.0.vfs.0.3
[PATCH v11 24/30] examples/vhost_blk: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
examples/vhost_blk/blk_spec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/vhost_blk/blk_spec.h b/examples/vhost_blk/blk_spec.h
index 3c54f70eaf..7f785fa563 100644
--- a/examples/vhost_blk/blk_spec.h
+++ b/examples/vhost_blk/blk_spec.h
@@ -73,7 +73,7 @@ struct vhost_memory_padded {
struct vhost_memory_region regions[VHOST_USER_MEMORY_MAX_NREGIONS];
};
-struct vhost_user_msg {
+struct __rte_packed_begin vhost_user_msg {
enum vhost_user_request request;
#define VHOST_USER_VERSION_MASK 0x3
@@ -89,6 +89,6 @@ struct vhost_user_msg {
struct vhost_memory_padded memory;
struct vhost_user_config cfg;
} payload;
-} __rte_packed;
+} __rte_packed_end;
#endif
--
2.47.0.vfs.0.3
Re: [PATCH v14 03/81] eal/common: remove use of VLAs
On Fri, 10 Jan 2025 12:22:22 -0800 Andre Muezerie wrote: > diff --git a/lib/eal/meson.build b/lib/eal/meson.build > index e1d6c4cf17..352db049e9 100644 > --- a/lib/eal/meson.build > +++ b/lib/eal/meson.build > @@ -31,3 +31,11 @@ endif > if is_freebsd > annotate_locks = false > endif > + > +warning_flags = ['-Wvla'] > + > +foreach arg: warning_flags > +if cc.has_argument(arg) > +cflags += arg > +endif > +endforeach > -- Could we enable it for all libs and only turn it off as required?
[PATCH v11 02/30] eal/include: add new packing macros
MSVC struct packing is not compatible with GCC. Add macro
__rte_packed_begin which can be used to push existing pack value
and set packing to 1-byte. Add macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Acked-by: Tyler Retzlaff
---
lib/eal/include/rte_common.h | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h
index 4d299f2b36..d72f8590bd 100644
--- a/lib/eal/include/rte_common.h
+++ b/lib/eal/include/rte_common.h
@@ -101,11 +101,17 @@ typedef uint16_t unaligned_uint16_t;
/**
* Force a structure to be packed
+ * Usage:
+ * struct __rte_packed_begin mystruct { ... } __rte_packed_end;
+ * union __rte_packed_begin myunion { ... } __rte_packed_end;
+ * Note: alignment attributes when present should precede __rte_packed_begin.
*/
#ifdef RTE_TOOLCHAIN_MSVC
-#define __rte_packed
+#define __rte_packed_begin __pragma(pack(push, 1))
+#define __rte_packed_end __pragma(pack(pop))
#else
-#define __rte_packed __attribute__((__packed__))
+#define __rte_packed_begin
+#define __rte_packed_end __attribute__((__packed__))
#endif
/**
--
2.47.0.vfs.0.3
[PATCH v11 03/30] app/test-pmd: remove unnecessary packed attributes
Removed __rte_packed attribute from structure that is naturally
packed already.
Signed-off-by: Andre Muezerie
---
app/test-pmd/csumonly.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 2246c22e8e..d77a140641 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -92,7 +92,7 @@ struct testpmd_offload_info {
struct simple_gre_hdr {
uint16_t flags;
uint16_t proto;
-} __rte_packed;
+};
static uint16_t
get_udptcp_checksum(struct rte_mbuf *m, void *l3_hdr, uint16_t l4_off,
--
2.47.0.vfs.0.3
[PATCH v11 10/30] drivers/crypto: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/crypto/caam_jr/caam_jr.c | 4 +-
drivers/crypto/caam_jr/caam_jr_desc.h| 64 ++--
drivers/crypto/caam_jr/caam_jr_hw_specific.h | 48 +++
drivers/crypto/dpaa_sec/dpaa_sec.h | 12 ++--
drivers/crypto/ionic/ionic_crypto_if.h | 36 +--
drivers/crypto/mlx5/mlx5_crypto.h| 8 +--
drivers/crypto/mlx5/mlx5_crypto_gcm.c| 4 +-
drivers/crypto/qat/qat_sym.h | 8 +--
drivers/crypto/qat/qat_sym_session.h | 4 +-
9 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 4082b3f422..a57dc56b80 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -53,10 +53,10 @@ static enum sec_driver_state_e g_driver_state =
SEC_DRIVER_STATE_IDLE;
static int g_job_rings_no;
static int g_job_rings_max;
-struct sec_outring_entry {
+struct __rte_packed_begin sec_outring_entry {
phys_addr_t desc; /* Pointer to completed descriptor */
uint32_t status;/* Status for completed descriptor */
-} __rte_packed;
+} __rte_packed_end;
/* virtual address conversin when mempool support is available for ctx */
static inline phys_addr_t
diff --git a/drivers/crypto/caam_jr/caam_jr_desc.h
b/drivers/crypto/caam_jr/caam_jr_desc.h
index a4507613be..eb4e68578a 100644
--- a/drivers/crypto/caam_jr/caam_jr_desc.h
+++ b/drivers/crypto/caam_jr/caam_jr_desc.h
@@ -123,8 +123,8 @@
}
/* Union describing a descriptor header.
*/
-struct descriptor_header_s {
- union {
+struct __rte_packed_begin descriptor_header_s {
+ union __rte_packed_begin {
uint32_t word;
struct {
/* 4 */ unsigned int ctype:5;
@@ -162,15 +162,15 @@ struct descriptor_header_s {
/* 26 */ unsigned int res1:1;
/* 27 */ unsigned int ctype:5;
} jd;
- } __rte_packed command;
-} __rte_packed;
+ } __rte_packed_end command;
+} __rte_packed_end;
/* Union describing a KEY command in a descriptor.
*/
-struct key_command_s {
- union {
+struct __rte_packed_begin key_command_s {
+ union __rte_packed_begin {
uint32_t word;
- struct {
+ struct __rte_packed_begin {
unsigned int ctype:5;
unsigned int cls:2;
unsigned int sgf:1;
@@ -182,30 +182,30 @@ struct key_command_s {
unsigned int tk:1;
unsigned int rsvd1:5;
unsigned int length:10;
- } __rte_packed field;
- } __rte_packed command;
-} __rte_packed;
+ } __rte_packed_end field;
+ } __rte_packed_end command;
+} __rte_packed_end;
/* Union describing a PROTOCOL command
* in a descriptor.
*/
-struct protocol_operation_command_s {
- union {
+struct __rte_packed_begin protocol_operation_command_s {
+ union __rte_packed_begin {
uint32_t word;
- struct {
+ struct __rte_packed_begin {
unsigned int ctype:5;
unsigned int optype:3;
unsigned char protid;
unsigned short protinfo;
- } __rte_packed field;
- } __rte_packed command;
-} __rte_packed;
+ } __rte_packed_end field;
+ } __rte_packed_end command;
+} __rte_packed_end;
/* Union describing a SEQIN command in a
* descriptor.
*/
-struct seq_in_command_s {
- union {
+struct __rte_packed_begin seq_in_command_s {
+ union __rte_packed_begin {
uint32_t word;
struct {
unsigned int ctype:5;
@@ -219,14 +219,14 @@ struct seq_in_command_s {
unsigned int res2:4;
unsigned int length:16;
} field;
- } __rte_packed command;
-} __rte_packed;
+ } __rte_packed_end command;
+} __rte_packed_end;
/* Union describing a SEQOUT command in a
* descriptor.
*/
-struct seq_out_command_s {
- union {
+struct __rte_packed_begin seq_out_command_s {
+ union __rte_packed_begin {
uint32_t word;
struct {
unsigned int ctype:5;
@@ -238,11 +238,11 @@ struct seq_out_command_s {
u
[PATCH v11 05/30] doc/guides: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Acked-by: Tyler Retzlaff
---
doc/guides/nics/ark.rst | 4 ++--
doc/guides/prog_guide/packet_classif_access_ctrl.rst | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index a9f6d4cdb8..6aabde2ed5 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -172,10 +172,10 @@ during RX from user meta data coming from FPGA hardware.
};
/* RX tuser field based on user's hardware */
- struct user_rx_meta {
+ struct __rte_packed_begin user_rx_meta {
uint64_t timestamp;
uint32_t rss;
- } __rte_packed;
+ } __rte_packed_end;
/* Create ark_user_extension object for use in other hook functions */
void *rte_pmd_ark_dev_init(struct rte_eth_dev * dev,
diff --git a/doc/guides/prog_guide/packet_classif_access_ctrl.rst
b/doc/guides/prog_guide/packet_classif_access_ctrl.rst
index c8844d0616..e2cd60fb47 100644
--- a/doc/guides/prog_guide/packet_classif_access_ctrl.rst
+++ b/doc/guides/prog_guide/packet_classif_access_ctrl.rst
@@ -154,14 +154,14 @@ To define classification for the IPv6 2-tuple: o
.. code-block:: c
-struct rte_ipv6_hdr {
+struct __rte_packed_begin rte_ipv6_hdr {
uint32_t vtc_flow; /* IP version, traffic class & flow label. */
uint16_t payload_len; /* IP packet length - includes
sizeof(ip_header). */
uint8_t proto; /* Protocol, next header. */
uint8_t hop_limits;/* Hop limits. */
uint8_t src_addr[16]; /* IP address of source host. */
uint8_t dst_addr[16]; /* IP address of destination host(s). */
-} __rte_packed;
+} __rte_packed_end;
The following array of field definitions can be used:
--
2.47.0.vfs.0.3
[PATCH v11 06/30] drivers/baseband: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retlzaff
---
drivers/baseband/acc/acc_common.h | 52 +--
drivers/baseband/fpga_5gnr_fec/agx100_pmd.h | 16 +++---
.../baseband/fpga_5gnr_fec/fpga_5gnr_fec.h| 4 +-
drivers/baseband/fpga_5gnr_fec/vc_5gnr_pmd.h | 8 +--
drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 12 ++---
drivers/baseband/la12xx/bbdev_la12xx_ipc.h| 32 ++--
6 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/drivers/baseband/acc/acc_common.h
b/drivers/baseband/acc/acc_common.h
index bf218332be..a49b154a0c 100644
--- a/drivers/baseband/acc/acc_common.h
+++ b/drivers/baseband/acc/acc_common.h
@@ -160,7 +160,7 @@ extern int acc_common_logtype;
RTE_LOG_LINE(level, ACC_COMMON, __VA_ARGS__)
/* ACC100 DMA Descriptor triplet */
-struct acc_dma_triplet {
+struct __rte_packed_begin acc_dma_triplet {
uint64_t address;
uint32_t blen:20,
res0:4,
@@ -168,7 +168,7 @@ struct acc_dma_triplet {
dma_ext:1,
res1:2,
blkid:4;
-} __rte_packed;
+} __rte_packed_end;
/* ACC100 Queue Manager Enqueue PCI Register */
@@ -183,7 +183,7 @@ union acc_enqueue_reg_fmt {
};
/* FEC 4G Uplink Frame Control Word */
-struct __rte_packed acc_fcw_td {
+struct __rte_packed_begin acc_fcw_td {
uint8_t fcw_ver:4,
num_maps:4; /* Unused in ACC100 */
uint8_t filler:6, /* Unused in ACC100 */
@@ -220,10 +220,10 @@ struct __rte_packed acc_fcw_td {
rsrvd4:10;
};
};
-};
+} __rte_packed_end;
/* FEC 4G Downlink Frame Control Word */
-struct __rte_packed acc_fcw_te {
+struct __rte_packed_begin acc_fcw_te {
uint16_t k_neg;
uint16_t k_pos;
uint8_t c_neg;
@@ -251,10 +251,10 @@ struct __rte_packed acc_fcw_te {
uint8_t code_block_mode:1,
rsrvd8:7;
uint64_t rsrvd9;
-};
+} __rte_packed_end;
/* FEC 5GNR Downlink Frame Control Word */
-struct __rte_packed acc_fcw_le {
+struct __rte_packed_begin acc_fcw_le {
uint32_t FCWversion:4,
qm:4,
nfiller:11,
@@ -279,10 +279,10 @@ struct __rte_packed acc_fcw_le {
uint32_t res6;
uint32_t res7;
uint32_t res8;
-};
+} __rte_packed_end;
/* FEC 5GNR Uplink Frame Control Word */
-struct __rte_packed acc_fcw_ld {
+struct __rte_packed_begin acc_fcw_ld {
uint32_t FCWversion:4,
qm:4,
nfiller:11,
@@ -326,10 +326,10 @@ struct __rte_packed acc_fcw_ld {
tb_crc_select:2, /* Not supported in ACC100 */
dec_llrclip:2, /* Not supported in VRB1 */
tb_trailer_size:20; /* Not supported in ACC100 */
-};
+} __rte_packed_end;
/* FFT Frame Control Word */
-struct __rte_packed acc_fcw_fft {
+struct __rte_packed_begin acc_fcw_fft {
uint32_t in_frame_size:16,
leading_pad_size:16;
uint32_t out_frame_size:16,
@@ -351,10 +351,10 @@ struct __rte_packed acc_fcw_fft {
power_shift:4,
power_en:1,
res:19;
-};
+} __rte_packed_end;
/* FFT Frame Control Word. */
-struct __rte_packed acc_fcw_fft_3 {
+struct __rte_packed_begin acc_fcw_fft_3 {
uint32_t in_frame_size:16,
leading_pad_size:16;
uint32_t out_frame_size:16,
@@ -381,11 +381,11 @@ struct __rte_packed acc_fcw_fft_3 {
uint16_t cs_theta_0[ACC_MAX_CS];
uint32_t cs_theta_d[ACC_MAX_CS];
int8_t cs_time_offset[ACC_MAX_CS];
-};
+} __rte_packed_end;
/* MLD-TS Frame Control Word */
-struct __rte_packed acc_fcw_mldts {
+struct __rte_packed_begin acc_fcw_mldts {
uint32_t fcw_version:4,
res0:12,
nrb:13, /* 1 to 1925 */
@@ -409,7 +409,7 @@ struct __rte_packed acc_fcw_mldts {
uint32_t pad2;
uint32_t pad3;
uint32_t pad4;
-};
+} __rte_packed_end;
/* DMA Response Descriptor */
union acc_dma_rsp_desc {
@@ -435,7 +435,7 @@ union acc_dma_rsp_desc {
};
/* DMA Request Descriptor */
-struct __rte_packed acc_dma_req_desc {
+struct __rte_packed_begin acc_dma_req_desc {
union {
struct{
uint32_t type:4,
@@ -496,7 +496,7 @@ struct __rte_packed acc_dma_req_desc {
};
uint64_t pad3[ACC_DMA_DESC_PADDINGS]; /* pad to 64 bits */
};
-};
+} __rte_packed_end;
/* ACC100 DMA Descriptor */
union acc_dma_desc {
@@ -506,7 +506,7 @@ union acc_dma_desc {
[PATCH v11 00/30] fix packing of structs when building with MSVC
MSVC struct packing is not compatible with GCC. Different alternatives were considered: 1) Have a macro __RTE_PACKED(decl) to which the struct/union is passed and the macro would define the struct/union with the appropriate packing attribute for the compiler in use. Advantages: * Can be placed in front of a struct, or even in the middle. Good for readability. * Does not require a different macro to be placed at the end of the structure. However, problems can arise when compiler directives are present in the struct, as they become arguments for __RTE_PACKED macro. This is not portable. Two problematic situations observed in the DPDK code: a) #defines mentioned in the struct. In this situation we could just move the #define out of the struct. b) #if/#ifdef/#elif mentioned in the struct. This is a somewhat common pattern in structs where fields change based on endianness and would require code duplication to be handled, which makes the code hard to read and maintain. 2) Have macros __rte_msvc_pack_begin and __rte_msvc_pack_end which would be placed at the beginning and end of the struct/union respectively. Concerns were raised about having macros for specific compilers, or even having compiler names mentioned in the macros' names. 3) Instead of providing macros exclusively for MSVC and for GCC, have a macro __rte_packed_begin and __rte_packed_end which would be placed at the beginning and end of the struct/union respectively. With MSVC both macros end up having a purpose. With GCC and Clang only __rte_packed_end has a purpose, as can be seen below. This makes the solution generic and is the approach taken in this patchset. #ifdef RTE_TOOLCHAIN_MSVC #define __rte_packed_begin __pragma(pack(push, 1)) #define __rte_packed_end __pragma(pack(pop)) #else #define __rte_packed_begin #define __rte_packed_end __attribute__((__packed__)) #endif Macro __rte_packed_end is deliberately utilized to trigger a MSVC compiler warning if no existing packing has been pushed allowing easy identification of locations where the __rte_packed_begin is missing. Macro __rte_packed is marked deprecated and the two new macros represent the new way to enable packing in the DPDK code. Script checkpatches.sh was enhanced to ensure that: * __rte_packed_begin and __rte_packed_end show up in pairs. * __rte_packed_begin is not used with enums. * __rte_packed_begin is only used after struct, union, __rte_cache_aligned, __rte_cache_min_aligned or __rte_aligned v11: * removed lib/ prefix from commit titles v10: * added a note to commit message on patch 27/30 about storage size change for variables of type enum rte_ipv6_mc_scope. v9: * moved the deprecation of __rte_packed to the end of the patchset v8: * moved __rte_packed_begin after the struct and union keywords * added more packing related tests to checkpatches.sh v7: * added __rte_packed back but marked it deprecated v6: * replace __rte_msvc_pack with __rte_packed_begin * replace __rte_packed with __rte_packed_end * update checkpatches.sh to ensure __rte_packed_begin and __rte_packed_end are used in pairs * remove __rte_packed v5: * rebase on top of latest main v4: * add another missing __rte_msvc_pack to crypto/mlx5 patch * correct commit message for duplicated packing in crypto/mlx5 patch v3: * add missing __rte_msvc_pack to crypto/mlx5 * fix commit messages to reference __rte_msvc_pack macro instead of __rte_msvc_pushpack(1) v2: * app/testpmd, remove packing from simple_gre_hdr * net/iavf, remove packing from iavf_ipsec_crypto_pkt_metadata, simple_gre_hdr * examples, remove packing from pkt_key_qinq, pkt_key_ipv4_5tuple, pkt_key_ipv6_5tuple, pkt_key_ipv4_addr, pkt_key_ipv6_addr * eal, remove packing from rte_config, __rte_trace_stream_header Andre Muezerie (30): devtools: check packed attributes eal/include: add new packing macros app/test-pmd: remove unnecessary packed attributes app/test: replace packed attributes doc/guides: replace packed attributes drivers/baseband: replace packed attributes drivers/bus: replace packed attributes drivers/common: replace packed attributes drivers/compress: replace packed attributes drivers/crypto: replace packed attributes drivers/dma: replace packed attributes drivers/event: replace packed attributes drivers/mempool: replace packed attributes drivers/net: replace packed attributes drivers/raw: replace packed attributes drivers/regex: replace packed attributes drivers/vdpa: replace packed attributes examples/common: replace packed attributes examples/ip-pipeline: remove packed attributes examples/ipsec_secgw: replace packed attributes examples/l3fwd-power: replace packed attributes examples/l3fwd: replace packed attributes examples/ptpclient: replace packed attributes examples/vhost_blk: replace packed attributes eal: repla
[PATCH v11 11/30] drivers/dma: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/dma/dpaa/dpaa_qdma.h| 20 ++--
drivers/dma/dpaa2/dpaa2_qdma.h | 16
drivers/dma/ioat/ioat_hw_defs.h | 4 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/dma/dpaa/dpaa_qdma.h b/drivers/dma/dpaa/dpaa_qdma.h
index 91eaf1455a..0b08909221 100644
--- a/drivers/dma/dpaa/dpaa_qdma.h
+++ b/drivers/dma/dpaa/dpaa_qdma.h
@@ -119,7 +119,7 @@
(((fsl_qdma_engine)->block_offset) * (x))
/* qDMA Command Descriptor Formats */
-struct fsl_qdma_comp_cmd_desc {
+struct __rte_packed_begin fsl_qdma_comp_cmd_desc {
uint8_t status;
uint32_t rsv0:22;
uint32_t ser:1;
@@ -132,9 +132,9 @@ struct fsl_qdma_comp_cmd_desc {
uint8_t queue:3;
uint8_t rsv4:3;
uint8_t dd:2;
-} __rte_packed;
+} __rte_packed_end;
-struct fsl_qdma_comp_sg_desc {
+struct __rte_packed_begin fsl_qdma_comp_sg_desc {
uint32_t offset:13;
uint32_t rsv0:19;
uint32_t length:30;
@@ -143,9 +143,9 @@ struct fsl_qdma_comp_sg_desc {
uint32_t addr_lo;
uint8_t addr_hi;
uint32_t rsv1:24;
-} __rte_packed;
+} __rte_packed_end;
-struct fsl_qdma_sdf {
+struct __rte_packed_begin fsl_qdma_sdf {
uint32_t rsv0;
uint32_t ssd:12;
uint32_t sss:12;
@@ -160,9 +160,9 @@ struct fsl_qdma_sdf {
uint32_t sqos:3;
uint32_t ns:1;
uint32_t srttype:4;
-} __rte_packed;
+} __rte_packed_end;
-struct fsl_qdma_ddf {
+struct __rte_packed_begin fsl_qdma_ddf {
uint32_t rsv0;
uint32_t dsd:12;
uint32_t dss:12;
@@ -177,7 +177,7 @@ struct fsl_qdma_ddf {
uint32_t dqos:3;
uint32_t ns:1;
uint32_t dwttype:4;
-} __rte_packed;
+} __rte_packed_end;
struct fsl_qdma_df {
struct fsl_qdma_sdf sdf;
@@ -186,7 +186,7 @@ struct fsl_qdma_df {
#define FSL_QDMA_SG_MAX_ENTRY 64
#define FSL_QDMA_MAX_DESC_NUM (FSL_QDMA_SG_MAX_ENTRY * QDMA_QUEUE_SIZE)
-struct fsl_qdma_cmpd_ft {
+struct __rte_packed_begin fsl_qdma_cmpd_ft {
struct fsl_qdma_comp_sg_desc desc_buf;
struct fsl_qdma_comp_sg_desc desc_sbuf;
struct fsl_qdma_comp_sg_desc desc_dbuf;
@@ -197,7 +197,7 @@ struct fsl_qdma_cmpd_ft {
uint64_t phy_ssge;
uint64_t phy_dsge;
uint64_t phy_df;
-} __rte_packed;
+} __rte_packed_end;
#define FSL_QDMA_ERR_REG_STATUS_OFFSET 0xe00
diff --git a/drivers/dma/dpaa2/dpaa2_qdma.h b/drivers/dma/dpaa2/dpaa2_qdma.h
index 0fd1debaf8..e2d2eb4fa8 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma.h
+++ b/drivers/dma/dpaa2/dpaa2_qdma.h
@@ -39,7 +39,7 @@
#define DPAA2_QDMA_BMT_DISABLE 0x0
/** Source/Destination Descriptor */
-struct qdma_sdd {
+struct __rte_packed_begin qdma_sdd {
uint32_t rsv;
/** Stride configuration */
uint32_t stride;
@@ -85,7 +85,7 @@ struct qdma_sdd {
uint32_t wrttype:4;
} write_cmd;
};
-} __rte_packed;
+} __rte_packed_end;
#define QDMA_SG_FMT_SDB0x0 /* single data buffer */
#define QDMA_SG_FMT_FDS0x1 /* frame data section */
@@ -96,7 +96,7 @@ struct qdma_sdd {
#define QDMA_SG_BMT_ENABLE DPAA2_QDMA_BMT_ENABLE
#define QDMA_SG_BMT_DISABLE DPAA2_QDMA_BMT_DISABLE
-struct qdma_sg_entry {
+struct __rte_packed_begin qdma_sg_entry {
uint32_t addr_lo; /* address 0:31 */
uint32_t addr_hi:17;/* address 32:48 */
uint32_t rsv:15;
@@ -122,7 +122,7 @@ struct qdma_sg_entry {
uint32_t f:1;
} ctrl;
};
-} __rte_packed;
+} __rte_packed_end;
struct dpaa2_qdma_rbp {
uint32_t use_ultrashort:1;
@@ -213,19 +213,19 @@ enum {
DPAA2_QDMA_MAX_SDD
};
-struct qdma_cntx_fle_sdd {
+struct __rte_packed_begin qdma_cntx_fle_sdd {
struct qbman_fle fle[DPAA2_QDMA_MAX_FLE];
struct qdma_sdd sdd[DPAA2_QDMA_MAX_SDD];
-} __rte_packed;
+} __rte_packed_end;
-struct qdma_cntx_sg {
+struct __rte_packed_begin qdma_cntx_sg {
struct qdma_cntx_fle_sdd fle_sdd;
struct qdma_sg_entry sg_src_entry[RTE_DPAAX_QDMA_JOB_SUBMIT_MAX];
struct qdma_sg_entry sg_dst_entry[RTE_DPAAX_QDMA_JOB_SUBMIT_MAX];
uint16_t cntx_idx[RTE_DPAAX_QDMA_JOB_SUBMIT_MAX];
uint16_t job_nb;
uint16_t rsv[3];
-} __rte_packed;
+} __rte_packed_end;
#define DPAA2_QDMA_IDXADDR_FROM_SG_FLAG(flag) \
((void *)(uintptr_t)((flag) - ((flag) &
RTE_DPAAX_QDMA_SG_IDX_ADDR_MASK)))
diff --git a/drivers/dma/ioat/ioat_hw_defs.h b/d
[PATCH v11 09/30] drivers/compress: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/compress/qat/qat_comp.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h
index 1da4770b1c..18d5fd4b02 100644
--- a/drivers/compress/qat/qat_comp.h
+++ b/drivers/compress/qat/qat_comp.h
@@ -50,10 +50,10 @@ struct array_of_ptrs {
phys_addr_t pointer[0];
};
-struct __rte_cache_aligned qat_inter_sgl {
+struct __rte_cache_aligned __rte_packed_begin qat_inter_sgl {
qat_sgl_hdr;
struct qat_flat_buf buffers[QAT_NUM_BUFS_IN_IM_SGL];
-} __rte_packed;
+} __rte_packed_end;
struct qat_comp_op_cookie {
--
2.47.0.vfs.0.3
[PATCH v11 04/30] app/test: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
app/test/test_efd.c| 4 ++--
app/test/test_hash.c | 4 ++--
app/test/test_member.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index 1c0986b9bc..4a4379c563 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -33,13 +33,13 @@ test_efd(void)
static unsigned int test_socket_id;
/* 5-tuple key type */
-struct flow_key {
+struct __rte_packed_begin flow_key {
uint32_t ip_src;
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
RTE_LOG_REGISTER(efd_logtype_test, test.efd, INFO);
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 65b9cad93c..6b5ef2d1e5 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -79,13 +79,13 @@ static uint32_t hashtest_key_lens[] = {0, 2, 4, 5, 6, 7, 8,
10, 11, 15, 16, 21,
* Should be packed to avoid holes with potentially
* undefined content in the middle.
*/
-struct flow_key {
+struct __rte_packed_begin flow_key {
uint32_t ip_src;
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
uint32_t proto;
-} __rte_packed;
+} __rte_packed_end;
/*
* Hash function that always returns the same value, to easily test what
diff --git a/app/test/test_member.c b/app/test/test_member.c
index 5a4d2750db..a93787a10c 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -32,13 +32,13 @@ struct rte_member_setsum *setsum_vbf;
struct rte_member_setsum *setsum_sketch;
/* 5-tuple key type */
-struct flow_key {
+struct __rte_packed_begin flow_key {
uint32_t ip_src;
uint32_t ip_dst;
uint16_t port_src;
uint16_t port_dst;
uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
/* Set ID Macros for multimatch test usage */
#define M_MATCH_S 1/* Not start with 0 since by default 0 means no match */
--
2.47.0.vfs.0.3
[PATCH v11 01/30] devtools: check packed attributes
Ensure __rte_packed_begin and __rte_packed_end show up in pairs
when checking patches.
Signed-off-by: Andre Muezerie
Acked-by: Tyler Retzlaff
---
devtools/checkpatches.sh | 43
1 file changed, 43 insertions(+)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 4a8591be22..7868f5e522 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -202,6 +202,14 @@ check_forbidden_additions() { #
-f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
"$1" || res=1
+ # forbid use of __rte_packed_begin with enums
+ awk -v FOLDERS='lib drivers app examples' \
+ -v EXPRESSIONS='enum.*__rte_packed_begin' \
+ -v RET_ON_FAIL=1 \
+ -v MESSAGE='Using __rte_packed_begin with enum is not allowed' \
+ -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+ "$1" || res=1
+
# forbid use of experimental build flag except in examples
awk -v FOLDERS='lib drivers app' \
-v EXPRESSIONS='-DALLOW_EXPERIMENTAL_API
allow_experimental_apis' \
@@ -362,6 +370,33 @@ check_aligned_attributes() { #
return $res
}
+check_packed_attributes() { #
+ res=0
+
+ if [ $(grep -E '^\+.*__rte_packed_begin' "$1" | \
+ grep -vE '\' | \
+ grep -vE '\' | \
+ grep -vE
'\<__rte_cache_aligned[[:space:]]*__rte_packed_begin\>' | \
+ grep -vE
'\<__rte_cache_min_aligned[[:space:]]*__rte_packed_begin\>' | \
+ grep -vE
'\<__rte_aligned\(.*\)[[:space:]]*__rte_packed_begin\>' | \
+ wc -l) != 0 ]; then
+ echo "Please use __rte_packed_begin only after struct, union," \
+" __rte_cache_aligned, __rte_cache_min_aligned or
__rte_aligned."
+ res=1
+ fi
+
+ begin_count=$(grep '__rte_packed_begin' "$1" | \
+ wc -l)
+ end_count=$(grep '__rte_packed_end' "$1" | \
+ wc -l)
+ if [ $begin_count != $end_count ]; then
+ echo "__rte_packed_begin and __rte_packed_end mismatch. They
should always be used in pairs."
+ res=1
+ fi
+
+ return $res
+}
+
check_release_notes() { #
rel_notes_prefix=doc/guides/rel_notes/release_
IFS=. read year month release < VERSION
@@ -479,6 +514,14 @@ check () { #
ret=1
fi
+ ! $verbose || printf '\nChecking packed attributes:\n'
+ report=$(check_packed_attributes "$tmpinput")
+ if [ $? -ne 0 ] ; then
+ $headline_printed || print_headline "$subject"
+ printf '%s\n' "$report"
+ ret=1
+ fi
+
! $verbose || printf '\nChecking release notes updates:\n'
report=$(check_release_notes "$tmpinput")
if [ $? -ne 0 ] ; then
--
2.47.0.vfs.0.3
[PATCH v11 27/30] net: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
This change affects the storage size of a variable of enum
rte_ipv6_mc_scope (at least with gcc). It should be OK from an ABI POV
though: there is one (inline) helper using this type, and nothing else
in DPDK takes a IPv6 multicast scope as input.
Signed-off-by: Andre Muezerie
---
lib/net/rte_arp.h | 8
lib/net/rte_dtls.h | 4 ++--
lib/net/rte_esp.h | 8
lib/net/rte_geneve.h | 4 ++--
lib/net/rte_gre.h | 16
lib/net/rte_gtp.h | 20 ++--
lib/net/rte_ib.h | 4 ++--
lib/net/rte_icmp.h | 12 ++--
lib/net/rte_ip4.h | 4 ++--
lib/net/rte_ip6.h | 14 +++---
lib/net/rte_l2tpv2.h | 16
lib/net/rte_macsec.h | 8
lib/net/rte_mpls.h | 4 ++--
lib/net/rte_pdcp_hdr.h | 16
lib/net/rte_ppp.h | 4 ++--
lib/net/rte_sctp.h | 4 ++--
lib/net/rte_tcp.h | 4 ++--
lib/net/rte_tls.h | 4 ++--
lib/net/rte_udp.h | 4 ++--
lib/net/rte_vxlan.h| 28 ++--
20 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/lib/net/rte_arp.h b/lib/net/rte_arp.h
index 668cea1704..e885a71292 100644
--- a/lib/net/rte_arp.h
+++ b/lib/net/rte_arp.h
@@ -21,17 +21,17 @@ extern "C" {
/**
* ARP header IPv4 payload.
*/
-struct __rte_aligned(2) rte_arp_ipv4 {
+struct __rte_aligned(2) __rte_packed_begin rte_arp_ipv4 {
struct rte_ether_addr arp_sha; /**< sender hardware address */
rte_be32_tarp_sip; /**< sender IP address */
struct rte_ether_addr arp_tha; /**< target hardware address */
rte_be32_tarp_tip; /**< target IP address */
-} __rte_packed;
+} __rte_packed_end;
/**
* ARP header.
*/
-struct __rte_aligned(2) rte_arp_hdr {
+struct __rte_aligned(2) __rte_packed_begin rte_arp_hdr {
rte_be16_t arp_hardware; /**< format of hardware address */
#define RTE_ARP_HRD_ETHER 1 /**< ARP Ethernet address format */
@@ -47,7 +47,7 @@ struct __rte_aligned(2) rte_arp_hdr {
#defineRTE_ARP_OP_INVREPLY 9 /**< response identifying peer */
struct rte_arp_ipv4 arp_data;
-} __rte_packed;
+} __rte_packed_end;
/**
* Make a RARP packet based on MAC addr.
diff --git a/lib/net/rte_dtls.h b/lib/net/rte_dtls.h
index 246cd8a72d..1dd95ce899 100644
--- a/lib/net/rte_dtls.h
+++ b/lib/net/rte_dtls.h
@@ -30,7 +30,7 @@
* DTLS Header
*/
__extension__
-struct rte_dtls_hdr {
+struct __rte_packed_begin rte_dtls_hdr {
/** Content type of DTLS packet. Defined as RTE_DTLS_TYPE_*. */
uint8_t type;
/** DTLS Version defined as RTE_DTLS_VERSION*. */
@@ -48,6 +48,6 @@ struct rte_dtls_hdr {
#endif
/** The length (in bytes) of the following DTLS packet. */
rte_be16_t length;
-} __rte_packed;
+} __rte_packed_end;
#endif /* RTE_DTLS_H */
diff --git a/lib/net/rte_esp.h b/lib/net/rte_esp.h
index 745a9847fe..2a0002f4d9 100644
--- a/lib/net/rte_esp.h
+++ b/lib/net/rte_esp.h
@@ -16,17 +16,17 @@
/**
* ESP Header
*/
-struct rte_esp_hdr {
+struct __rte_packed_begin rte_esp_hdr {
rte_be32_t spi; /**< Security Parameters Index */
rte_be32_t seq; /**< packet sequence number */
-} __rte_packed;
+} __rte_packed_end;
/**
* ESP Trailer
*/
-struct rte_esp_tail {
+struct __rte_packed_begin rte_esp_tail {
uint8_t pad_len; /**< number of pad bytes (0-255) */
uint8_t next_proto; /**< IPv4 or IPv6 or next layer header */
-} __rte_packed;
+} __rte_packed_end;
#endif /* RTE_ESP_H_ */
diff --git a/lib/net/rte_geneve.h b/lib/net/rte_geneve.h
index eb2c85f1e9..f962c587ee 100644
--- a/lib/net/rte_geneve.h
+++ b/lib/net/rte_geneve.h
@@ -34,7 +34,7 @@
* More-bits (optional) variable length options.
*/
__extension__
-struct rte_geneve_hdr {
+struct __rte_packed_begin rte_geneve_hdr {
#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
uint8_t ver:2; /**< Version. */
uint8_t opt_len:6; /**< Options length. */
@@ -52,7 +52,7 @@ struct rte_geneve_hdr {
uint8_t vni[3]; /**< Virtual network identifier. */
uint8_t reserved2; /**< Reserved. */
uint32_t opts[];/**< Variable length options. */
-} __rte_packed;
+} __rte_packed_end;
/* GENEVE ETH next protocol types */
#define RTE_GENEVE_TYPE_ETH0x6558 /**< Ethernet Protocol. */
diff --git a/lib/net/rte_gre.h b/lib/net/rte_gre.h
index 1483e1b42d..768c4ce7b5 100644
--- a/lib/net/rte_gre.h
+++ b/lib/net/rte_gre.h
@@ -23,7 +23,7 @@
* GRE Header
*/
__e
RE: [PATCH] doc: document hash RSS limitations with CQE zipping
> -Original Message- > From: Alexander Kozyrev > Sent: Thursday, January 9, 2025 23:34 > To: dev@dpdk.org > Cc: Raslan Darawsheh ; Slava Ovsiienko > ; Dariusz Sosnowski ; > Bing Zhao ; Suanming Mou > Subject: [PATCH] doc: document hash RSS limitations with CQE zipping > > RSS hash is only fully supported when the Hash RSS format is selected. > Update MLX5 documentation about lack of RTE_MBUF_F_RX_RSS_HASH flag > for some packets in case of any other CQE compression format is configured. > > Signed-off-by: Alexander Kozyrev Acked-by: Dariusz Sosnowski Best regards, Dariusz Sosnowski
Re: [PATCH v4] vhost/user: clear ring addresses when getting vring base
On 11/27/24 3:03 AM, Jianping Zhao wrote:
Clear ring addresses during vring base retrieval to handle guest reboot
scenarios correctly. This is particularly important for vdpa-blk devices
where the following issue occurs:
When a guest OS with vdpa-blk device reboots, during UEFI stage, only
one vring is actually used and configured. However, QEMU still sends
enable messages for all configured queues. The remaining queues retain
their addresses from before reboot, which reference invalid memory
mappings in the rebooted guest.
The issue manifests in vq_is_ready():
static bool
vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
{
/* Only checks pointer validity, not address freshness */
rings_ok = vq->desc && vq->avail && vq->used;
...
}
vq_is_ready() incorrectly considers these queues as ready because it
only checks if desc/avail/used pointers are non-NULL, but cannot
detect that these addresses are stale from the previous boot.
Clear the ring addresses in vhost_user_get_vring_base() to force
the guest driver to reconfigure them before use. This ensures that
vq_is_ready() will return false for queues with stale addresses
until they are properly reconfigured by the guest driver.
Fixes: 3ea7052f4b1b ("vhost: postpone rings addresses translation")
Signed-off-by: Jianping Zhao
---
lib/vhost/vhost_user.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 6d92ad904e..52d8078d7c 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2277,6 +2277,7 @@ vhost_user_get_vring_base(struct virtio_net **pdev,
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
+ memset(&vq->ring_addrs, 0, sizeof(struct vhost_vring_addr));
rte_rwlock_write_unlock(&vq->access_lock);
return RTE_VHOST_MSG_RESULT_REPLY;
Reviewed-by: Maxime Coquelin
Thanks,
Maxime
Re: [PATCH v3 0/2] dts: add softnic test
Reviewed-by: Luca Vizzarro
Re: [PATCH] vhost: fix misleading log when setting max queue num
On 09/01/2025 14:31, Maxime Coquelin wrote:
> rte_vhost_driver_set_max_queue_num API returns early when
> called for a Vhost-user device, as this API is intended to
> limit the maximum number of queue pairs supported by VDUSE
> devices. However, a log mentioning the maximim number of
> queue pairs is being set is emitted unconditionally, which
> may confuse the end user.
>
> This patch moves this log after the backend type is
> checked, so that it is only called with VDUSE backends.
> The check on the requested value is also moved at the same
> place.
>
> Fixes: e1808999d36b ("vhost: restrict set max queue pair API to VDUSE")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Maxime Coquelin
> ---
> lib/vhost/socket.c | 16 +---
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
Thanks, this will make it easier for vhost-user users. One nit below,
Acked-by: Kevin Traynor
> diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
> index d29d15494c..07247907b0 100644
> --- a/lib/vhost/socket.c
> +++ b/lib/vhost/socket.c
> @@ -844,13 +844,6 @@ rte_vhost_driver_set_max_queue_num(const char *path,
> uint32_t max_queue_pairs)
> struct vhost_user_socket *vsocket;
> int ret = 0;
>
> - VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u",
> max_queue_pairs);
> -
> - if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) {
> - VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u
> queue pairs",
> - VHOST_MAX_QUEUE_PAIRS);
> - return -1;
> - }
>
you can remove the extra blank line here
> pthread_mutex_lock(&vhost_user.mutex);
> vsocket = find_vhost_user_socket(path);
> @@ -872,6 +865,15 @@ rte_vhost_driver_set_max_queue_num(const char *path,
> uint32_t max_queue_pairs)
> goto unlock_exit;
> }
>
> + VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u",
> max_queue_pairs);
> +
> + if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) {
> + VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u
> queue pairs",
> + VHOST_MAX_QUEUE_PAIRS);
> + ret = -1;
> + goto unlock_exit;
> + }
> +
> vsocket->max_queue_pairs = max_queue_pairs;
>
> unlock_exit:
RE: [PATCH v13 00/21] remove use of VLAs for Windows
> On Wed, Jan 08, 2025 at 01:30:13PM +, Konstantin Ananyev wrote: > > > > > > > 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. > > > > > > v13: > > > * increase stack allocated buffer size in > > > ipv4_reassembly_interleaved_flows_perf and > > > ipv6_reassembly_interleaved_flows_perf to avoid > > > STATUS_STACK_BUFFER_OVERRUN on Windows using MSVC > > > > > > v12: > > > * update commit message for patch 06/21 to avoid warning > > > > > > v11: > > > * add include stdlib.h for alloca() declaration on FreeBSD > > > * zero-initialize array without code loop > > > * increase maximum tuple length > > > > > > v10: > > > * add ifdef to scope gcc's diagnostic error down to gcc only > > > > > > v9: > > > * fix sender's email address > > > * fix gcc's diagnostic error string to make clang happy > > > > > > v8: > > > * rebase > > > * reduce scope for disabling error "-Warray-bounds=" to only > > >the place that needs it > > > * remove parentesis around numbers from defines in test_bitset.c > > > > > > v7: > > > * remove use of VLA from new file which sneaked in during review > > > > > > v6: > > > * remove use of VLA from new test code added recently > > > * fix title for patch 08/20 > > > > > > v5: > > > * add patches for net/ice, net/ixgbe and gro > > >from Konstantin Ananyev from > > > https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=* > > > * address debug_autotest ASan failure > > > * address array-bound error in bitset_autotest with gcc-13 > > > > > > v4: > > > * rebase and adapt for changes made in main since v3 was sent > > > * use fixed maximum array size instead of VLA when doable > > > > > > v3: > > > * address checkpatch/check git log warnings (minor typos) > > > > > > v2: > > > * replace patches for ethdev, hash, rcu and include new > > >patches for eal from Konstantin Ananyev > > >from https://patchwork.dpdk.org/project/dpdk/list/?series=31781 > > > > > > Andre Muezerie (3): > > > test: remove use of VLAs for Windows built code in bitset tests > > > app/testpmd: remove use of VLAs for Windows built code in > > > shared_rxq_fwd > > > hash: remove use of VLAs by using standard arrays > > > > > > 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 > > > > > > -- > > > > Series-Acked-by: Konstantin Ananyev > > > > One extra thing I would like to suggest: can we for each lib/driver/app/etc. > > we made VLA free add an '-Wvla' option into corresponding meson.build? > > To prevent people re-introducing VLA code. > > > > > 2.47.0.vfs.0.3 > > > > Yes, I'll do so. It will add many small patches to the patchset though. I > hope that is fine. That's ok with me, hope tree maintainers will not complain too. Another possible option - combine it with particular lib changes, i.e. patch that fixing VLA usage in lib/hash can also enable -Wvla for it, and so on.
[PATCH] examples/l3fwd: add option to set refetch offset
The prefetch window depending on the HW platform. It is difficult to
measure the prefetch window of a HW platform. Therefore, the prefetch
offset option is added to change the prefetch window. User can adjust
the refetch offset to achieve the best prefetch effect.
In addition, this option is used only in the main loop.
Signed-off-by: Dengdui Huang
---
examples/l3fwd/l3fwd.h | 6 ++-
examples/l3fwd/l3fwd_acl_scalar.h| 6 +--
examples/l3fwd/l3fwd_em.h| 18 -
examples/l3fwd/l3fwd_em_hlm.h| 9 +++--
examples/l3fwd/l3fwd_em_sequential.h | 60
examples/l3fwd/l3fwd_fib.c | 21 +-
examples/l3fwd/l3fwd_lpm.h | 6 +--
examples/l3fwd/l3fwd_lpm_neon.h | 45 -
examples/l3fwd/main.c| 14 +++
9 files changed, 91 insertions(+), 94 deletions(-)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index 0cce3406ee..2272fb2870 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -39,8 +39,7 @@
#define NB_SOCKETS8
-/* Configure how many packets ahead to prefetch, when reading packets */
-#define PREFETCH_OFFSET 3
+#define DEFAULT_PREFECH_OFFSET 4
/* Used to mark destination port as 'invalid'. */
#defineBAD_PORT ((uint16_t)-1)
@@ -119,6 +118,9 @@ extern uint32_t max_pkt_len;
extern uint32_t nb_pkt_per_burst;
extern uint32_t mb_mempool_cache_size;
+/* Prefetch offset of packets processed by the main loop. */
+extern uint16_t prefetch_offset;
+
/* Send burst of packets on an output interface */
static inline int
send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
diff --git a/examples/l3fwd/l3fwd_acl_scalar.h
b/examples/l3fwd/l3fwd_acl_scalar.h
index cb22bb49aa..d00730ff25 100644
--- a/examples/l3fwd/l3fwd_acl_scalar.h
+++ b/examples/l3fwd/l3fwd_acl_scalar.h
@@ -72,14 +72,14 @@ l3fwd_acl_prepare_acl_parameter(struct rte_mbuf **pkts_in,
struct acl_search_t *
acl->num_ipv6 = 0;
/* Prefetch first packets */
- for (i = 0; i < PREFETCH_OFFSET && i < nb_rx; i++) {
+ for (i = 0; i < prefetch_offset && i < nb_rx; i++) {
rte_prefetch0(rte_pktmbuf_mtod(
pkts_in[i], void *));
}
- for (i = 0; i < (nb_rx - PREFETCH_OFFSET); i++) {
+ for (i = 0; i < (nb_rx - prefetch_offset); i++) {
rte_prefetch0(rte_pktmbuf_mtod(pkts_in[
- i + PREFETCH_OFFSET], void *));
+ i + prefetch_offset], void *));
l3fwd_acl_prepare_one_packet(pkts_in, acl, i);
}
diff --git a/examples/l3fwd/l3fwd_em.h b/examples/l3fwd/l3fwd_em.h
index 1fee2e2e6c..3ef32c9053 100644
--- a/examples/l3fwd/l3fwd_em.h
+++ b/examples/l3fwd/l3fwd_em.h
@@ -132,16 +132,16 @@ l3fwd_em_no_opt_send_packets(int nb_rx, struct rte_mbuf
**pkts_burst,
int32_t j;
/* Prefetch first packets */
- for (j = 0; j < PREFETCH_OFFSET && j < nb_rx; j++)
+ for (j = 0; j < prefetch_offset && j < nb_rx; j++)
rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[j], void *));
/*
* Prefetch and forward already prefetched
* packets.
*/
- for (j = 0; j < (nb_rx - PREFETCH_OFFSET); j++) {
+ for (j = 0; j < (nb_rx - prefetch_offset); j++) {
rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[
- j + PREFETCH_OFFSET], void *));
+ j + prefetch_offset], void *));
l3fwd_em_simple_forward(pkts_burst[j], portid, qconf);
}
@@ -161,16 +161,16 @@ l3fwd_em_no_opt_process_events(int nb_rx, struct
rte_event **events,
int32_t j;
/* Prefetch first packets */
- for (j = 0; j < PREFETCH_OFFSET && j < nb_rx; j++)
+ for (j = 0; j < prefetch_offset && j < nb_rx; j++)
rte_prefetch0(rte_pktmbuf_mtod(events[j]->mbuf, void *));
/*
* Prefetch and forward already prefetched
* packets.
*/
- for (j = 0; j < (nb_rx - PREFETCH_OFFSET); j++) {
+ for (j = 0; j < (nb_rx - prefetch_offset); j++) {
rte_prefetch0(rte_pktmbuf_mtod(events[
- j + PREFETCH_OFFSET]->mbuf, void *));
+ j + prefetch_offset]->mbuf, void *));
l3fwd_em_simple_process(events[j]->mbuf, qconf);
}
@@ -188,15 +188,15 @@ l3fwd_em_no_opt_process_event_vector(struct
rte_event_vector *vec,
int32_t i;
/* Prefetch first packets */
- for (i = 0; i < PREFETCH_OFFSET && i < vec->nb_elem; i++)
+ for (i = 0; i < prefetch_offset && i < vec->nb_elem; i++)
rte_prefetch0(rte_pktmbuf_mtod(mbufs[i], void *));
/*
* Prefetch and forward already prefetched packets.
*/
- for (i = 0; i < (vec->nb_elem - PREFETCH_OFFSET); i++) {
+ f
Re: [PATCH] vhost: fix misleading log when setting max queue num
Hi Maxime,
> On Jan 9, 2025, at 22:31, Maxime Coquelin wrote:
>
> External email: Use caution opening links or attachments
>
>
> rte_vhost_driver_set_max_queue_num API returns early when
> called for a Vhost-user device, as this API is intended to
> limit the maximum number of queue pairs supported by VDUSE
> devices. However, a log mentioning the maximim number of
maximum
With above fixed:
Reviewed-by: Chenbo Xia
> queue pairs is being set is emitted unconditionally, which
> may confuse the end user.
>
> This patch moves this log after the backend type is
> checked, so that it is only called with VDUSE backends.
> The check on the requested value is also moved at the same
> place.
>
> Fixes: e1808999d36b ("vhost: restrict set max queue pair API to VDUSE")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Maxime Coquelin
> ---
> lib/vhost/socket.c | 16 +---
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
> index d29d15494c..07247907b0 100644
> --- a/lib/vhost/socket.c
> +++ b/lib/vhost/socket.c
> @@ -844,13 +844,6 @@ rte_vhost_driver_set_max_queue_num(const char *path,
> uint32_t max_queue_pairs)
>struct vhost_user_socket *vsocket;
>int ret = 0;
>
> - VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u",
> max_queue_pairs);
> -
> - if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) {
> - VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u
> queue pairs",
> - VHOST_MAX_QUEUE_PAIRS);
> - return -1;
> - }
>
>pthread_mutex_lock(&vhost_user.mutex);
>vsocket = find_vhost_user_socket(path);
> @@ -872,6 +865,15 @@ rte_vhost_driver_set_max_queue_num(const char *path,
> uint32_t max_queue_pairs)
>goto unlock_exit;
>}
>
> + VHOST_CONFIG_LOG(path, INFO, "Setting max queue pairs to %u",
> max_queue_pairs);
> +
> + if (max_queue_pairs > VHOST_MAX_QUEUE_PAIRS) {
> + VHOST_CONFIG_LOG(path, ERR, "Library only supports up to %u
> queue pairs",
> + VHOST_MAX_QUEUE_PAIRS);
> + ret = -1;
> + goto unlock_exit;
> + }
> +
>vsocket->max_queue_pairs = max_queue_pairs;
>
> unlock_exit:
> --
> 2.47.1
>
[PATCH v11 13/30] drivers/mempool: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/mempool/octeontx/octeontx_fpavf.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c
b/drivers/mempool/octeontx/octeontx_fpavf.c
index 966fee8bfe..6cd0fc057f 100644
--- a/drivers/mempool/octeontx/octeontx_fpavf.c
+++ b/drivers/mempool/octeontx/octeontx_fpavf.c
@@ -46,20 +46,20 @@ struct octeontx_mbox_fpa_cfg {
uint64_taura_cfg;
};
-struct __rte_packed gen_req {
+struct __rte_packed_begin gen_req {
uint32_tvalue;
-};
+} __rte_packed_end;
-struct __rte_packed idn_req {
+struct __rte_packed_begin idn_req {
uint8_t domain_id;
-};
+} __rte_packed_end;
-struct __rte_packed gen_resp {
+struct __rte_packed_begin gen_resp {
uint16_tdomain_id;
uint16_tvfid;
-};
+} __rte_packed_end;
-struct __rte_packed dcfg_resp {
+struct __rte_packed_begin dcfg_resp {
uint8_t sso_count;
uint8_t ssow_count;
uint8_t fpa_count;
@@ -67,7 +67,7 @@ struct __rte_packed dcfg_resp {
uint8_t tim_count;
uint8_t net_port_count;
uint8_t virt_port_count;
-};
+} __rte_packed_end;
#define FPA_MAX_POOL 32
#define FPA_PF_PAGE_SZ 4096
--
2.47.0.vfs.0.3
[PATCH v11 08/30] drivers/common: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/common/cnxk/hw/sdp.h| 4 +-
drivers/common/cnxk/roc_npc.h | 16 +--
drivers/common/cnxk/roc_npc_mcam_dump.c | 4 +-
drivers/common/cnxk/roc_platform.h | 3 +-
drivers/common/dpaax/compat.h | 3 -
drivers/common/iavf/iavf_osdep.h| 8 +-
drivers/common/iavf/virtchnl_inline_ipsec.h | 44 +++
drivers/common/idpf/base/idpf_osdep.h | 8 +-
drivers/common/mlx5/mlx5_common_mr.h| 16 +--
drivers/common/mlx5/mlx5_common_utils.h | 4 +-
drivers/common/mlx5/mlx5_prm.h | 120 ++--
drivers/common/qat/qat_adf/icp_qat_fw_la.h | 8 +-
drivers/common/qat/qat_common.h | 8 +-
13 files changed, 122 insertions(+), 124 deletions(-)
diff --git a/drivers/common/cnxk/hw/sdp.h b/drivers/common/cnxk/hw/sdp.h
index 686f516097..5792f309d7 100644
--- a/drivers/common/cnxk/hw/sdp.h
+++ b/drivers/common/cnxk/hw/sdp.h
@@ -156,7 +156,7 @@
#define SDP_VF_R_OUT_INT_LEVELS_TIMET (32)
/* SDP Instruction Header */
-struct sdp_instr_ih {
+struct __plt_packed_begin sdp_instr_ih {
/* Data Len */
uint64_t tlen : 16;
@@ -177,6 +177,6 @@ struct sdp_instr_ih {
/* Reserved2 */
uint64_t rsvd2 : 1;
-} __plt_packed;
+} __plt_packed_end;
#endif /* __SDP_HW_H_ */
diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h
index bf8c65aa9c..f7a1e5d810 100644
--- a/drivers/common/cnxk/roc_npc.h
+++ b/drivers/common/cnxk/roc_npc.h
@@ -97,10 +97,10 @@ struct roc_npc_flow_item_eth {
uint32_t reserved : 31; /**< Reserved, must be zero. */
};
-struct roc_vlan_hdr {
+struct __plt_packed_begin roc_vlan_hdr {
uint16_t vlan_tci; /**< Priority (3) + CFI (1) + Identifier Code (12) */
uint16_t eth_proto; /**< Ethernet type of encapsulated frame. */
-} __plt_packed;
+} __plt_packed_end;
struct roc_npc_flow_item_vlan {
union {
@@ -115,23 +115,23 @@ struct roc_npc_flow_item_vlan {
uint32_t reserved : 31; /**< Reserved, must be zero. */
};
-struct roc_ipv6_hdr {
+struct __plt_packed_begin roc_ipv6_hdr {
uint32_t vtc_flow;/**< IP version, traffic class & flow label. */
uint16_t payload_len; /**< IP payload size, including ext. headers */
uint8_t proto;/**< Protocol, next header. */
uint8_t hop_limits; /**< Hop limits. */
uint8_t src_addr[16]; /**< IP address of source host. */
uint8_t dst_addr[16]; /**< IP address of destination host(s). */
-} __plt_packed;
+} __plt_packed_end;
-struct roc_ipv6_fragment_ext {
+struct __plt_packed_begin roc_ipv6_fragment_ext {
uint8_t next_header; /**< Next header type */
uint8_t reserved;/**< Reserved */
uint16_t frag_data; /**< All fragmentation data */
uint32_t id; /**< Packet ID */
-} __plt_packed;
+} __plt_packed_end;
-struct roc_ipv6_routing_ext {
+struct __plt_packed_begin roc_ipv6_routing_ext {
uint8_t next_hdr; /**< Protocol, next header. */
uint8_t hdr_len;/**< Header length. */
uint8_t type; /**< Extension header type. */
@@ -145,7 +145,7 @@ struct roc_ipv6_routing_ext {
};
};
/* Next are 128-bit IPv6 address fields to describe segments. */
-} __plt_packed;
+} __plt_packed_end;
struct roc_flow_item_ipv6_ext {
uint8_t next_hdr; /**< Next header. */
diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c
b/drivers/common/cnxk/roc_npc_mcam_dump.c
index ebd2dd69c2..27a63cc92d 100644
--- a/drivers/common/cnxk/roc_npc_mcam_dump.c
+++ b/drivers/common/cnxk/roc_npc_mcam_dump.c
@@ -35,7 +35,7 @@
#define NIX_TX_VTAGACT_VTAG1_OP_MASKGENMASK(45, 44)
#define NIX_TX_VTAGACT_VTAG1_DEF_MASK GENMASK(57, 48)
-struct npc_rx_parse_nibble_s {
+struct __plt_packed_begin npc_rx_parse_nibble_s {
uint16_t chan : 3;
uint16_t errlev : 1;
uint16_t errcode : 2;
@@ -56,7 +56,7 @@ struct npc_rx_parse_nibble_s {
uint16_t lgtype : 1;
uint16_t lhflags : 2;
uint16_t lhtype : 1;
-} __plt_packed;
+} __plt_packed_end;
static const char *const intf_str[] = {
"NIX-RX",
diff --git a/drivers/common/cnxk/roc_platform.h
b/drivers/common/cnxk/roc_platform.h
index df4f88f288..d6f3ea9acc 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -97,7 +97,8 @@
#define __plt_cache_aligned __rte_cache_aligned
#define __plt_alw
[PATCH v11 20/30] examples/ipsec_secgw: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
---
examples/ipsec-secgw/ipsec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index f12f57e2d5..e3cc43ef3b 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -274,11 +274,11 @@ struct socket_ctx {
struct rte_mempool *session_pool;
};
-struct cnt_blk {
+struct __rte_packed_begin cnt_blk {
uint32_t salt;
uint64_t iv;
uint32_t cnt;
-} __rte_packed;
+} __rte_packed_end;
struct __rte_cache_aligned lcore_rx_queue {
uint16_t port_id;
--
2.47.0.vfs.0.3
[PATCH v11 17/30] drivers/vdpa: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/vdpa/ifc/base/ifcvf.h | 4 ++--
drivers/vdpa/mlx5/mlx5_vdpa.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
index 04c81c8196..0c3b8956c5 100644
--- a/drivers/vdpa/ifc/base/ifcvf.h
+++ b/drivers/vdpa/ifc/base/ifcvf.h
@@ -115,11 +115,11 @@ struct ifcvf_pci_common_cfg {
u32 queue_used_hi;
};
-struct ifcvf_net_config {
+struct __rte_packed_begin ifcvf_net_config {
u8mac[6];
u16 status;
u16 max_virtqueue_pairs;
-} __rte_packed;
+} __rte_packed_end;
struct ifcvf_pci_mem_resource {
u64 phys_addr; /**< Physical address, 0 if not resource. */
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h
index e156520172..a398aa22ce 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.h
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h
@@ -90,13 +90,13 @@ enum mlx5_vdpa_task_type {
};
/* Generic task information and size must be multiple of 4B. */
-struct __rte_aligned(4) mlx5_vdpa_task {
+struct __rte_aligned(4) __rte_packed_begin mlx5_vdpa_task {
struct mlx5_vdpa_priv *priv;
enum mlx5_vdpa_task_type type;
RTE_ATOMIC(uint32_t) *remaining_cnt;
RTE_ATOMIC(uint32_t) *err_cnt;
uint32_t idx;
-} __rte_packed;
+} __rte_packed_end;
/* Generic mlx5_vdpa_c_thread information. */
struct mlx5_vdpa_c_thread {
--
2.47.0.vfs.0.3
[PATCH v11 15/30] drivers/raw: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/raw/ifpga/afu_pmd_n3000.h| 8
drivers/raw/ifpga/base/opae_hw_api.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/raw/ifpga/afu_pmd_n3000.h
b/drivers/raw/ifpga/afu_pmd_n3000.h
index f6b6e07c6b..2c137bd14e 100644
--- a/drivers/raw/ifpga/afu_pmd_n3000.h
+++ b/drivers/raw/ifpga/afu_pmd_n3000.h
@@ -211,7 +211,7 @@ typedef union {
};
} msgdma_desc_ctrl;
-typedef struct __rte_packed {
+typedef struct __rte_packed_begin {
uint32_t rd_address;
uint32_t wr_address;
uint32_t len;
@@ -223,7 +223,7 @@ typedef struct __rte_packed {
uint32_t rd_address_ext;
uint32_t wr_address_ext;
msgdma_desc_ctrl control;
-} msgdma_ext_desc;
+} __rte_packed_end msgdma_ext_desc;
typedef union {
uint32_t csr;
@@ -279,13 +279,13 @@ typedef union {
};
} msgdma_seq_num;
-typedef struct __rte_packed {
+typedef struct __rte_packed_begin {
msgdma_status status;
msgdma_ctrl ctrl;
msgdma_fill_level fill_level;
msgdma_rsp_level rsp;
msgdma_seq_num seq_num;
-} msgdma_csr;
+} __rte_packed_end msgdma_csr;
#define CSR_STATUS(csr) (&(((msgdma_csr *)(csr))->status))
#define CSR_CONTROL(csr) (&(((msgdma_csr *)(csr))->ctrl))
diff --git a/drivers/raw/ifpga/base/opae_hw_api.h
b/drivers/raw/ifpga/base/opae_hw_api.h
index 613563a0b4..57750022dd 100644
--- a/drivers/raw/ifpga/base/opae_hw_api.h
+++ b/drivers/raw/ifpga/base/opae_hw_api.h
@@ -343,9 +343,9 @@ static inline void opae_adapter_remove_acc(struct
opae_adapter *adapter,
/* OPAE vBNG network datastruct */
#define OPAE_ETHER_ADDR_LEN 6
-struct opae_ether_addr {
+struct __rte_packed_begin opae_ether_addr {
unsigned char addr_bytes[OPAE_ETHER_ADDR_LEN];
-} __rte_packed;
+} __rte_packed_end;
/* OPAE vBNG network API*/
int opae_manager_read_mac_rom(struct opae_manager *mgr, int port,
--
2.47.0.vfs.0.3
[PATCH v11 07/30] drivers/bus: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/bus/dpaa/include/fsl_bman.h | 20 ++--
drivers/bus/dpaa/include/fsl_fman.h | 4 +-
drivers/bus/dpaa/include/fsl_qman.h | 160 +--
drivers/bus/ifpga/bus_ifpga_driver.h | 8 +-
drivers/bus/vmbus/rte_vmbus_reg.h| 108 +-
5 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/drivers/bus/dpaa/include/fsl_bman.h
b/drivers/bus/dpaa/include/fsl_bman.h
index 34d7eb32ce..c0760149e1 100644
--- a/drivers/bus/dpaa/include/fsl_bman.h
+++ b/drivers/bus/dpaa/include/fsl_bman.h
@@ -86,7 +86,7 @@ static inline dma_addr_t bm_buf_addr(const struct bm_buffer
*buf)
} while (0)
/* See 1.5.3.5.4: "Release Command" */
-struct bm_rcr_entry {
+struct __rte_packed_begin bm_rcr_entry {
union {
struct {
u8 __dont_write_directly__verb;
@@ -95,7 +95,7 @@ struct bm_rcr_entry {
};
struct bm_buffer bufs[8];
};
-} __packed;
+} __rte_packed_end;
#define BM_RCR_VERB_VBIT 0x80
#define BM_RCR_VERB_CMD_MASK 0x70/* one of two values; */
#define BM_RCR_VERB_CMD_BPID_SINGLE0x20
@@ -104,20 +104,20 @@ struct bm_rcr_entry {
/* See 1.5.3.1: "Acquire Command" */
/* See 1.5.3.2: "Query Command" */
-struct bm_mcc_acquire {
+struct __rte_packed_begin bm_mcc_acquire {
u8 bpid;
u8 __reserved1[62];
-} __packed;
-struct bm_mcc_query {
+} __rte_packed_end;
+struct __rte_packed_begin bm_mcc_query {
u8 __reserved2[63];
-} __packed;
-struct bm_mc_command {
+} __rte_packed_end;
+struct __rte_packed_begin bm_mc_command {
u8 __dont_write_directly__verb;
union {
struct bm_mcc_acquire acquire;
struct bm_mcc_query query;
};
-} __packed;
+} __rte_packed_end;
#define BM_MCC_VERB_VBIT 0x80
#define BM_MCC_VERB_CMD_MASK 0x70/* where the verb contains; */
#define BM_MCC_VERB_CMD_ACQUIRE0x10
@@ -136,7 +136,7 @@ struct bm_pool_state {
} as, ds;
};
-struct bm_mc_result {
+struct __rte_packed_begin bm_mc_result {
union {
struct {
u8 verb;
@@ -152,7 +152,7 @@ struct bm_mc_result {
} acquire;
struct bm_pool_state query;
};
-} __packed;
+} __rte_packed_end;
#define BM_MCR_VERB_VBIT 0x80
#define BM_MCR_VERB_CMD_MASK BM_MCC_VERB_CMD_MASK
#define BM_MCR_VERB_CMD_ACQUIREBM_MCC_VERB_CMD_ACQUIRE
diff --git a/drivers/bus/dpaa/include/fsl_fman.h
b/drivers/bus/dpaa/include/fsl_fman.h
index 5a9750ad0c..7acdcfc7f0 100644
--- a/drivers/bus/dpaa/include/fsl_fman.h
+++ b/drivers/bus/dpaa/include/fsl_fman.h
@@ -12,7 +12,7 @@
/* Status field in FD is updated on Rx side by FMAN with following information.
* Refer to field description in FM BG.
*/
-struct fm_status_t {
+struct __rte_packed_begin fm_status_t {
unsigned int reserved0:3;
unsigned int dcl4c:1; /* Don't Check L4 Checksum */
unsigned int reserved1:1;
@@ -38,7 +38,7 @@ struct fm_status_t {
unsigned int phe:1; /* Header Error during parsing */
unsigned int frdr:1; /* Frame Dropped by disabled port */
unsigned int reserved5:4;
-} __rte_packed;
+} __rte_packed_end;
/* Set MAC address for a particular interface */
__rte_internal
diff --git a/drivers/bus/dpaa/include/fsl_qman.h
b/drivers/bus/dpaa/include/fsl_qman.h
index 25dbf72fd4..b949f2c893 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -221,7 +221,7 @@ static inline dma_addr_t qm_fd_addr(const struct qm_fd *fd)
} while (0)
/* Scatter/Gather table entry */
-struct qm_sg_entry {
+struct __rte_packed_begin qm_sg_entry {
union {
struct {
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -273,7 +273,7 @@ struct qm_sg_entry {
};
u16 val_off;
};
-} __packed;
+} __rte_packed_end;
static inline u64 qm_sg_entry_get64(const struct qm_sg_entry *sg)
{
return sg->addr;
@@ -292,7 +292,7 @@ static inline dma_addr_t qm_sg_addr(const struct
qm_sg_entry *sg)
} while (0)
/* See 1.5.8.1: "Enqueue Command" */
-struct __rte_aligned(8) qm_eqcr_entry {
+struct __rte_aligned(8) __rte_packed_begin qm_eqcr_entry {
u8 __dont_write_directly__verb;
u8 dca;
u16 seqnum;
@@ -301,7 +301,7 @@ struct __rte_aligned(8) qm_eqcr_entry {
u32 tag;
[PATCH v11 18/30] examples/common: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Added parenthesis around *pnum in line
__ rte_packed_end (*pnum) = (void *)pn;
to avoid patch check error below:
ERROR:SPACING: need consistent spacing around '*' (ctx:WxV)
34: FILE: examples/common/neon/port_group.h:27:
+ } __ rte_packed_end *pnum = (void *)pn;
With the parenthesis it becomes a warning, still not ideal, but better
Running checkpatch.pl:
WARNING:SPACING: space prohibited between function name and open
parenthesis '('
34: FILE: examples/common/neon/port_group.h:27:
+ } __ rte_packed_end (*pnum) = (void *)pn;
Signed-off-by: Andre Muezerie
---
examples/common/neon/port_group.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/common/neon/port_group.h
b/examples/common/neon/port_group.h
index 421e2e8613..b8f8be66e8 100644
--- a/examples/common/neon/port_group.h
+++ b/examples/common/neon/port_group.h
@@ -21,10 +21,10 @@ static inline uint16_t *
port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1,
uint16x8_t dp2)
{
- union {
+ union __rte_packed_begin {
uint16_t u16[FWDSTEP + 1];
uint64_t u64;
- } __rte_packed *pnum = (void *)pn;
+ } __rte_packed_end (*pnum) = (void *)pn;
uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0};
int32_t v;
--
2.47.0.vfs.0.3
[PATCH v11 12/30] drivers/event: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/event/octeontx/timvf_evdev.c | 4 ++--
drivers/event/octeontx/timvf_evdev.h | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/event/octeontx/timvf_evdev.c
b/drivers/event/octeontx/timvf_evdev.c
index 82f17144a6..b404b1db61 100644
--- a/drivers/event/octeontx/timvf_evdev.c
+++ b/drivers/event/octeontx/timvf_evdev.c
@@ -9,10 +9,10 @@ RTE_LOG_REGISTER_SUFFIX(otx_logtype_timvf, timer, NOTICE);
static struct rte_eventdev *event_dev;
-struct __rte_packed timvf_mbox_dev_info {
+struct __rte_packed_begin timvf_mbox_dev_info {
uint64_t ring_active[4];
uint64_t clk_freq;
-};
+} __rte_packed_end;
/* Response messages */
enum {
diff --git a/drivers/event/octeontx/timvf_evdev.h
b/drivers/event/octeontx/timvf_evdev.h
index 44a4ee41c4..e9152424ab 100644
--- a/drivers/event/octeontx/timvf_evdev.h
+++ b/drivers/event/octeontx/timvf_evdev.h
@@ -123,7 +123,7 @@ enum timvf_clk_src {
};
/* TIM_MEM_BUCKET */
-struct __rte_aligned(8) tim_mem_bucket {
+struct __rte_aligned(8) __rte_packed_begin tim_mem_bucket {
uint64_t first_chunk;
union {
RTE_ATOMIC(uint64_t) w1;
@@ -139,19 +139,19 @@ struct __rte_aligned(8) tim_mem_bucket {
};
uint64_t current_chunk;
uint64_t pad;
-} __rte_packed;
+} __rte_packed_end;
-struct tim_mem_entry {
+struct __rte_packed_begin tim_mem_entry {
uint64_t w0;
uint64_t wqe;
-} __rte_packed;
+} __rte_packed_end;
-struct timvf_ctrl_reg {
+struct __rte_packed_begin timvf_ctrl_reg {
uint64_t rctrl0;
uint64_t rctrl1;
uint64_t rctrl2;
uint8_t use_pmu;
-} __rte_packed;
+} __rte_packed_end;
struct timvf_ring;
--
2.47.0.vfs.0.3
[PATCH v11 16/30] drivers/regex: replace packed attributes
MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.
Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.
Signed-off-by: Andre Muezerie
Reviewed-by: Tyler Retzlaff
---
drivers/regex/cn9k/cn9k_regexdev.c | 4 ++--
drivers/regex/mlx5/mlx5_rxp.h | 16
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/regex/cn9k/cn9k_regexdev.c
b/drivers/regex/cn9k/cn9k_regexdev.c
index aa809ab5bf..5abc7e22bc 100644
--- a/drivers/regex/cn9k/cn9k_regexdev.c
+++ b/drivers/regex/cn9k/cn9k_regexdev.c
@@ -40,12 +40,12 @@ struct ree_rule_db_entry {
uint64_tvalue;
};
-struct ree_rule_db {
+struct __rte_packed_begin ree_rule_db {
uint32_t version;
uint32_t revision;
uint32_t number_of_entries;
struct ree_rule_db_entry entries[];
-} __rte_packed;
+} __rte_packed_end;
static void
qp_memzone_name_get(char *name, int size, int dev_id, int qp_id)
diff --git a/drivers/regex/mlx5/mlx5_rxp.h b/drivers/regex/mlx5/mlx5_rxp.h
index b38b53cc14..08b9a2680b 100644
--- a/drivers/regex/mlx5/mlx5_rxp.h
+++ b/drivers/regex/mlx5/mlx5_rxp.h
@@ -42,14 +42,14 @@
#define MLX5_RXP_RESP_STATUS_PMI_EOJ (1 << 14)
/* This describes the header the RXP expects for any search data. */
-struct mlx5_rxp_job_desc {
+struct __rte_packed_begin mlx5_rxp_job_desc {
uint32_t job_id;
uint16_t ctrl;
uint16_t len;
uint16_t subset[4];
-} __rte_packed;
+} __rte_packed_end;
-struct mlx5_rxp_response_desc {
+struct __rte_packed_begin mlx5_rxp_response_desc {
uint32_t job_id;
uint16_t status;
uint8_t detected_match_count;
@@ -58,13 +58,13 @@ struct mlx5_rxp_response_desc {
uint16_t instruction_count;
uint16_t latency_count;
uint16_t pmi_min_byte_ptr;
-} __rte_packed;
+} __rte_packed_end;
-struct mlx5_rxp_match_tuple {
+struct __rte_packed_begin mlx5_rxp_match_tuple {
uint32_t rule_id;
uint16_t start_ptr;
uint16_t length;
-} __rte_packed;
+} __rte_packed_end;
struct mlx5_rxp_response {
struct mlx5_rxp_response_desc header;
@@ -115,11 +115,11 @@ struct mlx5_rxp_rof {
struct mlx5_rxp_rof_entry *rof_entries;
};
-struct mlx5_rxp_ctl_rules_pgm {
+struct __rte_packed_begin mlx5_rxp_ctl_rules_pgm {
struct mlx5_rxp_ctl_hdr hdr;
uint32_t count;
struct mlx5_rxp_rof_entry rules[];
-} __rte_packed;
+} __rte_packed_end;
/* RXP programming mode setting. */
enum mlx5_rxp_program_mode {
--
2.47.0.vfs.0.3
Re: [PATCH v3 2/2] dts: add softnic test
Reviewed-by: Luca Vizzarro
Re: [PATCH v3 1/2] dts: allow expected packets to come from the TG
Reviewed-by: Luca Vizzarro
Re: [EXTERNAL] [PATCH v6 0/4] add feature arc in rte_graph
Nitin Saxena, Jan 03, 2025 at 15:41: > Hi, > > Please find attached slides explaining feature arc concept and its > usage in graph library > > I can also present these slides to community to facilitate this patch > series review process Hi Nitin, thanks for taking the time to explain your design better. I would really like to have a video meeting to really understand what problem you are trying to solve. And how it could help the grout code base. Let me know how what you think. Cheers
Re: [PATCH v4 2/2] dts: add dual VLAN test suite
Reviewed-by: Luca Vizzarro
[PATCH v9] dts: add offload version of buffer scatter test
From: Jeremy Spewock
Some NICs tested in DPDK allow for the scattering of packets without an
offload and others enforce that you enable the scattered_rx offload in
testpmd. The current version of the suite for testing support of
scattering packets only tests the case where the NIC supports testing
without the offload, so an expansion of coverage is needed to cover the
second case as well.
Signed-off-by: Jeremy Spewock
Signed-off-by: Paul Szczepanek
Reviewed-by: Luca Vizzarro
---
dts/tests/TestSuite_pmd_buffer_scatter.py | 49 ++-
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/dts/tests/TestSuite_pmd_buffer_scatter.py
b/dts/tests/TestSuite_pmd_buffer_scatter.py
index b2f42425d4..a8c111eea7 100644
--- a/dts/tests/TestSuite_pmd_buffer_scatter.py
+++ b/dts/tests/TestSuite_pmd_buffer_scatter.py
@@ -19,7 +19,7 @@
from scapy.layers.inet import IP
from scapy.layers.l2 import Ether
-from scapy.packet import Raw
+from scapy.packet import Packet, Raw
from scapy.utils import hexstr
from framework.params.testpmd import SimpleForwardingModes
@@ -61,65 +61,70 @@ def set_up_suite(self) -> None:
self.tg_node.main_session.configure_port_mtu(9000,
self._tg_port_egress)
self.tg_node.main_session.configure_port_mtu(9000,
self._tg_port_ingress)
-def scatter_pktgen_send_packet(self, pktsize: int) -> str:
+def scatter_pktgen_send_packet(self, pkt_size: int) -> list[Packet]:
"""Generate and send a packet to the SUT then capture what is
forwarded back.
Generate an IP packet of a specific length and send it to the SUT,
-then capture the resulting received packet and extract its payload.
-The desired length of the packet is met by packing its payload
+then capture the resulting received packets and filter them down to
the ones that have the
+correct layers. The desired length of the packet is met by packing its
payload
with the letter "X" in hexadecimal.
Args:
-pktsize: Size of the packet to generate and send.
+pkt_size: Size of the packet to generate and send.
Returns:
-The payload of the received packet as a string.
+The filtered down list of received packets.
"""
packet = Ether() / IP() / Raw()
if layer2 := packet.getlayer(2):
layer2.load = ""
-payload_len = pktsize - len(packet) - 4
+payload_len = pkt_size - len(packet) - 4
payload = ["58"] * payload_len
# pack the payload
for X_in_hex in payload:
packet.load += struct.pack("=B", int("%s%s" % (X_in_hex[0],
X_in_hex[1]), 16))
received_packets = self.send_packet_and_capture(packet)
+# filter down the list to packets that have the appropriate structure
+received_packets = [p for p in received_packets if Ether in p and IP
in p and Raw in p]
+
self.verify(len(received_packets) > 0, "Did not receive any packets.")
layer2 = received_packets[0].getlayer(2)
self.verify(layer2 is not None, "The received packet is invalid.")
assert layer2 is not None
-load = hexstr(layer2, onlyhex=1)
-return load
+return received_packets
-def pmd_scatter(self, mbsize: int) -> None:
+def pmd_scatter(self, mb_size: int, enable_offload: bool = False) -> None:
"""Testpmd support of receiving and sending scattered multi-segment
packets.
Support for scattered packets is shown by sending 5 packets of
differing length
where the length of the packet is calculated by taking mbuf-size + an
offset.
The offsets used in the test are -1, 0, 1, 4, 5 respectively.
+Args:
+mb_size: Size to set memory buffers to when starting testpmd.
+enable_offload: Whether or not to offload the scattering
functionality in testpmd.
+
Test:
-Start testpmd and run functional test with preset mbsize.
+Start testpmd and run functional test with preset `mb_size`.
"""
with TestPmdShell(
self.sut_node,
forward_mode=SimpleForwardingModes.mac,
mbcache=200,
-mbuf_size=[mbsize],
+mbuf_size=[mb_size],
max_pkt_len=9000,
tx_offloads=0x8000,
+enable_scatter=True if enable_offload else None,
) as testpmd:
testpmd.start()
for offset in [-1, 0, 1, 4, 5]:
-recv_payload = self.scatter_pktgen_send_packet(mbsize + offset)
-self._logger.debug(
-f"Payload of scattered packet after forwarding:
\n{recv_payload}"
-)
+recv_packets = self.scatter_pktgen_send_packet(mb_size +
offset)
+self._logger.debug(f"Relevant captured packets:
\n{recv_packets}")
self.verify(
-
Re: [PATCH v4 1/2] dts: add stop ports decorator for VLAN functions
Reviewed-by: Luca Vizzarro
[PATCH] base/thunderx: fix build with Gcc 15
Gcc 15 now produces warning with the base code of Thunderx driver.
The issue is that Gcc now defaults to C23 mode, and the standards
gods have decided that partial initialization of a union has changed.
The fix is to use an empty initializer which forces full initialization.
[2377/3224] Compiling C object
drivers/net/thunderx/base/libnicvf_base.a.p/nicvf_mbox.c.o
In function ‘nicvf_mbox_send_msg_to_pf_raw’,
inlined from ‘nicvf_mbox_send_async_msg_to_pf’ at
../drivers/net/thunderx/base/nicvf_mbox.c:70:2,
inlined from ‘nicvf_mbox_cfg_done’ at
../drivers/net/thunderx/base/nicvf_mbox.c:468:2:
../drivers/net/thunderx/base/nicvf_mbox.c:59:17: warning: ‘mbx’ is used
uninitialized [-Wuninitialized]
59 | nicvf_reg_write(nic, mbx_addr, *mbx_data);
| ^
../drivers/net/thunderx/base/nicvf_mbox.c: In function ‘nicvf_mbox_cfg_done’:
../drivers/net/thunderx/base/nicvf_mbox.c:465:24: note: ‘mbx’ declared here
465 | struct nic_mbx mbx = { .msg = { 0 } };
|^~~
In function ‘nicvf_mbox_send_msg_to_pf_raw’,
inlined from ‘nicvf_mbox_send_async_msg_to_pf’ at
../drivers/net/thunderx/base/nicvf_mbox.c:70:2,
inlined from ‘nicvf_mbox_link_change’ at
../drivers/net/thunderx/base/nicvf_mbox.c:477:2:
../drivers/net/thunderx/base/nicvf_mbox.c:59:17: warning: ‘mbx’ is used
uninitialized [-Wuninitialized]
59 | nicvf_reg_write(nic, mbx_addr, *mbx_data);
| ^
../drivers/net/thunderx/base/nicvf_mbox.c: In function ‘nicvf_mbox_link_change’:
../drivers/net/thunderx/base/nicvf_mbox.c:474:24: note: ‘mbx’ declared here
474 | struct nic_mbx mbx = { .msg = { 0 } };
Signed-off-by: Stephen Hemminger
---
drivers/net/thunderx/base/nicvf_mbox.c | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/net/thunderx/base/nicvf_mbox.c
b/drivers/net/thunderx/base/nicvf_mbox.c
index 0e0176974d..29407f75fa 100644
--- a/drivers/net/thunderx/base/nicvf_mbox.c
+++ b/drivers/net/thunderx/base/nicvf_mbox.c
@@ -212,7 +212,7 @@ int
nicvf_mbox_set_mac_addr(struct nicvf *nic,
const uint8_t mac[NICVF_MAC_ADDR_SIZE])
{
- struct nic_mbx mbx = { .msg = {0} };
+ struct nic_mbx mbx = { };
int i;
mbx.msg.msg = NIC_MBOX_MSG_SET_MAC;
@@ -226,7 +226,7 @@ nicvf_mbox_set_mac_addr(struct nicvf *nic,
int
nicvf_mbox_config_cpi(struct nicvf *nic, uint32_t qcnt)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
mbx.msg.msg = NIC_MBOX_MSG_CPI_CFG;
mbx.cpi_cfg.vf_id = nic->vf_id;
@@ -239,7 +239,7 @@ nicvf_mbox_config_cpi(struct nicvf *nic, uint32_t qcnt)
int
nicvf_mbox_get_rss_size(struct nicvf *nic)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
mbx.msg.msg = NIC_MBOX_MSG_RSS_SIZE;
mbx.rss_size.vf_id = nic->vf_id;
@@ -251,7 +251,7 @@ nicvf_mbox_get_rss_size(struct nicvf *nic)
int
nicvf_mbox_config_rss(struct nicvf *nic)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
struct nicvf_rss_reta_info *rss = &nic->rss_info;
size_t tot_len = rss->rss_size;
size_t cur_len;
@@ -284,7 +284,7 @@ int
nicvf_mbox_rq_config(struct nicvf *nic, uint16_t qidx,
struct pf_rq_cfg *pf_rq_cfg)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
mbx.msg.msg = NIC_MBOX_MSG_RQ_CFG;
mbx.rq.qs_num = nic->vf_id;
@@ -296,7 +296,7 @@ nicvf_mbox_rq_config(struct nicvf *nic, uint16_t qidx,
int
nicvf_mbox_sq_config(struct nicvf *nic, uint16_t qidx)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
mbx.msg.msg = NIC_MBOX_MSG_SQ_CFG;
mbx.sq.qs_num = nic->vf_id;
@@ -309,7 +309,7 @@ nicvf_mbox_sq_config(struct nicvf *nic, uint16_t qidx)
int
nicvf_mbox_qset_config(struct nicvf *nic, struct pf_qs_cfg *qs_cfg)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN
qs_cfg->be = 1;
@@ -325,7 +325,7 @@ nicvf_mbox_qset_config(struct nicvf *nic, struct pf_qs_cfg
*qs_cfg)
int
nicvf_mbox_request_sqs(struct nicvf *nic)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
size_t i;
assert_primary(nic);
@@ -346,7 +346,7 @@ nicvf_mbox_request_sqs(struct nicvf *nic)
int
nicvf_mbox_rq_drop_config(struct nicvf *nic, uint16_t qidx, bool enable)
{
- struct nic_mbx mbx = { .msg = { 0 } };
+ struct nic_mbx mbx = { };
struct pf_rq_drop_cfg *drop_cfg;
/* Enable CQ drop to reserve sufficient CQEs for all tx packets */
@@ -365,7 +365,7 @@ nicvf_mbox_rq_drop_config(struct nicvf *nic, uint16_t qidx,
bool enable)
int
nicvf_mbox_update_hw_max_frs(struct nic
[PATCH] crypto/cnxk: fix gcc 15 warning
GCC 15 produces warnings about uninitaialized variables.
In file included from ../lib/mbuf/rte_mbuf.h:36,
from ../lib/cryptodev/rte_crypto.h:15,
from ../lib/cryptodev/rte_cryptodev.h:19,
from ../drivers/crypto/cnxk/cn9k_cryptodev_ops.c:5:
In function ‘pdcp_chain_sg1_prep’,
inlined from ‘cpt_pdcp_chain_alg_prep’ at
../drivers/crypto/cnxk/cnxk_se.h:1621:11,
inlined from ‘fill_pdcp_chain_params’ at
../drivers/crypto/cnxk/cnxk_se.h:3114:8,
inlined from ‘cpt_sym_inst_fill’ at ../drivers/crypto/cnxk/cnxk_se.h:3364:9,
inlined from ‘cn9k_cpt_inst_prep’ at
../drivers/crypto/cnxk/cn9k_cryptodev_ops.c:93:10:
../lib/eal/include/rte_common.h:469:38: warning: ‘fc_params.meta_buf.vaddr’ may
be used uninitialized [-Wmaybe-uninitialized]
469 | #define RTE_PTR_ADD(ptr, x) ((void*)((uintptr_t)(ptr) + (x)))
| ^~~~
../drivers/common/cnxk/roc_platform.h:47:34: note: in expansion of macro
‘RTE_PTR_ADD’
47 | #define PLT_PTR_ADD RTE_PTR_ADD
| ^~~
../drivers/crypto/cnxk/cnxk_se.h:900:19: note: in expansion of macro
‘PLT_PTR_ADD’
900 | m_vaddr = PLT_PTR_ADD(m_vaddr, ROC_SE_OFF_CTRL_LEN +
PLT_ALIGN_CEIL(hdr_len, 8));
| ^~~
In file included from ../drivers/crypto/cnxk/cn9k_cryptodev_ops.c:20:
../drivers/crypto/cnxk/cnxk_se.h: In function ‘cn9k_cpt_inst_prep’:
../drivers/crypto/cnxk/cnxk_se.h:3008:33: note: ‘fc_params.meta_buf.vaddr’ was
declared here
3008 | struct roc_se_fc_params fc_params;
| ^
In function ‘pdcp_chain_sg1_prep’,
inlined from ‘cpt_pdcp_chain_alg_prep’ at
../drivers/crypto/cnxk/cnxk_se.h:1621:11,
inlined from ‘fill_pdcp_chain_params’ at
../drivers/crypto/cnxk/cnxk_se.h:3114:8,
inlined from ‘cpt_sym_inst_fill’ at ../drivers/crypto/cnxk/cnxk_se.h:3364:9,
inlined from ‘cn9k_cpt_inst_prep’ at
../drivers/crypto/cnxk/cn9k_cryptodev_ops.c:82:10:
../lib/eal/include/rte_common.h:469:38: warning: ‘fc_params.meta_buf.vaddr’ may
be used uninitialized [-Wmaybe-uninitialized]
469 | #define RTE_PTR_ADD(ptr, x) ((void*)((uintptr_t)(ptr) + (x)))
| ^~~~
../drivers/common/cnxk/roc_platform.h:47:34: note: in expansion of macro
‘RTE_PTR_ADD’
47 | #define PLT_PTR_ADD RTE_PTR_ADD
| ^~~
../drivers/crypto/cnxk/cnxk_se.h:900:19: note: in expansion of macro
‘PLT_PTR_ADD’
900 | m_vaddr = PLT_PTR_ADD(m_vaddr, ROC_SE_OFF_CTRL_LEN +
PLT_ALIGN_CEIL(hdr_len, 8));
| ^~~
../drivers/crypto/cnxk/cnxk_se.h: In function ‘cn9k_cpt_inst_prep’:
../drivers/crypto/cnxk/cnxk_se.h:3008:33: note: ‘fc_params.meta_buf.vaddr’ was
declared here
3008 | struct roc_se_fc_params fc_params;
| ^
Fixes: d3bff77cc371 ("crypto/cnxk: separate out PDCP chain datapath")
Cc: sta...@dpdk.org
Cc: ano...@marvell.com
Signed-off-by: Stephen Hemminger
---
drivers/crypto/cnxk/cnxk_se.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h
index 7262a49945..649e38c495 100644
--- a/drivers/crypto/cnxk/cnxk_se.h
+++ b/drivers/crypto/cnxk/cnxk_se.h
@@ -3005,7 +3005,7 @@ fill_pdcp_chain_params(struct rte_crypto_op *cop, struct
cnxk_se_sess *sess,
{
uint32_t ci_data_length, ci_data_offset, a_data_length, a_data_offset;
struct rte_crypto_sym_op *sym_op = cop->sym;
- struct roc_se_fc_params fc_params;
+ struct roc_se_fc_params fc_params = { };
struct rte_mbuf *m_src, *m_dst;
uint8_t cpt_op = sess->cpt_op;
uint64_t d_offs, d_lens;
--
2.45.2
Re: [PATCH] eal: add worker threads cleanup in rte_eal_cleanup()
On Fri, 10 Jan 2025 12:17:17 +0530 Gagandeep Singh wrote: > This patch introduces a worker thread cleanup function in the EAL library, > ensuring proper termination of created pthreads and invocation of > registered pthread destructors. > This guarantees the correct cleanup of thread-specific resources, > used by drivers or applications. > > Signed-off-by: Gagandeep Singh > --- What problem is this trying to solve? Canceling threads sends signals and can be problematic. Many of the operations done in drivers are not signal safe.
Re: [PATCH] examples/l3fwd: add option to set refetch offset
On Fri, 10 Jan 2025 17:37:15 +0800 Dengdui Huang wrote: > The prefetch window depending on the HW platform. It is difficult to > measure the prefetch window of a HW platform. Therefore, the prefetch > offset option is added to change the prefetch window. User can adjust > the refetch offset to achieve the best prefetch effect. > > In addition, this option is used only in the main loop. > > Signed-off-by: Dengdui Huang > --- This will make it slower for many platforms. GCC will unroll a loop of fixed small size, which is what we want.
Re: [PATCH] examples/l3fwd: add option to set refetch offset
On Fri, 10 Jan 2025 17:37:15 +0800 Dengdui Huang wrote: > +#define DEFAULT_PREFECH_OFFSET 4 Spelling
[DPDK/ethdev Bug 1613] net/thunderx: warning with Gcc 15
https://bugs.dpdk.org/show_bug.cgi?id=1613
Bug ID: 1613
Summary: net/thunderx: warning with Gcc 15
Product: DPDK
Version: 25.03
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: normal
Priority: Normal
Component: ethdev
Assignee: dev@dpdk.org
Reporter: step...@networkplumber.org
Target Milestone: ---
Gcc 15 has changed how unions are initialized and now this driver gets an
uninitialized variable warning.
Reported as Gcc bug. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118403
Simple fix is to change to empty initializer.
2377/3224] Compiling C object
drivers/net/thunderx/base/libnicvf_base.a.p/nicvf_mbox.c.o
In function ‘nicvf_mbox_send_msg_to_pf_raw’,
inlined from ‘nicvf_mbox_send_async_msg_to_pf’ at
../drivers/net/thunderx/base/nicvf_mbox.c:70:2,
inlined from ‘nicvf_mbox_cfg_done’ at
../drivers/net/thunderx/base/nicvf_mbox.c:468:2:
../drivers/net/thunderx/base/nicvf_mbox.c:59:17: warning: ‘mbx’ is used
uninitialized [-Wuninitialized]
59 | nicvf_reg_write(nic, mbx_addr, *mbx_data);
| ^
../drivers/net/thunderx/base/nicvf_mbox.c: In function ‘nicvf_mbox_cfg_done’:
../drivers/net/thunderx/base/nicvf_mbox.c:465:24: note: ‘mbx’ declared here
465 | struct nic_mbx mbx = { .msg = { 0 } };
|^~~
In function ‘nicvf_mbox_send_msg_to_pf_raw’,
inlined from ‘nicvf_mbox_send_async_msg_to_pf’ at
../drivers/net/thunderx/base/nicvf_mbox.c:70:2,
inlined from ‘nicvf_mbox_link_change’ at
../drivers/net/thunderx/base/nicvf_mbox.c:477:2:
../drivers/net/thunderx/base/nicvf_mbox.c:59:17: warning: ‘mbx’ is used
uninitialized [-Wuninitialized]
59 | nicvf_reg_write(nic, mbx_addr, *mbx_data);
| ^
../drivers/net/thunderx/base/nicvf_mbox.c: In function
‘nicvf_mbox_link_change’:
../drivers/net/thunderx/base/nicvf_mbox.c:474:24: note: ‘mbx’ declared here
474 | struct nic_mbx mbx = { .msg = { 0 } };
--
You are receiving this mail because:
You are the assignee for the bug.
Re: [PATCH RESEND v7 2/5] ethdev: fix skip valid port in probing callback
On Fri, 10 Jan 2025 11:21:26 +0800
"lihuisong (C)" wrote:
> Hi Stephen,
>
> Can you take a look at my below reply and reconsider this patch?
>
> /Huisong
>
> 在 2024/12/10 9:50, lihuisong (C) 写道:
> > Hi Ferruh, Stephen and Thomas,
> >
> > Can you take a look at this patch? After all, it is an issue in ethdev
> > layer.
> > This also is the fruit we disscussed with Thomas and Ferruh before.
> > Please go back to this thread. If we don't need this patch, please let
> > me know. I will drop it from my upstreaming list.
> >
> > /Huisong
> >
> >
> > 在 2024/9/29 13:52, Huisong Li 写道:
> >> The event callback in application may use the macro
> >> RTE_ETH_FOREACH_DEV to
> >> iterate over all enabled ports to do something(like, verifying the
> >> port id
> >> validity) when receive a probing event. If the ethdev state of a port is
> >> not RTE_ETH_DEV_UNUSED, this port will be considered as a valid port.
> >>
> >> However, this state is set to RTE_ETH_DEV_ATTACHED after pushing probing
> >> event. It means that probing callback will skip this port. But this
> >> assignment can not move to front of probing notification. See
> >> commit be8cd210379a ("ethdev: fix port probing notification")
> >>
> >> So this patch has to add a new state, RTE_ETH_DEV_ALLOCATED. Set the
> >> ethdev
> >> state to RTE_ETH_DEV_ALLOCATED before pushing probing event and set
> >> it to
> >> RTE_ETH_DEV_ATTACHED after definitely probed. And this port is valid
> >> if its
> >> device state is 'ALLOCATED' or 'ATTACHED'.
> >>
> >> In addition, the new state has to be placed behind 'REMOVED' to avoid
> >> ABI
> >> break. Fortunately, this ethdev state is internal and applications
> >> can not
> >> access it directly. So this patch encapsulates an API,
> >> rte_eth_dev_is_used,
> >> for ethdev or PMD to call and eliminate concerns about using this state
> >> enum value comparison.
> >>
> >> Fixes: be8cd210379a ("ethdev: fix port probing notification")
> >> Cc: sta...@dpdk.org
> >>
> >> Signed-off-by: Huisong Li
> >> Acked-by: Chengwen Feng
> >> ---
> >> drivers/net/bnxt/bnxt_ethdev.c | 3 ++-
> >> drivers/net/mlx5/mlx5.c | 2 +-
> >> lib/ethdev/ethdev_driver.c | 13 ++---
> >> lib/ethdev/ethdev_driver.h | 12
> >> lib/ethdev/ethdev_pci.h | 2 +-
> >> lib/ethdev/rte_class_eth.c | 2 +-
> >> lib/ethdev/rte_ethdev.c | 4 ++--
> >> lib/ethdev/rte_ethdev.h | 4 +++-
> >> lib/ethdev/version.map | 1 +
> >> 9 files changed, 33 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/drivers/net/bnxt/bnxt_ethdev.c
> >> b/drivers/net/bnxt/bnxt_ethdev.c
> >> index c6ad764813..7401dcd8b5 100644
> >> --- a/drivers/net/bnxt/bnxt_ethdev.c
> >> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> >> @@ -6612,7 +6612,8 @@ bnxt_dev_uninit(struct rte_eth_dev *eth_dev)
> >> PMD_DRV_LOG(DEBUG, "Calling Device uninit\n");
> >> - if (eth_dev->state != RTE_ETH_DEV_UNUSED)
> >> +
> >> + if (rte_eth_dev_is_used(eth_dev->state))
> >> bnxt_dev_close_op(eth_dev);
> >> return 0;
> >> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> >> index 8d266b0e64..0df49e1f69 100644
> >> --- a/drivers/net/mlx5/mlx5.c
> >> +++ b/drivers/net/mlx5/mlx5.c
> >> @@ -3371,7 +3371,7 @@ mlx5_eth_find_next(uint16_t port_id, struct
> >> rte_device *odev)
> >> while (port_id < RTE_MAX_ETHPORTS) {
> >> struct rte_eth_dev *dev = &rte_eth_devices[port_id];
> >> - if (dev->state != RTE_ETH_DEV_UNUSED &&
> >> + if (rte_eth_dev_is_used(dev->state) &&
> >> dev->device &&
> >> (dev->device == odev ||
> >> (dev->device->driver &&
> >> diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
> >> index c335a25a82..a87dbb00ff 100644
> >> --- a/lib/ethdev/ethdev_driver.c
> >> +++ b/lib/ethdev/ethdev_driver.c
> >> @@ -55,8 +55,8 @@ eth_dev_find_free_port(void)
> >> for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
> >> /* Using shared name field to find a free port. */
> >> if (eth_dev_shared_data->data[i].name[0] == '\0') {
> >> - RTE_ASSERT(rte_eth_devices[i].state ==
> >> - RTE_ETH_DEV_UNUSED);
> >> + RTE_ASSERT(!rte_eth_dev_is_used(
> >> + rte_eth_devices[i].state));
> >> return i;
> >> }
> >> }
> >> @@ -221,11 +221,18 @@ rte_eth_dev_probing_finish(struct rte_eth_dev
> >> *dev)
> >> if (rte_eal_process_type() == RTE_PROC_SECONDARY)
> >> eth_dev_fp_ops_setup(rte_eth_fp_ops + dev->data->port_id,
> >> dev);
> >> + dev->state = RTE_ETH_DEV_ALLOCATED;
> >> rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_NEW, NULL);
> >> dev->state = RTE_ETH_DEV_ATTACHED;
> >> }
> >> +bool rte_eth_dev_is_used(uint16_t dev_state)
> >> +{
> >> + return dev_state == RTE_ETH_DEV_ALLOCATED ||
> >> + dev_state == RTE_ETH_DEV_ATTACHED;
> >> +}
> >> +
> >> int
Re: Driver: bnxt_en
On Fri, 10 Jan 2025 10:02:48 +0530
Eldho Paul Mathew wrote:
> We are using DPDK 18.05.1
>
> We received a new network card.
>
> Broadcom Inc. and subsidiaries BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet
> Controller
>
> DPDK 18.05.1 has support for this card and driver bnxt_en?
>
> If not, which stable version onwards has this driver support added?
Release 18.05 is not a stable LTS version.
Let me teach you how to look this question up.
To look up device you need the actual PCI-ID, using pcilookup.com
14e4:16d7
Look at source of drivers/net/bnxt/bnxt_ethdev.c for the pci table
bnxt_id_pci_map.
The entry for 16d7 is
#define BROADCOM_DEV_ID_57414 0x16d7
Using git blame find the commit that added that:
$ git blame drivers/net/bnxt/bnxt_ethdev.c | grep BROADCOM_DEV_ID_57414
3fab7694403 (Ajit Khaparde 2017-04-26 14:20:02 -0500 51)
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414_VF) },
1f4a84672ec (Ajit Khaparde 2017-01-06 13:55:17 -0600 60)
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414) },
1f4a84672ec (Ajit Khaparde 2017-01-06 13:55:17 -0600 68)
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414_MF) },
3f6d59b0c88 (Kalesh AP 2019-12-02 09:48:07 +0530 4999)
case BROADCOM_DEV_ID_57414_VF:
So we want 1f4a84672ec
If you look at that commit with a tool like gitk it shows it happened way back
in 17.02
And the card is listed in driver for 18.11
[PATCH v5] dts: reform hello world test suite
Add a test suite to replace hello_world which simply
starts and stops a testpmd session. The user can use
this as a confidence check to verify their configuration.
Signed-off-by: Dean Marx
Reviewed-by: Paul Szczepanek
Reviewed-by: Luca Vizzarro
---
dts/framework/test_suite.py| 10 +
dts/tests/TestSuite_hello_world.py | 69 ++
2 files changed, 23 insertions(+), 56 deletions(-)
diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index 16012bfc79..6de36b7242 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -300,6 +300,16 @@ def get_expected_packet(self, packet: Packet) -> Packet:
"""
return self.get_expected_packets([packet])[0]
+def testsuite_log(self, message: str) -> None:
+"""Call the private instance of logger within the TestSuite class.
+
+Log the given message with the level 'INFO'.
+
+Args:
+message: String representing the message to log.
+"""
+self._logger.info(message)
+
def _adjust_addresses(self, packets: list[Packet], expected: bool = False)
-> list[Packet]:
"""L2 and L3 address additions in both directions.
diff --git a/dts/tests/TestSuite_hello_world.py
b/dts/tests/TestSuite_hello_world.py
index 734f006026..3789b027f9 100644
--- a/dts/tests/TestSuite_hello_world.py
+++ b/dts/tests/TestSuite_hello_world.py
@@ -1,71 +1,28 @@
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
+# Copyright(c) 2024 University of New Hampshire
-"""The DPDK hello world app test suite.
+"""DPDK Hello World test suite.
-Run the helloworld example app and verify it prints a message for each used
core.
-No other EAL parameters apart from cores are used.
+Starts and stops a testpmd session to verify EAL parameters
+are properly configured.
"""
-from framework.remote_session.dpdk_shell import compute_eal_params
+from framework.remote_session.testpmd_shell import TestPmdShell
from framework.test_suite import TestSuite, func_test
-from framework.testbed_model.capability import TopologyType, requires
-from framework.testbed_model.cpu import (
-LogicalCoreCount,
-LogicalCoreCountFilter,
-LogicalCoreList,
-)
-@requires(topology_type=TopologyType.no_link)
class TestHelloWorld(TestSuite):
-"""DPDK hello world app test suite."""
-
-def set_up_suite(self) -> None:
-"""Set up the test suite.
-
-Setup:
-Build the app we're about to test - helloworld.
-"""
-self.app_helloworld_path = self.sut_node.build_dpdk_app("helloworld")
-
-@func_test
-def hello_world_single_core(self) -> None:
-"""Single core test case.
-
-Steps:
-Run the helloworld app on the first usable logical core.
-Verify:
-The app prints a message from the used core:
-"hello from core "
-"""
-# get the first usable core
-lcore_amount = LogicalCoreCount(1, 1, 1)
-lcores = LogicalCoreCountFilter(self.sut_node.lcores,
lcore_amount).filter()
-eal_para = compute_eal_params(self.sut_node,
lcore_filter_specifier=lcore_amount)
-result = self.sut_node.run_dpdk_app(self.app_helloworld_path, eal_para)
-self.verify(
-f"hello from core {int(lcores[0])}" in result.stdout,
-f"helloworld didn't start on lcore{lcores[0]}",
-)
+"""Hello World test suite. One test case, which starts and stops a testpmd
session."""
@func_test
-def hello_world_all_cores(self) -> None:
-"""All cores test case.
+def test_hello_world(self) -> None:
+"""EAL confidence test.
Steps:
-Run the helloworld app on all usable logical cores.
+Start testpmd session and check status.
Verify:
-The app prints a message from all used cores:
-"hello from core "
+The testpmd session throws no errors.
"""
-# get the maximum logical core number
-eal_para = compute_eal_params(
-self.sut_node,
lcore_filter_specifier=LogicalCoreList(self.sut_node.lcores)
-)
-result = self.sut_node.run_dpdk_app(self.app_helloworld_path,
eal_para, 50)
-for lcore in self.sut_node.lcores:
-self.verify(
-f"hello from core {int(lcore)}" in result.stdout,
-f"helloworld didn't start on lcore{lcore}",
-)
+with TestPmdShell(node=self.sut_node) as testpmd:
+testpmd.start()
+self.testsuite_log("Hello World!")
--
2.44.0
[PATCH v14 12/81] app/testpmd: remove use of VLAs for Windows built
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Acked-by: Chengwen Feng
---
app/test-pmd/cmdline.c | 2 +-
app/test-pmd/cmdline_flow.c | 15 ++-
app/test-pmd/config.c | 16 +---
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7e0666e9f6..2897e44c34 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -13274,7 +13274,7 @@ cmd_set_port_ptypes_parsed(
return;
}
- uint32_t ptypes[ret];
+ uint32_t *ptypes = alloca(sizeof(uint32_t) * ret);
ret = rte_eth_dev_set_ptypes(port_id, ptype_mask, ptypes, ret);
if (ret < 0) {
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 9e4fc2d95d..e1720e54d7 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -11707,8 +11707,7 @@ parse_hex(struct context *ctx, const struct token
*token,
char tmp[16]; /* Ought to be enough. */
int ret;
unsigned int hexlen = len;
- unsigned int length = 256;
- uint8_t hex_tmp[length];
+ uint8_t hex_tmp[256];
/* Arguments are expected. */
if (!arg_data)
@@ -11735,7 +11734,7 @@ parse_hex(struct context *ctx, const struct token
*token,
str += 2;
hexlen -= 2;
}
- if (hexlen > length)
+ if (hexlen > RTE_DIM(hex_tmp))
goto error;
ret = parse_hex_string(str, hex_tmp, &hexlen);
if (ret < 0)
@@ -11868,10 +11867,13 @@ parse_ipv4_addr(struct context *ctx, const struct
token *token,
void *buf, unsigned int size)
{
const struct arg *arg = pop_args(ctx);
- char str2[len + 1];
+ char str2[INET_ADDRSTRLEN];
struct in_addr tmp;
int ret;
+ /* Length is longer than the max length an IPv4 address can have. */
+ if (len >= INET_ADDRSTRLEN)
+ return -1;
/* Argument is expected. */
if (!arg)
return -1;
@@ -11914,11 +11916,14 @@ parse_ipv6_addr(struct context *ctx, const struct
token *token,
void *buf, unsigned int size)
{
const struct arg *arg = pop_args(ctx);
- char str2[len + 1];
+ char str2[INET6_ADDRSTRLEN];
struct rte_ipv6_addr tmp;
int ret;
(void)token;
+ /* Length is longer than the max length an IPv6 address can have. */
+ if (len >= INET6_ADDRSTRLEN)
+ return -1;
/* Argument is expected. */
if (!arg)
return -1;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 4e7fb69183..b19df95321 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1802,7 +1802,8 @@ port_flow_configure(portid_t port_id,
{
struct rte_port *port;
struct rte_flow_error error;
- const struct rte_flow_queue_attr *attr_list[nb_queue];
+ const struct rte_flow_queue_attr **attr_list =
+ alloca(sizeof(struct rte_flow_queue_attr *) * nb_queue);
int std_queue;
if (port_id_is_invalid(port_id, ENABLED_WARN) ||
@@ -2616,10 +2617,10 @@ port_flow_template_table_create(portid_t port_id,
uint32_t id,
int ret;
uint32_t i;
struct rte_flow_error error;
- struct rte_flow_pattern_template
- *flow_pattern_templates[nb_pattern_templates];
- struct rte_flow_actions_template
- *flow_actions_templates[nb_actions_templates];
+ struct rte_flow_pattern_template **flow_pattern_templates =
+ alloca(sizeof(struct rte_flow_pattern_template *) *
nb_pattern_templates);
+ struct rte_flow_actions_template **flow_actions_templates =
+ alloca(sizeof(struct rte_flow_actions_template *) *
nb_actions_templates);
if (port_id_is_invalid(port_id, ENABLED_WARN) ||
port_id == (portid_t)RTE_PORT_ALL)
@@ -5551,7 +5552,7 @@ parse_port_list(const char *list, unsigned int *values,
unsigned int maxsize)
char *end = NULL;
int min, max;
int value, i;
- unsigned int marked[maxsize];
+ unsigned int *marked = alloca(sizeof(unsigned int) * maxsize);
if (list == NULL || values == NULL)
return 0;
@@ -7292,7 +7293,8 @@ show_macs(portid_t port_id)
if (eth_dev_info_get_print_err(port_id, &dev_info))
return;
- struct rte_ether_addr addr[dev_info.max_mac_addrs];
+ struct rte_ether_addr *addr =
+ alloca(sizeof(struct rte_ether_addr) * dev_info.max_mac_addrs);
rc = rte_eth_macaddrs_get(port_id, addr, dev_info.max_mac_addrs);
if (rc < 0)
return;
--
2.47.0.vfs.0.3
[PATCH v14 07/81] rcu: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/rcu/rte_rcu_qsbr.c:359:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
2) ./lib/rcu/rte_rcu_qsbr.c:422:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
In both cases we allocate VLA for one element from RCU deferred queue.
Right now, size of element in RCU queue is not limited by API.
The approach is to introduce some reasonable limitation on RCU DQ
element size.
Choose 128B for now.
With that in place we can replace both VLA occurencies with fixed size
array.
Note that such change need to be treated as API change.
So can be applied only at 24.11.
Signed-off-by: Konstantin Ananyev
---
lib/rcu/meson.build| 8
lib/rcu/rte_rcu_qsbr.c | 7 ---
lib/rcu/rte_rcu_qsbr.h | 5 +
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/lib/rcu/meson.build b/lib/rcu/meson.build
index 71143f5210..bbe73aa72f 100644
--- a/lib/rcu/meson.build
+++ b/lib/rcu/meson.build
@@ -11,3 +11,11 @@ sources = files('rte_rcu_qsbr.c')
headers = files('rte_rcu_qsbr.h')
deps += ['ring']
+
+warning_flags = ['-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index dbf31501a6..fe68d16326 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -245,7 +245,8 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
if (params == NULL || params->free_fn == NULL ||
params->v == NULL || params->name == NULL ||
params->size == 0 || params->esize == 0 ||
- (params->esize % 4 != 0)) {
+ (params->esize % 4 != 0) ||
+ params->esize > RTE_QSBR_ESIZE_MAX) {
RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
@@ -323,7 +324,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq,
void *e)
return 1;
}
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;
/* Start the grace period */
dq_elem->token = rte_rcu_qsbr_start(dq->v);
@@ -386,7 +387,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq,
unsigned int n,
cnt = 0;
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
/* Check reader threads quiescent state and reclaim resources */
while (cnt < n &&
rte_ring_dequeue_bulk_elem_start(dq->r, &data,
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 550fadf56a..abcbd78914 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -86,6 +86,11 @@ struct __rte_cache_aligned rte_rcu_qsbr_cnt {
#define __RTE_QSBR_CNT_MAX ((uint64_t)~0)
#define __RTE_QSBR_TOKEN_SIZE sizeof(uint64_t)
+/**
+ * Max allowable size (in bytes) of each element in the defer queue
+ */
+#define RTE_QSBR_ESIZE_MAX (2 * RTE_CACHE_LINE_MIN_SIZE)
+
/* RTE Quiescent State variable structure.
* This structure has two elements that vary in size based on the
* 'max_threads' parameter.
--
2.47.0.vfs.0.3
[PATCH v14 10/81] net/ixgbe: remove use of VLAs
From: Konstantin Ananyev
1) ../drivers/net/ixgbe/ixgbe_ethdev.c:3556:46: warning:
variable length array used [-Wvla]
2) ../drivers/net/ixgbe/ixgbe_ethdev.c:3739:23: warning:
variable length array used [-Wvla]
3) ../drivers/net/ixgbe/ixgbe_rxtx_vec_common.h:17:24: warning:
variable length array used [-Wvla]
For first two cases: in fact ixgbe_xstats_calc_num() always returns
constant value, so it should be safe to replace that function invocation
just with a macro that performs same calculations.
For case #3: reassemble_packets() is invoked only by
ixgbe_recv_scattered_burst_vec().
And in turn, ixgbe_recv_scattered_burst_vec() operates only on fixed
max amount of packets per call: RTE_IXGBE_MAX_RX_BURST.
So, it should be safe to replace VLA with fixed size array.
Signed-off-by: Konstantin Ananyev
Acked-by: Anatoly Burakov
---
drivers/net/ixgbe/ixgbe_ethdev.c | 21 +
drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 4 +++-
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 8bee97d191..47b0acd7b1 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -3437,11 +3437,16 @@ ixgbe_dev_stats_reset(struct rte_eth_dev *dev)
}
/* This function calculates the number of xstats based on the current config */
+
+#define IXGBE_XSTATS_CALC_NUM \
+ (IXGBE_NB_HW_STATS + IXGBE_NB_MACSEC_STATS + \
+ (IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) + \
+ (IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES))
+
static unsigned
-ixgbe_xstats_calc_num(void) {
- return IXGBE_NB_HW_STATS + IXGBE_NB_MACSEC_STATS +
- (IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) +
- (IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES);
+ixgbe_xstats_calc_num(void)
+{
+ return IXGBE_XSTATS_CALC_NUM;
}
static int ixgbe_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
@@ -3557,8 +3562,8 @@ static int ixgbe_dev_xstats_get_names_by_id(
}
uint16_t i;
- uint16_t size = ixgbe_xstats_calc_num();
- struct rte_eth_xstat_name xstats_names_copy[size];
+ struct rte_eth_xstat_name xstats_names_copy[IXGBE_XSTATS_CALC_NUM];
+ const uint16_t size = RTE_DIM(xstats_names_copy);
ixgbe_dev_xstats_get_names_by_id(dev, NULL, xstats_names_copy,
size);
@@ -3740,8 +3745,8 @@ ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const
uint64_t *ids,
}
uint16_t i;
- uint16_t size = ixgbe_xstats_calc_num();
- uint64_t values_copy[size];
+ uint64_t values_copy[IXGBE_XSTATS_CALC_NUM];
+ const uint16_t size = RTE_DIM(values_copy);
ixgbe_dev_xstats_get_by_id(dev, NULL, values_copy, size);
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index a4d9ec9b08..c1cf0a581a 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -14,11 +14,13 @@ static inline uint16_t
reassemble_packets(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_bufs,
uint16_t nb_bufs, uint8_t *split_flags)
{
- struct rte_mbuf *pkts[nb_bufs]; /*finished pkts*/
+ struct rte_mbuf *pkts[RTE_IXGBE_MAX_RX_BURST]; /*finished pkts*/
struct rte_mbuf *start = rxq->pkt_first_seg;
struct rte_mbuf *end = rxq->pkt_last_seg;
unsigned int pkt_idx, buf_idx;
+ RTE_ASSERT(nb_bufs <= RTE_DIM(pkts));
+
for (buf_idx = 0, pkt_idx = 0; buf_idx < nb_bufs; buf_idx++) {
if (end != NULL) {
/* processing a split packet */
--
2.47.0.vfs.0.3
[PATCH v14 05/81] hash: remove use of VLAs for Windows built code
From: Konstantin Ananyev 1) ./lib/hash/rte_cuckoo_hash.c:2362:9 : warning: ISO C90 forbids variable length array ‘positions’ 2) ../lib/hash/rte_cuckoo_hash.c:2478:9 : warning: ISO C90 forbids variable length array ‘positions’ Both rte_hash_lookup_bulk_data() and rte_hash_lookup_with_hash_bulk_data() expect @num_keys <= RTE_HASH_LOOKUP_BULK_MAX. So, for both cases it should be safe to replace VLA with fixed size array. Signed-off-by: Konstantin Ananyev Reviewed-by: Bruce Richardson Acked-by: Vladimir Medvedkin Acked-by: Chengwen Feng --- lib/hash/rte_cuckoo_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c index 9575e8aa0c..fc93182efe 100644 --- a/lib/hash/rte_cuckoo_hash.c +++ b/lib/hash/rte_cuckoo_hash.c @@ -2418,7 +2418,7 @@ rte_hash_lookup_bulk_data(const struct rte_hash *h, const void **keys, (num_keys > RTE_HASH_LOOKUP_BULK_MAX) || (hit_mask == NULL)), -EINVAL); - int32_t positions[num_keys]; + int32_t positions[RTE_HASH_LOOKUP_BULK_MAX]; __rte_hash_lookup_bulk(h, keys, num_keys, positions, hit_mask, data); @@ -2534,7 +2534,7 @@ rte_hash_lookup_with_hash_bulk_data(const struct rte_hash *h, (num_keys > RTE_HASH_LOOKUP_BULK_MAX) || (hit_mask == NULL)), -EINVAL); - int32_t positions[num_keys]; + int32_t positions[RTE_HASH_LOOKUP_BULK_MAX]; __rte_hash_lookup_with_hash_bulk(h, keys, sig, num_keys, positions, hit_mask, data); -- 2.47.0.vfs.0.3
[PATCH v14 14/81] common/idpf: remove use of VLAs for Windows built code
From: Tyler Retzlaff MSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson --- drivers/common/idpf/idpf_common_rxtx.c| 2 +- drivers/common/idpf/idpf_common_rxtx_avx512.c | 6 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/common/idpf/idpf_common_rxtx.c b/drivers/common/idpf/idpf_common_rxtx.c index a04e54ce26..e04ab40fa2 100644 --- a/drivers/common/idpf/idpf_common_rxtx.c +++ b/drivers/common/idpf/idpf_common_rxtx.c @@ -569,7 +569,7 @@ idpf_split_rx_bufq_refill(struct idpf_rx_queue *rx_bufq) uint16_t nb_refill = rx_bufq->rx_free_thresh; uint16_t nb_desc = rx_bufq->nb_rx_desc; uint16_t next_avail = rx_bufq->rx_tail; - struct rte_mbuf *nmb[rx_bufq->rx_free_thresh]; + struct rte_mbuf **nmb = alloca(sizeof(struct rte_mbuf *) * rx_bufq->rx_free_thresh); uint64_t dma_addr; uint16_t delta; int i; diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c index b8450b03ae..63e10c542f 100644 --- a/drivers/common/idpf/idpf_common_rxtx_avx512.c +++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c @@ -1002,7 +1002,8 @@ idpf_tx_singleq_free_bufs_avx512(struct idpf_tx_queue *txq) uint32_t n; uint32_t i; int nb_free = 0; - struct rte_mbuf *m, *free[txq->rs_thresh]; + struct rte_mbuf *m; + struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) * txq->rs_thresh); /* check DD bits on threshold descriptor */ if ((txq->tx_ring[txq->next_dd].qw1 & @@ -1326,7 +1327,8 @@ idpf_tx_splitq_free_bufs_avx512(struct idpf_tx_queue *txq) uint32_t n; uint32_t i; int nb_free = 0; - struct rte_mbuf *m, *free[txq->rs_thresh]; + struct rte_mbuf *m; + struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) * txq->rs_thresh); n = txq->rs_thresh; -- 2.47.0.vfs.0.3
[PATCH v14 08/81] gro: fix overwrite unprocessed packets
From: Konstantin Ananyev
gro_vxlan_tcp4_tbl_timeout_flush() is called without taking into account
that first entries in pkts[] can be already occupied by
un-processed packets.
Fixes: 74080d7dcf31 ("gro: support IPv6 for TCP")
Cc: sta...@dpdk.org
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/rte_gro.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index d824eebd93..db86117609 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -327,7 +327,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
i += gro_vxlan_tcp4_tbl_timeout_flush(&vxlan_tcp_tbl,
- 0, pkts, nb_pkts);
+ 0, &pkts[i], nb_pkts - i);
}
if (do_vxlan_udp_gro) {
--
2.47.0.vfs.0.3
[PATCH v14 20/81] app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Andre Muezerie
Acked-by: Chengwen Feng
---
app/test-pmd/meson.build | 10 +-
app/test-pmd/shared_rxq_fwd.c | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index f1c36529b4..efd1eab0b0 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -3,7 +3,15 @@
# override default name to drop the hyphen
name = 'testpmd'
-cflags += '-Wno-deprecated-declarations'
+
+warning_flags = ['-Wno-deprecated-declarations', '-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files(
'5tswap.c',
'cmdline.c',
diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c
index 623d62da88..b85830b90e 100644
--- a/app/test-pmd/shared_rxq_fwd.c
+++ b/app/test-pmd/shared_rxq_fwd.c
@@ -92,7 +92,7 @@ forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx,
static bool
shared_rxq_fwd(struct fwd_stream *fs)
{
- struct rte_mbuf *pkts_burst[nb_pkt_per_burst];
+ struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
uint16_t nb_rx;
nb_rx = common_fwd_stream_receive(fs, pkts_burst, nb_pkt_per_burst);
--
2.47.0.vfs.0.3
[PATCH v14 13/81] test: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Acked-by: Chengwen Feng
---
app/test/test.c | 2 +-
app/test/test_cmdline_string.c| 2 +-
app/test/test_cryptodev.c | 34 +--
app/test/test_cryptodev_blockcipher.c | 4 +--
app/test/test_cryptodev_crosscheck.c | 2 +-
app/test/test_dmadev.c| 9 +++--
app/test/test_hash.c | 14
app/test/test_mempool.c | 25 +++---
app/test/test_reorder.c | 48 +++
app/test/test_service_cores.c | 9 +++--
app/test/test_thash.c | 7 ++--
11 files changed, 82 insertions(+), 74 deletions(-)
diff --git a/app/test/test.c b/app/test/test.c
index 680351f6a3..fd653cbbfd 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -105,7 +105,7 @@ int
main(int argc, char **argv)
{
struct cmdline *cl;
- char *tests[argc]; /* store an array of tests to run */
+ char **tests = alloca(sizeof(char *) * argc); /* store an array of
tests to run */
int test_count = 0;
int i;
char *extra_args;
diff --git a/app/test/test_cmdline_string.c b/app/test/test_cmdline_string.c
index 97516c9400..e1cf86020f 100644
--- a/app/test/test_cmdline_string.c
+++ b/app/test/test_cmdline_string.c
@@ -40,7 +40,7 @@ struct string_elt_str string_elt_strs[] = {
#if (CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE) \
|| (CMDLINE_TEST_BUFSIZE < STR_MULTI_TOKEN_SIZE)
#undef CMDLINE_TEST_BUFSIZE
-#define CMDLINE_TEST_BUFSIZE RTE_MAX(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE)
+#define CMDLINE_TEST_BUFSIZE RTE_MAX_T(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE,
size_t)
#endif
struct string_nb_str {
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a33ef574cc..c05d377f0f 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2886,7 +2886,7 @@ create_wireless_algo_hash_session(uint8_t dev_id,
enum rte_crypto_auth_operation op,
enum rte_crypto_auth_algorithm algo)
{
- uint8_t hash_key[key_len];
+ uint8_t *hash_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -2922,7 +2922,7 @@ create_wireless_algo_cipher_session(uint8_t dev_id,
const uint8_t *key, const uint8_t key_len,
uint8_t iv_len)
{
- uint8_t cipher_key[key_len];
+ uint8_t *cipher_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -3074,7 +3074,7 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
const struct wireless_test_data *tdata)
{
const uint8_t key_len = tdata->key.len;
- uint8_t cipher_auth_key[key_len];
+ uint8_t *cipher_auth_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -9078,7 +9078,7 @@ create_aead_session(uint8_t dev_id, enum
rte_crypto_aead_algorithm algo,
const uint16_t aad_len, const uint8_t auth_len,
uint8_t iv_len)
{
- uint8_t aead_key[key_len];
+ uint8_t *aead_key = alloca(key_len);
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
@@ -12989,7 +12989,7 @@ test_cryptodev_error_recover_helper(uint8_t dev_id,
const void *test_data, bool
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
const struct blockcipher_test_data *tdata = test_data;
- uint8_t cipher_key[tdata->cipher_key.len];
+ uint8_t *cipher_key = alloca(tdata->cipher_key.len);
struct rte_crypto_sym_op *sym_op = NULL;
struct rte_crypto_op *op = NULL;
char *dst;
@@ -13343,7 +13343,7 @@ static int
test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
{
struct aead_test_data tdata;
- uint8_t aad[gcm_test_case_7.aad.len];
+ uint8_t *aad = alloca(gcm_test_case_7.aad.len);
int res;
RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
@@ -13732,7 +13732,7 @@ static int
test_AES_GCM_auth_decryption_fail_aad_corrupt(void)
{
struct aead_test_data tdata;
- uint8_t aad[gcm_test_case_7.aad.len];
+ uint8_t *aad = alloca(gcm_test_case_7.aad.len);
int res;
memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
@@ -13984,7 +13984,7 @@ test_authenticated_encryption_sessionless(
int retval;
uint8_t *ciphertext, *auth_
[PATCH v14 11/81] net/ice: remove use of VLAs
From: Konstantin Ananyev
../drivers/net/ice/ice_rxtx.c:1871:29: warning:
variable length array used [-Wvla]
Here VLA is used as a temp array for mbufs that will be used as a split
RX data buffers.
As at any given time only one thread can do RX from particular queue,
at rx_queue_setup() we can allocate extra space for that array, and then
safely use it at RX fast-path.
Signed-off-by: Konstantin Ananyev
Acked-by: Anatoly Burakov
---
drivers/net/ice/ice_rxtx.c | 18 --
drivers/net/ice/ice_rxtx.h | 2 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 0c7106c7e0..578453ec89 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1186,7 +1186,7 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
struct ice_vsi *vsi = pf->main_vsi;
struct ice_rx_queue *rxq;
const struct rte_memzone *rz;
- uint32_t ring_size;
+ uint32_t ring_size, tlen;
uint16_t len;
int use_def_burst_func = 1;
uint64_t offloads;
@@ -1294,9 +1294,14 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
/* always reserve more for bulk alloc */
len = (uint16_t)(nb_desc + ICE_RX_MAX_BURST);
+ /* allocate extra entries for SW split buffer */
+ tlen = ((rxq->offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT) != 0) ?
+ rxq->rx_free_thresh : 0;
+ tlen += len;
+
/* Allocate the software ring. */
rxq->sw_ring = rte_zmalloc_socket(NULL,
- sizeof(struct ice_rx_entry) * len,
+ sizeof(struct ice_rx_entry) * tlen,
RTE_CACHE_LINE_SIZE,
socket_id);
if (!rxq->sw_ring) {
@@ -1305,6 +1310,8 @@ ice_rx_queue_setup(struct rte_eth_dev *dev,
return -ENOMEM;
}
+ rxq->sw_split_buf = (tlen == len) ? NULL : rxq->sw_ring + len;
+
ice_reset_rx_queue(rxq);
rxq->q_set = true;
dev->data->rx_queues[queue_idx] = rxq;
@@ -1883,7 +1890,6 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
uint64_t dma_addr;
int diag, diag_pay;
uint64_t pay_addr;
- struct rte_mbuf *mbufs_pay[rxq->rx_free_thresh];
/* Allocate buffers in bulk */
alloc_idx = (uint16_t)(rxq->rx_free_trigger -
@@ -1898,7 +1904,7 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
if (rxq->offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT) {
diag_pay = rte_mempool_get_bulk(rxq->rxseg[1].mp,
- (void *)mbufs_pay, rxq->rx_free_thresh);
+ (void *)rxq->sw_split_buf, rxq->rx_free_thresh);
if (unlikely(diag_pay != 0)) {
PMD_RX_LOG(ERR, "Failed to get payload mbufs in bulk");
return -ENOMEM;
@@ -1923,8 +1929,8 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq)
rxdp[i].read.hdr_addr = 0;
rxdp[i].read.pkt_addr = dma_addr;
} else {
- mb->next = mbufs_pay[i];
- pay_addr =
rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbufs_pay[i]));
+ mb->next = rxq->sw_split_buf[i].mbuf;
+ pay_addr =
rte_cpu_to_le_64(rte_mbuf_data_iova_default(mb->next));
rxdp[i].read.hdr_addr = dma_addr;
rxdp[i].read.pkt_addr = pay_addr;
}
diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h
index 45f25b3609..20ee325c2b 100644
--- a/drivers/net/ice/ice_rxtx.h
+++ b/drivers/net/ice/ice_rxtx.h
@@ -139,6 +139,8 @@ struct ice_rx_queue {
uint32_t hw_time_high; /* high 32 bits of timestamp */
uint32_t hw_time_low; /* low 32 bits of timestamp */
uint64_t hw_time_update; /* SW time of HW record updating */
+ struct ice_rx_entry *sw_split_buf;
+ /* address of temp buffer for RX split mbufs */
struct rte_eth_rxseg_split rxseg[ICE_RX_MAX_NSEG];
uint32_t rxseg_nb;
bool ts_enable; /* if rxq timestamp is enabled */
--
2.47.0.vfs.0.3
[PATCH v14 09/81] gro: remove use of VLAs
From: Konstantin Ananyev
../lib/gro/rte_gro.c:182:34: warning:
variable length array used [-Wvla]
../lib/gro/rte_gro.c:363:34: warning:
variable length array used [-Wvla]
In both cases the pattern is the same: we use unprocess_pkts[nb_pkts] to
collect un-used by GRO packets, and then copy them to the start of
input/output pkts[] array.
In both cases, we can safely copy pkts[i] into already
processed entry at the same array, i.e. into pkts[unprocess_num].
Such change eliminates need of temporary VLA: unprocess_pkts[nb_pkts].
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/meson.build | 8
lib/gro/rte_gro.c | 40 ++--
2 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/lib/gro/meson.build b/lib/gro/meson.build
index dbce05220d..83b97e2022 100644
--- a/lib/gro/meson.build
+++ b/lib/gro/meson.build
@@ -11,3 +11,11 @@ sources = files(
)
headers = files('rte_gro.h')
deps += ['ethdev']
+
+warning_flags = ['-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index db86117609..6d5aadf32a 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -179,7 +179,6 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM]
= {{{0}} };
- struct rte_mbuf *unprocess_pkts[nb_pkts];
uint32_t item_num;
int32_t ret;
uint16_t i, unprocess_num = 0, nb_after_gro = nb_pkts;
@@ -275,7 +274,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_VXLAN_UDP4_PKT(pkts[i]->packet_type) &&
do_vxlan_udp_gro) {
ret = gro_vxlan_udp4_reassemble(pkts[i],
@@ -284,7 +283,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_TCP_PKT(pkts[i]->packet_type) &&
do_tcp4_gro) {
ret = gro_tcp4_reassemble(pkts[i], &tcp_tbl, 0);
@@ -292,7 +291,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_UDP_PKT(pkts[i]->packet_type) &&
do_udp4_gro) {
ret = gro_udp4_reassemble(pkts[i], &udp_tbl, 0);
@@ -300,7 +299,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV6_TCP_PKT(pkts[i]->packet_type) &&
do_tcp6_gro) {
ret = gro_tcp6_reassemble(pkts[i], &tcp6_tbl, 0);
@@ -308,21 +307,15 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
}
if ((nb_after_gro < nb_pkts)
|| (unprocess_num < nb_pkts)) {
- i = 0;
- /* Copy unprocessed packets */
- if (unprocess_num > 0) {
- memcpy(&pkts[i], unprocess_pkts,
- sizeof(struct rte_mbuf *) *
- unprocess_num);
- i = unprocess_num;
- }
+
+ i = unprocess_num;
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
@@ -360,7 +353,6 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
uint16_t nb_pkts,
void *
[PATCH v14 00/81] remove use of VLAs for Windows
As per guidance technical board meeting 2024/04/17. This series removes the use of VLAs from code built for Windows for all 3 toolchains. If there are additional opportunities to convert VLAs to regular C arrays please provide the details for incorporation into the series. MSVC does not support VLAs, replace VLAs with standard C arrays or alloca(). alloca() is available for all toolchain/platform combinations officially supported by DPDK. v14: * add -Wvla to meson build for directories that are VLA free under app, lib, drivers. This is to ensure that new VLAs are not added to these directories in the future. v13: * increase stack allocated buffer size in ipv4_reassembly_interleaved_flows_perf and ipv6_reassembly_interleaved_flows_perf to avoid STATUS_STACK_BUFFER_OVERRUN on Windows using MSVC v12: * update commit message for patch 06/21 to avoid warning v11: * add include stdlib.h for alloca() declaration on FreeBSD * zero-initialize array without code loop * increase maximum tuple length v10: * add ifdef to scope gcc's diagnostic error down to gcc only v9: * fix sender's email address * fix gcc's diagnostic error string to make clang happy v8: * rebase * reduce scope for disabling error "-Warray-bounds=" to only the place that needs it * remove parentesis around numbers from defines in test_bitset.c v7: * remove use of VLA from new file which sneaked in during review v6: * remove use of VLA from new test code added recently * fix title for patch 08/20 v5: * add patches for net/ice, net/ixgbe and gro from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=* * address debug_autotest ASan failure * address array-bound error in bitset_autotest with gcc-13 v4: * rebase and adapt for changes made in main since v3 was sent * use fixed maximum array size instead of VLA when doable v3: * address checkpatch/check git log warnings (minor typos) v2: * replace patches for ethdev, hash, rcu and include new patches for eal from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31781 Andre Muezerie (63): test: remove use of VLAs for Windows built code in bitset tests app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd hash: remove use of VLAs by using standard arrays app/dumpcap: add compile warning about use of VLAs app/graph: add compile warning about use of VLAs app/test-cmdline: add compile warning about use of VLAs app/test-compress-perf: add compile warning about use of VLAs app/test-fib: add compile warning about use of VLAs app/test-gpudev: add compile warning about use of VLAs app/test-mldev: add compile warning about use of VLAs app/test-pipeline: add compile warning about use of VLAs app/test-regex: add compile warning about use of VLAs app/test-security-perf: add compile warning about use of VLAs lib/argparse: add compile warning about use of VLAs lib/bbdev: add compile warning about use of VLAs lib/bitratestats: add compile warning about use of VLAs lib/cfgfile: add compile warning about use of VLAs lib/cmdline: add compile warning about use of VLAs lib/compressdev: add compile warning about use of VLAs lib/cryptodev: add compile warning about use of VLAs lib/distributor: add compile warning about use of VLAs lib/dmadev: add compile warning about use of VLAs lib/efd: add compile warning about use of VLAs lib/fib: add compile warning about use of VLAs lib/gpudev: add compile warning about use of VLAs lib/gso: add compile warning about use of VLAs lib/ip_frag: add compile warning about use of VLAs lib/jobstats: add compile warning about use of VLAs lib/kvargs: add compile warning about use of VLAs lib/latencystats: add compile warning about use of VLAs lib/log: add compile warning about use of VLAs lib/lpm: add compile warning about use of VLAs lib/mbuf: add compile warning about use of VLAs lib/mempool: add compile warning about use of VLAs lib/meter: add compile warning about use of VLAs lib/metrics: add compile warning about use of VLAs lib/mldev: add compile warning about use of VLAs lib/net: add compile warning about use of VLAs lib/node: add compile warning about use of VLAs lib/pcapng: add compile warning about use of VLAs lib/pci: add compile warning about use of VLAs lib/port: add compile warning about use of VLAs lib/ptr_compress: add compile warning about use of VLAs lib/rawdev: add compile warning about use of VLAs lib/reorder: add compile warning about use of VLAs lib/rib: add compile warning about use of VLAs lib/ring: add compile warning about use of VLAs lib/sched: add compile warning about use of VLAs lib/security: add compile warning about use of VLAs lib/stack: add compile warning about use of VLAs lib/telemetry: add compile warning about use of VLAs lib/timer: add compile warning about use of VLAs drivers/baseba
[PATCH v14 02/81] eal/linux: remove use of VLAs
From: Konstantin Ananyev
1) ./lib/eal/linux/eal_interrupts.c:1073:16
: warning: ISO C90 forbids variable length array ‘events’
MSVC does not support VLAs. Use alloca() to allocate the memory on
the stack.
2) ./lib/eal/linux/eal_interrupts.c:1319:16
: warning: ISO C90 forbids variable length array ‘evs’
make eal_epoll_wait() use a fixed size array and use it though multiple
iterations to process up to @maxevents events.
Note that technically it is not one to one replacement, as here we might
reduce number of events returned by first call to epoll_wait(..., timeout);
Signed-off-by: Konstantin Ananyev
---
lib/eal/linux/eal_interrupts.c | 32 +++-
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index 6436f796eb..23039964fc 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -34,6 +34,8 @@
#define EAL_INTR_EPOLL_WAIT_FOREVER (-1)
#define NB_OTHER_INTR 1
+#define MAX_ITER_EVNUM RTE_EVENT_ETH_INTR_RING_SIZE
+
static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */
/**
@@ -1070,7 +1072,7 @@ eal_intr_process_interrupts(struct epoll_event *events,
int nfds)
static void
eal_intr_handle_interrupts(int pfd, unsigned totalfds)
{
- struct epoll_event events[totalfds];
+ struct epoll_event *events = alloca(sizeof(struct epoll_event) *
totalfds);
int nfds = 0;
for(;;) {
@@ -1316,8 +1318,9 @@ static int
eal_epoll_wait(int epfd, struct rte_epoll_event *events,
int maxevents, int timeout, bool interruptible)
{
- struct epoll_event evs[maxevents];
int rc;
+ uint32_t i, k, n, num;
+ struct epoll_event evs[MAX_ITER_EVNUM];
if (!events) {
EAL_LOG(ERR, "rte_epoll_event can't be NULL");
@@ -1328,12 +1331,31 @@ eal_epoll_wait(int epfd, struct rte_epoll_event *events,
if (epfd == RTE_EPOLL_PER_THREAD)
epfd = rte_intr_tls_epfd();
+ num = maxevents;
+ n = RTE_MIN(RTE_DIM(evs), num);
+
+ /* Process events in chunks of MAX_ITER_EVNUM */
+
while (1) {
- rc = epoll_wait(epfd, evs, maxevents, timeout);
+ rc = epoll_wait(epfd, evs, n, timeout);
if (likely(rc > 0)) {
+
/* epoll_wait has at least one fd ready to read */
- rc = eal_epoll_process_event(evs, rc, events);
- break;
+ for (i = 0, k = 0; rc > 0;) {
+ k += rc;
+ rc = eal_epoll_process_event(evs, rc,
+ events + i);
+ i += rc;
+
+ /*
+* try to read more events that are already
+* available (up to maxevents in total).
+*/
+ n = RTE_MIN(RTE_DIM(evs), num - k);
+ rc = (n == 0) ? 0 : epoll_wait(epfd, evs, n, 0);
+ }
+ return i;
+
} else if (rc < 0) {
if (errno == EINTR) {
if (interruptible)
--
2.47.0.vfs.0.3
[PATCH v14 01/81] eal: include header required for alloca
From: Tyler Retzlaff Include alloca.h for Linux and malloc.h for Windows to get declaration of alloca(). Signed-off-by: Tyler Retzlaff --- lib/eal/freebsd/include/rte_os.h | 1 + lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/rte_os.h | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h index 62e70dc15b..94b9275beb 100644 --- a/lib/eal/freebsd/include/rte_os.h +++ b/lib/eal/freebsd/include/rte_os.h @@ -11,6 +11,7 @@ */ #include +#include /* Declares alloca() */ #include /* These macros are compatible with system's sys/queue.h. */ diff --git a/lib/eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h index 35c07c70cb..20eff0409a 100644 --- a/lib/eal/linux/include/rte_os.h +++ b/lib/eal/linux/include/rte_os.h @@ -10,6 +10,7 @@ * which is not supported natively or named differently in Linux. */ +#include #include #include diff --git a/lib/eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h index 9d69467aaa..d09adeb3b4 100644 --- a/lib/eal/windows/include/rte_os.h +++ b/lib/eal/windows/include/rte_os.h @@ -13,6 +13,7 @@ #include #include #include +#include #include -- 2.47.0.vfs.0.3
[PATCH v14 03/81] eal/common: remove use of VLAs
From: Konstantin Ananyev 1) ../lib/eal/common/eal_common_proc.c:695:15 : warning: variable length array used As msg->num_fds should not exceed RTE_MP_MAX_FD_NUM, replaced it with fixed size array. Signed-off-by: Konstantin Ananyev Acked-by: Stephen Hemminger --- lib/eal/common/eal_common_proc.c | 5 +++-- lib/eal/meson.build | 8 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index d24093937c..201973c5db 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -692,7 +692,8 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) struct sockaddr_un dst; struct mp_msg_internal m; int fd_size = msg->num_fds * sizeof(int); - char control[CMSG_SPACE(fd_size)]; + const int32_t control_sz = CMSG_SPACE(fd_size); + char control[CMSG_SPACE(sizeof(msg->fds))]; m.type = type; memcpy(&m.msg, msg, sizeof(*msg)); @@ -712,7 +713,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = control; - msgh.msg_controllen = sizeof(control); + msgh.msg_controllen = control_sz; cmsg = CMSG_FIRSTHDR(&msgh); cmsg->cmsg_len = CMSG_LEN(fd_size); diff --git a/lib/eal/meson.build b/lib/eal/meson.build index e1d6c4cf17..352db049e9 100644 --- a/lib/eal/meson.build +++ b/lib/eal/meson.build @@ -31,3 +31,11 @@ endif if is_freebsd annotate_locks = false endif + +warning_flags = ['-Wvla'] + +foreach arg: warning_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 04/81] ethdev: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/ethdev/rte_ethdev.c:3244:16
: warning: ISO C90 forbids variable length array ‘xstats_names’
2) ./lib/ethdev/rte_ethdev.c:3345:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
3) ./lib/ethdev/rte_ethdev.c:3538:16
: warning: ISO C90 forbids variable length array ‘xstats’
4) ./lib/ethdev/rte_ethdev.c:3554:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
For 1) and 3) - just replaced VLA with arrays allocated from heap.
As I understand xstats extraction belongs to control-path, so extra
calloc/free is hopefully acceptable.
Also ethdev xstats already doing that within
rte_eth_xstats_get_id_by_name().
For 2) and 4) changed the code to use fixed size array and call
appropriate devops function several times, if needed.
Signed-off-by: Konstantin Ananyev
---
lib/ethdev/meson.build | 8 ++
lib/ethdev/rte_ethdev.c | 183 +---
2 files changed, 121 insertions(+), 70 deletions(-)
diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build
index f1d2586591..f5faac8bba 100644
--- a/lib/ethdev/meson.build
+++ b/lib/ethdev/meson.build
@@ -62,3 +62,11 @@ endif
if get_option('buildtype').contains('debug')
cflags += ['-DRTE_FLOW_DEBUG']
endif
+
+warning_flags = ['-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..09cc4764c3 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -36,6 +36,8 @@
#include "ethdev_trace.h"
#include "sff_telemetry.h"
+#define ETH_XSTATS_ITER_NUM0x100
+
struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
/* public fast-path API */
@@ -3308,7 +3310,8 @@ int
rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
uint64_t *id)
{
- int cnt_xstats, idx_xstat;
+ int cnt_xstats, idx_xstat, rc;
+ struct rte_eth_xstat_name *xstats_names;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3334,26 +3337,33 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const
char *xstat_name,
}
/* Get id-name lookup table */
- struct rte_eth_xstat_name xstats_names[cnt_xstats];
+ xstats_names = calloc(cnt_xstats, sizeof(xstats_names[0]));
+ if (xstats_names == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
+ }
if (cnt_xstats != rte_eth_xstats_get_names_by_id(
port_id, xstats_names, cnt_xstats, NULL)) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot get xstats lookup");
+ free(xstats_names);
return -1;
}
+ rc = -EINVAL;
for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
if (!strcmp(xstats_names[idx_xstat].name, xstat_name)) {
*id = idx_xstat;
rte_eth_trace_xstats_get_id_by_name(port_id,
xstat_name, *id);
-
- return 0;
+ rc = 0;
+ break;
};
}
- return -EINVAL;
+ free(xstats_names);
+ return rc;
}
/* retrieve basic stats names */
@@ -3399,6 +3409,38 @@ eth_basic_stats_get_names(struct rte_eth_dev *dev,
return cnt_used_entries;
}
+static int
+eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names, uint32_t size,
+ uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+* Convert ids to xstats ids that PMD knows.
+* ids known by user are basic + extended stats.
+*/
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy,
+ xstats_names + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
+
/* retrieve ethdev extended statistics names */
int
rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -3406,9 +3448,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
uint64_t *ids)
{
struct rte_eth_xstat_name *xstats_names_copy;
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
unsigned int expected_entries;
+ unsigned int nb_basic_stats;
unsigned int basic_count;
struct rte_eth_dev *dev;
unsigned int i;
@@ -3434,27 +3475,18 @@ rte_eth_xstats_get_names_by_id(uint16_t
[PATCH v14 06/81] hash/thash: remove use of VLAs for Windows built
From: Konstantin Ananyev
1) ./lib/hash/rte_thash.c:774:9
: warning: ISO C90 forbids variable length array ‘tmp_tuple’
The tuple can exceed sizeof(union rte_thash_tuple), for example if any
tunneling header is used in the RSS hash calculation.
The longest RSS hash key currently supported is 52 bytes. Technically, the
longest tuple with such a key should be (52 - sizeof(uint32_t)), so this
can be used as a size of the tmp_tuple array.
Signed-off-by: Konstantin Ananyev
---
lib/hash/rte_thash.c | 2 +-
lib/hash/rte_thash.h | 7 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 336c228e64..fa78787143 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -761,7 +761,7 @@ rte_thash_adjust_tuple(struct rte_thash_ctx *ctx,
uint32_t desired_value, unsigned int attempts,
rte_thash_check_tuple_t fn, void *userdata)
{
- uint32_t tmp_tuple[tuple_len / sizeof(uint32_t)];
+ uint32_t tmp_tuple[RTE_THASH_TUPLE_LEN_MAX];
unsigned int i, j, ret = 0;
uint32_t hash, adj_bits;
const uint8_t *hash_key;
diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h
index c0af5968df..04f9f1875c 100644
--- a/lib/hash/rte_thash.h
+++ b/lib/hash/rte_thash.h
@@ -121,6 +121,13 @@ __rte_internal
uint32_t
thash_get_rand_poly(uint32_t poly_degree);
+/**
+ * Longest RSS hash key currently supported
+ */
+#define RTE_THASH_KEY_LEN_MAX 52
+
+#define RTE_THASH_TUPLE_LEN_MAX (RTE_THASH_KEY_LEN_MAX - sizeof(uint32_t))
+
/**
* Prepare special converted key to use with rte_softrss_be()
* @param orig
--
2.47.0.vfs.0.3
[PATCH v14 19/81] test: remove use of VLAs for Windows built code in bitset tests
1) MSVC does not support VLAs. Use standard fixed C arrays of
maximum size required instead.
2) ../usr/lib/gcc/x86_64-redhat-linux/13/include/emmintrin.h:742:8:
error: array subscript 9 is outside array bounds of 'uint64_t[16]'
{aka 'long unsigned int[16]'} [-Werror=array-bounds=]
3695 742 | *__P = __B;
Compile with -Wno-array-bounds to avoid false positives when
using gcc version 11 or newer (gcc compiler bug/limitation).
Signed-off-by: Andre Muezerie
---
app/test/test_bitset.c | 69 -
app/test/test_lcore_var_perf.c | 2 +-
app/test/test_reassembly_perf.c | 22 ++-
3 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/app/test/test_bitset.c b/app/test/test_bitset.c
index 50b8bf0da4..45460204c1 100644
--- a/app/test/test_bitset.c
+++ b/app/test/test_bitset.c
@@ -99,11 +99,13 @@ typedef void clear_fun(uint64_t *bitset, size_t bit_num);
typedef void assign_fun(uint64_t *bitset, size_t bit_num, bool value);
typedef void flip_fun(uint64_t *bitset, size_t bit_num);
+#define RAND_SET_MAX_SIZE 1000
+
static int
test_set_clear_size(test_fun test_fun, set_fun set_fun, clear_fun clear_fun,
size_t size)
{
size_t i;
- bool reference[size];
+ bool reference[RAND_SET_MAX_SIZE];
uint64_t *bitset;
rand_bool_ary(reference, size);
@@ -131,8 +133,7 @@ test_set_clear_size(test_fun test_fun, set_fun set_fun,
clear_fun clear_fun, siz
return TEST_SUCCESS;
}
-#define RAND_ITERATIONS (1)
-#define RAND_SET_MAX_SIZE (1000)
+#define RAND_ITERATIONS 1
static int
test_set_clear_fun(test_fun test_fun, set_fun set_fun, clear_fun clear_fun)
@@ -168,10 +169,20 @@ test_flip_size(test_fun test_fun, assign_fun assign_fun,
flip_fun flip_fun, size
rand_bitset(bitset, size);
for (i = 0; i < size; i++) {
- RTE_BITSET_DECLARE(reference, size);
+ RTE_BITSET_DECLARE(reference, RAND_SET_MAX_SIZE);
+
+#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 11)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+ /* gcc is giving false positives here when code is optimized */
rte_bitset_copy(reference, bitset, size);
+#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 11)
+#pragma GCC diagnostic pop
+#endif
+
bool value = test_fun(bitset, i);
flip_fun(bitset, i);
@@ -282,13 +293,13 @@ find_clear(const bool *ary, size_t num_bools, size_t
start, size_t len)
return find(ary, num_bools, start, len, false);
}
-#define FFS_ITERATIONS (100)
+#define FFS_ITERATIONS 100
static int
test_find_size(size_t size, bool set)
{
uint64_t *bitset;
- bool reference[size];
+ bool reference[RAND_SET_MAX_SIZE];
size_t i;
bitset = alloc_bitset(size);
@@ -388,8 +399,8 @@ record_match(ssize_t match_idx, size_t size, int *calls)
static int
test_foreach_size(ssize_t size, bool may_wrap, bool set)
{
- bool reference[size];
- int calls[size];
+ bool reference[RAND_SET_MAX_SIZE];
+ int calls[RAND_SET_MAX_SIZE];
uint64_t *bitset;
ssize_t i;
ssize_t start_bit;
@@ -633,17 +644,19 @@ test_define(void)
typedef void bitset_op(uint64_t *dst, const uint64_t *a, const uint64_t *b,
size_t bit_num);
typedef bool bool_op(bool a, bool b);
+#define LOGIC_MAX_SET_SIZE 200
+
static int
test_logic_op(bitset_op bitset_op, bool_op bool_op)
{
- const size_t size = 1 + rte_rand_max(200);
- RTE_BITSET_DECLARE(bitset_a, size);
- RTE_BITSET_DECLARE(bitset_b, size);
- RTE_BITSET_DECLARE(bitset_d, size);
+ const size_t size = 1 + rte_rand_max(LOGIC_MAX_SET_SIZE);
+ RTE_BITSET_DECLARE(bitset_a, LOGIC_MAX_SET_SIZE);
+ RTE_BITSET_DECLARE(bitset_b, LOGIC_MAX_SET_SIZE);
+ RTE_BITSET_DECLARE(bitset_d, LOGIC_MAX_SET_SIZE);
- bool ary_a[size];
- bool ary_b[size];
- bool ary_d[size];
+ bool ary_a[LOGIC_MAX_SET_SIZE];
+ bool ary_b[LOGIC_MAX_SET_SIZE];
+ bool ary_d[LOGIC_MAX_SET_SIZE];
rand_bool_ary(ary_a, size);
rand_bool_ary(ary_b, size);
@@ -708,14 +721,14 @@ test_complement(void)
for (i = 0; i < RAND_ITERATIONS; i++) {
const size_t size = 1 + rte_rand_max(RAND_SET_MAX_SIZE - 1);
- RTE_BITSET_DECLARE(src, size);
+ RTE_BITSET_DECLARE(src, RAND_SET_MAX_SIZE);
rand_bitset(src, size);
bool bit_idx = rte_rand_max(size);
bool bit_value = rte_bitset_test(src, bit_idx);
- RTE_BITSET_DECLARE(dst, size);
+ RTE_BITSET_DECLARE(dst, RAND_SET_MAX_SIZE);
rte_bitset_complement(dst, src, size);
@@ -726,6 +739,8 @@ test_complement(void)
return TEST_SUCCESS;
}
+#define SHIFT_SET_MAX_SIZE 500
+
static int
test_shift(bool right)
{
@@ -734,12 +749,12 @@ test_shift
[PATCH v14 17/81] net/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/net/meson.build | 8
drivers/net/mlx5/mlx5.c | 5 ++---
drivers/net/mlx5/mlx5_flow.c | 6 +++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index dafd637ba4..170e7339e5 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -68,3 +68,11 @@ drivers = [
std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std
std_deps += ['bus_vdev']# same with vdev bus
+
+warning_flags = ['-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6e4473e2f4..979e54686b 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1598,14 +1598,13 @@ void
mlx5_rt_timestamp_config(struct mlx5_dev_ctx_shared *sh,
struct mlx5_hca_attr *hca_attr)
{
- uint32_t dw_cnt = MLX5_ST_SZ_DW(register_mtutc);
- uint32_t reg[dw_cnt];
+ uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
int ret = ENOTSUP;
if (hca_attr->access_register_user)
ret = mlx5_devx_cmd_register_read(sh->cdev->ctx,
MLX5_REGISTER_ID_MTUTC, 0,
- reg, dw_cnt);
+ reg, RTE_DIM(reg));
if (!ret) {
uint32_t ts_mode;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 16ddd05448..37b5402447 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1479,8 +1479,8 @@ mlx5_flow_item_acceptable(const struct rte_eth_dev *dev,
"mask/last without a spec is not"
" supported");
if (item->spec && item->last && !range_accepted) {
- uint8_t spec[size];
- uint8_t last[size];
+ uint8_t *spec = alloca(size);
+ uint8_t *last = alloca(size);
unsigned int i;
int ret;
@@ -8477,7 +8477,7 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
.type = RTE_FLOW_ITEM_TYPE_END,
},
};
- uint16_t queue[priv->reta_idx_n];
+ uint16_t *queue = alloca(sizeof(uint16_t) * priv->reta_idx_n);
struct rte_flow_action_rss action_rss = {
.func = RTE_ETH_HASH_FUNCTION_DEFAULT,
.level = 0,
--
2.47.0.vfs.0.3
[PATCH v14 16/81] common/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/common/meson.build | 8
drivers/common/mlx5/mlx5_common.h| 4 ++--
drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index 8734af36aa..79ba0a3001 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -11,3 +11,11 @@ drivers = [
'mvep',
'octeontx',
]
+
+warning_flags = ['-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 1abd1e8239..f29f06a86e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -125,10 +125,10 @@ mlx5_fp_debug_enabled(void)
/* Allocate a buffer on the stack and fill it with a printf format string. */
#define MKSTR(name, ...) \
int mkstr_size_##name = snprintf(NULL, 0, "" __VA_ARGS__); \
- char name[mkstr_size_##name + 1]; \
+ char *name = alloca(mkstr_size_##name + 1); \
\
memset(name, 0, mkstr_size_##name + 1); \
- snprintf(name, sizeof(name), "" __VA_ARGS__)
+ snprintf(name, mkstr_size_##name + 1, "" __VA_ARGS__)
enum {
PCI_VENDOR_ID_MELLANOX = 0x15b3,
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index a75f011750..804ee67cd6 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -284,10 +284,9 @@ mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_obj *dcs,
void *cmd_comp,
uint64_t async_id)
{
- int out_len = MLX5_ST_SZ_BYTES(query_flow_counter_out) +
- MLX5_ST_SZ_BYTES(traffic_counter);
- uint32_t out[out_len];
+ uint32_t out[MLX5_ST_SZ_BYTES(query_flow_counter_out) +
MLX5_ST_SZ_BYTES(traffic_counter)];
uint32_t in[MLX5_ST_SZ_DW(query_flow_counter_in)] = {0};
+ const int out_len = RTE_DIM(out);
void *stats;
int rc;
@@ -346,7 +345,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
int klm_num = attr->klm_num;
int in_size_dw = MLX5_ST_SZ_DW(create_mkey_in) +
(klm_num ? RTE_ALIGN(klm_num, 4) : 0) * MLX5_ST_SZ_DW(klm);
- uint32_t in[in_size_dw];
+ uint32_t *in = alloca(sizeof(uint32_t) * in_size_dw);
uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
void *mkc;
struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
--
2.47.0.vfs.0.3
[PATCH v14 23/81] app/graph: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/graph/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/graph/meson.build b/app/graph/meson.build
index 344e4a418f..28ad533498 100644
--- a/app/graph/meson.build
+++ b/app/graph/meson.build
@@ -33,3 +33,11 @@ cmd_h = custom_target('commands_hdr',
command: [cmdline_gen_cmd, '--context-name=modules_ctx', '@INPUT@']
)
sources += cmd_h
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 61/81] lib/ptr_compress: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/ptr_compress/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/ptr_compress/meson.build b/lib/ptr_compress/meson.build
index e92706a45f..7074348513 100644
--- a/lib/ptr_compress/meson.build
+++ b/lib/ptr_compress/meson.build
@@ -2,3 +2,11 @@
# Copyright(c) 2024 Arm Limited
headers = files('rte_ptr_compress.h')
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 15/81] net/i40e: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
Reviewed-by: Bruce Richardson
---
drivers/net/i40e/i40e_testpmd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_testpmd.c b/drivers/net/i40e/i40e_testpmd.c
index b6ef5d6e42..21f596297b 100644
--- a/drivers/net/i40e/i40e_testpmd.c
+++ b/drivers/net/i40e/i40e_testpmd.c
@@ -2168,8 +2168,7 @@ cmd_ptype_mapping_get_parsed(void *parsed_result,
{
struct cmd_ptype_mapping_get_result *res = parsed_result;
int ret = -ENOTSUP;
- int max_ptype_num = 256;
- struct rte_pmd_i40e_ptype_mapping mapping[max_ptype_num];
+ struct rte_pmd_i40e_ptype_mapping mapping[256];
uint16_t count;
int i;
@@ -2178,7 +2177,7 @@ cmd_ptype_mapping_get_parsed(void *parsed_result,
ret = rte_pmd_i40e_ptype_mapping_get(res->port_id,
mapping,
- max_ptype_num,
+ RTE_DIM(mapping),
&count,
res->valid_only);
switch (ret) {
--
2.47.0.vfs.0.3
[PATCH v14 55/81] lib/mldev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/mldev/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/mldev/meson.build b/lib/mldev/meson.build
index 2c933baad6..d49302f021 100644
--- a/lib/mldev/meson.build
+++ b/lib/mldev/meson.build
@@ -48,3 +48,11 @@ if get_option('buildtype').contains('debug')
else
cflags += [ '-URTE_LIBRTE_ML_DEV_DEBUG' ]
endif
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 21/81] hash: remove use of VLAs by using standard arrays
MSVC does not support VLAs, replace VLAs with standard C arrays.
Signed-off-by: Andre Muezerie
---
lib/hash/meson.build | 8
lib/hash/rte_thash_gf2_poly_math.c | 9 -
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index 7ce504ee8b..289c6a3543 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -29,3 +29,11 @@ sources = files(
deps += ['net']
deps += ['ring']
deps += ['rcu']
+
+warning_flags = ['-Wvla']
+
+foreach arg: warning_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
diff --git a/lib/hash/rte_thash_gf2_poly_math.c
b/lib/hash/rte_thash_gf2_poly_math.c
index 1c62974e71..825da4382f 100644
--- a/lib/hash/rte_thash_gf2_poly_math.c
+++ b/lib/hash/rte_thash_gf2_poly_math.c
@@ -8,6 +8,7 @@
#include
#include
+#define MAX_POLY_DEGREE 32
#define MAX_TOEPLITZ_KEY_LENGTH 64
RTE_LOG_REGISTER_SUFFIX(thash_poly_logtype, thash_poly, INFO);
#define RTE_LOGTYPE_HASH thash_poly_logtype
@@ -149,7 +150,7 @@ gf2_pow(uint32_t a, uint32_t pow, uint32_t r, int degree)
static uint32_t
__thash_get_rand_poly(int poly_degree)
{
- uint32_t roots[poly_degree];
+ uint32_t roots[MAX_POLY_DEGREE];
uint32_t rnd;
uint32_t ret_poly = 0;
int i, j;
@@ -194,9 +195,7 @@ __thash_get_rand_poly(int poly_degree)
* Get coefficients of the polynomial for
* (x - roots[0])(x - roots[1])...(x - roots[n])
*/
- uint32_t poly_coefficients[poly_degree + 1];
- for (i = 0; i <= poly_degree; i++)
- poly_coefficients[i] = 0;
+ uint32_t poly_coefficients[MAX_POLY_DEGREE + 1] = {0};
poly_coefficients[0] = 1; /* highest degree term coefficient in the end
*/
for (i = 0; i < (int)poly_degree; i++) {
@@ -247,7 +246,7 @@ thash_get_rand_poly(uint32_t poly_degree)
{
uint32_t ret_poly;
- if (poly_degree > 32) {
+ if (poly_degree > MAX_POLY_DEGREE) {
HASH_LOG(ERR, "Wrong polynomial degree %d, must be in range [1,
32]", poly_degree);
return 0;
}
--
2.47.0.vfs.0.3
[PATCH v14 25/81] app/test-compress-perf: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- app/test-compress-perf/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-compress-perf/meson.build b/app/test-compress-perf/meson.build index 34dcfe5b8e..58fea052d9 100644 --- a/app/test-compress-perf/meson.build +++ b/app/test-compress-perf/meson.build @@ -16,3 +16,11 @@ sources = files( 'main.c', ) deps = ['compressdev'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 32/81] lib/argparse: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/argparse/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/argparse/meson.build b/lib/argparse/meson.build
index b6a08ca049..3ef537b958 100644
--- a/lib/argparse/meson.build
+++ b/lib/argparse/meson.build
@@ -5,3 +5,11 @@ sources = files('rte_argparse.c')
headers = files('rte_argparse.h')
deps += ['log']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 60/81] lib/port: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/port/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/port/meson.build b/lib/port/meson.build
index b597772872..4a09af361f 100644
--- a/lib/port/meson.build
+++ b/lib/port/meson.build
@@ -46,3 +46,11 @@ if dpdk_conf.has('RTE_HAS_LIBPCAP')
dpdk_conf.set('RTE_PORT_PCAP', 1)
ext_deps += pcap_dep # dependency provided in config/meson.build
endif
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 22/81] app/dumpcap: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/dumpcap/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/dumpcap/meson.build b/app/dumpcap/meson.build
index 69c016c780..675f5d7448 100644
--- a/app/dumpcap/meson.build
+++ b/app/dumpcap/meson.build
@@ -15,3 +15,11 @@ endif
ext_deps += pcap_dep
sources = files('main.c')
deps += ['ethdev', 'pdump', 'pcapng', 'bpf']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 64/81] lib/rib: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/rib/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/rib/meson.build b/lib/rib/meson.build
index e98f708481..58fcb825a8 100644
--- a/lib/rib/meson.build
+++ b/lib/rib/meson.build
@@ -5,3 +5,11 @@
sources = files('rte_rib.c', 'rte_rib6.c')
headers = files('rte_rib.h', 'rte_rib6.h')
deps += ['net', 'mempool']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 30/81] app/test-regex: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/test-regex/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-regex/meson.build b/app/test-regex/meson.build
index e3ba060e55..a0c5bcebc4 100644
--- a/app/test-regex/meson.build
+++ b/app/test-regex/meson.build
@@ -9,3 +9,11 @@ endif
sources = files('main.c')
deps = ['regexdev']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 18/81] build: enable vla warnings on Windows built code
From: Tyler Retzlaff MSVC does not support optional C11 VLAs. When building for Windows enable -Wvla so that mingw and clang also fail if a VLA is used. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson Acked-by: Chengwen Feng --- config/meson.build | 4 1 file changed, 4 insertions(+) diff --git a/config/meson.build b/config/meson.build index 6aaad6d8a4..ebca19b4e5 100644 --- a/config/meson.build +++ b/config/meson.build @@ -342,6 +342,10 @@ if cc.get_id() == 'intel' warning_flags += '-diag-disable=@0@'.format(i) endforeach endif +# no VLAs in code built on Windows +if is_windows +warning_flags += '-Wvla' +endif foreach arg: warning_flags if cc.has_argument(arg) add_project_arguments(arg, language: 'c') -- 2.47.0.vfs.0.3
[PATCH v14 24/81] app/test-cmdline: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/test-cmdline/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-cmdline/meson.build b/app/test-cmdline/meson.build
index 6027f67919..06813ff1f5 100644
--- a/app/test-cmdline/meson.build
+++ b/app/test-cmdline/meson.build
@@ -9,3 +9,11 @@ endif
sources = files('commands.c', 'cmdline_test.c')
deps += 'cmdline'
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 28/81] app/test-mldev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- app/test-mldev/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-mldev/meson.build b/app/test-mldev/meson.build index 2922888e9f..06fba62947 100644 --- a/app/test-mldev/meson.build +++ b/app/test-mldev/meson.build @@ -23,3 +23,11 @@ sources = files( ) deps += ['mldev', 'hash'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 58/81] lib/pcapng: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/pcapng/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/pcapng/meson.build b/lib/pcapng/meson.build
index 4549925d41..0ccaf2dcfd 100644
--- a/lib/pcapng/meson.build
+++ b/lib/pcapng/meson.build
@@ -5,3 +5,11 @@ sources = files('rte_pcapng.c')
headers = files('rte_pcapng.h')
deps += ['ethdev']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 63/81] lib/reorder: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/reorder/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/reorder/meson.build b/lib/reorder/meson.build
index 03aed53d90..5197da9298 100644
--- a/lib/reorder/meson.build
+++ b/lib/reorder/meson.build
@@ -4,3 +4,11 @@
sources = files('rte_reorder.c')
headers = files('rte_reorder.h')
deps += ['mbuf']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 57/81] lib/node: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- lib/node/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/node/meson.build b/lib/node/meson.build index 0bed97a96c..4c7361a53a 100644 --- a/lib/node/meson.build +++ b/lib/node/meson.build @@ -35,3 +35,11 @@ headers = files( # Strict-aliasing rules are violated by uint8_t[] to context size casts. cflags += '-fno-strict-aliasing' deps += ['graph', 'mbuf', 'lpm', 'ethdev', 'mempool', 'cryptodev', 'ip_frag'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 29/81] app/test-pipeline: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- app/test-pipeline/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-pipeline/meson.build b/app/test-pipeline/meson.build index 3add6b637b..bec2e7958b 100644 --- a/app/test-pipeline/meson.build +++ b/app/test-pipeline/meson.build @@ -19,3 +19,11 @@ sources = files( 'runtime.c', ) deps += ['pipeline', 'pci'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 33/81] lib/bbdev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/bbdev/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/bbdev/meson.build b/lib/bbdev/meson.build
index 07685e7578..542372d29b 100644
--- a/lib/bbdev/meson.build
+++ b/lib/bbdev/meson.build
@@ -12,3 +12,11 @@ headers = files('rte_bbdev.h',
'rte_bbdev_pmd.h',
'rte_bbdev_op.h')
deps += ['mbuf']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 26/81] app/test-fib: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/test-fib/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-fib/meson.build b/app/test-fib/meson.build
index eb36772cf3..f639171068 100644
--- a/app/test-fib/meson.build
+++ b/app/test-fib/meson.build
@@ -9,3 +9,11 @@ endif
sources = files('main.c')
deps += ['fib', 'lpm', 'net']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 31/81] app/test-security-perf: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- app/test-security-perf/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/app/test-security-perf/meson.build b/app/test-security-perf/meson.build index 547de9c908..507d17d368 100644 --- a/app/test-security-perf/meson.build +++ b/app/test-security-perf/meson.build @@ -13,3 +13,11 @@ sources = files( '../test/test_security_proto.c', ) deps += ['security', 'cmdline'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 34/81] lib/bitratestats: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/bitratestats/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/bitratestats/meson.build b/lib/bitratestats/meson.build
index ede7e0a579..793c6cfc04 100644
--- a/lib/bitratestats/meson.build
+++ b/lib/bitratestats/meson.build
@@ -4,3 +4,11 @@
sources = files('rte_bitrate.c')
headers = files('rte_bitrate.h')
deps += ['ethdev', 'metrics']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 62/81] lib/rawdev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/rawdev/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/rawdev/meson.build b/lib/rawdev/meson.build
index 7dfc3d5cf9..5e60255676 100644
--- a/lib/rawdev/meson.build
+++ b/lib/rawdev/meson.build
@@ -11,3 +11,11 @@ sources = files('rte_rawdev.c')
headers = files('rte_rawdev.h', 'rte_rawdev_pmd.h')
deps += ['telemetry']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 38/81] lib/cryptodev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- lib/cryptodev/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/cryptodev/meson.build b/lib/cryptodev/meson.build index 4734acf321..02bf7cec8e 100644 --- a/lib/cryptodev/meson.build +++ b/lib/cryptodev/meson.build @@ -21,3 +21,11 @@ driver_sdk_headers += files( ) deps += ['kvargs', 'mbuf', 'rcu', 'telemetry'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 37/81] lib/compressdev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- lib/compressdev/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/compressdev/meson.build b/lib/compressdev/meson.build index c80295dc0d..b3546fa8e2 100644 --- a/lib/compressdev/meson.build +++ b/lib/compressdev/meson.build @@ -17,3 +17,11 @@ driver_sdk_headers = files( 'rte_compressdev_internal.h', ) deps += ['kvargs', 'mbuf'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
[PATCH v14 35/81] lib/cfgfile: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
lib/cfgfile/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/lib/cfgfile/meson.build b/lib/cfgfile/meson.build
index 88eb819856..afc0a87c00 100644
--- a/lib/cfgfile/meson.build
+++ b/lib/cfgfile/meson.build
@@ -3,3 +3,11 @@
sources = files('rte_cfgfile.c')
headers = files('rte_cfgfile.h')
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 27/81] app/test-gpudev: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being
introduced under this path.
Signed-off-by: Andre Muezerie
---
app/test-gpudev/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/app/test-gpudev/meson.build b/app/test-gpudev/meson.build
index 17bdef3646..9d119a11a0 100644
--- a/app/test-gpudev/meson.build
+++ b/app/test-gpudev/meson.build
@@ -3,3 +3,11 @@
sources = files('main.c')
deps = ['gpudev', 'ethdev']
+
+extra_flags = ['-Wvla']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
--
2.47.0.vfs.0.3
[PATCH v14 36/81] lib/cmdline: add compile warning about use of VLAs
MSVC does not support VLAs, so we want to prevent VLAs from being introduced under this path. Signed-off-by: Andre Muezerie --- lib/cmdline/meson.build | 8 1 file changed, 8 insertions(+) diff --git a/lib/cmdline/meson.build b/lib/cmdline/meson.build index 63fb69100d..da7a578d05 100644 --- a/lib/cmdline/meson.build +++ b/lib/cmdline/meson.build @@ -32,3 +32,11 @@ else endif deps += ['net'] + +extra_flags = ['-Wvla'] + +foreach arg: extra_flags +if cc.has_argument(arg) +cflags += arg +endif +endforeach -- 2.47.0.vfs.0.3
