RE: [PATCH v18 00/26] remove use of VLAs for Windows
> From: Andre Muezerie [mailto:andre...@linux.microsoft.com] > Sent: Thursday, 30 January 2025 22.55 > > 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. > > v18: > * add no_vla_cflag to examples directories that are not VLA-free > * add no_vla_cflag to drivers directories that are not VLA-free and >were missed in v17 due to missing libs > > v17: > * define no_vla_cflag in a top directory (config) > * add no_vla_cflag to directories that are not VLA-free > * add -Wvla project-wide (VLAs not allowed by default, except for >directories using no_vla_cflag) nit: The name no_vla_cflag is inverted. It should be e.g. no_wvla_cflag or allow_vla_cflag. Although the latter lacks indication that it is an exception, it could be mentioned in a comment where it is defined. Maybe no_wvla_cflag is better.
Re: [PATCH v2 3/3] trace: fix undefined behavior in register
On Thu, 30 Jan 2025 15:58:49 +0100 David Marchand wrote: > Registering a tracepoint handler was resulting so far in undefined > behavior at runtime. > > The RTE_TRACE_POINT_REGISTER() macro was casting the tracepoint handler > (which expects arguments) to a void (*)(void). > At runtime, calling this handler while registering resulted in > reading the current stack with no relation to this function prototype. > > Instead, declare an additional inline _register() handler for each > tracepoint and make sure that the emitting macros in > rte_trace_point_register.h only work on arguments name and type. > > The original tracepoint handler prototype is adjusted by adding a > __rte_unused for each argument (since emitting macros do nothing > with them). > This last part introduces an implementation limit of 15 arguments. > > With this change in place, the workaround in dmadev tracepoints can be > removed. > > Signed-off-by: David Marchand When I build with -Db_santize=undefined the following warning shows up. It seems related. In function ‘rte_ethdev_trace_get_dcb_info’, inlined from ‘rte_eth_dev_get_dcb_info’ at ../lib/ethdev/rte_ethdev.c:6720:2: ../lib/eal/include/rte_trace_point.h:381:9: warning: writing 1 byte into a region of size 0 [-Wstringop-overflow=] 381 | memcpy(mem, &(in), sizeof(in)); \ | ^~ ../lib/eal/include/rte_trace_point.h:53:9: note: in definition of macro ‘__RTE_TRACE_POINT’ 53 | __VA_ARGS__ \ | ^~~ ../lib/ethdev/ethdev_trace.h:1213:1: note: in expansion of macro ‘RTE_TRACE_POINT’ 1213 | RTE_TRACE_POINT( | ^~~ ../lib/eal/include/rte_trace_point.h:399:9: note: in expansion of macro ‘__rte_trace_point_emit’ 399 | __rte_trace_point_emit(len, uint8_t); \ | ^~ ../lib/ethdev/ethdev_trace.h:1223:9: note: in expansion of macro ‘rte_trace_point_emit_blob’ 1223 | rte_trace_point_emit_blob(dcb_info->tc_bws, num_tcs); | ^ In function ‘rte_eth_dev_get_dcb_info’: cc1: note: destination object is likely at address zero In function ‘rte_ethdev_trace_get_dcb_info’, inlined from ‘rte_eth_dev_get_dcb_info’ at ../lib/ethdev/rte_ethdev.c:6720:2: ../lib/eal/include/rte_trace_point.h:401:9: warning: ‘memset’ offset [0, 55] is out of the bounds [0, 0] [-Warray-bounds=] 401 | memset(RTE_PTR_ADD(mem, len), 0, RTE_TRACE_BLOB_LEN_MAX - len); \ | ^~ ../lib/eal/include/rte_trace_point.h:53:9: note: in definition of macro ‘__RTE_TRACE_POINT’ 53 | __VA_ARGS__ \ | ^~~ ../lib/ethdev/ethdev_trace.h:1213:1: note: in expansion of macro ‘RTE_TRACE_POINT’ 1213 | RTE_TRACE_POINT( | ^~~ ../lib/ethdev/ethdev_trace.h:1222:9: note: in expansion of macro ‘rte_trace_point_emit_blob’ 1222 | rte_trace_point_emit_blob(dcb_info->prio_tc, num_user_priorities);
[PATCH] net/ice: fix segmentation fault Rx function
Fix a typo in avx512 rx function, where accidentally the _mm_load_si128
argument was passed by value instead of a pointer.
Fixes: 43fd3624fdfe ("drivers: replace GCC pragma with cast")
Cc: andre...@linux.microsoft.com
Signed-off-by: Vladimir Medvedkin
---
drivers/net/intel/ice/ice_rxtx_vec_avx512.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
index 681b31f61f..bd49be07c9 100644
--- a/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
+++ b/drivers/net/intel/ice/ice_rxtx_vec_avx512.c
@@ -474,7 +474,7 @@ _ice_recv_raw_pkts_vec_avx512(struct ice_rx_queue *rxq,
(RTE_CAST_PTR(const __m128i *,
&rxdp[7].wb.status_error1));
rte_compiler_barrier();
const __m128i raw_desc_bh6 = _mm_load_si128
- (RTE_CAST_PTR(const __m128i *,
rxdp[6].wb.status_error1));
+ (RTE_CAST_PTR(const __m128i *,
&rxdp[6].wb.status_error1));
rte_compiler_barrier();
const __m128i raw_desc_bh5 = _mm_load_si128
(RTE_CAST_PTR(const __m128i *,
&rxdp[5].wb.status_error1));
--
2.43.0
Re: [PATCH 1/1] net/{octeon_ep,enetfec}: remove unused value
Hello Stephen, On Thursday, January 30, 2025 19:39 CET, Stephen Hemminger wrote: > Fixed that and applied to next-net Thanks for having wrapped up the series; much appreciated. I now have the proper length in my git config. Have a good one, Ariel
[PATCH v18 02/26] 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.2.vfs.0.1
[PATCH v18 01/26] 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.2.vfs.0.1
[PATCH v18 03/26] eal/common: remove use of VLAs
From: Konstantin Ananyev 1) ../lib/eal/common/eal_common_proc.c:695:15 : warning: variable length array used As msg->num_fds should not exceed RTE_MP_MAX_FD_NUM, replaced it with fixed size array. Signed-off-by: Konstantin Ananyev Acked-by: Stephen Hemminger --- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index d24093937c..201973c5db 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -692,7 +692,8 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) struct sockaddr_un dst; struct mp_msg_internal m; int fd_size = msg->num_fds * sizeof(int); - char control[CMSG_SPACE(fd_size)]; + const int32_t control_sz = CMSG_SPACE(fd_size); + char control[CMSG_SPACE(sizeof(msg->fds))]; m.type = type; memcpy(&m.msg, msg, sizeof(*msg)); @@ -712,7 +713,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = control; - msgh.msg_controllen = sizeof(control); + msgh.msg_controllen = control_sz; cmsg = CMSG_FIRSTHDR(&msgh); cmsg->cmsg_len = CMSG_LEN(fd_size); -- 2.47.2.vfs.0.1
[PATCH v18 08/26] 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.2.vfs.0.1
[PATCH v18 23/26] drivers: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
drivers/common/cnxk/meson.build | 2 ++
drivers/common/mlx5/meson.build | 2 ++
drivers/common/qat/meson.build | 2 ++
drivers/crypto/ccp/meson.build | 2 ++
drivers/crypto/cnxk/meson.build | 2 ++
drivers/crypto/octeontx/meson.build | 2 ++
drivers/crypto/openssl/meson.build | 1 +
drivers/crypto/scheduler/meson.build | 2 ++
drivers/dma/dpaa/meson.build | 2 ++
drivers/event/cnxk/meson.build | 2 ++
drivers/event/dsw/meson.build| 1 +
drivers/event/opdl/meson.build | 1 +
drivers/event/sw/meson.build | 1 +
drivers/net/af_xdp/meson.build | 2 ++
drivers/net/bnxt/meson.build | 2 ++
drivers/net/bonding/meson.build | 2 ++
drivers/net/cnxk/meson.build | 2 ++
drivers/net/cxgbe/meson.build| 2 ++
drivers/net/dpaa/meson.build | 2 ++
drivers/net/dpaa2/meson.build| 2 ++
drivers/net/failsafe/meson.build | 1 +
drivers/net/gve/meson.build | 2 ++
drivers/net/hns3/meson.build | 2 ++
drivers/net/mlx4/meson.build | 2 ++
drivers/net/mlx5/linux/meson.build | 2 ++
drivers/net/netvsc/meson.build | 2 ++
drivers/net/nfp/meson.build | 2 ++
drivers/net/ngbe/base/meson.build| 1 +
drivers/net/ntnic/meson.build| 2 ++
drivers/net/octeontx/meson.build | 2 ++
drivers/net/sfc/meson.build | 1 +
drivers/net/softnic/meson.build | 1 +
drivers/net/tap/meson.build | 1 +
drivers/net/txgbe/meson.build| 2 ++
drivers/net/vdev_netvsc/meson.build | 2 ++
drivers/net/virtio/meson.build | 2 ++
drivers/vdpa/mlx5/meson.build| 3 +++
37 files changed, 66 insertions(+)
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 9e3fd44317..f685f94ee1 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -92,6 +92,8 @@ sources += files('cnxk_telemetry_bphy.c',
'cnxk_telemetry_sso.c',
)
+cflags += no_vla_cflag
+
if meson.is_cross_build()
soc_type = meson.get_external_property('platform', '')
else
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index 1eefc02f06..c706db08ad 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -24,6 +24,8 @@ sources += files(
'mlx5_common_utils.c',
)
+cflags += no_vla_cflag
+
cflags_options = [
'-std=c11',
'-Wno-strict-prototypes',
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 5a8de16fe0..75530610ef 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -103,6 +103,8 @@ if qat_compress
endforeach
endif
+cflags += no_vla_cflag
+
if qat_crypto
foreach f: ['qat_sym.c', 'qat_sym_session.c',
'qat_asym.c', 'qat_crypto.c',
diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index a9abaa4da0..45eedb2e92 100644
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -22,3 +22,5 @@ sources = files(
)
ext_deps += dep
+
+cflags += no_vla_cflag
diff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build
index aa840fb7bb..2e483d786c 100644
--- a/drivers/crypto/cnxk/meson.build
+++ b/drivers/crypto/cnxk/meson.build
@@ -28,6 +28,8 @@ headers = files('rte_pmd_cnxk_crypto.h')
deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev']
includes += include_directories('../../../lib/net', '../../event/cnxk')
+cflags += no_vla_cflag
+
if get_option('buildtype').contains('debug')
cflags += [ '-DLA_IPSEC_DEBUG','-DCNXK_CRYPTODEV_DEBUG' ]
else
diff --git a/drivers/crypto/octeontx/meson.build
b/drivers/crypto/octeontx/meson.build
index 387727c6ab..94689c1484 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -32,3 +32,5 @@ includes += include_directories('../../common/octeontx')
includes += include_directories('../../event/octeontx')
includes += include_directories('../../mempool/octeontx')
includes += include_directories('../../net/octeontx')
+
+cflags += no_vla_cflag
diff --git a/drivers/crypto/openssl/meson.build
b/drivers/crypto/openssl/meson.build
index 1ec63c216d..02716e1674 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -16,3 +16,4 @@ deps += 'bus_vdev'
sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
ext_deps += dep
require_iova_in_mbuf = false
+cflags += no_vla_cflag
diff --git a/drivers/crypto/scheduler/meson.build
b/drivers/crypto/scheduler/meson.build
index 752d655415..d443e2a2ab 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -22,3 +22,5 @@ headers = files(
'rte_cryptodev_scheduler.h',
'rte_cryptodev_scheduler_operations.h',
)
+
+cflags += no_vla_cflag
[PATCH v18 12/26] 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.2.vfs.0.1
[PATCH v18 00/26] 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. v18: * add no_vla_cflag to examples directories that are not VLA-free * add no_vla_cflag to drivers directories that are not VLA-free and were missed in v17 due to missing libs v17: * define no_vla_cflag in a top directory (config) * add no_vla_cflag to directories that are not VLA-free * add -Wvla project-wide (VLAs not allowed by default, except for directories using no_vla_cflag) v16: * remove -Wvla from drivers/common/mlx5/meson.build and drivers/common/qat/meson.build v15: * inverted some of the logic added during v14: add -Wvla to meson build files in app and lib directories, adding -Wno-vla to the few subdirectories which are not yet VLA free v14: * add -Wvla to meson build for directories that are VLA free under app, lib, drivers. This is to ensure that new VLAs are not added to these directories in the future. v13: * increase stack allocated buffer size in ipv4_reassembly_interleaved_flows_perf and ipv6_reassembly_interleaved_flows_perf to avoid STATUS_STACK_BUFFER_OVERRUN on Windows using MSVC v12: * update commit message for patch 06/21 to avoid warning v11: * add include stdlib.h for alloca() declaration on FreeBSD * zero-initialize array without code loop * increase maximum tuple length v10: * add ifdef to scope gcc's diagnostic error down to gcc only v9: * fix sender's email address * fix gcc's diagnostic error string to make clang happy v8: * rebase * reduce scope for disabling error "-Warray-bounds=" to only the place that needs it * remove parentesis around numbers from defines in test_bitset.c v7: * remove use of VLA from new file which sneaked in during review v6: * remove use of VLA from new test code added recently * fix title for patch 08/20 v5: * add patches for net/ice, net/ixgbe and gro from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=* * address debug_autotest ASan failure * address array-bound error in bitset_autotest with gcc-13 v4: * rebase and adapt for changes made in main since v3 was sent * use fixed maximum array size instead of VLA when doable v3: * address checkpatch/check git log warnings (minor typos) v2: * replace patches for ethdev, hash, rcu and include new patches for eal from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31781 Andre Muezerie (9): 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 config: define no_vla_cflag app: add no_vla_cflag to directories that are not VLA-free drivers: add no_vla_cflag to directories that are not VLA-free lib: add no_vla_cflag to directories that are not VLA-free examples: add no_vla_cflag to directories that are not VLA-free config: add -Wvla project-wide 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 (7): 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 app/pdump/meson.build | 2 + app/proc-info/meson.build | 2 + app/test-acl/meson.build | 2 + app/test-bbdev/meson.build| 2 + app/test-crypto-perf/meson.build | 2 + app/test-dma-perf/meson.build | 2 + app/test-eventdev/meson.build | 2 + app/test-flow-perf/meson.build| 2 + app/test-pmd/cmdline.c| 2 +- app/test-pmd/cmdline_flow.c | 15 +- app/test-pmd/config.c | 16 +- app/test-pmd/meson.build | 10 +- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test-sad/meson.build | 2 + app/test/meson.build
[PATCH v18 10/26] 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/intel/ixgbe/ixgbe_ethdev.c | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
index 5f18fbaad5..c79ecd6eec 100644
--- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/intel/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);
--
2.47.2.vfs.0.1
[PATCH v18 09/26] gro: remove use of VLAs
From: Konstantin Ananyev
../lib/gro/rte_gro.c:182:34: warning:
variable length array used [-Wvla]
../lib/gro/rte_gro.c:363:34: warning:
variable length array used [-Wvla]
In both cases the pattern is the same: we use unprocess_pkts[nb_pkts] to
collect un-used by GRO packets, and then copy them to the start of
input/output pkts[] array.
In both cases, we can safely copy pkts[i] into already
processed entry at the same array, i.e. into pkts[unprocess_num].
Such change eliminates need of temporary VLA: unprocess_pkts[nb_pkts].
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/rte_gro.c | 40 ++--
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index db86117609..6d5aadf32a 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -179,7 +179,6 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM]
= {{{0}} };
- struct rte_mbuf *unprocess_pkts[nb_pkts];
uint32_t item_num;
int32_t ret;
uint16_t i, unprocess_num = 0, nb_after_gro = nb_pkts;
@@ -275,7 +274,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_VXLAN_UDP4_PKT(pkts[i]->packet_type) &&
do_vxlan_udp_gro) {
ret = gro_vxlan_udp4_reassemble(pkts[i],
@@ -284,7 +283,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_TCP_PKT(pkts[i]->packet_type) &&
do_tcp4_gro) {
ret = gro_tcp4_reassemble(pkts[i], &tcp_tbl, 0);
@@ -292,7 +291,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_UDP_PKT(pkts[i]->packet_type) &&
do_udp4_gro) {
ret = gro_udp4_reassemble(pkts[i], &udp_tbl, 0);
@@ -300,7 +299,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV6_TCP_PKT(pkts[i]->packet_type) &&
do_tcp6_gro) {
ret = gro_tcp6_reassemble(pkts[i], &tcp6_tbl, 0);
@@ -308,21 +307,15 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
}
if ((nb_after_gro < nb_pkts)
|| (unprocess_num < nb_pkts)) {
- i = 0;
- /* Copy unprocessed packets */
- if (unprocess_num > 0) {
- memcpy(&pkts[i], unprocess_pkts,
- sizeof(struct rte_mbuf *) *
- unprocess_num);
- i = unprocess_num;
- }
+
+ i = unprocess_num;
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
@@ -360,7 +353,6 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
uint16_t nb_pkts,
void *ctx)
{
- struct rte_mbuf *unprocess_pkts[nb_pkts];
struct gro_ctx *gro_ctx = ctx;
void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_udp_tbl, *tcp6_tbl;
uint64_t current_time;
@@ -396,33 +388,29 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
do_vxlan_tcp_gro) {
if (gro_vxlan_tcp4_reassemble(pkts[i], vxlan_tcp_tbl,
[PATCH v18 07/26] rcu: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/rcu/rte_rcu_qsbr.c:359:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
2) ./lib/rcu/rte_rcu_qsbr.c:422:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
In both cases we allocate VLA for one element from RCU deferred queue.
Right now, size of element in RCU queue is not limited by API.
The approach is to introduce some reasonable limitation on RCU DQ
element size.
Choose 128B for now.
With that in place we can replace both VLA occurencies with fixed size
array.
Note that such change need to be treated as API change.
So can be applied only at 24.11.
Signed-off-by: Konstantin Ananyev
---
lib/rcu/rte_rcu_qsbr.c | 7 ---
lib/rcu/rte_rcu_qsbr.h | 5 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index dbf31501a6..fe68d16326 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -245,7 +245,8 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
if (params == NULL || params->free_fn == NULL ||
params->v == NULL || params->name == NULL ||
params->size == 0 || params->esize == 0 ||
- (params->esize % 4 != 0)) {
+ (params->esize % 4 != 0) ||
+ params->esize > RTE_QSBR_ESIZE_MAX) {
RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
@@ -323,7 +324,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq,
void *e)
return 1;
}
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;
/* Start the grace period */
dq_elem->token = rte_rcu_qsbr_start(dq->v);
@@ -386,7 +387,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq,
unsigned int n,
cnt = 0;
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
/* Check reader threads quiescent state and reclaim resources */
while (cnt < n &&
rte_ring_dequeue_bulk_elem_start(dq->r, &data,
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 550fadf56a..abcbd78914 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -86,6 +86,11 @@ struct __rte_cache_aligned rte_rcu_qsbr_cnt {
#define __RTE_QSBR_CNT_MAX ((uint64_t)~0)
#define __RTE_QSBR_TOKEN_SIZE sizeof(uint64_t)
+/**
+ * Max allowable size (in bytes) of each element in the defer queue
+ */
+#define RTE_QSBR_ESIZE_MAX (2 * RTE_CACHE_LINE_MIN_SIZE)
+
/* RTE Quiescent State variable structure.
* This structure has two elements that vary in size based on the
* 'max_threads' parameter.
--
2.47.2.vfs.0.1
[PATCH v18 11/26] 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/intel/ice/ice_rxtx.c | 18 --
drivers/net/intel/ice/ice_rxtx.h | 2 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
index 8dd8644b16..437cf0d807 100644
--- a/drivers/net/intel/ice/ice_rxtx.c
+++ b/drivers/net/intel/ice/ice_rxtx.c
@@ -1172,7 +1172,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;
@@ -1280,9 +1280,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) {
@@ -1291,6 +1296,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;
@@ -1864,7 +1871,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 -
@@ -1879,7 +1885,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)) {
rte_mempool_put_bulk(rxq->mp, (void *)rxep,
rxq->rx_free_thresh);
@@ -1906,8 +1912,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/intel/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h
index f9293ac6f9..276d40b57f 100644
--- a/drivers/net/intel/ice/ice_rxtx.h
+++ b/drivers/net/intel/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.2.vfs.0.1
[PATCH v18 05/26] 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.2.vfs.0.1
[PATCH v18 06/26] 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.2.vfs.0.1
[PATCH v18 14/26] 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 81052e72c1..6fbfee1b2d 100644 --- a/drivers/common/idpf/idpf_common_rxtx_avx512.c +++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c @@ -998,7 +998,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 & @@ -1322,7 +1323,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.2.vfs.0.1
[PATCH v18 13/26] 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 v18 17/26] net/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/net/mlx5/mlx5.c | 5 ++---
drivers/net/mlx5/mlx5_flow.c | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6e4473e2f4..979e54686b 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1598,14 +1598,13 @@ void
mlx5_rt_timestamp_config(struct mlx5_dev_ctx_shared *sh,
struct mlx5_hca_attr *hca_attr)
{
- uint32_t dw_cnt = MLX5_ST_SZ_DW(register_mtutc);
- uint32_t reg[dw_cnt];
+ uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
int ret = ENOTSUP;
if (hca_attr->access_register_user)
ret = mlx5_devx_cmd_register_read(sh->cdev->ctx,
MLX5_REGISTER_ID_MTUTC, 0,
- reg, dw_cnt);
+ reg, RTE_DIM(reg));
if (!ret) {
uint32_t ts_mode;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 3e79754b83..bfc44f25bf 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;
@@ -8481,7 +8481,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.2.vfs.0.1
[PATCH v18 24/26] lib: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
lib/acl/meson.build| 2 ++
lib/bpf/meson.build| 2 ++
lib/dispatcher/meson.build | 2 ++
lib/eventdev/meson.build | 2 ++
lib/ipsec/meson.build | 2 ++
lib/member/meson.build | 2 ++
lib/metrics/meson.build| 2 ++
lib/pdcp/meson.build | 2 ++
lib/pdump/meson.build | 2 ++
lib/pipeline/meson.build | 2 ++
lib/power/meson.build | 3 +++
lib/table/meson.build | 2 ++
lib/vhost/meson.build | 15 ---
13 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/lib/acl/meson.build b/lib/acl/meson.build
index 9cba08321a..12c4d5d45b 100644
--- a/lib/acl/meson.build
+++ b/lib/acl/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
'rte_acl.c', 'tb_mem.c')
headers = files('rte_acl.h', 'rte_acl_osdep.h')
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index aa258a9061..1548b1a3fd 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32')
build = false
reason = 'not supported on 32-bit x86'
diff --git a/lib/dispatcher/meson.build b/lib/dispatcher/meson.build
index ffaef26a6d..825debbcef 100644
--- a/lib/dispatcher/meson.build
+++ b/lib/dispatcher/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('rte_dispatcher.c')
headers = files('rte_dispatcher.h')
diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build
index a04bb86f0f..92b0135922 100644
--- a/lib/eventdev/meson.build
+++ b/lib/eventdev/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files(
'eventdev_private.c',
'eventdev_trace_points.c',
diff --git a/lib/ipsec/meson.build b/lib/ipsec/meson.build
index 5c5a4aae78..40bc0f39cf 100644
--- a/lib/ipsec/meson.build
+++ b/lib/ipsec/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('esp_inb.c', 'esp_outb.c',
'sa.c', 'ses.c', 'ipsec_sad.c',
'ipsec_telemetry.c')
diff --git a/lib/member/meson.build b/lib/member/meson.build
index 02ef59795e..0daee47803 100644
--- a/lib/member/meson.build
+++ b/lib/member/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
headers = files('rte_member.h')
sources = files(
diff --git a/lib/metrics/meson.build b/lib/metrics/meson.build
index 8c1c4b4b49..c4f734471a 100644
--- a/lib/metrics/meson.build
+++ b/lib/metrics/meson.build
@@ -9,3 +9,5 @@ if dpdk_conf.has('RTE_HAS_JANSSON')
endif
deps += ['ethdev', 'telemetry']
+
+cflags += no_vla_cflag
diff --git a/lib/pdcp/meson.build b/lib/pdcp/meson.build
index f4f9246bcb..bab1838a26 100644
--- a/lib/pdcp/meson.build
+++ b/lib/pdcp/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files(
'pdcp_cnt.c',
'pdcp_crypto.c',
diff --git a/lib/pdump/meson.build b/lib/pdump/meson.build
index da8d51b616..f8d5ad9802 100644
--- a/lib/pdump/meson.build
+++ b/lib/pdump/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('rte_pdump.c')
headers = files('rte_pdump.h')
deps += ['ethdev', 'bpf', 'pcapng']
diff --git a/lib/pipeline/meson.build b/lib/pipeline/meson.build
index fd5e0dc6bb..3d02a03243 100644
--- a/lib/pipeline/meson.build
+++ b/lib/pipeline/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files(
'rte_pipeline.c',
'rte_port_in_action.c',
diff --git a/lib/power/meson.build b/lib/power/meson.build
index b3a7bc7b2e..e56d544adf 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -11,6 +11,9 @@ if not is_linux
build = false
reason = 'only supported on Linux'
endif
+
+cflags += no_vla_cflag
+
sources = files(
'power_common.c',
'rte_power_cpufreq.c',
diff --git a/lib/table/meson.build b/lib/table/meson.build
index 9b3d9ac759..66fb88279b 100644
--- a/lib/table/meson.build
+++ b/lib/table/meson.build
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+cflags += no_vla_cflag
+
sources = files(
'rte_swx_keycmp.c',
'rte_swx_table_em.c',
diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build
index 51bcf17244..4f8417158e 100644
--- a/lib/vhost/meson.build
+++ b/lib/vhost/meson.build
@@ -16,11 +16,20 @@ elif (toolchain == 'icc' and
cc.version().version_compare('>=16.0.0'))
cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
endif
dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
cc.has_heade
[PATCH v18 25/26] examples: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
examples/fips_validation/meson.build | 2 ++
examples/ip_fragmentation/meson.build | 1 +
examples/ipsec-secgw/meson.build | 3 +++
examples/l2fwd-crypto/meson.build | 1 +
examples/l2fwd-jobstats/meson.build | 1 +
examples/l3fwd-power/meson.build | 1 +
examples/l3fwd/meson.build| 1 +
examples/pipeline/meson.build | 1 +
examples/qos_sched/meson.build| 1 +
examples/vhost/meson.build| 1 +
10 files changed, 13 insertions(+)
diff --git a/examples/fips_validation/meson.build
b/examples/fips_validation/meson.build
index 7d4e440c6c..de14b305cf 100644
--- a/examples/fips_validation/meson.build
+++ b/examples/fips_validation/meson.build
@@ -25,6 +25,8 @@ sources = files(
'main.c',
)
+cflags += no_vla_cflag
+
if dpdk_conf.has('RTE_HAS_JANSSON')
ext_deps += jansson_dep
cflags += '-DUSE_JANSSON'
diff --git a/examples/ip_fragmentation/meson.build
b/examples/ip_fragmentation/meson.build
index cd84e9b143..873680079d 100644
--- a/examples/ip_fragmentation/meson.build
+++ b/examples/ip_fragmentation/meson.build
@@ -11,3 +11,4 @@ deps += ['ip_frag', 'lpm']
sources = files(
'main.c',
)
+cflags += no_vla_cflag
diff --git a/examples/ipsec-secgw/meson.build b/examples/ipsec-secgw/meson.build
index 023d9cf039..bad48a35b4 100644
--- a/examples/ipsec-secgw/meson.build
+++ b/examples/ipsec-secgw/meson.build
@@ -23,6 +23,9 @@ sources = files(
'sp4.c',
'sp6.c',
)
+
+cflags += no_vla_cflag
+
app_cflags = ['-Wno-address-of-packed-member']
foreach flag:app_cflags
if cc.has_argument(flag)
diff --git a/examples/l2fwd-crypto/meson.build
b/examples/l2fwd-crypto/meson.build
index bb44c2..b5c9a6987f 100644
--- a/examples/l2fwd-crypto/meson.build
+++ b/examples/l2fwd-crypto/meson.build
@@ -14,3 +14,4 @@ allow_experimental_apis = true
sources = files(
'main.c',
)
+cflags += no_vla_cflag
diff --git a/examples/l2fwd-jobstats/meson.build
b/examples/l2fwd-jobstats/meson.build
index bffcf35e8c..673d3254ea 100644
--- a/examples/l2fwd-jobstats/meson.build
+++ b/examples/l2fwd-jobstats/meson.build
@@ -11,3 +11,4 @@ deps += ['jobstats', 'timer']
sources = files(
'main.c',
)
+cflags += no_vla_cflag
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index 624ef5e947..a54cd1df83 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -12,3 +12,4 @@ sources = files(
'main.c',
'perf_core.c',
)
+cflags += no_vla_cflag
diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
index c25de77bba..d981f5566c 100644
--- a/examples/l3fwd/meson.build
+++ b/examples/l3fwd/meson.build
@@ -21,3 +21,4 @@ sources = files(
if dpdk_conf.has('RTE_LIB_EVENTDEV')
deps += 'eventdev'
endif
+cflags += no_vla_cflag
diff --git a/examples/pipeline/meson.build b/examples/pipeline/meson.build
index 50103f2e01..b261022431 100644
--- a/examples/pipeline/meson.build
+++ b/examples/pipeline/meson.build
@@ -20,3 +20,4 @@ sources = files(
'obj.c',
'thread.c',
)
+cflags += no_vla_cflag
diff --git a/examples/qos_sched/meson.build b/examples/qos_sched/meson.build
index dc103e9556..71ebbd8166 100644
--- a/examples/qos_sched/meson.build
+++ b/examples/qos_sched/meson.build
@@ -17,3 +17,4 @@ sources = files(
'main.c',
'stats.c',
)
+cflags += no_vla_cflag
diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build
index 87a637f83f..7dd22f4d0c 100644
--- a/examples/vhost/meson.build
+++ b/examples/vhost/meson.build
@@ -18,3 +18,4 @@ sources = files(
'main.c',
'virtio_net.c',
)
+cflags += no_vla_cflag
--
2.47.2.vfs.0.1
[PATCH v18 16/26] common/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/common/mlx5/mlx5_common.h| 4 ++--
drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 1abd1e8239..f29f06a86e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -125,10 +125,10 @@ mlx5_fp_debug_enabled(void)
/* Allocate a buffer on the stack and fill it with a printf format string. */
#define MKSTR(name, ...) \
int mkstr_size_##name = snprintf(NULL, 0, "" __VA_ARGS__); \
- char name[mkstr_size_##name + 1]; \
+ char *name = alloca(mkstr_size_##name + 1); \
\
memset(name, 0, mkstr_size_##name + 1); \
- snprintf(name, sizeof(name), "" __VA_ARGS__)
+ snprintf(name, mkstr_size_##name + 1, "" __VA_ARGS__)
enum {
PCI_VENDOR_ID_MELLANOX = 0x15b3,
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index a75f011750..804ee67cd6 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -284,10 +284,9 @@ mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_obj *dcs,
void *cmd_comp,
uint64_t async_id)
{
- int out_len = MLX5_ST_SZ_BYTES(query_flow_counter_out) +
- MLX5_ST_SZ_BYTES(traffic_counter);
- uint32_t out[out_len];
+ uint32_t out[MLX5_ST_SZ_BYTES(query_flow_counter_out) +
MLX5_ST_SZ_BYTES(traffic_counter)];
uint32_t in[MLX5_ST_SZ_DW(query_flow_counter_in)] = {0};
+ const int out_len = RTE_DIM(out);
void *stats;
int rc;
@@ -346,7 +345,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
int klm_num = attr->klm_num;
int in_size_dw = MLX5_ST_SZ_DW(create_mkey_in) +
(klm_num ? RTE_ALIGN(klm_num, 4) : 0) * MLX5_ST_SZ_DW(klm);
- uint32_t in[in_size_dw];
+ uint32_t *in = alloca(sizeof(uint32_t) * in_size_dw);
uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
void *mkc;
struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
--
2.47.2.vfs.0.1
[PATCH v18 18/26] 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 +-
app/test/test_soring_stress_impl.h | 13 +++---
4 files changed, 63 insertions(+), 43 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_
[PATCH v18 22/26] app: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
app/pdump/meson.build| 2 ++
app/proc-info/meson.build| 2 ++
app/test-acl/meson.build | 2 ++
app/test-bbdev/meson.build | 2 ++
app/test-crypto-perf/meson.build | 2 ++
app/test-dma-perf/meson.build| 2 ++
app/test-eventdev/meson.build| 2 ++
app/test-flow-perf/meson.build | 2 ++
app/test-pmd/meson.build | 10 +-
app/test-sad/meson.build | 2 ++
app/test/meson.build | 17 -
11 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/app/pdump/meson.build b/app/pdump/meson.build
index fb282bba1f..ae12636b2c 100644
--- a/app/pdump/meson.build
+++ b/app/pdump/meson.build
@@ -9,3 +9,5 @@ endif
sources = files('main.c')
deps += ['ethdev', 'kvargs', 'pdump']
+
+cflags += no_vla_cflag
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index 4f83f29a64..d2f2bd98d1 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -12,3 +12,5 @@ deps += ['ethdev', 'security', 'eventdev']
if dpdk_conf.has('RTE_LIB_METRICS')
deps += 'metrics'
endif
+
+cflags += no_vla_cflag
diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build
index c0dc4b221a..714bd4b5c7 100644
--- a/app/test-acl/meson.build
+++ b/app/test-acl/meson.build
@@ -9,3 +9,5 @@ endif
sources = files('main.c')
deps += ['acl', 'net']
+
+cflags += no_vla_cflag
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 926e0a5271..64181ec630 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -26,3 +26,5 @@ endif
if dpdk_conf.has('RTE_BASEBAND_LA12XX')
deps += ['baseband_la12xx']
endif
+
+cflags += no_vla_cflag
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 7b02b518f0..e75d60eedd 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -23,3 +23,5 @@ deps += ['cryptodev', 'net', 'security']
if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
deps += 'crypto_scheduler'
endif
+
+cflags += no_vla_cflag
diff --git a/app/test-dma-perf/meson.build b/app/test-dma-perf/meson.build
index b1557b8125..5f710c03b7 100644
--- a/app/test-dma-perf/meson.build
+++ b/app/test-dma-perf/meson.build
@@ -13,3 +13,5 @@ sources = files(
'main.c',
'benchmark.c',
)
+
+cflags += no_vla_cflag
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index ab8769c755..12276b2cf3 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -23,3 +23,5 @@ sources = files(
'test_pipeline_queue.c',
)
deps += 'eventdev'
+
+cflags += no_vla_cflag
diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build
index 766e4516ad..d983c71302 100644
--- a/app/test-flow-perf/meson.build
+++ b/app/test-flow-perf/meson.build
@@ -15,3 +15,5 @@ sources = files(
)
deps += ['ethdev']
+
+cflags += no_vla_cflag
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index f1c36529b4..8de1528428 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -3,7 +3,15 @@
# override default name to drop the hyphen
name = 'testpmd'
-cflags += '-Wno-deprecated-declarations'
+
+extra_flags = ['-Wno-deprecated-declarations']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files(
'5tswap.c',
'cmdline.c',
diff --git a/app/test-sad/meson.build b/app/test-sad/meson.build
index a50616a9c7..f166e00511 100644
--- a/app/test-sad/meson.build
+++ b/app/test-sad/meson.build
@@ -9,3 +9,5 @@ endif
sources = files('main.c')
deps += ['ipsec', 'net']
+
+cflags += no_vla_cflag
diff --git a/app/test/meson.build b/app/test/meson.build
index 48cf77fda9..622c480519 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -250,12 +250,19 @@ foreach d:optional_deps
endif
endforeach
-if cc.has_argument('-Wno-format-truncation')
-cflags += '-Wno-format-truncation'
-endif
+cflags += no_vla_cflag
+
+extra_flags = [
+# Strict-aliasing rules are violated by uint8_t[] to context size casts.
+'-fno-strict-aliasing',
+'-Wno-format-truncation',
+]
-# Strict-aliasing rules are violated by uint8_t[] to context size casts.
-cflags += '-fno-strict-aliasing'
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
# Enable using internal APIs in unit tests
cflags += '-DALLOW_INTERNAL_API'
--
2.47.2.vfs.0.1
[PATCH v18 21/26] config: define no_vla_cflag
We define no_vla_cflag in a top directory so that it can be used by
meson.build files in lower directories that are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
config/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/config/meson.build b/config/meson.build
index 6aaad6d8a4..6be928e04b 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -342,6 +342,14 @@ if cc.get_id() == 'intel'
warning_flags += '-diag-disable=@0@'.format(i)
endforeach
endif
+
+no_vla_cflag = []
+if cc.has_argument('-Wvla')
+if not is_windows
+no_vla_cflag = '-Wno-vla'
+endif
+endif
+
foreach arg: warning_flags
if cc.has_argument(arg)
add_project_arguments(arg, language: 'c')
--
2.47.2.vfs.0.1
[PATCH v18 19/26] app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Andre Muezerie
Acked-by: Chengwen Feng
---
app/test-pmd/shared_rxq_fwd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c
index 623d62da88..b85830b90e 100644
--- a/app/test-pmd/shared_rxq_fwd.c
+++ b/app/test-pmd/shared_rxq_fwd.c
@@ -92,7 +92,7 @@ forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx,
static bool
shared_rxq_fwd(struct fwd_stream *fs)
{
- struct rte_mbuf *pkts_burst[nb_pkt_per_burst];
+ struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
uint16_t nb_rx;
nb_rx = common_fwd_stream_receive(fs, pkts_burst, nb_pkt_per_burst);
--
2.47.2.vfs.0.1
[PATCH v18 15/26] 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/intel/i40e/i40e_testpmd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_testpmd.c
b/drivers/net/intel/i40e/i40e_testpmd.c
index b6ef5d6e42..21f596297b 100644
--- a/drivers/net/intel/i40e/i40e_testpmd.c
+++ b/drivers/net/intel/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.2.vfs.0.1
Re: [PATCH v3 2/2] net/af_xdp: Refactor af_xdp_tx_zc()
Hello Maryam,
On Wed, Jan 29, 2025 at 6:58 PM Maryam Tahhan wrote:
> > +static struct rte_mbuf *
> > +maybe_kick_tx(struct pkt_tx_queue *txq, uint32_t *idx_tx, struct
> rte_mbuf *mbuf)
> > +{
> > + struct rte_mbuf *ret = mbuf;
> > +
> > + if (!xsk_ring_prod__reserve(&txq->tx, 1, idx_tx)) {
> > + kick_tx(txq, &txq->pair->cq);
> > + if (!xsk_ring_prod__reserve(&txq->tx, 1, idx_tx))
> > + ret = NULL;
> > + }
> > +
> > + return ret;
> > +}
>
>
> [MT] I don't see why we are passing in mbuf here?
>
My aim was to use the output of maybe_kick_tx() for the if statement on
local_buf: the true leg would copy mbuf into local_mbuf, and the false
would create a fresh local_mbuf
> > +static void
> > +maybe_cpy_pkt(bool is_mbuf_equal, struct xsk_umem_info *umem,
> > + uint64_t addr_plus_offset, struct rte_mbuf *mbuf,
> > + struct xdp_desc *desc)
> > +{
> > + void *pkt;
> > +
> > + if(is_mbuf_equal)
> > + goto out;
> > +
> > + pkt = xsk_umem__get_data(umem->buffer, addr_plus_offset);
> > + rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *), desc->len);
> > + rte_pktmbuf_free(mbuf);
> > +
> > +out:
> > + return;
> > +}
>
>
> [MT] does this really need to be an inline function? it wasn't common
> code between the blocks?
>
In order for the next statements to just fall through till the exit. The
loop would have read as such:
1. Some boiler plate to check if mbuf is equal to umem; and the creation of
local_mbuf accordingly
2. If local_mbuf is null, goto exit.
3. Else, update addr, offset, and description
> Firstly thank you for your efforts to clean up the code. I believe a
> simpler cleanup approach would better balance readability +
> maintainability. This approach would focus on eliminating the repeated
> code in both branches of the conditional block. For me the main
> repetition between the branches is the code that reserves and fills the
> descriptor info, Please find an example below...
>
Thanks to you, I do appreciate your honest feedback. From what I
understand, you would like to take the filling of addr, offset, and desc
off from af_xdp_tx_zc(), but keep its core logic.
I wanted the boiler plate to be into separate functions, so one could read
through the subsequent statements. So we could avoid the cascade of if
statements.
>
> Note: The following is all untested code (don't even know if it
> compiles) it's just to give an idea around the cleanup I had in mind:
>
The code did compile on the go, that was pretty neat. I cleared out few
warnings, and pushed out a new version
https://inbox.dpdk.org/dev/20250130221853.789366-3-ariel.otilib...@6wind.com/
>
> Please let me know your thoughts, and I’d be happy to discuss further
>
> I improved on the snippets your proposal. It has fewer lines, so fewer
changes.
What matters to me, is that the series be merged.
Have a good day,
Ariel
Re: [PATCH v2 3/3] trace: fix undefined behavior in register
On Thu, Jan 30, 2025 at 8:10 PM Stephen Hemminger wrote: > > On Thu, 30 Jan 2025 15:58:49 +0100 > David Marchand wrote: > > > Registering a tracepoint handler was resulting so far in undefined > > behavior at runtime. > > > > The RTE_TRACE_POINT_REGISTER() macro was casting the tracepoint handler > > (which expects arguments) to a void (*)(void). > > At runtime, calling this handler while registering resulted in > > reading the current stack with no relation to this function prototype. > > > > Instead, declare an additional inline _register() handler for each > > tracepoint and make sure that the emitting macros in > > rte_trace_point_register.h only work on arguments name and type. > > > > The original tracepoint handler prototype is adjusted by adding a > > __rte_unused for each argument (since emitting macros do nothing > > with them). > > This last part introduces an implementation limit of 15 arguments. > > > > With this change in place, the workaround in dmadev tracepoints can be > > removed. > > > > Signed-off-by: David Marchand > > When I build with -Db_santize=undefined the following warning shows up. > It seems related. > > In function ‘rte_ethdev_trace_get_dcb_info’, > inlined from ‘rte_eth_dev_get_dcb_info’ at > ../lib/ethdev/rte_ethdev.c:6720:2: > ../lib/eal/include/rte_trace_point.h:381:9: warning: writing 1 byte into a > region of size 0 [-Wstringop-overflow=] > 381 | memcpy(mem, &(in), sizeof(in)); \ > | ^~ > ../lib/eal/include/rte_trace_point.h:53:9: note: in definition of macro > ‘__RTE_TRACE_POINT’ >53 | __VA_ARGS__ \ > | ^~~ > ../lib/ethdev/ethdev_trace.h:1213:1: note: in expansion of macro > ‘RTE_TRACE_POINT’ > 1213 | RTE_TRACE_POINT( > | ^~~ > ../lib/eal/include/rte_trace_point.h:399:9: note: in expansion of macro > ‘__rte_trace_point_emit’ > 399 | __rte_trace_point_emit(len, uint8_t); \ > | ^~ > ../lib/ethdev/ethdev_trace.h:1223:9: note: in expansion of macro > ‘rte_trace_point_emit_blob’ > 1223 | rte_trace_point_emit_blob(dcb_info->tc_bws, num_tcs); This is something I saw with optimisations (like O2 or O3 iirc) too. Compiling and running with optimisations made GHA vm go out of memory, so I have been testing only with O0 when it comes to ubsan. In any case, this series is fixing just one undefined behavior. Fixing all build and runtime errors seen with ubsan requires more work. -- David Marchand
[PATCH v18 26/26] config: add -Wvla project-wide
Add -Wvla project-wide so that VLAs are not allowed by default. This
is to avoid new VLAs from being introduced.
Meson files in directories which are not yet VLA-free have already
been updated with -Wno-vla to avoid build breaks.
Signed-off-by: Andre Muezerie
---
config/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/config/meson.build b/config/meson.build
index 6be928e04b..78f79b9a4d 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -345,6 +345,7 @@ endif
no_vla_cflag = []
if cc.has_argument('-Wvla')
+add_project_arguments('-Wvla', language: 'c')
if not is_windows
no_vla_cflag = '-Wno-vla'
endif
--
2.47.2.vfs.0.1
Re: [PATCH v2] net/ice: fix how ice driver handles flows
Hi Bruce,
On 30/01/2025 17:54, Bruce Richardson wrote:
On Thu, Jan 30, 2025 at 04:14:42PM +, Vladimir Medvedkin wrote:
Currently ICE PMD uses group attribute to select the appropriate HW engine
to offload the flow. This behavior violates the rte_flow API, existing
documentation/examples, and reveals hardware specific details.
This patch eliminates the use of the group attribute and runs each engine
parser in the order they work in the HW pipeline.
Fixes: 9c5f0070fa3f ("net/ice: map group to pipeline stage")
Cc:qi.z.zh...@intel.com
Cc:sta...@dpdk.org
Signed-off-by: Vladimir Medvedkin
Thanks, this seems a great idea, to automatically put the flow in place.
Question: is there ever a scenario where a user may need, or want, to
override the automatic choice made here? Or is it just the case that once
the flow is installed, it works the same whatever group it's added into?
I would assume the latter, but just want to confirm.
I don't think a user might have to worry about the internals of the NIC
filters. Thesefiltersperformdifferent lookups: ACL provides wildcard
matching, when FDIR in an exact match, so it depends on what kind of
mask is used for a particular field, for example:
I want to install _exact_match_ rule:
- I use FDIR engine: flow create 0 ingress group 2 pattern eth / ipv4
dst spec 192.168.0.1 dst mask 255.255.255.255 / end actions drop / end
and it works as expected.
- I use ACL engine: flow create 0 ingress group 2 pattern eth / ipv4 dst
spec 192.168.0.1 dst mask 255.255.255.255 / end actions drop / end
and parser throws an error: Invalid IPv4 mask.: Invalid argument
I want to install _wildcard_match_ rule:
- I use FDIR engine: flow create 0 ingress group 2 pattern eth / ipv4
dst spec 192.168.0.1 dst mask 255.255.255.254 / end actions drop / end
doesn't work, Invalid action.: Invalid argument
- I use ACL engine:flow create 0 ingress group 1 pattern eth / ipv4 dst
spec 192.168.0.1 dst mask 255.255.0.255 / end actions drop / end
and it works as expected
/Bruce
--
Regards,
Vladimir
[PATCH v18 20/26] hash: remove use of VLAs by using standard arrays
MSVC does not support VLAs, replace VLAs with standard C arrays.
Signed-off-by: Andre Muezerie
---
lib/hash/rte_thash_gf2_poly_math.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/hash/rte_thash_gf2_poly_math.c
b/lib/hash/rte_thash_gf2_poly_math.c
index 1c62974e71..825da4382f 100644
--- a/lib/hash/rte_thash_gf2_poly_math.c
+++ b/lib/hash/rte_thash_gf2_poly_math.c
@@ -8,6 +8,7 @@
#include
#include
+#define MAX_POLY_DEGREE 32
#define MAX_TOEPLITZ_KEY_LENGTH 64
RTE_LOG_REGISTER_SUFFIX(thash_poly_logtype, thash_poly, INFO);
#define RTE_LOGTYPE_HASH thash_poly_logtype
@@ -149,7 +150,7 @@ gf2_pow(uint32_t a, uint32_t pow, uint32_t r, int degree)
static uint32_t
__thash_get_rand_poly(int poly_degree)
{
- uint32_t roots[poly_degree];
+ uint32_t roots[MAX_POLY_DEGREE];
uint32_t rnd;
uint32_t ret_poly = 0;
int i, j;
@@ -194,9 +195,7 @@ __thash_get_rand_poly(int poly_degree)
* Get coefficients of the polynomial for
* (x - roots[0])(x - roots[1])...(x - roots[n])
*/
- uint32_t poly_coefficients[poly_degree + 1];
- for (i = 0; i <= poly_degree; i++)
- poly_coefficients[i] = 0;
+ uint32_t poly_coefficients[MAX_POLY_DEGREE + 1] = {0};
poly_coefficients[0] = 1; /* highest degree term coefficient in the end
*/
for (i = 0; i < (int)poly_degree; i++) {
@@ -247,7 +246,7 @@ thash_get_rand_poly(uint32_t poly_degree)
{
uint32_t ret_poly;
- if (poly_degree > 32) {
+ if (poly_degree > MAX_POLY_DEGREE) {
HASH_LOG(ERR, "Wrong polynomial degree %d, must be in range [1,
32]", poly_degree);
return 0;
}
--
2.47.2.vfs.0.1
[PATCH v18 04/26] ethdev: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/ethdev/rte_ethdev.c:3244:16
: warning: ISO C90 forbids variable length array ‘xstats_names’
2) ./lib/ethdev/rte_ethdev.c:3345:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
3) ./lib/ethdev/rte_ethdev.c:3538:16
: warning: ISO C90 forbids variable length array ‘xstats’
4) ./lib/ethdev/rte_ethdev.c:3554:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
For 1) and 3) - just replaced VLA with arrays allocated from heap.
As I understand xstats extraction belongs to control-path, so extra
calloc/free is hopefully acceptable.
Also ethdev xstats already doing that within
rte_eth_xstats_get_id_by_name().
For 2) and 4) changed the code to use fixed size array and call
appropriate devops function several times, if needed.
Signed-off-by: Konstantin Ananyev
---
lib/ethdev/rte_ethdev.c | 183 +---
1 file changed, 113 insertions(+), 70 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..09cc4764c3 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -36,6 +36,8 @@
#include "ethdev_trace.h"
#include "sff_telemetry.h"
+#define ETH_XSTATS_ITER_NUM0x100
+
struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
/* public fast-path API */
@@ -3308,7 +3310,8 @@ int
rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
uint64_t *id)
{
- int cnt_xstats, idx_xstat;
+ int cnt_xstats, idx_xstat, rc;
+ struct rte_eth_xstat_name *xstats_names;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3334,26 +3337,33 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const
char *xstat_name,
}
/* Get id-name lookup table */
- struct rte_eth_xstat_name xstats_names[cnt_xstats];
+ xstats_names = calloc(cnt_xstats, sizeof(xstats_names[0]));
+ if (xstats_names == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
+ }
if (cnt_xstats != rte_eth_xstats_get_names_by_id(
port_id, xstats_names, cnt_xstats, NULL)) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot get xstats lookup");
+ free(xstats_names);
return -1;
}
+ rc = -EINVAL;
for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
if (!strcmp(xstats_names[idx_xstat].name, xstat_name)) {
*id = idx_xstat;
rte_eth_trace_xstats_get_id_by_name(port_id,
xstat_name, *id);
-
- return 0;
+ rc = 0;
+ break;
};
}
- return -EINVAL;
+ free(xstats_names);
+ return rc;
}
/* retrieve basic stats names */
@@ -3399,6 +3409,38 @@ eth_basic_stats_get_names(struct rte_eth_dev *dev,
return cnt_used_entries;
}
+static int
+eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names, uint32_t size,
+ uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+* Convert ids to xstats ids that PMD knows.
+* ids known by user are basic + extended stats.
+*/
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy,
+ xstats_names + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
+
/* retrieve ethdev extended statistics names */
int
rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -3406,9 +3448,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
uint64_t *ids)
{
struct rte_eth_xstat_name *xstats_names_copy;
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
unsigned int expected_entries;
+ unsigned int nb_basic_stats;
unsigned int basic_count;
struct rte_eth_dev *dev;
unsigned int i;
@@ -3434,27 +3475,18 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
if (ids && !xstats_names)
return -EINVAL;
- if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
- uint64_t ids_copy[size];
-
- for (i = 0; i < size; i++) {
- if (ids[i] < basic_count) {
- no_basic_stat_requested = 0;
- break;
- }
-
-
Re: [PATCH v4 2/2] net/af_xdp: Refactor af_xdp_tx_zc
On Thu, 30 Jan 2025 23:18:53 +0100 Ariel Otilibili wrote: > +static inline struct xdp_desc* Need space after xdp_desc to follow style used elsewhere in DPDK.
[PATCH v2 1/3] trace: support expression for blob length
Support any expression as a blob length by using an intermediate
variable in the trace point emitter itself.
This also avoids any side effect on the passed variable.
Signed-off-by: David Marchand
---
Changes since v1:
- removed code relying on arguments in "registering"
rte_trace_point_emit_blob implementation (see patch 3),
- moved build check in non registering __rte_trace_point_emit,
---
lib/eal/include/rte_trace_point.h | 12 ++
lib/eal/include/rte_trace_point_register.h | 2 +-
lib/ethdev/ethdev_trace.h | 27 ++
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/lib/eal/include/rte_trace_point.h
b/lib/eal/include/rte_trace_point.h
index b24db3b6da..a162502002 100644
--- a/lib/eal/include/rte_trace_point.h
+++ b/lib/eal/include/rte_trace_point.h
@@ -378,6 +378,7 @@ do { \
#define __rte_trace_point_emit(in, type) \
do { \
+ RTE_BUILD_BUG_ON(sizeof(type) != sizeof(typeof(in))); \
memcpy(mem, &(in), sizeof(in)); \
mem = RTE_PTR_ADD(mem, sizeof(in)); \
} while (0)
@@ -392,13 +393,14 @@ do { \
#define rte_trace_point_emit_blob(in, len) \
do { \
+ uint8_t size = len; \
if (unlikely(in == NULL)) \
return; \
- if (len > RTE_TRACE_BLOB_LEN_MAX) \
- len = RTE_TRACE_BLOB_LEN_MAX; \
- __rte_trace_point_emit(len, uint8_t); \
- memcpy(mem, in, len); \
- memset(RTE_PTR_ADD(mem, len), 0, RTE_TRACE_BLOB_LEN_MAX - len); \
+ if (size > RTE_TRACE_BLOB_LEN_MAX) \
+ size = RTE_TRACE_BLOB_LEN_MAX; \
+ __rte_trace_point_emit(size, uint8_t); \
+ memcpy(mem, in, size); \
+ memset(RTE_PTR_ADD(mem, size), 0, RTE_TRACE_BLOB_LEN_MAX - size); \
mem = RTE_PTR_ADD(mem, RTE_TRACE_BLOB_LEN_MAX); \
} while (0)
diff --git a/lib/eal/include/rte_trace_point_register.h
b/lib/eal/include/rte_trace_point_register.h
index 748c931830..1d6198b32f 100644
--- a/lib/eal/include/rte_trace_point_register.h
+++ b/lib/eal/include/rte_trace_point_register.h
@@ -37,7 +37,7 @@ RTE_INIT(trace##_init) \
#define __rte_trace_point_emit(in, type) \
do { \
- RTE_BUILD_BUG_ON(sizeof(type) != sizeof(typeof(in))); \
+ RTE_SET_USED(in); \
__rte_trace_point_emit_field(sizeof(type), RTE_STR(in), \
RTE_STR(type)); \
} while (0)
diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h
index 5951ae2d99..c65b78590a 100644
--- a/lib/ethdev/ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -860,10 +860,8 @@ RTE_TRACE_POINT(
rte_ethdev_trace_mac_addr_add,
RTE_TRACE_POINT_ARGS(uint16_t port_id,
const struct rte_ether_addr *addr, uint32_t pool, int ret),
- uint8_t len = RTE_ETHER_ADDR_LEN;
-
rte_trace_point_emit_u16(port_id);
- rte_trace_point_emit_blob(addr->addr_bytes, len);
+ rte_trace_point_emit_blob(addr->addr_bytes, RTE_ETHER_ADDR_LEN);
rte_trace_point_emit_u32(pool);
rte_trace_point_emit_int(ret);
)
@@ -872,20 +870,16 @@ RTE_TRACE_POINT(
rte_ethdev_trace_mac_addr_remove,
RTE_TRACE_POINT_ARGS(uint16_t port_id,
const struct rte_ether_addr *addr),
- uint8_t len = RTE_ETHER_ADDR_LEN;
-
rte_trace_point_emit_u16(port_id);
- rte_trace_point_emit_blob(addr->addr_bytes, len);
+ rte_trace_point_emit_blob(addr->addr_bytes, RTE_ETHER_ADDR_LEN);
)
RTE_TRACE_POINT(
rte_ethdev_trace_default_mac_addr_set,
RTE_TRACE_POINT_ARGS(uint16_t port_id,
const struct rte_ether_addr *addr),
- uint8_t len = RTE_ETHER_ADDR_LEN;
-
rte_trace_point_emit_u16(port_id);
- rte_trace_point_emit_blob(addr->addr_bytes, len);
+ rte_trace_point_emit_blob(addr->addr_bytes, RTE_ETHER_ADDR_LEN);
)
RTE_TRACE_POINT(
@@ -1102,11 +1096,9 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT_ARGS(uint16_t port_id,
const struct rte_ether_addr *mc_addr_set, uint32_t nb_mc_addr,
int ret),
- uint8_t len = nb_mc_addr * RTE_ETHER_ADDR_LEN;
-
rte_trace_point_emit_u16(port_id);
rte_trace_point_emit_u32(nb_mc_addr);
- rte_trace_point_emit_blob(mc_addr_set, len);
+ rte_trace_point_emit_blob(mc_addr_set, nb_mc_addr * RTE_ETHER_ADDR_LEN);
rte_trace_point_emit_int(ret);
)
@@ -1214,13 +1206,10 @@ RTE_TRACE_POINT(
rte_ethdev_trace_get_dcb_info,
RTE_TRACE_POINT_ARGS(uint16_t port_id,
const struct rte_eth_dcb_info *dcb_info, int ret),
- uint8_t num_user_priorities = RTE_ETH_DCB_NUM_USER_PRIORITIES;
- uint8_t num_tcs = RTE_ETH_DCB_NUM_TCS;
-
rte_trace_point_emit_u16(port_id);
rte_trace_point_emit_u8(dcb_info->nb_tcs);
- rte_trace_point_emit_blob(dcb_info->prio_tc, num_user_priorities);
- rte_trace_point_emit_blob(dcb_info->tc_bws, num_tcs);
+ rte_trace_point_emit_blob(dcb_info->prio_tc,
RTE_ETH_DCB_NUM_USER_PRIORITIES);
+
[PATCH v3 3/4] drivers: move iavf common folder to iavf net
The common/iavf driver folder contains the base code for the iavf
driver, which is also linked against by the ice driver and others.
However, there is no need for this to be in common, and we can
move it to the net/intel/iavf as a base code driver. This involves
updating dependencies that were on common/iavf to net/iavf
Signed-off-by: Bruce Richardson
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst | 5 -
drivers/common/iavf/version.map| 13 -
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README| 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/intel/iavf/base}/iavf_devids.h | 0
.../iavf => net/intel/iavf/base}/iavf_impl.c | 0
.../iavf => net/intel/iavf/base}/iavf_osdep.h | 0
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/intel/iavf/base}/iavf_status.h | 0
.../iavf => net/intel/iavf/base}/iavf_type.h | 0
.../iavf => net/intel/iavf/base}/meson.build | 0
.../iavf => net/intel/iavf/base}/virtchnl.h| 0
.../intel/iavf/base}/virtchnl_inline_ipsec.h | 0
drivers/net/intel/iavf/meson.build | 13 +
drivers/net/intel/iavf/version.map | 14 ++
drivers/net/intel/ice/meson.build | 7 +++
drivers/net/intel/idpf/meson.build | 2 +-
24 files changed, 32 insertions(+), 24 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
rename drivers/{common/iavf => net/intel/iavf/base}/README (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq_cmd.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_alloc.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_common.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_devids.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_impl.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_osdep.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_prototype.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_register.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_status.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_type.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/meson.build (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/virtchnl.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/virtchnl_inline_ipsec.h
(100%)
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 1dee6a954f..4d7079abbc 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -26,6 +26,7 @@
; SKIP_LIBRARY=librte_common_mlx5_glue
; SKIP_LIBRARY=librte_net_mlx4_glue
; SKIP_LIBRARY=librte_common_idpf
+; SKIP_LIBRARY=librte_common_iavf
; Experimental APIs exceptions ;
diff --git a/doc/guides/rel_notes/release_25_03.rst
b/doc/guides/rel_notes/release_25_03.rst
index 79b1116f6e..1f22efa79f 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -116,9 +116,12 @@ API Changes
For example, ``-Denable_drivers=/net/i40e`` becomes
``-Denable_drivers=/net/intel/i40e``.
* The driver ``common/idpf`` has been merged into the ``net/intel/idpf``
driver.
- This change should have no impact to end applications, but,
+ Similarly, the ``common/iavf`` driver has been merged into the
``net/intel/iavf`` driver.
+ These changes should have no impact to end applications, but,
when specifying the ``idpf`` or ``cpfl`` net drivers to meson via
``-Denable_drivers`` option,
there is no longer any need to also specify the ``common/idpf`` driver.
+ In the same way, when specifying the ``iavf`` or ``ice`` net drivers,
+ there is no need to also specify the ``common/iavf`` driver.
Note, however, ``net/intel/cpfl`` driver now depends upon the
``net/intel/idpf`` driver.
diff --git a/drivers/common/iavf/version.map b/drivers/common/iavf/version.map
deleted file mode 100644
index 6c1427cca4..00
--- a/drivers/common/iavf/version.map
+++ /dev/null
@@ -1,13 +0,0 @@
-INTERNAL {
- global:
-
- iavf_aq_send_msg_to_pf;
- iavf_clean_arq_element;
- iavf_init_adminq;
- iavf_set_mac_type;
- iavf_shutdown_adminq;
- iavf_vf_parse_hw_config;
- iavf_vf_reset;
-
-
[PATCH v3 4/4] net/intel: allow building ice driver without iavf
The ice PMD relies on a number of functions from the iavf base code,
which can be got by linking against that iavf driver. However, since
only three C files are necessary here, we can allow ice to be built
independently of iavf by including the base files directly in cases
where iavf is not part of the build. If it is part of the build, the
dependency remains as now.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/iavf/base/iavf_prototype.h | 8
drivers/net/intel/ice/meson.build| 13 -
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/net/intel/iavf/base/iavf_prototype.h
b/drivers/net/intel/iavf/base/iavf_prototype.h
index 7c43a817bb..5d2ee0a785 100644
--- a/drivers/net/intel/iavf/base/iavf_prototype.h
+++ b/drivers/net/intel/iavf/base/iavf_prototype.h
@@ -11,6 +11,14 @@
#include
+/* functions only need exporting if this is being built into
+ * iavf driver itself. If included in ice driver, then no export
+ */
+#ifndef RTE_NET_IAVF
+#undef __rte_internal
+#define __rte_internal
+#endif
+
/* Prototypes for shared code functions that are not in
* the standard function pointer structures. These are
* mostly because they are needed even before the init
diff --git a/drivers/net/intel/ice/meson.build
b/drivers/net/intel/ice/meson.build
index 5faf887386..f990e62250 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -18,9 +18,20 @@ sources = files(
testpmd_sources = files('ice_testpmd.c')
-deps += ['hash', 'net', 'net_iavf']
+deps += ['hash', 'net']
includes += include_directories('base')
+if dpdk_conf.has('RTE_NET_IAVF')
+deps += 'net_iavf'
+else
+includes += include_directories('../iavf/base')
+sources += files(
+'../iavf/base/iavf_adminq.c',
+'../iavf/base/iavf_common.c',
+'../iavf/base/iavf_impl.c',
+)
+endif
+
if arch_subdir == 'x86'
sources += files('ice_rxtx_vec_sse.c')
--
2.43.0
[PATCH v3 1/4] drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common"
directory, used by both a net/idpf and a net/cpfl driver, we can
merge all idpf code together under net/idpf and have the cpfl driver
depend on "net/idpf" rather than "common/idpf".
Signed-off-by: Bruce Richardson
---
devtools/libabigail.abignore | 1 +
doc/guides/rel_notes/release_25_03.rst| 6
drivers/common/idpf/meson.build | 34 ---
drivers/common/meson.build| 1 -
drivers/net/intel/cpfl/meson.build| 2 +-
.../{common => net/intel}/idpf/base/README| 0
.../intel}/idpf/base/idpf_alloc.h | 0
.../intel}/idpf/base/idpf_controlq.c | 0
.../intel}/idpf/base/idpf_controlq.h | 0
.../intel}/idpf/base/idpf_controlq_api.h | 0
.../intel}/idpf/base/idpf_controlq_setup.c| 0
.../intel}/idpf/base/idpf_devids.h| 0
.../intel}/idpf/base/idpf_lan_pf_regs.h | 0
.../intel}/idpf/base/idpf_lan_txrx.h | 0
.../intel}/idpf/base/idpf_lan_vf_regs.h | 0
.../intel}/idpf/base/idpf_osdep.h | 0
.../intel}/idpf/base/idpf_prototype.h | 0
.../intel}/idpf/base/idpf_type.h | 0
.../intel}/idpf/base/meson.build | 0
.../intel}/idpf/base/siov_regs.h | 0
.../intel}/idpf/base/virtchnl2.h | 0
.../intel}/idpf/base/virtchnl2_lan_desc.h | 0
.../intel}/idpf/idpf_common_device.c | 0
.../intel}/idpf/idpf_common_device.h | 0
.../intel}/idpf/idpf_common_logs.h| 0
.../intel}/idpf/idpf_common_rxtx.c| 0
.../intel}/idpf/idpf_common_rxtx.h| 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c| 0
.../intel}/idpf/idpf_common_virtchnl.h| 0
drivers/net/intel/idpf/meson.build| 20 +--
.../{common => net/intel}/idpf/version.map| 0
drivers/net/meson.build | 2 +-
33 files changed, 27 insertions(+), 39 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
rename drivers/{common => net/intel}/idpf/base/README (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_alloc.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq.c (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq_api.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq_setup.c (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_devids.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_pf_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_txrx.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_vf_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_osdep.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_prototype.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_type.h (100%)
rename drivers/{common => net/intel}/idpf/base/meson.build (100%)
rename drivers/{common => net/intel}/idpf/base/siov_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/virtchnl2.h (100%)
rename drivers/{common => net/intel}/idpf/base/virtchnl2_lan_desc.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_device.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_device.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_logs.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx_avx512.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 21b8cd6113..1dee6a954f 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -25,6 +25,7 @@
;
; SKIP_LIBRARY=librte_common_mlx5_glue
; SKIP_LIBRARY=librte_net_mlx4_glue
+; SKIP_LIBRARY=librte_common_idpf
; Experimental APIs exceptions ;
diff --git a/doc/guides/rel_notes/release_25_03.rst
b/doc/guides/rel_notes/release_25_03.rst
index a88b04d958..79b1116f6e 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -115,6 +115,12 @@ API Changes
but to enable/disable these drivers via Meson option requires use of the new
paths.
For example, ``-Denable_drivers=/net/i40e`` becomes
``-Denable_drivers=/net/intel/i40e``.
+* The driver ``common/idpf`` has been merged into the ``net/intel/idpf``
driver.
+ This change should have no impact to end applications, but,
+ when specifying the ``idpf`` or ``cpfl`` net
[PATCH v3 0/4] remove common iavf and idpf drivers
The iavf and idpf common directories were used only to share code
between multiple net drivers and did not need to be drivers in their own
right, since it is just as easy to have a dependency from one net driver
on another as a net driver on a common one.
This patchset therefore aims to eliminate the two unnecessary common
drivers. It does so as follows:
* merging common/idpf into net/idpf and updating the cpfl dependency to
point to the net driver.
* merging common/iavf into net/iavf and similarly updating the
dependencies, including the paths from idpf (which does not directly
depend on iavf, but does make use of the definitions in the iavf
header files).
Separately, two other cleanups are done - one to remove an unnecessary
warning disable flag. The second is a little more complex - it makes the
dependency between ice and iavf an optional one, by having ice compile
in the necessary iavf shared code files in case iavf is disabled in the
build.
v3: add libabigail exclusions for removed libs
v2: include Release note updates
Bruce Richardson (4):
drivers: merge common and net idpf drivers
net/idpf: re-enable unused variable warnings
drivers: move iavf common folder to iavf net
net/intel: allow building ice driver without iavf
devtools/libabigail.abignore | 2 ++
doc/guides/rel_notes/release_25_03.rst| 9 +
drivers/common/iavf/version.map | 13 ---
drivers/common/idpf/meson.build | 34 ---
drivers/common/meson.build| 2 --
drivers/net/intel/cpfl/meson.build| 2 +-
.../iavf => net/intel/iavf/base}/README | 0
.../intel/iavf/base}/iavf_adminq.c| 0
.../intel/iavf/base}/iavf_adminq.h| 0
.../intel/iavf/base}/iavf_adminq_cmd.h| 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../intel/iavf/base}/iavf_common.c| 0
.../intel/iavf/base}/iavf_devids.h| 0
.../iavf => net/intel/iavf/base}/iavf_impl.c | 0
.../iavf => net/intel/iavf/base}/iavf_osdep.h | 0
.../intel/iavf/base}/iavf_prototype.h | 8 +
.../intel/iavf/base}/iavf_register.h | 0
.../intel/iavf/base}/iavf_status.h| 0
.../iavf => net/intel/iavf/base}/iavf_type.h | 0
.../iavf => net/intel/iavf/base}/meson.build | 0
.../iavf => net/intel/iavf/base}/virtchnl.h | 0
.../intel/iavf/base}/virtchnl_inline_ipsec.h | 0
drivers/net/intel/iavf/meson.build| 13 ---
drivers/net/intel/iavf/version.map| 14
drivers/net/intel/ice/meson.build | 18 +++---
.../{common => net/intel}/idpf/base/README| 0
.../intel}/idpf/base/idpf_alloc.h | 0
.../intel}/idpf/base/idpf_controlq.c | 0
.../intel}/idpf/base/idpf_controlq.h | 0
.../intel}/idpf/base/idpf_controlq_api.h | 0
.../intel}/idpf/base/idpf_controlq_setup.c| 0
.../intel}/idpf/base/idpf_devids.h| 0
.../intel}/idpf/base/idpf_lan_pf_regs.h | 0
.../intel}/idpf/base/idpf_lan_txrx.h | 0
.../intel}/idpf/base/idpf_lan_vf_regs.h | 0
.../intel}/idpf/base/idpf_osdep.h | 0
.../intel}/idpf/base/idpf_prototype.h | 0
.../intel}/idpf/base/idpf_type.h | 0
.../intel}/idpf/base/meson.build | 9 -
.../intel}/idpf/base/siov_regs.h | 0
.../intel}/idpf/base/virtchnl2.h | 0
.../intel}/idpf/base/virtchnl2_lan_desc.h | 0
.../intel}/idpf/idpf_common_device.c | 0
.../intel}/idpf/idpf_common_device.h | 0
.../intel}/idpf/idpf_common_logs.h| 0
.../intel}/idpf/idpf_common_rxtx.c| 2 --
.../intel}/idpf/idpf_common_rxtx.h| 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c| 4 +--
.../intel}/idpf/idpf_common_virtchnl.h| 0
drivers/net/intel/idpf/meson.build| 20 +--
.../{common => net/intel}/idpf/version.map| 0
drivers/net/meson.build | 2 +-
53 files changed, 78 insertions(+), 74 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
delete mode 100644 drivers/common/idpf/meson.build
rename drivers/{common/iavf => net/intel/iavf/base}/README (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq_cmd.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_alloc.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_common.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_devids.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_impl.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_osdep.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/i
[PATCH v3 2/4] net/idpf: re-enable unused variable warnings
The idpf driver was being built with warnings disabled for unused
variables. However, while the warning was being disabled in the base
code directory, all suppressed warnings were in the main directory.
Therefore, just remove the unused variables and re-enable the
warnings.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/idpf/base/meson.build | 9 -
drivers/net/intel/idpf/idpf_common_rxtx.c | 2 --
drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++--
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/intel/idpf/base/meson.build
b/drivers/net/intel/idpf/base/meson.build
index f30ec7dfc2..7316e0a805 100644
--- a/drivers/net/intel/idpf/base/meson.build
+++ b/drivers/net/intel/idpf/base/meson.build
@@ -5,12 +5,3 @@ sources += files(
'idpf_controlq.c',
'idpf_controlq_setup.c',
)
-
-error_cflags = [
-'-Wno-unused-variable',
-]
-foreach flag: error_cflags
-if cc.has_argument(flag)
-cflags += flag
-endif
-endforeach
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.c
b/drivers/net/intel/idpf/idpf_common_rxtx.c
index a04e54ce26..9b17279181 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx.c
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct
rte_mbuf **rx_pkts,
struct rte_mbuf *last_seg = rxq->pkt_last_seg;
struct rte_mbuf *rxm;
struct rte_mbuf *nmb;
- struct rte_eth_dev *dev;
const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;
uint16_t rx_id = rxq->rx_tail;
uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)
uint16_t nb_tx_desc = txq->nb_tx_desc;
uint16_t desc_to_clean_to;
uint16_t nb_tx_to_clean;
- uint16_t i;
volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
diff --git a/drivers/net/intel/idpf/idpf_common_virtchnl.c
b/drivers/net/intel/idpf/idpf_common_virtchnl.c
index de511da788..0ae1d55d79 100644
--- a/drivers/net/intel/idpf/idpf_common_virtchnl.c
+++ b/drivers/net/intel/idpf/idpf_common_virtchnl.c
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport,
{
struct idpf_adapter *adapter = vport->adapter;
struct idpf_cmd_info args;
- int size, qg_info_size;
+ int size;
int err = -1;
size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport,
struct virtchnl2_rxq_in
struct idpf_adapter *adapter = vport->adapter;
struct virtchnl2_config_rx_queues *vc_rxqs = NULL;
struct idpf_cmd_info args;
- int size, err, i;
+ int size, err;
size = sizeof(*vc_rxqs) + (num_qs - 1) *
sizeof(struct virtchnl2_rxq_info);
--
2.43.0
RE: [RFC PATCH] eventdev: adapter API to configure multiple Rx queues
> -Original Message-
> From: Jerin Jacob
> Sent: Wednesday, January 29, 2025 1:13 PM
> To: Naga Harish K, S V ; Shijith Thotton
> ; dev@dpdk.org
> Cc: Pavan Nikhilesh Bhagavatula ; Pathak,
> Pravin ; Hemant Agrawal
> ; Sachin Saxena ;
> Mattias R_nnblom ; Liang Ma
> ; Mccarthy, Peter ; Van
> Haaren, Harry ; Carrillo, Erik G
> ; Gujjar, Abhinandan S
> ; Amit Prakash Shukla
> ; Burakov, Anatoly
>
> Subject: RE: [RFC PATCH] eventdev: adapter API to configure multiple Rx
> queues
>
>
>
> > -Original Message-
> > From: Naga Harish K, S V
> > Sent: Wednesday, January 29, 2025 10:35 AM
> > To: Shijith Thotton ; dev@dpdk.org
> > Cc: Pavan Nikhilesh Bhagavatula ; Pathak,
> > Pravin ; Hemant Agrawal
> > ; Sachin Saxena ;
> > Mattias R_nnblom ; Jerin Jacob
> > ; Liang Ma ; Mccarthy, Peter
> > ; Van Haaren, Harry
> > ; Carrillo, Erik G
> > ; Gujjar, Abhinandan S
> > ; Amit Prakash Shukla
> > ; Burakov, Anatoly
> >
> > Subject: [EXTERNAL] RE: [RFC PATCH] eventdev: adapter API to configure
> > multiple Rx queues
> > > >
> > > >This requires a change to the rte_event_eth_rx_adapter_queue_add()
> > > >stable API parameters.
> > > >This is an ABI breakage and may not be possible now.
> > > >It requires changes to many current applications that are using the
> > > >rte_event_eth_rx_adapter_queue_add() stable API.
> > > >
> > >
> > > What I meant by mapping was to retain the stable API parameters as they
> are.
> > > Internally, the API can use the proposed eventdev PMD operation
> > > (eth_rx_adapter_queues_add) without causing an ABI break, as shown
> below.
> > >
> > > int rte_event_eth_rx_adapter_queue_add(uint8_t id, uint16_t eth_dev_id,
> > > int32_t rx_queue_id,
> > > const struct rte_event_eth_rx_adapter_queue_conf *conf) {
> > > if (rx_queue_id == -1)
> > > dev->dev_ops->eth_rx_adapter_queues_add)(
> > > dev, &rte_eth_devices[eth_dev_id], 0,
> > > conf, 0);
> > > else
> > > dev->dev_ops->eth_rx_adapter_queues_add)(
> > > dev, &rte_eth_devices[eth_dev_id], &rx_queue_id,
> > > conf, 1);
> > > }
> > >
> > > With above change, old op (eth_rx_adapter_queue_add) can be removed
> > > as both API (stable and proposed) will be using
> eth_rx_adapter_queues_add.
>
>
> Since this thread is not converging and looks like it is due to confusion.
> I am trying to summarize my understanding to define the next steps(like if
> needed, we need to reach tech board if there are no consensus)
>
>
> Problem statement:
> ==
> 1) Implementation of rte_event_eth_rx_adapter_queue_add() in HW typically
> uses an administrative function to enable it. Typically, it translated to
> sending a
> mailbox to PF driver etc.
> So, this function takes "time" to complete in HW implementations.
> 2) For SW implementations, this won't take time as there is no other actors
> involved.
> 3) There are customer use cases, they add 300+
> rte_event_eth_rx_adapter_queue_add() on application bootup, that is
> introducing significant boot time for the application.
> Number of queues are function of number of ethdev ports, number of
> ethdev Rx queues per port and number of event queues.
>
>
> Expected outcome of problem statement:
> ==
> 1) The cases where application knows queue mapping(typically at boot time
> case),
> application can call burst variant of rte_event_eth_rx_adapter_queue_add()
> function
> to amortize the cost. Similar scheme used DPDK in control path API where
> latency is critical,
> like rte_acl_add_rules() or rte_flow via template scheme.
> 2) Solution should not break ABI or any impact to SW drivers.
> 3) Avoid duplicating the code as much as possible
>
>
> Proposed solution:
> ==
> 1) Update eventdev_eth_rx_adapter_queue_add_t() PMD (Internal ABI) API
> to take burst parameters
> 2) Add new rte_event_eth_rx_adapter_queue*s*_add() function and wire to
> use updated PMD API
> 3) Use rte_event_eth_rx_adapter_queue_add() as
> rte_event_eth_rx_adapter_queue*s*_add(, 1)
>
> If so, I am not sure what is the cons of this approach, it will let to have
> optimized applications when
> a) Application knows the queue mapping at priorly (typically in boot time)
> b) Allow HW drivers to optimize without breaking anything for SW drivers
> c) Provide applications to decide burst vs non burst selection based on the
> needed and performance requirements
The proposed API benefits only some hardware platforms that have optimized the
"queue_add" eventdev PMD implementation for burst mode.
It may not benefit SW drivers/other HW platforms.
There will not be much difference in calling the existing API
(rte_event_eth_rx_adapter_queue_add()) in a loop vs using the new API for the
above cases.
If the new proposed API benefits all platforms, then it is useful.
This is the point I am ma
Re: [EXTERNAL] Re: [PATCH 1/2] lib/dmadev: eliminate undefined behavior
On Fri, Jan 24, 2025 at 12:13 PM David Marchand
wrote:
>
> On Tue, Dec 10, 2024 at 1:58 AM fengchengwen wrote:
> > > + @Chengwen Feng
> > >
> > > This kind of patten is not used other places like ethdev traces, Why we
> > > need this kind of pattern in dmadev?
> > > Looks like, it can be fixed by caller of this function by initializing
> > > struct rte_dma_info. So may not need a fixup patch to begin with
> >
> > It's strange that no other library doesn't have this problem.
> >
> > When I first add tracepoints support for dmadev, there is no such macro
> > (just like other library),
> > but the CI report ASAN error.
> >
> > The rootcause is that register:
> > RTE_TRACE_POINT_REGISTER(rte_dma_trace_info_get,
> > lib.dmadev.info_get)
> > it will invoke :
> > __rte_trace_point_register(&__rte_dma_trace_info_get,
> > __rte_dma_trace_info_get_lib.dmadev.info_get,
> > (void (*)(void)rte_dma_trace_info_get) {
> > rte_dma_trace_info_get();
> > }
> >
> > But rte_dma_trace_info_get() it was defined with parameters: int16_t
> > dev_id, struct rte_dma_info *dev_info
> > If we force invoke rte_dma_trace_info_get() without pass any parameter, it
> > may lead to ASAN problem because
> > the parameter's corresponding register was not set (and it's value
> > undefine).
>
> I remember of an issue with tracepoint and *UB*SAN, but I fail to see
> how ASAN is affected (plus I see that the CI runs the tracepoint
> autotests with ASAN).
> Can you clarify?
>
> In any case, this looks like something that should be handled at the
> tracepoint framework level, and not silenced/wrapped around in the
> dmadev library.
Fengcheng, Jerin, André, could you please have a look at this patch:
https://patchwork.dpdk.org/project/dpdk/patch/20250130145849.82003-3-david.march...@redhat.com/
Thanks!
--
David Marchand
[PATCH] net/ice: fix how ice driver handles flows
Currently ICE PMD uses group attribute to select the appropriate HW engine
to offload the flow. This behavior violates the rte_flow API, existing
documentation/examples, and reveals hardware specific details.
This patch eliminates the use of the group attribute and runs each engine
parser in the order they work in the HW pipeline.
Fixes: 9c5f0070fa3f ("net/ice: map group to pipeline stage")
Cc: qi.z.zh...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Vladimir Medvedkin
---
drivers/net/ice/ice_generic_flow.c | 27 ++-
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ice/ice_generic_flow.c
b/drivers/net/ice/ice_generic_flow.c
index 50d760004f..666c8f3cb9 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -2295,21 +2295,22 @@ ice_flow_process_filter(struct rte_eth_dev *dev,
return 0;
}
- parser = get_flow_parser(attr->group);
- if (parser == NULL) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
+ for (int i = 0; i < 3; i++) {
+ parser = get_flow_parser(i);
+ if (parser == NULL) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR,
+ NULL, "NULL attribute.");
+ return -rte_errno;
+ }
+ if (ice_parse_engine(ad, flow, parser, attr->priority,
+ pattern, actions, error)) {
+ *engine = parser->engine;
+ return 0;
+ }
}
- if (ice_parse_engine(ad, flow, parser, attr->priority,
-pattern, actions, error)) {
- *engine = parser->engine;
- return 0;
- } else {
- return -rte_errno;
- }
+ return -rte_errno;
}
static int
--
2.43.0
[PATCH v2] net/ice: fix how ice driver handles flows
Currently ICE PMD uses group attribute to select the appropriate HW engine
to offload the flow. This behavior violates the rte_flow API, existing
documentation/examples, and reveals hardware specific details.
This patch eliminates the use of the group attribute and runs each engine
parser in the order they work in the HW pipeline.
Fixes: 9c5f0070fa3f ("net/ice: map group to pipeline stage")
Cc: qi.z.zh...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Vladimir Medvedkin
---
drivers/net/intel/ice/ice_generic_flow.c | 30 ++--
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/drivers/net/intel/ice/ice_generic_flow.c
b/drivers/net/intel/ice/ice_generic_flow.c
index 50d760004f..5c34e0385f 100644
--- a/drivers/net/intel/ice/ice_generic_flow.c
+++ b/drivers/net/intel/ice/ice_generic_flow.c
@@ -20,6 +20,8 @@
#define ICE_FLOW_ENGINE_DISABLED(mask, type) ((mask) & BIT(type))
+#define ICE_FLOW_ENGINE_NB 3
+
static struct ice_engine_list engine_list =
TAILQ_HEAD_INITIALIZER(engine_list);
@@ -2295,21 +2297,23 @@ ice_flow_process_filter(struct rte_eth_dev *dev,
return 0;
}
- parser = get_flow_parser(attr->group);
- if (parser == NULL) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
+ for (int i = 0; i < ICE_FLOW_ENGINE_NB; i++) {
+ parser = get_flow_parser(i);
+ if (parser == NULL) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR,
+ NULL, "NULL attribute.");
+ return -rte_errno;
+ }
- if (ice_parse_engine(ad, flow, parser, attr->priority,
-pattern, actions, error)) {
- *engine = parser->engine;
- return 0;
- } else {
- return -rte_errno;
+ if (ice_parse_engine(ad, flow, parser, attr->priority,
+ pattern, actions, error)) {
+ *engine = parser->engine;
+ return 0;
+ }
}
+
+ return -rte_errno;
}
static int
--
2.43.0
[PATCH v2] net/cnxk: fix of NIX send header L3 type
For small packets less than 55 bytes, SQ error interrupts are
observed.
When checksum offload flag is enabled and mbuf ol_flags are not
set, then default L3 type will be set to IPv6 in vector
processing. Based on this, HW will still validate for minimum
header size and generate send header error if mismatch.
To address this, will set default L3 type to none. Mbuf ol_flags
RTE_MBUF_F_TX_IPV6 will set with offload feature TSO or L4
checksum only, so handled in corresponding routine.
Fixes: f71b7dbbf04b ("net/cnxk: add vector Tx for CN10K")
Fixes: e829e60c6917 ("net/cnxk: support Tx burst vector for CN20K")
Fixes: 862e28128707 ("net/cnxk: add vector Tx for CN9K")
Signed-off-by: Rahul Bhansali
---
Changes in v2: Added fix for cn9k also.
drivers/net/cnxk/cn10k_tx.h | 7 +--
drivers/net/cnxk/cn20k_tx.h | 7 +--
drivers/net/cnxk/cn9k_tx.h | 7 +--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h
index 7d9b259a5f..77f4e54cd8 100644
--- a/drivers/net/cnxk/cn10k_tx.h
+++ b/drivers/net/cnxk/cn10k_tx.h
@@ -1773,6 +1773,9 @@ cn10k_nix_prepare_tso(struct rte_mbuf *m, union
nix_send_hdr_w1_u *w1,
w0->lso_mps = m->tso_segsz;
w0->lso_format = NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags &
RTE_MBUF_F_TX_IPV6);
w1->ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
+ w1->ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
+ ((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2) +
+ !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
/* Handle tunnel tso */
if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
@@ -2477,7 +2480,7 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
*/
const uint8x16_t tbl = {
/* [0-15] = il4type:il3type */
- 0x04, /* none (IPv6 assumed) */
+ 0x00, /* none */
0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6 assumed)
*/
0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6
assumed) */
0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6 assumed)
*/
@@ -2681,7 +2684,7 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
const uint8x16x2_t tbl = {{
{
/* [0-15] = il4type:il3type */
- 0x04, /* none (IPv6) */
+ 0x00, /* none */
0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6)
*/
0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM
(IPv6) */
0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6)
*/
diff --git a/drivers/net/cnxk/cn20k_tx.h b/drivers/net/cnxk/cn20k_tx.h
index c731406529..8c3ba8326d 100644
--- a/drivers/net/cnxk/cn20k_tx.h
+++ b/drivers/net/cnxk/cn20k_tx.h
@@ -1733,6 +1733,9 @@ cn20k_nix_prepare_tso(struct rte_mbuf *m, union
nix_send_hdr_w1_u *w1, union nix
w0->lso_mps = m->tso_segsz;
w0->lso_format = NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags &
RTE_MBUF_F_TX_IPV6);
w1->ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
+ w1->ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
+ ((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2) +
+ !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
/* Handle tunnel tso */
if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) && (ol_flags &
RTE_MBUF_F_TX_TUNNEL_MASK)) {
@@ -2395,7 +2398,7 @@ cn20k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
struct rte_mbuf **tx_pk
*/
const uint8x16_t tbl = {
/* [0-15] = il4type:il3type */
- 0x04, /* none (IPv6 assumed) */
+ 0x00, /* none */
0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6 assumed)
*/
0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6
assumed) */
0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6 assumed)
*/
@@ -2595,7 +2598,7 @@ cn20k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
struct rte_mbuf **tx_pk
const uint8x16x2_t tbl = {{
{
/* [0-15] = il4type:il3type */
- 0x04, /* none (IPv6) */
+ 0x00, /* none */
0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6)
*/
0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM
(IPv6) */
0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6)
*/
diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h
index 9370985864..902a17860c 100644
--- a/drivers/net/cnxk/cn9k_tx
Re: [PATCH v2 0/4] remove common iavf and idpf drivers
On Thu, Jan 30, 2025 at 02:55:54PM +0100, David Marchand wrote: > Hello Bruce, > > On Thu, Jan 30, 2025 at 1:48 PM Bruce Richardson > wrote: > > > > The iavf and idpf common directories were used only to share code > > between multiple net drivers and did not need to be drivers in their own > > right, since it is just as easy to have a dependency from one net driver > > on another as a net driver on a common one. > > > > This patchset therefore aims to eliminate the two unnecessary common > > drivers. It does so as follows: > > > > * merging common/idpf into net/idpf and updating the cpfl dependency to > > point to the net driver. > > * merging common/iavf into net/iavf and similarly updating the > > dependencies, including the paths from idpf (which does not directly > > depend on iavf, but does make use of the definitions in the iavf > > header files). > > > > Separately, two other cleanups are done - one to remove an unnecessary > > warning disable flag. The second is a little more complex - it makes the > > dependency between ice and iavf an optional one, by having ice compile > > in the necessary iavf shared code files in case iavf is disabled in the > > build. > > > > > > v2: include Release note updates > > > > Bruce Richardson (4): > > drivers: merge common and net idpf drivers > > net/idpf: re-enable unused variable warnings > > drivers: move iavf common folder to iavf net > > net/intel: allow building ice driver without iavf > > You'll probably need something like: > > $ git show --oneline 9863a695075109f15bbfa2f1a3042139f25d6493 -- > devtools/libabigail.abignore > 9863a69507 net/liquidio: remove LiquidIO ethdev driver > diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore > index 585eb23c5e..03bfbce259 100644 > --- a/devtools/libabigail.abignore > +++ b/devtools/libabigail.abignore > @@ -25,6 +25,7 @@ > ; > ; SKIP_LIBRARY=librte_common_mlx5_glue > ; SKIP_LIBRARY=librte_net_mlx4_glue > +; SKIP_LIBRARY=librte_net_liquidio > Yes, I see the libabigail errors in the CI now. V3 coming up... /Bruce
[PATCH v17 03/25] eal/common: remove use of VLAs
From: Konstantin Ananyev 1) ../lib/eal/common/eal_common_proc.c:695:15 : warning: variable length array used As msg->num_fds should not exceed RTE_MP_MAX_FD_NUM, replaced it with fixed size array. Signed-off-by: Konstantin Ananyev Acked-by: Stephen Hemminger --- lib/eal/common/eal_common_proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index d24093937c..201973c5db 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -692,7 +692,8 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) struct sockaddr_un dst; struct mp_msg_internal m; int fd_size = msg->num_fds * sizeof(int); - char control[CMSG_SPACE(fd_size)]; + const int32_t control_sz = CMSG_SPACE(fd_size); + char control[CMSG_SPACE(sizeof(msg->fds))]; m.type = type; memcpy(&m.msg, msg, sizeof(*msg)); @@ -712,7 +713,7 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type) msgh.msg_iov = &iov; msgh.msg_iovlen = 1; msgh.msg_control = control; - msgh.msg_controllen = sizeof(control); + msgh.msg_controllen = control_sz; cmsg = CMSG_FIRSTHDR(&msgh); cmsg->cmsg_len = CMSG_LEN(fd_size); -- 2.47.2.vfs.0.1
[PATCH v17 02/25] 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.2.vfs.0.1
[PATCH v17 01/25] 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.2.vfs.0.1
[PATCH v17 00/25] 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. v17: * define no_vla_cflag in a top directory (config) * add no_vla_cflag to directories that are not VLA-free * add -Wvla project-wide (VLAs not allowed by default, except for directories using no_vla_cflag) v16: * remove -Wvla from drivers/common/mlx5/meson.build and drivers/common/qat/meson.build v15: * inverted some of the logic added during v14: add -Wvla to meson build files in app and lib directories, adding -Wno-vla to the few subdirectories which are not yet VLA free v14: * add -Wvla to meson build for directories that are VLA free under app, lib, drivers. This is to ensure that new VLAs are not added to these directories in the future. v13: * increase stack allocated buffer size in ipv4_reassembly_interleaved_flows_perf and ipv6_reassembly_interleaved_flows_perf to avoid STATUS_STACK_BUFFER_OVERRUN on Windows using MSVC v12: * update commit message for patch 06/21 to avoid warning v11: * add include stdlib.h for alloca() declaration on FreeBSD * zero-initialize array without code loop * increase maximum tuple length v10: * add ifdef to scope gcc's diagnostic error down to gcc only v9: * fix sender's email address * fix gcc's diagnostic error string to make clang happy v8: * rebase * reduce scope for disabling error "-Warray-bounds=" to only the place that needs it * remove parentesis around numbers from defines in test_bitset.c v7: * remove use of VLA from new file which sneaked in during review v6: * remove use of VLA from new test code added recently * fix title for patch 08/20 v5: * add patches for net/ice, net/ixgbe and gro from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31972&archive=both&state=* * address debug_autotest ASan failure * address array-bound error in bitset_autotest with gcc-13 v4: * rebase and adapt for changes made in main since v3 was sent * use fixed maximum array size instead of VLA when doable v3: * address checkpatch/check git log warnings (minor typos) v2: * replace patches for ethdev, hash, rcu and include new patches for eal from Konstantin Ananyev from https://patchwork.dpdk.org/project/dpdk/list/?series=31781 Andre Muezerie (8): 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 config: define no_vla_cflag app: add no_vla_cflag to directories that are not VLA-free drivers: add no_vla_cflag to directories that are not VLA-free lib: add no_vla_cflag to directories that are not VLA-free config: add -Wvla project-wide 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 (7): 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 app/pdump/meson.build | 2 + app/proc-info/meson.build | 2 + app/test-acl/meson.build | 2 + app/test-bbdev/meson.build| 2 + app/test-crypto-perf/meson.build | 2 + app/test-dma-perf/meson.build | 2 + app/test-eventdev/meson.build | 2 + app/test-flow-perf/meson.build| 2 + app/test-pmd/cmdline.c| 2 +- app/test-pmd/cmdline_flow.c | 15 +- app/test-pmd/config.c | 16 +- app/test-pmd/meson.build | 10 +- app/test-pmd/shared_rxq_fwd.c | 2 +- app/test-sad/meson.build | 2 + app/test/meson.build | 17 +- app/test/test.c | 2 +- app/test/test_bitset.c| 69 --- app/test/test_cmdline_string.c| 2 +- app/test/test_cryptodev.c | 34 ++
[PATCH v17 13/25] 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 v17 04/25] ethdev: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/ethdev/rte_ethdev.c:3244:16
: warning: ISO C90 forbids variable length array ‘xstats_names’
2) ./lib/ethdev/rte_ethdev.c:3345:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
3) ./lib/ethdev/rte_ethdev.c:3538:16
: warning: ISO C90 forbids variable length array ‘xstats’
4) ./lib/ethdev/rte_ethdev.c:3554:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
For 1) and 3) - just replaced VLA with arrays allocated from heap.
As I understand xstats extraction belongs to control-path, so extra
calloc/free is hopefully acceptable.
Also ethdev xstats already doing that within
rte_eth_xstats_get_id_by_name().
For 2) and 4) changed the code to use fixed size array and call
appropriate devops function several times, if needed.
Signed-off-by: Konstantin Ananyev
---
lib/ethdev/rte_ethdev.c | 183 +---
1 file changed, 113 insertions(+), 70 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 6413c54e3b..09cc4764c3 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -36,6 +36,8 @@
#include "ethdev_trace.h"
#include "sff_telemetry.h"
+#define ETH_XSTATS_ITER_NUM0x100
+
struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
/* public fast-path API */
@@ -3308,7 +3310,8 @@ int
rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
uint64_t *id)
{
- int cnt_xstats, idx_xstat;
+ int cnt_xstats, idx_xstat, rc;
+ struct rte_eth_xstat_name *xstats_names;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3334,26 +3337,33 @@ rte_eth_xstats_get_id_by_name(uint16_t port_id, const
char *xstat_name,
}
/* Get id-name lookup table */
- struct rte_eth_xstat_name xstats_names[cnt_xstats];
+ xstats_names = calloc(cnt_xstats, sizeof(xstats_names[0]));
+ if (xstats_names == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
+ }
if (cnt_xstats != rte_eth_xstats_get_names_by_id(
port_id, xstats_names, cnt_xstats, NULL)) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot get xstats lookup");
+ free(xstats_names);
return -1;
}
+ rc = -EINVAL;
for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
if (!strcmp(xstats_names[idx_xstat].name, xstat_name)) {
*id = idx_xstat;
rte_eth_trace_xstats_get_id_by_name(port_id,
xstat_name, *id);
-
- return 0;
+ rc = 0;
+ break;
};
}
- return -EINVAL;
+ free(xstats_names);
+ return rc;
}
/* retrieve basic stats names */
@@ -3399,6 +3409,38 @@ eth_basic_stats_get_names(struct rte_eth_dev *dev,
return cnt_used_entries;
}
+static int
+eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names, uint32_t size,
+ uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+* Convert ids to xstats ids that PMD knows.
+* ids known by user are basic + extended stats.
+*/
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy,
+ xstats_names + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
+
/* retrieve ethdev extended statistics names */
int
rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -3406,9 +3448,8 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
uint64_t *ids)
{
struct rte_eth_xstat_name *xstats_names_copy;
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
unsigned int expected_entries;
+ unsigned int nb_basic_stats;
unsigned int basic_count;
struct rte_eth_dev *dev;
unsigned int i;
@@ -3434,27 +3475,18 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
if (ids && !xstats_names)
return -EINVAL;
- if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
- uint64_t ids_copy[size];
-
- for (i = 0; i < size; i++) {
- if (ids[i] < basic_count) {
- no_basic_stat_requested = 0;
- break;
- }
-
-
[PATCH v17 05/25] 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.2.vfs.0.1
[PATCH v17 07/25] rcu: remove use of VLAs for Windows built code
From: Konstantin Ananyev
1) ./lib/rcu/rte_rcu_qsbr.c:359:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
2) ./lib/rcu/rte_rcu_qsbr.c:422:9
: warning: ISO C90 forbids variable length array ‘data’ [-Wvla]
In both cases we allocate VLA for one element from RCU deferred queue.
Right now, size of element in RCU queue is not limited by API.
The approach is to introduce some reasonable limitation on RCU DQ
element size.
Choose 128B for now.
With that in place we can replace both VLA occurencies with fixed size
array.
Note that such change need to be treated as API change.
So can be applied only at 24.11.
Signed-off-by: Konstantin Ananyev
---
lib/rcu/rte_rcu_qsbr.c | 7 ---
lib/rcu/rte_rcu_qsbr.h | 5 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index dbf31501a6..fe68d16326 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -245,7 +245,8 @@ rte_rcu_qsbr_dq_create(const struct
rte_rcu_qsbr_dq_parameters *params)
if (params == NULL || params->free_fn == NULL ||
params->v == NULL || params->name == NULL ||
params->size == 0 || params->esize == 0 ||
- (params->esize % 4 != 0)) {
+ (params->esize % 4 != 0) ||
+ params->esize > RTE_QSBR_ESIZE_MAX) {
RCU_LOG(ERR, "Invalid input parameter");
rte_errno = EINVAL;
@@ -323,7 +324,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq,
void *e)
return 1;
}
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
dq_elem = (__rte_rcu_qsbr_dq_elem_t *)data;
/* Start the grace period */
dq_elem->token = rte_rcu_qsbr_start(dq->v);
@@ -386,7 +387,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq,
unsigned int n,
cnt = 0;
- char data[dq->esize];
+ char data[RTE_QSBR_ESIZE_MAX + __RTE_QSBR_TOKEN_SIZE];
/* Check reader threads quiescent state and reclaim resources */
while (cnt < n &&
rte_ring_dequeue_bulk_elem_start(dq->r, &data,
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 550fadf56a..abcbd78914 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -86,6 +86,11 @@ struct __rte_cache_aligned rte_rcu_qsbr_cnt {
#define __RTE_QSBR_CNT_MAX ((uint64_t)~0)
#define __RTE_QSBR_TOKEN_SIZE sizeof(uint64_t)
+/**
+ * Max allowable size (in bytes) of each element in the defer queue
+ */
+#define RTE_QSBR_ESIZE_MAX (2 * RTE_CACHE_LINE_MIN_SIZE)
+
/* RTE Quiescent State variable structure.
* This structure has two elements that vary in size based on the
* 'max_threads' parameter.
--
2.47.2.vfs.0.1
[PATCH v17 12/25] 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.2.vfs.0.1
[PATCH v17 06/25] 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.2.vfs.0.1
[PATCH v17 23/25] drivers: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
drivers/common/cnxk/meson.build | 2 ++
drivers/crypto/cnxk/meson.build | 2 ++
drivers/crypto/octeontx/meson.build | 2 ++
drivers/crypto/scheduler/meson.build | 2 ++
drivers/dma/dpaa/meson.build | 2 ++
drivers/event/cnxk/meson.build | 2 ++
drivers/event/dsw/meson.build| 1 +
drivers/event/opdl/meson.build | 1 +
drivers/event/sw/meson.build | 1 +
drivers/net/af_xdp/meson.build | 2 ++
drivers/net/bnxt/meson.build | 2 ++
drivers/net/bonding/meson.build | 2 ++
drivers/net/cnxk/meson.build | 2 ++
drivers/net/cxgbe/meson.build| 2 ++
drivers/net/dpaa/meson.build | 2 ++
drivers/net/dpaa2/meson.build| 2 ++
drivers/net/failsafe/meson.build | 1 +
drivers/net/gve/meson.build | 2 ++
drivers/net/hns3/meson.build | 2 ++
drivers/net/netvsc/meson.build | 2 ++
drivers/net/nfp/meson.build | 2 ++
drivers/net/ngbe/base/meson.build| 1 +
drivers/net/ntnic/meson.build| 2 ++
drivers/net/octeontx/meson.build | 2 ++
drivers/net/sfc/meson.build | 1 +
drivers/net/softnic/meson.build | 1 +
drivers/net/tap/meson.build | 1 +
drivers/net/txgbe/meson.build| 2 ++
drivers/net/vdev_netvsc/meson.build | 2 ++
drivers/net/virtio/meson.build | 2 ++
30 files changed, 52 insertions(+)
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 9e3fd44317..f685f94ee1 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -92,6 +92,8 @@ sources += files('cnxk_telemetry_bphy.c',
'cnxk_telemetry_sso.c',
)
+cflags += no_vla_cflag
+
if meson.is_cross_build()
soc_type = meson.get_external_property('platform', '')
else
diff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build
index aa840fb7bb..2e483d786c 100644
--- a/drivers/crypto/cnxk/meson.build
+++ b/drivers/crypto/cnxk/meson.build
@@ -28,6 +28,8 @@ headers = files('rte_pmd_cnxk_crypto.h')
deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev']
includes += include_directories('../../../lib/net', '../../event/cnxk')
+cflags += no_vla_cflag
+
if get_option('buildtype').contains('debug')
cflags += [ '-DLA_IPSEC_DEBUG','-DCNXK_CRYPTODEV_DEBUG' ]
else
diff --git a/drivers/crypto/octeontx/meson.build
b/drivers/crypto/octeontx/meson.build
index 387727c6ab..94689c1484 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -32,3 +32,5 @@ includes += include_directories('../../common/octeontx')
includes += include_directories('../../event/octeontx')
includes += include_directories('../../mempool/octeontx')
includes += include_directories('../../net/octeontx')
+
+cflags += no_vla_cflag
diff --git a/drivers/crypto/scheduler/meson.build
b/drivers/crypto/scheduler/meson.build
index 752d655415..d443e2a2ab 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -22,3 +22,5 @@ headers = files(
'rte_cryptodev_scheduler.h',
'rte_cryptodev_scheduler_operations.h',
)
+
+cflags += no_vla_cflag
diff --git a/drivers/dma/dpaa/meson.build b/drivers/dma/dpaa/meson.build
index c31a6d91fe..1eade2bb35 100644
--- a/drivers/dma/dpaa/meson.build
+++ b/drivers/dma/dpaa/meson.build
@@ -9,6 +9,8 @@ endif
deps += ['dmadev', 'bus_dpaa']
sources = files('dpaa_qdma.c')
+cflags += no_vla_cflag
+
if cc.has_argument('-Wno-pointer-arith')
cflags += '-Wno-pointer-arith'
endif
diff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build
index 8aaf8116f7..e4d024edc9 100644
--- a/drivers/event/cnxk/meson.build
+++ b/drivers/event/cnxk/meson.build
@@ -299,6 +299,8 @@ sources += files(
endif
endif
+cflags += no_vla_cflag
+
extra_flags = ['-flax-vector-conversions', '-Wno-strict-aliasing']
if cc.get_id() == 'clang'
extra_flags += ['-Wno-asm-operand-widths']
diff --git a/drivers/event/dsw/meson.build b/drivers/event/dsw/meson.build
index 01af94165f..2a7f0d9496 100644
--- a/drivers/event/dsw/meson.build
+++ b/drivers/event/dsw/meson.build
@@ -2,6 +2,7 @@
# Copyright(c) 2018 Ericsson AB
deps += ['bus_vdev']
+cflags += no_vla_cflag
if cc.has_argument('-Wno-format-nonliteral')
cflags += '-Wno-format-nonliteral'
endif
diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build
index 8613b2a746..d79006d9ad 100644
--- a/drivers/event/opdl/meson.build
+++ b/drivers/event/opdl/meson.build
@@ -10,3 +10,4 @@ sources = files(
)
deps += ['bus_vdev']
require_iova_in_mbuf = false
+cflags += no_vla_cflag
diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build
index 3a3ebd72a3..019f2069fd 100644
--- a/drivers/event/sw/meson.build
+++ b/drivers/event/sw/meson.build
@@ -10,3 +10,4 @@ sources = files(
)
deps += ['hash', 'bus_vde
[PATCH v17 17/25] net/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/net/mlx5/mlx5.c | 5 ++---
drivers/net/mlx5/mlx5_flow.c | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6e4473e2f4..979e54686b 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1598,14 +1598,13 @@ void
mlx5_rt_timestamp_config(struct mlx5_dev_ctx_shared *sh,
struct mlx5_hca_attr *hca_attr)
{
- uint32_t dw_cnt = MLX5_ST_SZ_DW(register_mtutc);
- uint32_t reg[dw_cnt];
+ uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
int ret = ENOTSUP;
if (hca_attr->access_register_user)
ret = mlx5_devx_cmd_register_read(sh->cdev->ctx,
MLX5_REGISTER_ID_MTUTC, 0,
- reg, dw_cnt);
+ reg, RTE_DIM(reg));
if (!ret) {
uint32_t ts_mode;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 3e79754b83..bfc44f25bf 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;
@@ -8481,7 +8481,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.2.vfs.0.1
[PATCH v17 14/25] 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 81052e72c1..6fbfee1b2d 100644 --- a/drivers/common/idpf/idpf_common_rxtx_avx512.c +++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c @@ -998,7 +998,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 & @@ -1322,7 +1323,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.2.vfs.0.1
[PATCH v17 09/25] gro: remove use of VLAs
From: Konstantin Ananyev
../lib/gro/rte_gro.c:182:34: warning:
variable length array used [-Wvla]
../lib/gro/rte_gro.c:363:34: warning:
variable length array used [-Wvla]
In both cases the pattern is the same: we use unprocess_pkts[nb_pkts] to
collect un-used by GRO packets, and then copy them to the start of
input/output pkts[] array.
In both cases, we can safely copy pkts[i] into already
processed entry at the same array, i.e. into pkts[unprocess_num].
Such change eliminates need of temporary VLA: unprocess_pkts[nb_pkts].
Signed-off-by: Konstantin Ananyev
Acked-by: Ferruh Yigit
---
lib/gro/rte_gro.c | 40 ++--
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index db86117609..6d5aadf32a 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -179,7 +179,6 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
struct gro_vxlan_udp4_item vxlan_udp_items[RTE_GRO_MAX_BURST_ITEM_NUM]
= {{{0}} };
- struct rte_mbuf *unprocess_pkts[nb_pkts];
uint32_t item_num;
int32_t ret;
uint16_t i, unprocess_num = 0, nb_after_gro = nb_pkts;
@@ -275,7 +274,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_VXLAN_UDP4_PKT(pkts[i]->packet_type) &&
do_vxlan_udp_gro) {
ret = gro_vxlan_udp4_reassemble(pkts[i],
@@ -284,7 +283,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* Merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_TCP_PKT(pkts[i]->packet_type) &&
do_tcp4_gro) {
ret = gro_tcp4_reassemble(pkts[i], &tcp_tbl, 0);
@@ -292,7 +291,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV4_UDP_PKT(pkts[i]->packet_type) &&
do_udp4_gro) {
ret = gro_udp4_reassemble(pkts[i], &udp_tbl, 0);
@@ -300,7 +299,7 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else if (IS_IPV6_TCP_PKT(pkts[i]->packet_type) &&
do_tcp6_gro) {
ret = gro_tcp6_reassemble(pkts[i], &tcp6_tbl, 0);
@@ -308,21 +307,15 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
/* merge successfully */
nb_after_gro--;
else if (ret < 0)
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
} else
- unprocess_pkts[unprocess_num++] = pkts[i];
+ pkts[unprocess_num++] = pkts[i];
}
if ((nb_after_gro < nb_pkts)
|| (unprocess_num < nb_pkts)) {
- i = 0;
- /* Copy unprocessed packets */
- if (unprocess_num > 0) {
- memcpy(&pkts[i], unprocess_pkts,
- sizeof(struct rte_mbuf *) *
- unprocess_num);
- i = unprocess_num;
- }
+
+ i = unprocess_num;
/* Flush all packets from the tables */
if (do_vxlan_tcp_gro) {
@@ -360,7 +353,6 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
uint16_t nb_pkts,
void *ctx)
{
- struct rte_mbuf *unprocess_pkts[nb_pkts];
struct gro_ctx *gro_ctx = ctx;
void *tcp_tbl, *udp_tbl, *vxlan_tcp_tbl, *vxlan_udp_tbl, *tcp6_tbl;
uint64_t current_time;
@@ -396,33 +388,29 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
do_vxlan_tcp_gro) {
if (gro_vxlan_tcp4_reassemble(pkts[i], vxlan_tcp_tbl,
[PATCH v17 11/25] 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/intel/ice/ice_rxtx.c | 18 --
drivers/net/intel/ice/ice_rxtx.h | 2 ++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
index 8dd8644b16..437cf0d807 100644
--- a/drivers/net/intel/ice/ice_rxtx.c
+++ b/drivers/net/intel/ice/ice_rxtx.c
@@ -1172,7 +1172,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;
@@ -1280,9 +1280,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) {
@@ -1291,6 +1296,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;
@@ -1864,7 +1871,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 -
@@ -1879,7 +1885,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)) {
rte_mempool_put_bulk(rxq->mp, (void *)rxep,
rxq->rx_free_thresh);
@@ -1906,8 +1912,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/intel/ice/ice_rxtx.h b/drivers/net/intel/ice/ice_rxtx.h
index f9293ac6f9..276d40b57f 100644
--- a/drivers/net/intel/ice/ice_rxtx.h
+++ b/drivers/net/intel/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.2.vfs.0.1
[PATCH v17 10/25] 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/intel/ixgbe/ixgbe_ethdev.c | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
b/drivers/net/intel/ixgbe/ixgbe_ethdev.c
index 5f18fbaad5..c79ecd6eec 100644
--- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/intel/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);
--
2.47.2.vfs.0.1
[PATCH v17 08/25] 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.2.vfs.0.1
[PATCH v17 20/25] hash: remove use of VLAs by using standard arrays
MSVC does not support VLAs, replace VLAs with standard C arrays.
Signed-off-by: Andre Muezerie
---
lib/hash/rte_thash_gf2_poly_math.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/hash/rte_thash_gf2_poly_math.c
b/lib/hash/rte_thash_gf2_poly_math.c
index 1c62974e71..825da4382f 100644
--- a/lib/hash/rte_thash_gf2_poly_math.c
+++ b/lib/hash/rte_thash_gf2_poly_math.c
@@ -8,6 +8,7 @@
#include
#include
+#define MAX_POLY_DEGREE 32
#define MAX_TOEPLITZ_KEY_LENGTH 64
RTE_LOG_REGISTER_SUFFIX(thash_poly_logtype, thash_poly, INFO);
#define RTE_LOGTYPE_HASH thash_poly_logtype
@@ -149,7 +150,7 @@ gf2_pow(uint32_t a, uint32_t pow, uint32_t r, int degree)
static uint32_t
__thash_get_rand_poly(int poly_degree)
{
- uint32_t roots[poly_degree];
+ uint32_t roots[MAX_POLY_DEGREE];
uint32_t rnd;
uint32_t ret_poly = 0;
int i, j;
@@ -194,9 +195,7 @@ __thash_get_rand_poly(int poly_degree)
* Get coefficients of the polynomial for
* (x - roots[0])(x - roots[1])...(x - roots[n])
*/
- uint32_t poly_coefficients[poly_degree + 1];
- for (i = 0; i <= poly_degree; i++)
- poly_coefficients[i] = 0;
+ uint32_t poly_coefficients[MAX_POLY_DEGREE + 1] = {0};
poly_coefficients[0] = 1; /* highest degree term coefficient in the end
*/
for (i = 0; i < (int)poly_degree; i++) {
@@ -247,7 +246,7 @@ thash_get_rand_poly(uint32_t poly_degree)
{
uint32_t ret_poly;
- if (poly_degree > 32) {
+ if (poly_degree > MAX_POLY_DEGREE) {
HASH_LOG(ERR, "Wrong polynomial degree %d, must be in range [1,
32]", poly_degree);
return 0;
}
--
2.47.2.vfs.0.1
[PATCH v17 25/25] config: add -Wvla project-wide
Add -Wvla project-wide so that VLAs are not allowed by default. This
is to avoid new VLAs from being introduced.
Meson files in directories which are not yet VLA-free have already
been updated with -Wno-vla to avoid build breaks.
Signed-off-by: Andre Muezerie
---
config/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/config/meson.build b/config/meson.build
index 6be928e04b..78f79b9a4d 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -345,6 +345,7 @@ endif
no_vla_cflag = []
if cc.has_argument('-Wvla')
+add_project_arguments('-Wvla', language: 'c')
if not is_windows
no_vla_cflag = '-Wno-vla'
endif
--
2.47.2.vfs.0.1
[PATCH v17 18/25] 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 +-
app/test/test_soring_stress_impl.h | 13 +++---
4 files changed, 63 insertions(+), 43 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_
[PATCH v17 19/25] app/testpmd: remove use of VLAs for Windows built code in shared_rxq_fwd
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Andre Muezerie
Acked-by: Chengwen Feng
---
app/test-pmd/shared_rxq_fwd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c
index 623d62da88..b85830b90e 100644
--- a/app/test-pmd/shared_rxq_fwd.c
+++ b/app/test-pmd/shared_rxq_fwd.c
@@ -92,7 +92,7 @@ forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx,
static bool
shared_rxq_fwd(struct fwd_stream *fs)
{
- struct rte_mbuf *pkts_burst[nb_pkt_per_burst];
+ struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
uint16_t nb_rx;
nb_rx = common_fwd_stream_receive(fs, pkts_burst, nb_pkt_per_burst);
--
2.47.2.vfs.0.1
[PATCH v17 24/25] lib: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
lib/acl/meson.build| 2 ++
lib/bpf/meson.build| 2 ++
lib/dispatcher/meson.build | 2 ++
lib/eventdev/meson.build | 2 ++
lib/ipsec/meson.build | 2 ++
lib/member/meson.build | 2 ++
lib/metrics/meson.build| 2 ++
lib/pdcp/meson.build | 2 ++
lib/pdump/meson.build | 2 ++
lib/pipeline/meson.build | 2 ++
lib/power/meson.build | 3 +++
lib/table/meson.build | 2 ++
lib/vhost/meson.build | 15 ---
13 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/lib/acl/meson.build b/lib/acl/meson.build
index 9cba08321a..12c4d5d45b 100644
--- a/lib/acl/meson.build
+++ b/lib/acl/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
'rte_acl.c', 'tb_mem.c')
headers = files('rte_acl.h', 'rte_acl_osdep.h')
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index aa258a9061..1548b1a3fd 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32')
build = false
reason = 'not supported on 32-bit x86'
diff --git a/lib/dispatcher/meson.build b/lib/dispatcher/meson.build
index ffaef26a6d..825debbcef 100644
--- a/lib/dispatcher/meson.build
+++ b/lib/dispatcher/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('rte_dispatcher.c')
headers = files('rte_dispatcher.h')
diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build
index a04bb86f0f..92b0135922 100644
--- a/lib/eventdev/meson.build
+++ b/lib/eventdev/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files(
'eventdev_private.c',
'eventdev_trace_points.c',
diff --git a/lib/ipsec/meson.build b/lib/ipsec/meson.build
index 5c5a4aae78..40bc0f39cf 100644
--- a/lib/ipsec/meson.build
+++ b/lib/ipsec/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('esp_inb.c', 'esp_outb.c',
'sa.c', 'ses.c', 'ipsec_sad.c',
'ipsec_telemetry.c')
diff --git a/lib/member/meson.build b/lib/member/meson.build
index 02ef59795e..0daee47803 100644
--- a/lib/member/meson.build
+++ b/lib/member/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
headers = files('rte_member.h')
sources = files(
diff --git a/lib/metrics/meson.build b/lib/metrics/meson.build
index 8c1c4b4b49..c4f734471a 100644
--- a/lib/metrics/meson.build
+++ b/lib/metrics/meson.build
@@ -9,3 +9,5 @@ if dpdk_conf.has('RTE_HAS_JANSSON')
endif
deps += ['ethdev', 'telemetry']
+
+cflags += no_vla_cflag
diff --git a/lib/pdcp/meson.build b/lib/pdcp/meson.build
index f4f9246bcb..bab1838a26 100644
--- a/lib/pdcp/meson.build
+++ b/lib/pdcp/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files(
'pdcp_cnt.c',
'pdcp_crypto.c',
diff --git a/lib/pdump/meson.build b/lib/pdump/meson.build
index da8d51b616..f8d5ad9802 100644
--- a/lib/pdump/meson.build
+++ b/lib/pdump/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files('rte_pdump.c')
headers = files('rte_pdump.h')
deps += ['ethdev', 'bpf', 'pcapng']
diff --git a/lib/pipeline/meson.build b/lib/pipeline/meson.build
index fd5e0dc6bb..3d02a03243 100644
--- a/lib/pipeline/meson.build
+++ b/lib/pipeline/meson.build
@@ -7,6 +7,8 @@ if is_windows
subdir_done()
endif
+cflags += no_vla_cflag
+
sources = files(
'rte_pipeline.c',
'rte_port_in_action.c',
diff --git a/lib/power/meson.build b/lib/power/meson.build
index b3a7bc7b2e..e56d544adf 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -11,6 +11,9 @@ if not is_linux
build = false
reason = 'only supported on Linux'
endif
+
+cflags += no_vla_cflag
+
sources = files(
'power_common.c',
'rte_power_cpufreq.c',
diff --git a/lib/table/meson.build b/lib/table/meson.build
index 9b3d9ac759..66fb88279b 100644
--- a/lib/table/meson.build
+++ b/lib/table/meson.build
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+cflags += no_vla_cflag
+
sources = files(
'rte_swx_keycmp.c',
'rte_swx_table_em.c',
diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build
index 51bcf17244..4f8417158e 100644
--- a/lib/vhost/meson.build
+++ b/lib/vhost/meson.build
@@ -16,11 +16,20 @@ elif (toolchain == 'icc' and
cc.version().version_compare('>=16.0.0'))
cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
endif
dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY',
cc.has_heade
[PATCH v17 16/25] common/mlx5: remove use of VLAs for Windows built code
From: Tyler Retzlaff
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff
---
drivers/common/mlx5/mlx5_common.h| 4 ++--
drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 1abd1e8239..f29f06a86e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -125,10 +125,10 @@ mlx5_fp_debug_enabled(void)
/* Allocate a buffer on the stack and fill it with a printf format string. */
#define MKSTR(name, ...) \
int mkstr_size_##name = snprintf(NULL, 0, "" __VA_ARGS__); \
- char name[mkstr_size_##name + 1]; \
+ char *name = alloca(mkstr_size_##name + 1); \
\
memset(name, 0, mkstr_size_##name + 1); \
- snprintf(name, sizeof(name), "" __VA_ARGS__)
+ snprintf(name, mkstr_size_##name + 1, "" __VA_ARGS__)
enum {
PCI_VENDOR_ID_MELLANOX = 0x15b3,
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index a75f011750..804ee67cd6 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -284,10 +284,9 @@ mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_obj *dcs,
void *cmd_comp,
uint64_t async_id)
{
- int out_len = MLX5_ST_SZ_BYTES(query_flow_counter_out) +
- MLX5_ST_SZ_BYTES(traffic_counter);
- uint32_t out[out_len];
+ uint32_t out[MLX5_ST_SZ_BYTES(query_flow_counter_out) +
MLX5_ST_SZ_BYTES(traffic_counter)];
uint32_t in[MLX5_ST_SZ_DW(query_flow_counter_in)] = {0};
+ const int out_len = RTE_DIM(out);
void *stats;
int rc;
@@ -346,7 +345,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
int klm_num = attr->klm_num;
int in_size_dw = MLX5_ST_SZ_DW(create_mkey_in) +
(klm_num ? RTE_ALIGN(klm_num, 4) : 0) * MLX5_ST_SZ_DW(klm);
- uint32_t in[in_size_dw];
+ uint32_t *in = alloca(sizeof(uint32_t) * in_size_dw);
uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
void *mkc;
struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
--
2.47.2.vfs.0.1
[PATCH v17 22/25] app: add no_vla_cflag to directories that are not VLA-free
The no_vla_cflag is added to meson.build files in directories that
are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
app/pdump/meson.build| 2 ++
app/proc-info/meson.build| 2 ++
app/test-acl/meson.build | 2 ++
app/test-bbdev/meson.build | 2 ++
app/test-crypto-perf/meson.build | 2 ++
app/test-dma-perf/meson.build| 2 ++
app/test-eventdev/meson.build| 2 ++
app/test-flow-perf/meson.build | 2 ++
app/test-pmd/meson.build | 10 +-
app/test-sad/meson.build | 2 ++
app/test/meson.build | 17 -
11 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/app/pdump/meson.build b/app/pdump/meson.build
index fb282bba1f..ae12636b2c 100644
--- a/app/pdump/meson.build
+++ b/app/pdump/meson.build
@@ -9,3 +9,5 @@ endif
sources = files('main.c')
deps += ['ethdev', 'kvargs', 'pdump']
+
+cflags += no_vla_cflag
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index 4f83f29a64..d2f2bd98d1 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -12,3 +12,5 @@ deps += ['ethdev', 'security', 'eventdev']
if dpdk_conf.has('RTE_LIB_METRICS')
deps += 'metrics'
endif
+
+cflags += no_vla_cflag
diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build
index c0dc4b221a..714bd4b5c7 100644
--- a/app/test-acl/meson.build
+++ b/app/test-acl/meson.build
@@ -9,3 +9,5 @@ endif
sources = files('main.c')
deps += ['acl', 'net']
+
+cflags += no_vla_cflag
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 926e0a5271..64181ec630 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -26,3 +26,5 @@ endif
if dpdk_conf.has('RTE_BASEBAND_LA12XX')
deps += ['baseband_la12xx']
endif
+
+cflags += no_vla_cflag
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 7b02b518f0..e75d60eedd 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -23,3 +23,5 @@ deps += ['cryptodev', 'net', 'security']
if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
deps += 'crypto_scheduler'
endif
+
+cflags += no_vla_cflag
diff --git a/app/test-dma-perf/meson.build b/app/test-dma-perf/meson.build
index b1557b8125..5f710c03b7 100644
--- a/app/test-dma-perf/meson.build
+++ b/app/test-dma-perf/meson.build
@@ -13,3 +13,5 @@ sources = files(
'main.c',
'benchmark.c',
)
+
+cflags += no_vla_cflag
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index ab8769c755..12276b2cf3 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -23,3 +23,5 @@ sources = files(
'test_pipeline_queue.c',
)
deps += 'eventdev'
+
+cflags += no_vla_cflag
diff --git a/app/test-flow-perf/meson.build b/app/test-flow-perf/meson.build
index 766e4516ad..d983c71302 100644
--- a/app/test-flow-perf/meson.build
+++ b/app/test-flow-perf/meson.build
@@ -15,3 +15,5 @@ sources = files(
)
deps += ['ethdev']
+
+cflags += no_vla_cflag
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index f1c36529b4..8de1528428 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -3,7 +3,15 @@
# override default name to drop the hyphen
name = 'testpmd'
-cflags += '-Wno-deprecated-declarations'
+
+extra_flags = ['-Wno-deprecated-declarations']
+
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
+
sources = files(
'5tswap.c',
'cmdline.c',
diff --git a/app/test-sad/meson.build b/app/test-sad/meson.build
index a50616a9c7..f166e00511 100644
--- a/app/test-sad/meson.build
+++ b/app/test-sad/meson.build
@@ -9,3 +9,5 @@ endif
sources = files('main.c')
deps += ['ipsec', 'net']
+
+cflags += no_vla_cflag
diff --git a/app/test/meson.build b/app/test/meson.build
index 48cf77fda9..622c480519 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -250,12 +250,19 @@ foreach d:optional_deps
endif
endforeach
-if cc.has_argument('-Wno-format-truncation')
-cflags += '-Wno-format-truncation'
-endif
+cflags += no_vla_cflag
+
+extra_flags = [
+# Strict-aliasing rules are violated by uint8_t[] to context size casts.
+'-fno-strict-aliasing',
+'-Wno-format-truncation',
+]
-# Strict-aliasing rules are violated by uint8_t[] to context size casts.
-cflags += '-fno-strict-aliasing'
+foreach arg: extra_flags
+if cc.has_argument(arg)
+cflags += arg
+endif
+endforeach
# Enable using internal APIs in unit tests
cflags += '-DALLOW_INTERNAL_API'
--
2.47.2.vfs.0.1
[PATCH v17 15/25] 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/intel/i40e/i40e_testpmd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_testpmd.c
b/drivers/net/intel/i40e/i40e_testpmd.c
index b6ef5d6e42..21f596297b 100644
--- a/drivers/net/intel/i40e/i40e_testpmd.c
+++ b/drivers/net/intel/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.2.vfs.0.1
RE: [RFC PATCH] eventdev: adapter API to configure multiple Rx queues
> -Original Message-
> From: Naga Harish K, S V
> Sent: Thursday, January 30, 2025 9:01 PM
> To: Jerin Jacob ; Shijith Thotton ;
> dev@dpdk.org
> Cc: Pavan Nikhilesh Bhagavatula ; Pathak, Pravin
> ; Hemant Agrawal ;
> Sachin Saxena ; Mattias R_nnblom
> ; Liang Ma ;
> Mccarthy, Peter ; Van Haaren, Harry
> ; Carrillo, Erik G ;
> Gujjar, Abhinandan S ; Amit Prakash Shukla
> ; Burakov, Anatoly
> Subject: [EXTERNAL] RE: [RFC PATCH] eventdev: adapter API to configure
> multiple Rx queues
>
> > -Original Message- > From: Jerin Jacob
> > > Sent: Wednesday, January 29, 2025 1: 13 PM > To: Naga Harish K, S V
> > ; Shijith Thotton > > marvell. com>;
>
>
>
> > -Original Message-
> > From: Jerin Jacob
> > Sent: Wednesday, January 29, 2025 1:13 PM
> > To: Naga Harish K, S V ; Shijith Thotton
> > ; dev@dpdk.org
> > Cc: Pavan Nikhilesh Bhagavatula ; Pathak,
> > Pravin ; Hemant Agrawal
> > ; Sachin Saxena ;
> > Mattias R_nnblom ; Liang Ma
> > ; Mccarthy, Peter ;
> > Van Haaren, Harry ; Carrillo, Erik G
> > ; Gujjar, Abhinandan S
> > ; Amit Prakash Shukla
> > ; Burakov, Anatoly
> >
> > Subject: RE: [RFC PATCH] eventdev: adapter API to configure multiple
> > Rx queues
> >
> >
> >
> > > -Original Message-
> > > From: Naga Harish K, S V
> > > Sent: Wednesday, January 29, 2025 10:35 AM
> > > To: Shijith Thotton ; dev@dpdk.org
> > > Cc: Pavan Nikhilesh Bhagavatula ; Pathak,
> > > Pravin ; Hemant Agrawal
> > > ; Sachin Saxena ;
> > > Mattias R_nnblom ; Jerin Jacob
> > > ; Liang Ma ; Mccarthy,
> > > Peter ; Van Haaren, Harry
> > > ; Carrillo, Erik G
> > > ; Gujjar, Abhinandan S
> > > ; Amit Prakash Shukla
> > > ; Burakov, Anatoly
> > >
> > > Subject: [EXTERNAL] RE: [RFC PATCH] eventdev: adapter API to
> > > configure multiple Rx queues
> > > > >
> > > > >This requires a change to the
> > > > >rte_event_eth_rx_adapter_queue_add()
> > > > >stable API parameters.
> > > > >This is an ABI breakage and may not be possible now.
> > > > >It requires changes to many current applications that are using
> > > > >the
> > > > >rte_event_eth_rx_adapter_queue_add() stable API.
> > > > >
> > > >
> > > > What I meant by mapping was to retain the stable API parameters as
> > > > they
> > are.
> > > > Internally, the API can use the proposed eventdev PMD operation
> > > > (eth_rx_adapter_queues_add) without causing an ABI break, as shown
> > below.
> > > >
> > > > int rte_event_eth_rx_adapter_queue_add(uint8_t id, uint16_t eth_dev_id,
> > > > int32_t rx_queue_id,
> > > > const struct rte_event_eth_rx_adapter_queue_conf *conf)
> > > > {
> > > > if (rx_queue_id == -1)
> > > > dev->dev_ops->eth_rx_adapter_queues_add)(
> > > > dev, &rte_eth_devices[eth_dev_id], 0,
> > > > conf, 0);
> > > > else
> > > > dev->dev_ops->eth_rx_adapter_queues_add)(
> > > > dev, &rte_eth_devices[eth_dev_id], &rx_queue_id,
> > > > conf, 1);
> > > > }
> > > >
> > > > With above change, old op (eth_rx_adapter_queue_add) can be
> > > > removed as both API (stable and proposed) will be using
> > eth_rx_adapter_queues_add.
> >
> >
> > Since this thread is not converging and looks like it is due to confusion.
> > I am trying to summarize my understanding to define the next
> > steps(like if needed, we need to reach tech board if there are no
> > consensus)
> >
> >
> > Problem statement:
> > ==
> > 1) Implementation of rte_event_eth_rx_adapter_queue_add() in HW
> > typically uses an administrative function to enable it. Typically, it
> > translated to sending a mailbox to PF driver etc.
> > So, this function takes "time" to complete in HW implementations.
> > 2) For SW implementations, this won't take time as there is no other
> > actors involved.
> > 3) There are customer use cases, they add 300+
> > rte_event_eth_rx_adapter_queue_add() on application bootup, that is
> > introducing significant boot time for the application.
> > Number of queues are function of number of ethdev ports, number of
> > ethdev Rx queues per port and number of event queues.
> >
> >
> > Expected outcome of problem statement:
> > ==
> > 1) The cases where application knows queue mapping(typically at boot
> > time case), application can call burst variant of
> > rte_event_eth_rx_adapter_queue_add()
> > function
> > to amortize the cost. Similar scheme used DPDK in control path API
> > where latency is critical, like rte_acl_add_rules() or rte_flow via
> > template scheme.
> > 2) Solution should not break ABI or any impact to SW drivers.
> > 3) Avoid duplicating the code as much as possible
> >
> >
> > Proposed solution:
> > ==
> > 1) Update eventdev_eth_rx_adapter_queue_add_t() PMD (Internal ABI) API
> > to take burst parameters
> > 2) Add new rte_event_eth_rx_adapter_queue*s*_add() function and wire
> > to use updated PM
[PATCH v2 0/4] remove common iavf and idpf drivers
The iavf and idpf common directories were used only to share code
between multiple net drivers and did not need to be drivers in their own
right, since it is just as easy to have a dependency from one net driver
on another as a net driver on a common one.
This patchset therefore aims to eliminate the two unnecessary common
drivers. It does so as follows:
* merging common/idpf into net/idpf and updating the cpfl dependency to
point to the net driver.
* merging common/iavf into net/iavf and similarly updating the
dependencies, including the paths from idpf (which does not directly
depend on iavf, but does make use of the definitions in the iavf
header files).
Separately, two other cleanups are done - one to remove an unnecessary
warning disable flag. The second is a little more complex - it makes the
dependency between ice and iavf an optional one, by having ice compile
in the necessary iavf shared code files in case iavf is disabled in the
build.
v2: include Release note updates
Bruce Richardson (4):
drivers: merge common and net idpf drivers
net/idpf: re-enable unused variable warnings
drivers: move iavf common folder to iavf net
net/intel: allow building ice driver without iavf
doc/guides/rel_notes/release_25_03.rst| 9 +
drivers/common/iavf/version.map | 13 ---
drivers/common/idpf/meson.build | 34 ---
drivers/common/meson.build| 2 --
drivers/net/intel/cpfl/meson.build| 2 +-
.../iavf => net/intel/iavf/base}/README | 0
.../intel/iavf/base}/iavf_adminq.c| 0
.../intel/iavf/base}/iavf_adminq.h| 0
.../intel/iavf/base}/iavf_adminq_cmd.h| 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../intel/iavf/base}/iavf_common.c| 0
.../intel/iavf/base}/iavf_devids.h| 0
.../iavf => net/intel/iavf/base}/iavf_impl.c | 0
.../iavf => net/intel/iavf/base}/iavf_osdep.h | 0
.../intel/iavf/base}/iavf_prototype.h | 8 +
.../intel/iavf/base}/iavf_register.h | 0
.../intel/iavf/base}/iavf_status.h| 0
.../iavf => net/intel/iavf/base}/iavf_type.h | 0
.../iavf => net/intel/iavf/base}/meson.build | 0
.../iavf => net/intel/iavf/base}/virtchnl.h | 0
.../intel/iavf/base}/virtchnl_inline_ipsec.h | 0
drivers/net/intel/iavf/meson.build| 13 ---
drivers/net/intel/iavf/version.map| 14
drivers/net/intel/ice/meson.build | 18 +++---
.../{common => net/intel}/idpf/base/README| 0
.../intel}/idpf/base/idpf_alloc.h | 0
.../intel}/idpf/base/idpf_controlq.c | 0
.../intel}/idpf/base/idpf_controlq.h | 0
.../intel}/idpf/base/idpf_controlq_api.h | 0
.../intel}/idpf/base/idpf_controlq_setup.c| 0
.../intel}/idpf/base/idpf_devids.h| 0
.../intel}/idpf/base/idpf_lan_pf_regs.h | 0
.../intel}/idpf/base/idpf_lan_txrx.h | 0
.../intel}/idpf/base/idpf_lan_vf_regs.h | 0
.../intel}/idpf/base/idpf_osdep.h | 0
.../intel}/idpf/base/idpf_prototype.h | 0
.../intel}/idpf/base/idpf_type.h | 0
.../intel}/idpf/base/meson.build | 9 -
.../intel}/idpf/base/siov_regs.h | 0
.../intel}/idpf/base/virtchnl2.h | 0
.../intel}/idpf/base/virtchnl2_lan_desc.h | 0
.../intel}/idpf/idpf_common_device.c | 0
.../intel}/idpf/idpf_common_device.h | 0
.../intel}/idpf/idpf_common_logs.h| 0
.../intel}/idpf/idpf_common_rxtx.c| 2 --
.../intel}/idpf/idpf_common_rxtx.h| 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c| 4 +--
.../intel}/idpf/idpf_common_virtchnl.h| 0
drivers/net/intel/idpf/meson.build| 20 +--
.../{common => net/intel}/idpf/version.map| 0
drivers/net/meson.build | 2 +-
52 files changed, 76 insertions(+), 74 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
delete mode 100644 drivers/common/idpf/meson.build
rename drivers/{common/iavf => net/intel/iavf/base}/README (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq_cmd.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_alloc.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_common.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_devids.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_impl.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_osdep.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_prototype.h (94%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_register.h (100%)
ren
[PATCH v2 1/4] drivers: merge common and net idpf drivers
Rather than having some of the idpf code split out into the "common"
directory, used by both a net/idpf and a net/cpfl driver, we can
merge all idpf code together under net/idpf and have the cpfl driver
depend on "net/idpf" rather than "common/idpf".
Signed-off-by: Bruce Richardson
---
doc/guides/rel_notes/release_25_03.rst| 6
drivers/common/idpf/meson.build | 34 ---
drivers/common/meson.build| 1 -
drivers/net/intel/cpfl/meson.build| 2 +-
.../{common => net/intel}/idpf/base/README| 0
.../intel}/idpf/base/idpf_alloc.h | 0
.../intel}/idpf/base/idpf_controlq.c | 0
.../intel}/idpf/base/idpf_controlq.h | 0
.../intel}/idpf/base/idpf_controlq_api.h | 0
.../intel}/idpf/base/idpf_controlq_setup.c| 0
.../intel}/idpf/base/idpf_devids.h| 0
.../intel}/idpf/base/idpf_lan_pf_regs.h | 0
.../intel}/idpf/base/idpf_lan_txrx.h | 0
.../intel}/idpf/base/idpf_lan_vf_regs.h | 0
.../intel}/idpf/base/idpf_osdep.h | 0
.../intel}/idpf/base/idpf_prototype.h | 0
.../intel}/idpf/base/idpf_type.h | 0
.../intel}/idpf/base/meson.build | 0
.../intel}/idpf/base/siov_regs.h | 0
.../intel}/idpf/base/virtchnl2.h | 0
.../intel}/idpf/base/virtchnl2_lan_desc.h | 0
.../intel}/idpf/idpf_common_device.c | 0
.../intel}/idpf/idpf_common_device.h | 0
.../intel}/idpf/idpf_common_logs.h| 0
.../intel}/idpf/idpf_common_rxtx.c| 0
.../intel}/idpf/idpf_common_rxtx.h| 0
.../intel}/idpf/idpf_common_rxtx_avx512.c | 0
.../intel}/idpf/idpf_common_virtchnl.c| 0
.../intel}/idpf/idpf_common_virtchnl.h| 0
drivers/net/intel/idpf/meson.build| 20 +--
.../{common => net/intel}/idpf/version.map| 0
drivers/net/meson.build | 2 +-
32 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 drivers/common/idpf/meson.build
rename drivers/{common => net/intel}/idpf/base/README (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_alloc.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq.c (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq_api.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_controlq_setup.c (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_devids.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_pf_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_txrx.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_lan_vf_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_osdep.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_prototype.h (100%)
rename drivers/{common => net/intel}/idpf/base/idpf_type.h (100%)
rename drivers/{common => net/intel}/idpf/base/meson.build (100%)
rename drivers/{common => net/intel}/idpf/base/siov_regs.h (100%)
rename drivers/{common => net/intel}/idpf/base/virtchnl2.h (100%)
rename drivers/{common => net/intel}/idpf/base/virtchnl2_lan_desc.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_device.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_device.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_logs.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx.h (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_rxtx_avx512.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.c (100%)
rename drivers/{common => net/intel}/idpf/idpf_common_virtchnl.h (100%)
rename drivers/{common => net/intel}/idpf/version.map (100%)
diff --git a/doc/guides/rel_notes/release_25_03.rst
b/doc/guides/rel_notes/release_25_03.rst
index a88b04d958..79b1116f6e 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -115,6 +115,12 @@ API Changes
but to enable/disable these drivers via Meson option requires use of the new
paths.
For example, ``-Denable_drivers=/net/i40e`` becomes
``-Denable_drivers=/net/intel/i40e``.
+* The driver ``common/idpf`` has been merged into the ``net/intel/idpf``
driver.
+ This change should have no impact to end applications, but,
+ when specifying the ``idpf`` or ``cpfl`` net drivers to meson via
``-Denable_drivers`` option,
+ there is no longer any need to also specify the ``common/idpf`` driver.
+ Note, however, ``net/intel/cpfl`` driver now depends upon the
``net/intel/idpf`` driver.
+
ABI Changes
---
diff --git a/drivers/common/idpf/meson.build b/drivers/common/idpf/meson.build
deleted file mode 100644
index 46fd45c03b..00
--- a/drivers/common/idpf/meson.build
+++ /dev/null
@
[PATCH v2 4/4] net/intel: allow building ice driver without iavf
The ice PMD relies on a number of functions from the iavf base code,
which can be got by linking against that iavf driver. However, since
only three C files are necessary here, we can allow ice to be built
independently of iavf by including the base files directly in cases
where iavf is not part of the build. If it is part of the build, the
dependency remains as now.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/iavf/base/iavf_prototype.h | 8
drivers/net/intel/ice/meson.build| 13 -
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/net/intel/iavf/base/iavf_prototype.h
b/drivers/net/intel/iavf/base/iavf_prototype.h
index 7c43a817bb..5d2ee0a785 100644
--- a/drivers/net/intel/iavf/base/iavf_prototype.h
+++ b/drivers/net/intel/iavf/base/iavf_prototype.h
@@ -11,6 +11,14 @@
#include
+/* functions only need exporting if this is being built into
+ * iavf driver itself. If included in ice driver, then no export
+ */
+#ifndef RTE_NET_IAVF
+#undef __rte_internal
+#define __rte_internal
+#endif
+
/* Prototypes for shared code functions that are not in
* the standard function pointer structures. These are
* mostly because they are needed even before the init
diff --git a/drivers/net/intel/ice/meson.build
b/drivers/net/intel/ice/meson.build
index 5faf887386..f990e62250 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -18,9 +18,20 @@ sources = files(
testpmd_sources = files('ice_testpmd.c')
-deps += ['hash', 'net', 'net_iavf']
+deps += ['hash', 'net']
includes += include_directories('base')
+if dpdk_conf.has('RTE_NET_IAVF')
+deps += 'net_iavf'
+else
+includes += include_directories('../iavf/base')
+sources += files(
+'../iavf/base/iavf_adminq.c',
+'../iavf/base/iavf_common.c',
+'../iavf/base/iavf_impl.c',
+)
+endif
+
if arch_subdir == 'x86'
sources += files('ice_rxtx_vec_sse.c')
--
2.43.0
[PATCH v2 3/4] drivers: move iavf common folder to iavf net
The common/iavf driver folder contains the base code for the iavf
driver, which is also linked against by the ice driver and others.
However, there is no need for this to be in common, and we can
move it to the net/intel/iavf as a base code driver. This involves
updating dependencies that were on common/iavf to net/iavf
Signed-off-by: Bruce Richardson
---
doc/guides/rel_notes/release_25_03.rst | 5 -
drivers/common/iavf/version.map| 13 -
drivers/common/meson.build | 1 -
.../{common/iavf => net/intel/iavf/base}/README| 0
.../iavf => net/intel/iavf/base}/iavf_adminq.c | 0
.../iavf => net/intel/iavf/base}/iavf_adminq.h | 0
.../iavf => net/intel/iavf/base}/iavf_adminq_cmd.h | 0
.../iavf => net/intel/iavf/base}/iavf_alloc.h | 0
.../iavf => net/intel/iavf/base}/iavf_common.c | 0
.../iavf => net/intel/iavf/base}/iavf_devids.h | 0
.../iavf => net/intel/iavf/base}/iavf_impl.c | 0
.../iavf => net/intel/iavf/base}/iavf_osdep.h | 0
.../iavf => net/intel/iavf/base}/iavf_prototype.h | 0
.../iavf => net/intel/iavf/base}/iavf_register.h | 0
.../iavf => net/intel/iavf/base}/iavf_status.h | 0
.../iavf => net/intel/iavf/base}/iavf_type.h | 0
.../iavf => net/intel/iavf/base}/meson.build | 0
.../iavf => net/intel/iavf/base}/virtchnl.h| 0
.../intel/iavf/base}/virtchnl_inline_ipsec.h | 0
drivers/net/intel/iavf/meson.build | 13 +
drivers/net/intel/iavf/version.map | 14 ++
drivers/net/intel/ice/meson.build | 7 +++
drivers/net/intel/idpf/meson.build | 2 +-
23 files changed, 31 insertions(+), 24 deletions(-)
delete mode 100644 drivers/common/iavf/version.map
rename drivers/{common/iavf => net/intel/iavf/base}/README (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_adminq_cmd.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_alloc.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_common.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_devids.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_impl.c (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_osdep.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_prototype.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_register.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_status.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/iavf_type.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/meson.build (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/virtchnl.h (100%)
rename drivers/{common/iavf => net/intel/iavf/base}/virtchnl_inline_ipsec.h
(100%)
diff --git a/doc/guides/rel_notes/release_25_03.rst
b/doc/guides/rel_notes/release_25_03.rst
index 79b1116f6e..1f22efa79f 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -116,9 +116,12 @@ API Changes
For example, ``-Denable_drivers=/net/i40e`` becomes
``-Denable_drivers=/net/intel/i40e``.
* The driver ``common/idpf`` has been merged into the ``net/intel/idpf``
driver.
- This change should have no impact to end applications, but,
+ Similarly, the ``common/iavf`` driver has been merged into the
``net/intel/iavf`` driver.
+ These changes should have no impact to end applications, but,
when specifying the ``idpf`` or ``cpfl`` net drivers to meson via
``-Denable_drivers`` option,
there is no longer any need to also specify the ``common/idpf`` driver.
+ In the same way, when specifying the ``iavf`` or ``ice`` net drivers,
+ there is no need to also specify the ``common/iavf`` driver.
Note, however, ``net/intel/cpfl`` driver now depends upon the
``net/intel/idpf`` driver.
diff --git a/drivers/common/iavf/version.map b/drivers/common/iavf/version.map
deleted file mode 100644
index 6c1427cca4..00
--- a/drivers/common/iavf/version.map
+++ /dev/null
@@ -1,13 +0,0 @@
-INTERNAL {
- global:
-
- iavf_aq_send_msg_to_pf;
- iavf_clean_arq_element;
- iavf_init_adminq;
- iavf_set_mac_type;
- iavf_shutdown_adminq;
- iavf_vf_parse_hw_config;
- iavf_vf_reset;
-
- local: *;
-};
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index e1e3149d8f..dc096aab0a 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -5,7 +5,6 @@ std_deps = ['eal']
drivers = [
'cpt',
'dpaax',
-'iavf',
'ionic',
'mvep',
'octeontx',
diff --git a/drivers/common/iavf/README b/drivers/net/intel/iavf/base/README
similarity index 100%
rename from drivers/common/i
[PATCH v2 2/4] net/idpf: re-enable unused variable warnings
The idpf driver was being built with warnings disabled for unused
variables. However, while the warning was being disabled in the base
code directory, all suppressed warnings were in the main directory.
Therefore, just remove the unused variables and re-enable the
warnings.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/idpf/base/meson.build | 9 -
drivers/net/intel/idpf/idpf_common_rxtx.c | 2 --
drivers/net/intel/idpf/idpf_common_virtchnl.c | 4 ++--
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/intel/idpf/base/meson.build
b/drivers/net/intel/idpf/base/meson.build
index f30ec7dfc2..7316e0a805 100644
--- a/drivers/net/intel/idpf/base/meson.build
+++ b/drivers/net/intel/idpf/base/meson.build
@@ -5,12 +5,3 @@ sources += files(
'idpf_controlq.c',
'idpf_controlq_setup.c',
)
-
-error_cflags = [
-'-Wno-unused-variable',
-]
-foreach flag: error_cflags
-if cc.has_argument(flag)
-cflags += flag
-endif
-endforeach
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.c
b/drivers/net/intel/idpf/idpf_common_rxtx.c
index a04e54ce26..9b17279181 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx.c
@@ -1178,7 +1178,6 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct
rte_mbuf **rx_pkts,
struct rte_mbuf *last_seg = rxq->pkt_last_seg;
struct rte_mbuf *rxm;
struct rte_mbuf *nmb;
- struct rte_eth_dev *dev;
const uint32_t *ptype_tbl = rxq->adapter->ptype_tbl;
uint16_t rx_id = rxq->rx_tail;
uint16_t rx_packet_len;
@@ -1310,7 +1309,6 @@ idpf_xmit_cleanup(struct idpf_tx_queue *txq)
uint16_t nb_tx_desc = txq->nb_tx_desc;
uint16_t desc_to_clean_to;
uint16_t nb_tx_to_clean;
- uint16_t i;
volatile struct idpf_base_tx_desc *txd = txq->tx_ring;
diff --git a/drivers/net/intel/idpf/idpf_common_virtchnl.c
b/drivers/net/intel/idpf/idpf_common_virtchnl.c
index de511da788..0ae1d55d79 100644
--- a/drivers/net/intel/idpf/idpf_common_virtchnl.c
+++ b/drivers/net/intel/idpf/idpf_common_virtchnl.c
@@ -362,7 +362,7 @@ idpf_vc_queue_grps_add(struct idpf_vport *vport,
{
struct idpf_adapter *adapter = vport->adapter;
struct idpf_cmd_info args;
- int size, qg_info_size;
+ int size;
int err = -1;
size = sizeof(*p2p_queue_grps_info) +
@@ -1044,7 +1044,7 @@ int idpf_vc_rxq_config_by_info(struct idpf_vport *vport,
struct virtchnl2_rxq_in
struct idpf_adapter *adapter = vport->adapter;
struct virtchnl2_config_rx_queues *vc_rxqs = NULL;
struct idpf_cmd_info args;
- int size, err, i;
+ int size, err;
size = sizeof(*vc_rxqs) + (num_qs - 1) *
sizeof(struct virtchnl2_rxq_info);
--
2.43.0
Re: [PATCH v2 0/4] remove common iavf and idpf drivers
Hello Bruce, On Thu, Jan 30, 2025 at 1:48 PM Bruce Richardson wrote: > > The iavf and idpf common directories were used only to share code > between multiple net drivers and did not need to be drivers in their own > right, since it is just as easy to have a dependency from one net driver > on another as a net driver on a common one. > > This patchset therefore aims to eliminate the two unnecessary common > drivers. It does so as follows: > > * merging common/idpf into net/idpf and updating the cpfl dependency to > point to the net driver. > * merging common/iavf into net/iavf and similarly updating the > dependencies, including the paths from idpf (which does not directly > depend on iavf, but does make use of the definitions in the iavf > header files). > > Separately, two other cleanups are done - one to remove an unnecessary > warning disable flag. The second is a little more complex - it makes the > dependency between ice and iavf an optional one, by having ice compile > in the necessary iavf shared code files in case iavf is disabled in the > build. > > > v2: include Release note updates > > Bruce Richardson (4): > drivers: merge common and net idpf drivers > net/idpf: re-enable unused variable warnings > drivers: move iavf common folder to iavf net > net/intel: allow building ice driver without iavf You'll probably need something like: $ git show --oneline 9863a695075109f15bbfa2f1a3042139f25d6493 -- devtools/libabigail.abignore 9863a69507 net/liquidio: remove LiquidIO ethdev driver diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 585eb23c5e..03bfbce259 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -25,6 +25,7 @@ ; ; SKIP_LIBRARY=librte_common_mlx5_glue ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_net_liquidio ; Experimental APIs exceptions ; -- David Marchand
[PATCH] dts: add sudo to linux link up
Fixes: 41d133d6c62f ("dts: automatically bring up link on interfaces")
Cc: pr...@iol.unh.edu
Signed-off-by: Patrick Robb
---
dts/framework/testbed_model/linux_session.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dts/framework/testbed_model/linux_session.py
b/dts/framework/testbed_model/linux_session.py
index e77fe9b692..8d568e2466 100644
--- a/dts/framework/testbed_model/linux_session.py
+++ b/dts/framework/testbed_model/linux_session.py
@@ -169,7 +169,7 @@ def update_ports(self, ports: list[Port]) -> None:
def bring_up_link(self, ports: list[Port]) -> None:
"""Overrides :meth:`~.os_session.OSSession.bring_up_link`."""
for port in ports:
-self.send_command(f"ip link set dev {port.logical_name} up")
+self.send_command(f"ip link set dev {port.logical_name} up",
privileged=True, verify=True)
def _get_lshw_info(self) -> list[LshwOutput]:
output = self.send_command("lshw -quiet -json -C network", verify=True)
--
2.48.1
Re: [PATCH] dts: add sudo to linux link up
Reviewed-by: Luca Vizzarro
Re: [PATCH v16 00/60] remove use of VLAs for Windows
On Wed, Jan 29, 2025 at 04:57:16PM +0100, David Marchand wrote:
> On Thu, Jan 23, 2025 at 5:38 PM Andre Muezerie
> wrote:
> > > > I see there is some back and forth on the topic of passing -Wvla.
> > > > It would be less fragile to put a -Wla in a upper level meson.build
> > > > (like config/meson.build for example), then disable explicitly in the
> > > > parts that are not ready.
> > > >
> > > > Something like:
> > > > diff --git a/config/meson.build b/config/meson.build
> > > > index 6aaad6d8a4..be603bd45b 100644
> > > > --- a/config/meson.build
> > > > +++ b/config/meson.build
> > > > @@ -348,6 +348,17 @@ foreach arg: warning_flags
> > > > endif
> > > > endforeach
> > > >
> > > > +if cc.has_argument('-Wvla')
> > > > +add_project_arguments('-Wvla', language: 'c')
> > > > +if not is_windows
> > > > +no_vla_cflag = '-Wno-vla'
> > > > +else
> > > > +no_vla_cflag = []
> > > > +endif
> > > > +else
> > > > +no_vla_cflag = []
> > > > +endif
> > > > +
> > >
> > > Minor simplification suggestion, put "no_vla_cflag = []" outside the
> > > conditionals at the start, as the default value. Save having multiple
> > > copies of that assignment, and having to do "else" legs.
> >
> > These look like great improvements. I especially like the idea of using
> > -Wvla from the very top.
>
> Ok, can you work on a new revision and send it for the CI to have a try?
> Thanks.
>
>
> --
> David Marchand
Yes. I sent out v17 which incorporates the suggestions made.
--
Andre Muezerie
[DPDK/DTS Bug 1623] dts: add linting support for validating testsuite docstring (steps and verify sections)
https://bugs.dpdk.org/show_bug.cgi?id=1623 Bug ID: 1623 Summary: dts: add linting support for validating testsuite docstring (steps and verify sections) Product: DPDK Version: 25.03 Hardware: All OS: All Status: UNCONFIRMED Severity: minor Priority: Normal Component: DTS Assignee: dev@dpdk.org Reporter: pr...@iol.unh.edu CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu Target Milestone: --- -- You are receiving this mail because: You are the assignee for the bug.
[PATCH v17 21/25] config: define no_vla_cflag
We define no_vla_cflag in a top directory so that it can be used by
meson.build files in lower directories that are not yet VLA-free.
Signed-off-by: Andre Muezerie
---
config/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/config/meson.build b/config/meson.build
index 6aaad6d8a4..6be928e04b 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -342,6 +342,14 @@ if cc.get_id() == 'intel'
warning_flags += '-diag-disable=@0@'.format(i)
endforeach
endif
+
+no_vla_cflag = []
+if cc.has_argument('-Wvla')
+if not is_windows
+no_vla_cflag = '-Wno-vla'
+endif
+endif
+
foreach arg: warning_flags
if cc.has_argument(arg)
add_project_arguments(arg, language: 'c')
--
2.47.2.vfs.0.1
[PATCH v4] mbuf: add raw free and alloc bulk functions
When putting an mbuf back into its mempool, there are certain requirements
to the mbuf. Specifically, some of its fields must be initialized.
These requirements are in fact invariants about free mbufs, held in
mempools, and thus also apply when allocating an mbuf from a mempool.
With this in mind, the additional assertions in rte_mbuf_raw_free() were
moved to __rte_mbuf_raw_sanity_check().
Furthermore, the assertion regarding pinned external buffer was enhanced;
it now also asserts that the referenced pinned external buffer has
refcnt == 1.
The description of RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE was updated to
include the remaining requirements, which were missing here.
And finally:
A new rte_mbuf_raw_free_bulk() inline function was added for the
benefit of ethdev drivers supporting fast release of mbufs.
It asserts these requirements and that the mbufs belong to the specified
mempool, and then calls rte_mempool_put_bulk().
For symmetry, a new rte_mbuf_raw_alloc_bulk() inline function was also
added.
Signed-off-by: Morten Brørup
Acked-by: Dengdui Huang
Acked-by: Chengwen Feng
Acked-by: Viacheslav Ovsiienko
Acked-by: Konstantin Ananyev
---
v4:
* Renamed rte_mbuf_fast_free_bulk() to rte_mbuf_raw_free_bulk().
* Updated patch title to reflect behavior of new functions instead of
intended use case.
v3:
* Fixed missing experimental warning. (Stephen)
* Added raw alloc bulk function.
v2:
* Fixed missing inline.
---
lib/ethdev/rte_ethdev.h | 6 ++--
lib/mbuf/rte_mbuf.h | 80 +++--
2 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 1f71cad244..3fe156d78d 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -1612,8 +1612,10 @@ struct rte_eth_conf {
#define RTE_ETH_TX_OFFLOAD_MULTI_SEGS RTE_BIT64(15)
/**
* Device supports optimization for fast release of mbufs.
- * When set application must guarantee that per-queue all mbufs comes from
- * the same mempool and has refcnt = 1.
+ * When set application must guarantee that per-queue all mbufs come from the
same mempool,
+ * are direct, have refcnt=1, next=NULL and nb_segs=1, as done by
rte_pktmbuf_prefree_seg().
+ *
+ * @see rte_mbuf_raw_free_bulk()
*/
#define RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE RTE_BIT64(16)
#define RTE_ETH_TX_OFFLOAD_SECURITY RTE_BIT64(17)
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index 0d2e0e64b3..eb38d96429 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -568,6 +568,10 @@ __rte_mbuf_raw_sanity_check(__rte_unused const struct
rte_mbuf *m)
RTE_ASSERT(rte_mbuf_refcnt_read(m) == 1);
RTE_ASSERT(m->next == NULL);
RTE_ASSERT(m->nb_segs == 1);
+ RTE_ASSERT(!RTE_MBUF_CLONED(m));
+ RTE_ASSERT(!RTE_MBUF_HAS_EXTBUF(m) ||
+ (RTE_MBUF_HAS_PINNED_EXTBUF(m) &&
+ rte_mbuf_ext_refcnt_read(m->shinfo) == 1));
__rte_mbuf_sanity_check(m, 0);
}
@@ -606,6 +610,43 @@ static inline struct rte_mbuf *rte_mbuf_raw_alloc(struct
rte_mempool *mp)
return ret.m;
}
+/**
+ * @warning
+ * @b EXPERIMENTAL: This API may change, or be removed, without prior notice.
+ *
+ * Allocate a bulk of uninitialized mbufs from mempool *mp*.
+ *
+ * This function can be used by PMDs (especially in RX functions) to
+ * allocate a bulk of uninitialized mbufs. The driver is responsible of
+ * initializing all the required fields. See rte_pktmbuf_reset().
+ * For standard needs, prefer rte_pktmbuf_alloc_bulk().
+ *
+ * The caller can expect that the following fields of the mbuf structure
+ * are initialized: buf_addr, buf_iova, buf_len, refcnt=1, nb_segs=1,
+ * next=NULL, pool, priv_size. The other fields must be initialized
+ * by the caller.
+ *
+ * @param mp
+ * The mempool from which mbufs are allocated.
+ * @param mbufs
+ * Array of pointers to mbufs.
+ * @param count
+ * Array size.
+ * @return
+ * - 0: Success.
+ * - -ENOENT: Not enough entries in the mempool; no mbufs are retrieved.
+ */
+__rte_experimental
+static __rte_always_inline int
+rte_mbuf_raw_alloc_bulk(struct rte_mempool *mp, struct rte_mbuf **mbufs,
unsigned int count)
+{
+ int rc = rte_mempool_get_bulk(mp, (void **)mbufs, count);
+ if (likely(rc == 0))
+ for (unsigned int idx = 0; idx < count; idx++)
+ __rte_mbuf_raw_sanity_check(mbufs[idx]);
+ return rc;
+}
+
/**
* Put mbuf back into its original mempool.
*
@@ -623,12 +664,47 @@ static inline struct rte_mbuf *rte_mbuf_raw_alloc(struct
rte_mempool *mp)
static __rte_always_inline void
rte_mbuf_raw_free(struct rte_mbuf *m)
{
- RTE_ASSERT(!RTE_MBUF_CLONED(m) &&
- (!RTE_MBUF_HAS_EXTBUF(m) || RTE_MBUF_HAS_PINNED_EXTBUF(m)));
__rte_mbuf_raw_sanity_check(m);
rte_mempool_put(m->pool, m);
}
+/**
+ * @warning
+ * @b EXPERIMENTAL: This API may change, or be removed, without prior notice.
+ *
+ *
[PATCH v2 2/3] dmadev: avoid copies in tracepoints
No need to copy values in intermediate variables.
Just use the right trace point emitters.
Signed-off-by: David Marchand
---
lib/dmadev/rte_dmadev_trace.h| 20 ++--
lib/dmadev/rte_dmadev_trace_fp.h | 12
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/lib/dmadev/rte_dmadev_trace.h b/lib/dmadev/rte_dmadev_trace.h
index be089c065c..ddf60b9649 100644
--- a/lib/dmadev/rte_dmadev_trace.h
+++ b/lib/dmadev/rte_dmadev_trace.h
@@ -46,11 +46,10 @@ RTE_TRACE_POINT(
const struct rte_dma_conf __dev_conf = {0};
dev_conf = &__dev_conf;
#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
- int enable_silent = (int)dev_conf->enable_silent;
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(dev_conf->nb_vchans);
rte_trace_point_emit_u16(dev_conf->priority);
- rte_trace_point_emit_int(enable_silent);
+ rte_trace_point_emit_u8(dev_conf->enable_silent);
rte_trace_point_emit_int(ret);
)
@@ -83,21 +82,14 @@ RTE_TRACE_POINT(
const struct rte_dma_vchan_conf __conf = {0};
conf = &__conf;
#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
- int src_port_type = conf->src_port.port_type;
- int dst_port_type = conf->dst_port.port_type;
- int direction = conf->direction;
- uint64_t src_pcie_cfg;
- uint64_t dst_pcie_cfg;
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
- rte_trace_point_emit_int(direction);
+ rte_trace_point_emit_int(conf->direction);
rte_trace_point_emit_u16(conf->nb_desc);
- rte_trace_point_emit_int(src_port_type);
- memcpy(&src_pcie_cfg, &conf->src_port.pcie, sizeof(uint64_t));
- rte_trace_point_emit_u64(src_pcie_cfg);
- memcpy(&dst_pcie_cfg, &conf->dst_port.pcie, sizeof(uint64_t));
- rte_trace_point_emit_int(dst_port_type);
- rte_trace_point_emit_u64(dst_pcie_cfg);
+ rte_trace_point_emit_int(conf->src_port.port_type);
+ rte_trace_point_emit_blob(&conf->src_port.pcie, sizeof(uint64_t));
+ rte_trace_point_emit_int(conf->dst_port.port_type);
+ rte_trace_point_emit_blob(&conf->dst_port.pcie, sizeof(uint64_t));
rte_trace_point_emit_ptr(conf->auto_free.m2d.pool);
rte_trace_point_emit_int(ret);
)
diff --git a/lib/dmadev/rte_dmadev_trace_fp.h b/lib/dmadev/rte_dmadev_trace_fp.h
index f5b96838bc..4950f58cd2 100644
--- a/lib/dmadev/rte_dmadev_trace_fp.h
+++ b/lib/dmadev/rte_dmadev_trace_fp.h
@@ -37,10 +37,9 @@ RTE_TRACE_POINT_FP(
enum rte_dma_vchan_status __status = 0;
status = &__status;
#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
- int vchan_status = *status;
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
- rte_trace_point_emit_int(vchan_status);
+ rte_trace_point_emit_int(*status);
rte_trace_point_emit_int(ret);
)
@@ -107,13 +106,11 @@ RTE_TRACE_POINT_FP(
last_idx = &__last_idx;
has_error = &__has_error;
#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
- int has_error_val = *has_error;
- int last_idx_val = *last_idx;
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
- rte_trace_point_emit_int(last_idx_val);
- rte_trace_point_emit_int(has_error_val);
+ rte_trace_point_emit_u16(*last_idx);
+ rte_trace_point_emit_u8(*has_error);
rte_trace_point_emit_u16(ret);
)
@@ -126,11 +123,10 @@ RTE_TRACE_POINT_FP(
uint16_t __last_idx = 0;
last_idx = &__last_idx;
#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
- int last_idx_val = *last_idx;
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
- rte_trace_point_emit_int(last_idx_val);
+ rte_trace_point_emit_u16(*last_idx);
rte_trace_point_emit_ptr(status);
rte_trace_point_emit_u16(ret);
)
--
2.48.1
[PATCH v2 3/3] trace: fix undefined behavior in register
Registering a tracepoint handler was resulting so far in undefined
behavior at runtime.
The RTE_TRACE_POINT_REGISTER() macro was casting the tracepoint handler
(which expects arguments) to a void (*)(void).
At runtime, calling this handler while registering resulted in
reading the current stack with no relation to this function prototype.
Instead, declare an additional inline _register() handler for each
tracepoint and make sure that the emitting macros in
rte_trace_point_register.h only work on arguments name and type.
The original tracepoint handler prototype is adjusted by adding a
__rte_unused for each argument (since emitting macros do nothing
with them).
This last part introduces an implementation limit of 15 arguments.
With this change in place, the workaround in dmadev tracepoints can be
removed.
Signed-off-by: David Marchand
---
lib/dmadev/rte_dmadev_trace.h | 12 ---
lib/dmadev/rte_dmadev_trace_fp.h | 14
lib/eal/include/rte_trace_point.h | 4 +++
lib/eal/include/rte_trace_point_register.h | 42 +++---
4 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/lib/dmadev/rte_dmadev_trace.h b/lib/dmadev/rte_dmadev_trace.h
index ddf60b9649..9de9b54aad 100644
--- a/lib/dmadev/rte_dmadev_trace.h
+++ b/lib/dmadev/rte_dmadev_trace.h
@@ -22,10 +22,6 @@ extern "C" {
RTE_TRACE_POINT(
rte_dma_trace_info_get,
RTE_TRACE_POINT_ARGS(int16_t dev_id, struct rte_dma_info *dev_info),
-#ifdef _RTE_TRACE_POINT_REGISTER_H_
- struct rte_dma_info __dev_info = {0};
- dev_info = &__dev_info;
-#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_string(dev_info->dev_name);
rte_trace_point_emit_u64(dev_info->dev_capa);
@@ -42,10 +38,6 @@ RTE_TRACE_POINT(
rte_dma_trace_configure,
RTE_TRACE_POINT_ARGS(int16_t dev_id, const struct rte_dma_conf
*dev_conf,
int ret),
-#ifdef _RTE_TRACE_POINT_REGISTER_H_
- const struct rte_dma_conf __dev_conf = {0};
- dev_conf = &__dev_conf;
-#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(dev_conf->nb_vchans);
rte_trace_point_emit_u16(dev_conf->priority);
@@ -78,10 +70,6 @@ RTE_TRACE_POINT(
rte_dma_trace_vchan_setup,
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
const struct rte_dma_vchan_conf *conf, int ret),
-#ifdef _RTE_TRACE_POINT_REGISTER_H_
- const struct rte_dma_vchan_conf __conf = {0};
- conf = &__conf;
-#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_int(conf->direction);
diff --git a/lib/dmadev/rte_dmadev_trace_fp.h b/lib/dmadev/rte_dmadev_trace_fp.h
index 4950f58cd2..106eac24be 100644
--- a/lib/dmadev/rte_dmadev_trace_fp.h
+++ b/lib/dmadev/rte_dmadev_trace_fp.h
@@ -33,10 +33,6 @@ RTE_TRACE_POINT_FP(
rte_dma_trace_vchan_status,
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
enum rte_dma_vchan_status *status, int ret),
-#ifdef _RTE_TRACE_POINT_REGISTER_H_
- enum rte_dma_vchan_status __status = 0;
- status = &__status;
-#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_int(*status);
@@ -100,12 +96,6 @@ RTE_TRACE_POINT_FP(
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
const uint16_t nb_cpls, uint16_t *last_idx,
bool *has_error, uint16_t ret),
-#ifdef _RTE_TRACE_POINT_REGISTER_H_
- uint16_t __last_idx = 0;
- bool __has_error = false;
- last_idx = &__last_idx;
- has_error = &__has_error;
-#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
@@ -119,10 +109,6 @@ RTE_TRACE_POINT_FP(
RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
const uint16_t nb_cpls, uint16_t *last_idx,
enum rte_dma_status_code *status, uint16_t ret),
-#ifdef _RTE_TRACE_POINT_REGISTER_H_
- uint16_t __last_idx = 0;
- last_idx = &__last_idx;
-#endif /* _RTE_TRACE_POINT_REGISTER_H_ */
rte_trace_point_emit_i16(dev_id);
rte_trace_point_emit_u16(vchan);
rte_trace_point_emit_u16(nb_cpls);
diff --git a/lib/eal/include/rte_trace_point.h
b/lib/eal/include/rte_trace_point.h
index a162502002..444175f238 100644
--- a/lib/eal/include/rte_trace_point.h
+++ b/lib/eal/include/rte_trace_point.h
@@ -36,6 +36,8 @@ extern "C" {
/** The tracepoint object. */
typedef RTE_ATOMIC(uint64_t) rte_trace_point_t;
+#ifndef _RTE_TRACE_POINT_REGISTER_H_
+
/**
* Macro to define the tracepoint arguments i
Re: [PATCH 1/2] net/af_xdp: fix use after free in af_xdp_tx_zc()
On Thu, 16 Jan 2025 20:56:38 +0100
Ariel Otilibili wrote:
> tx_bytes is computed after both branches are tested. This might
> produce a use after memory free.
>
> The computation is now moved into both branches.
>
> Bugzilla ID: 1440
> Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks")
> Signed-off-by: Ariel Otilibili
> ---
Acked-by: Stephen Hemminger
Re: [PATCH v2 1/2] net: add ptype parse for tunnel packets
On Fri, 24 Jan 2025 17:43:31 +0800 Jie Hai wrote: > @@ -456,7 +550,6 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, > ip6h = rte_pktmbuf_read(m, off, sizeof(*ip6h), &ip6h_copy); > if (unlikely(ip6h == NULL)) > return pkt_type; > - > proto = ip6h->proto; > hdr_lens->inner_l3_len = sizeof(*ip6h); > off += hdr_lens->inner_l3_len; Random whitespace change, not needed. Please cleanup and resubmit
[PATCH] dma/idxd: add device ids for new HW versions
Add in two extra PCI device id's for future HW versions to be
supported by idxd driver. This aligns with the definitions present
in kernel idxd driver [1].
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/dma/idxd/registers.h#n9
Signed-off-by: Bruce Richardson
---
Cc: sta...@dpdk.org
Since this only adds a couple of device IDs, and there are no other
changes to the dma/idxd driver in 25.03, perhaps this could be
considered for backport for 24.11?
---
drivers/dma/idxd/idxd_pci.c | 4
usertools/dpdk-devbind.py | 7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c
index 5c05762d03..214f6f22d5 100644
--- a/drivers/dma/idxd/idxd_pci.c
+++ b/drivers/dma/idxd/idxd_pci.c
@@ -11,6 +11,8 @@
#define IDXD_VENDOR_ID 0x8086
#define IDXD_DEVICE_ID_SPR 0x0B25
+#define IDXD_DEVICE_ID_GNRD0x11FB
+#define IDXD_DEVICE_ID_DMR 0x1212
#define DEVICE_VERSION_1 0x100
#define DEVICE_VERSION_2 0x200
@@ -24,6 +26,8 @@
const struct rte_pci_id pci_id_idxd_map[] = {
{ RTE_PCI_DEVICE(IDXD_VENDOR_ID, IDXD_DEVICE_ID_SPR) },
+ { RTE_PCI_DEVICE(IDXD_VENDOR_ID, IDXD_DEVICE_ID_GNRD) },
+ { RTE_PCI_DEVICE(IDXD_VENDOR_ID, IDXD_DEVICE_ID_DMR) },
{ .vendor_id = 0, /* sentinel */ },
};
diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 283707fc16..62edbba095 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -62,6 +62,10 @@
'SVendor': None, 'SDevice': None}
intel_idxd_spr = {'Class': '08', 'Vendor': '8086', 'Device': '0b25',
'SVendor': None, 'SDevice': None}
+intel_idxd_gnrd = {'Class': '08', 'Vendor': '8086', 'Device': '11fb',
+ 'SVendor': None, 'SDevice': None}
+intel_idxd_dmr = {'Class': '08', 'Vendor': '8086', 'Device': '1212',
+ 'SVendor': None, 'SDevice': None}
intel_ntb_skx = {'Class': '06', 'Vendor': '8086', 'Device': '201c',
'SVendor': None, 'SDevice': None}
intel_ntb_icx = {'Class': '06', 'Vendor': '8086', 'Device': '347e',
@@ -84,7 +88,8 @@
baseband_devices = [acceleration_class]
crypto_devices = [encryption_class, intel_processor_class]
dma_devices = [cnxk_dma, hisilicon_dma,
- intel_idxd_spr, intel_ioat_bdw, intel_ioat_icx, intel_ioat_skx,
+ intel_idxd_gnrd, intel_idxd_dmr, intel_idxd_spr,
+ intel_ioat_bdw, intel_ioat_icx, intel_ioat_skx,
odm_dma]
eventdev_devices = [cavium_sso, cavium_tim, intel_dlb, cnxk_sso]
mempool_devices = [cavium_fpa, cnxk_npa]
--
2.43.0
Re: [PATCH v2] net/ice: fix how ice driver handles flows
On Thu, Jan 30, 2025 at 04:14:42PM +, Vladimir Medvedkin wrote:
> Currently ICE PMD uses group attribute to select the appropriate HW engine
> to offload the flow. This behavior violates the rte_flow API, existing
> documentation/examples, and reveals hardware specific details.
>
> This patch eliminates the use of the group attribute and runs each engine
> parser in the order they work in the HW pipeline.
>
> Fixes: 9c5f0070fa3f ("net/ice: map group to pipeline stage")
> Cc: qi.z.zh...@intel.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Vladimir Medvedkin
Thanks, this seems a great idea, to automatically put the flow in place.
Question: is there ever a scenario where a user may need, or want, to
override the automatic choice made here? Or is it just the case that once
the flow is installed, it works the same whatever group it's added into?
I would assume the latter, but just want to confirm.
/Bruce
Re: [PATCH 1/1] net/{octeon_ep,enetfec}: remove unused value
On Wed, 18 Dec 2024 21:00:09 +0100
Ariel Otilibili wrote:
> Coverity issue: 385414, 374016
> Fixes: c836a7ba33e ("net/octeon_ep: support mailbox between VF and PF")
> Fixes: bb5b5bf1e5c ("net/enetfec: support queue configuration")
> Signed-off-by: Ariel Otilibili
> --
> Cc: sta...@dpdk.org
> Cc: Vamsi Attunuru
> Cc: Apeksha Gupta
> Cc: Sachin Saxena
> ---
> drivers/net/enetfec/enet_ethdev.c | 1 -
> drivers/net/octeon_ep/otx_ep_mbox.c | 3 ---
> 2 files changed, 4 deletions(-)
The standard has changed (in upstream Linux checkpatch) to require longer
commit id.
### [PATCH] net/{octeon_ep,enetfec}: remove unused value
WARNING:BAD_FIXES_TAG: Please use correct Fixes: style 'Fixes: <12+ chars of
sha1> ("")' - ie: 'Fixes: c836a7ba33ee ("net/octeon_ep: support
mailbox between VF and PF")'
#7:
Fixes: c836a7ba33e ("net/octeon_ep: support mailbox between VF and PF")
WARNING:BAD_FIXES_TAG: Please use correct Fixes: style 'Fixes: <12+ chars of
sha1> ("")' - ie: 'Fixes: bb5b5bf1e5c6 ("net/enetfec: support queue
configuration")'
#8:
Fixes: bb5b5bf1e5c ("net/enetfec: support queue configuration")
Fixed that and applied to next-net
Re: [PATCH v4] net/gve: allocate RX QPL pages using malloc
On Thu, 9 Jan 2025 11:46:38 -0800
Joshua Washington wrote:
> Kaligineedi
>
> Allocating QPL for an RX queue might fail if enough contiguous IOVA
> memory cannot be allocated. This can commonly occur when using 2MB huge
> pages because the 1024 4K buffers are allocated for each RX ring by
> default, resulting in 4MB for each ring. However, the only requirement
> for RX QPLs is that each 4K buffer be IOVA contiguous, not the entire
> QPL. Therefore, malloc will be used to allocate RX QPLs instead.
>
> Note that TX queues require the entire QPL to be IOVA contiguous, so it
> will continue to use the memzone-based allocation.
>
> v2: Updated RX path to use malloc exclusively
>
> v3: Changed commit description to match updated code
>
> v4: Add fixes tag to allow 2M hugepages to be used on older versions of
> DPDK
>
> Fixes: a46583cf43c8 ("net/gve: support Rx/Tx")
> Cc: junfeng@intel.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Praveen Kaligineedi
> Signed-off-by: Joshua Washington
> ---
The standard practice is to put revision information below the cut line "---"
so it doesn't end up in the commit message.
I fixed that and applied it to next-net
Re: [RFC PATCH 1/1] dts: add SUT cleanup to framework
> My first question was why is there a need to pass all of dpdk_config through > from here all the way to cleanup_sut()? Is it sufficient to extract > dpdk_location from dpdk_config at the beginning here, and pass along just > dpdk_location? I can do that too if it's preferred, wasn't sure what the best way to handle that was my apologies > I understand the need for str or PurePath, but can you explain why None is > included in the union? I believe it was just so the linter wouldn't throw errors in the check format script, but I can double check that. > There was also discussion at the previous DTS meeting about appending the > datetime to the dpdk artifacts when they're copied over to the SUT (a way to > create artifact uniqueness). It's not really within the scope of this > patchseries, but it wouldn't hurt for us to touch base - maybe you can do > this next. Yes, that's in progress currently but I've put it on the backburner for now. Will send out a separate RFC for that sometime soon. > Looks good to me overall. Once you submit the v2 I will leave a little time > for other comments, otherwise I will merge. > > Thanks Dean. Sounds good, I'll get that out asap
Re: [PATCH 1/2] net/af_xdp: fix use after free in af_xdp_tx_zc()
Hello Stephen, On Thu, Jan 30, 2025 at 7:24 PM Stephen Hemminger < step...@networkplumber.org> wrote: > Acked-by: Stephen Hemminger > Thanks for having looked into the patch; I have ACKed the fourth version by your name, https://inbox.dpdk.org/dev/20250130221853.789366-2-ariel.otilib...@6wind.com/ Regards, Ariel
[PATCH v4 2/2] net/af_xdp: Refactor af_xdp_tx_zc
Both legs of the loop share the same logic: the common parts are about
reserving and filling both address and length into the description.
This is moved into reserve_and_fill().
Bugzilla ID: 1440
Suggested-by: Maryam Tahhan
Signed-off-by: Ariel Otilibili
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 62 -
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 092bcb73aa0a..3f5de4d9cbda 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -536,6 +536,31 @@ kick_tx(struct pkt_tx_queue *txq, struct xsk_ring_cons *cq)
}
}
+static inline struct xdp_desc*
+reserve_and_fill(struct pkt_tx_queue *txq, struct rte_mbuf *mbuf,
+struct xsk_umem_info *umem)
+{
+ struct xdp_desc *desc = NULL;
+ uint32_t *idx_tx = NULL;
+ uint64_t addr, offset;
+
+ if (!xsk_ring_prod__reserve(&txq->tx, 1, idx_tx))
+ goto out;
+
+ desc = xsk_ring_prod__tx_desc(&txq->tx, *idx_tx);
+ desc->len = mbuf->pkt_len;
+
+ addr = (uint64_t)mbuf - (uint64_t)umem->buffer
+ - umem->mb_pool->header_size;
+ offset = rte_pktmbuf_mtod(mbuf, uint64_t) - (uint64_t)mbuf
+ + umem->mb_pool->header_size;
+ offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT;
+ desc->addr = addr | offset;
+
+out:
+ return desc;
+}
+
#if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)
static uint16_t
af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
@@ -545,10 +570,8 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
struct rte_mbuf *mbuf;
unsigned long tx_bytes = 0;
int i;
- uint32_t idx_tx;
uint16_t count = 0;
struct xdp_desc *desc;
- uint64_t addr, offset;
struct xsk_ring_cons *cq = &txq->pair->cq;
uint32_t free_thresh = cq->size >> 1;
@@ -559,21 +582,12 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
mbuf = bufs[i];
if (mbuf->pool == umem->mb_pool) {
- if (!xsk_ring_prod__reserve(&txq->tx, 1, &idx_tx)) {
+ if (!(desc = reserve_and_fill(txq, mbuf, umem))) {
kick_tx(txq, cq);
- if (!xsk_ring_prod__reserve(&txq->tx, 1,
- &idx_tx))
+ if (!(desc = reserve_and_fill(txq, mbuf, umem)))
goto out;
}
- desc = xsk_ring_prod__tx_desc(&txq->tx, idx_tx);
- desc->len = mbuf->pkt_len;
- addr = (uint64_t)mbuf - (uint64_t)umem->buffer -
- umem->mb_pool->header_size;
- offset = rte_pktmbuf_mtod(mbuf, uint64_t) -
- (uint64_t)mbuf +
- umem->mb_pool->header_size;
- offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT;
- desc->addr = addr | offset;
+
tx_bytes += desc->len;
count++;
} else {
@@ -584,26 +598,18 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
if (local_mbuf == NULL)
goto out;
- if (!xsk_ring_prod__reserve(&txq->tx, 1, &idx_tx)) {
+ if (!(desc = reserve_and_fill(txq, local_mbuf, umem))) {
rte_pktmbuf_free(local_mbuf);
goto out;
}
- desc = xsk_ring_prod__tx_desc(&txq->tx, idx_tx);
- desc->len = mbuf->pkt_len;
-
- addr = (uint64_t)local_mbuf - (uint64_t)umem->buffer -
- umem->mb_pool->header_size;
- offset = rte_pktmbuf_mtod(local_mbuf, uint64_t) -
- (uint64_t)local_mbuf +
- umem->mb_pool->header_size;
- pkt = xsk_umem__get_data(umem->buffer, addr + offset);
- offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT;
- desc->addr = addr | offset;
+ pkt = xsk_umem__get_data(umem->buffer,
+(desc->addr & ~0xFFF)
++ (desc->addr & 0xFFF));
rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),
- desc->len);
- tx_bytes += desc->len;
+ desc->len);
rte_pktmbuf_free(mbuf);
+
[PATCH v4 0/2] Fix use after free, and refactor af_xdp_tx_zc
Hello, The series addresses Bugzilla ID 1440 in two steps; 1. Fix use after free. 2. Refactor af_xdp_tx_zc(). Thank you, --- v4 * redid the refactor (Maryam Tahhan) * marked the fix as acked (Stephen Hemminger) * updated .mailmap, my main e-mail is @6wind.com (https://inbox.dpdk.org/dev/20250115121152.487360-4-otili...@eurecom.fr/) v3 (https://inbox.dpdk.org/dev/20250128231152.249497-1-ariel.otilib...@6wind.com/) * reworded commit message of patch-1 * addressed feedback of Maryam Tahhan v2 (https://inbox.dpdk.org/dev/20250116225151.188214-1-ariel.otilib...@6wind.com/) * reworded commit messages * addressed feedback from Stephen Hemminger v1 (http://inbox.dpdk.org/dev/20250116195640.68885-1-ariel.otilib...@6wind.com/) Ariel Otilibili (2): net/af_xdp: Fix use after free in af_xdp_tx_zc net/af_xdp: Refactor af_xdp_tx_zc .mailmap| 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 64 - 2 files changed, 36 insertions(+), 30 deletions(-) -- 2.30.2
[PATCH v4 1/2] net/af_xdp: Fix use after free in af_xdp_tx_zc
tx_bytes is computed after both legs are tested. This might
produce a use after memory free.
The computation is now moved into each leg.
Bugzilla ID: 1440
Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks")
Signed-off-by: Ariel Otilibili
Acked-by: Stephen Hemminger
---
.mailmap| 2 +-
drivers/net/af_xdp/rte_eth_af_xdp.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index 8524952d2480..69e485deac55 100644
--- a/.mailmap
+++ b/.mailmap
@@ -134,7 +134,7 @@ Anupam Kapoor
Apeksha Gupta
Archana Muniganti
Archit Pandey
-Ariel Otilibili
+Ariel Otilibili
Arkadiusz Kubalewski
Arkadiusz Kusztal
Arnaud Fiorini
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 814398ba4b44..092bcb73aa0a 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -574,6 +574,7 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
umem->mb_pool->header_size;
offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT;
desc->addr = addr | offset;
+ tx_bytes += desc->len;
count++;
} else {
struct rte_mbuf *local_mbuf =
@@ -601,11 +602,10 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
desc->addr = addr | offset;
rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),
desc->len);
+ tx_bytes += desc->len;
rte_pktmbuf_free(mbuf);
count++;
}
-
- tx_bytes += mbuf->pkt_len;
}
out:
--
2.30.2
[PATCH v2] dts: add SUT cleanup to framework
Add method cleanup_sut to framework that removes a
DPDK source from a SUT node at the conclusion of a testrun.
This will only run when the DPDK source is being copied
from the DTS engine node during the testrun
(when remote=false in the conf.yaml).
Signed-off-by: Dean Marx
---
dts/framework/runner.py | 2 +-
dts/framework/testbed_model/sut_node.py | 21 ++---
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/dts/framework/runner.py b/dts/framework/runner.py
index 9f9789cf49..367034e038 100644
--- a/dts/framework/runner.py
+++ b/dts/framework/runner.py
@@ -336,7 +336,7 @@ def _run_test_run(
finally:
try:
self._logger.set_stage(DtsStage.test_run_teardown)
-sut_node.tear_down_test_run()
+
sut_node.tear_down_test_run(test_run_config.dpdk_config.dpdk_location)
tg_node.tear_down_test_run()
test_run_result.update_teardown(Result.PASS)
except Exception as e:
diff --git a/dts/framework/testbed_model/sut_node.py
b/dts/framework/testbed_model/sut_node.py
index 483733cede..c73500b146 100644
--- a/dts/framework/testbed_model/sut_node.py
+++ b/dts/framework/testbed_model/sut_node.py
@@ -188,6 +188,19 @@ def path_to_devbind_script(self) -> PurePath | str:
)
return self._path_to_devbind_script
+def cleanup_sut(self, dpdk_build_location, remote_tree: str | PurePath |
None) -> None:
+"""Removes the DPDK tree and/or build directory/tarball depending on
the configuration."""
+match dpdk_build_location:
+case LocalDPDKTreeLocation(dpdk_tree=dpdk_tree):
+tree_path =
self.main_session.join_remote_path(self._remote_tmp_dir, dpdk_tree.name)
+self.main_session.remove_remote_dir(tree_path)
+case LocalDPDKTarballLocation(tarball=tarball):
+self.main_session.remove_remote_dir(str(remote_tree))
+tarball_path = self.main_session.join_remote_path(
+self._remote_tmp_dir, tarball.name
+)
+self.main_session.remove_remote_file(tarball_path)
+
def get_dpdk_build_info(self) -> DPDKBuildInfo:
"""Get additional DPDK build information.
@@ -216,11 +229,11 @@ def set_up_test_run(
self.virtual_devices.append(VirtualDevice(vdev))
self._set_up_dpdk(dpdk_build_config)
-def tear_down_test_run(self) -> None:
+def tear_down_test_run(self, dpdk_build_location=None) -> None:
"""Extend the test run teardown with virtual device teardown and DPDK
teardown."""
super().tear_down_test_run()
self.virtual_devices = []
-self._tear_down_dpdk()
+self._tear_down_dpdk(dpdk_build_location)
def _set_up_dpdk(
self,
@@ -256,14 +269,16 @@ def _set_up_dpdk(
self.bind_ports_to_driver()
-def _tear_down_dpdk(self) -> None:
+def _tear_down_dpdk(self, dpdk_build_location) -> None:
"""Reset DPDK variables and bind port driver to the OS driver."""
self._env_vars = {}
+remote_tree = self.__remote_dpdk_tree_path
self.__remote_dpdk_tree_path = None
self._remote_dpdk_build_dir = None
self._dpdk_version = None
self.compiler_version = None
self.bind_ports_to_driver(for_dpdk=False)
+self.cleanup_sut(dpdk_build_location, remote_tree)
def _set_remote_dpdk_tree_path(self, dpdk_tree: PurePath):
"""Set the path to the remote DPDK source tree based on the provided
DPDK location.
--
2.48.1
RE: [PATCH] devtools: forbid use of compiler pragmas
> From: David Marchand [mailto:david.march...@redhat.com] > Sent: Thursday, 30 January 2025 09.38 > > Using pragma must be prevented to avoid breaking builds with other > compilers. > Let EAL use them (like for abstraction macros). You are only allowing them in rte_common.h. Do we need them elsewhere in EAL? Not that I think so, but the patch description could be interpreted that way. > > Signed-off-by: David Marchand > --- Good idea! Acked-by: Morten Brørup
