[PATCH 5/5] app/test: add tests for portable versions of __builtin_add_overflow
__builtin_add_overflow is gcc specific. There's a need for a portable
version that can also be used with other compilers.
This patch adds tests for these new portable functions, to confirm
they behave the same way across different compilers.
Signed-off-by: Andre Muezerie
---
app/test/meson.build | 1 +
app/test/test_math.c | 125 +++
2 files changed, 126 insertions(+)
create mode 100644 app/test/test_math.c
diff --git a/app/test/meson.build b/app/test/meson.build
index 22b3291fa6..ab23f8dc79 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -118,6 +118,7 @@ source_file_deps = {
'test_lpm_perf.c': ['net', 'lpm'],
'test_malloc.c': [],
'test_malloc_perf.c': [],
+'test_math.c': [],
'test_mbuf.c': ['net'],
'test_mcslock.c': [],
'test_member.c': ['member', 'net'],
diff --git a/app/test/test_math.c b/app/test/test_math.c
new file mode 100644
index 00..55fb11f22c
--- /dev/null
+++ b/app/test/test_math.c
@@ -0,0 +1,125 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2025 Microsoft Corporation
+ */
+
+#include
+#include
+
+#include "test.h"
+
+/* Check condition and return if true. */
+#define TEST_MATH_RETURN_IF_ERROR(X) \
+do { \
+ if (X) { \
+ return -1; \
+ } \
+} while (0)
+
+RTE_LOG_REGISTER(math_logtype_test, test.math, INFO);
+
+static int
+verify_add_overflow_u8(uint8_t a, uint8_t b,
+ uint8_t expected_res, uint8_t expected_overflow)
+{
+ uint8_t res;
+ uint8_t overflow = __rte_add_overflow_u8(a, b, &res);
+ RTE_TEST_ASSERT_EQUAL(res, expected_res,
+ "ERROR: __rte_add_overflow_u8(0x%x, 0x%x) returned
result 0x%x,"
+ " but 0x%x was expected.", a, b, res, expected_res);
+ RTE_TEST_ASSERT_EQUAL(overflow, expected_overflow,
+ "ERROR: __rte_add_overflow_u8(0x%x, 0x%x) returned
overflow 0x%x,"
+ " but 0x%x was expected.", a, b, overflow,
expected_overflow);
+
+ return 0;
+}
+
+static int
+verify_add_overflow_u16(uint16_t a, uint16_t b,
+ uint16_t expected_res, uint16_t expected_overflow)
+{
+ uint16_t res;
+ uint8_t overflow = __rte_add_overflow_u16(a, b, &res);
+ RTE_TEST_ASSERT_EQUAL(res, expected_res,
+ "ERROR: __rte_add_overflow_u16(0x%x, 0x%x) returned
result 0x%x,"
+ " but 0x%x was expected.", a, b, res, expected_res);
+ RTE_TEST_ASSERT_EQUAL(overflow, expected_overflow,
+ "ERROR: __rte_add_overflow_u16(0x%x, 0x%x) returned
overflow 0x%x,"
+ " but 0x%x was expected.", a, b, overflow,
expected_overflow);
+
+ return 0;
+}
+
+static int
+verify_add_overflow_u32(uint32_t a, uint32_t b,
+ uint32_t expected_res, uint32_t expected_overflow)
+{
+ uint32_t res;
+ uint8_t overflow = __rte_add_overflow_u32(a, b, &res);
+ RTE_TEST_ASSERT_EQUAL(res, expected_res,
+ "ERROR: __rte_add_overflow_u32(0x%x, 0x%x) returned
result 0x%x,"
+ " but 0x%x was expected.", a, b, res, expected_res);
+ RTE_TEST_ASSERT_EQUAL(overflow, expected_overflow,
+ "ERROR: __rte_add_overflow_u32(0x%x, 0x%x) returned
overflow 0x%x,"
+ " but 0x%x was expected.", a, b, overflow,
expected_overflow);
+
+ return 0;
+}
+
+static int
+test_add_overflow_u8(void)
+{
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u8(0, 0, 0, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u8(0, 1, 1, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u8(0, 0xFF, 0xFF, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u8(1, 0xFF, 0, 1));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u8(2, 0xFF, 1, 1));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u8(4, 0xFE, 2, 1));
+
+ return 0;
+}
+
+static int
+test_add_overflow_u16(void)
+{
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u16(0, 0, 0, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u16(0, 1, 1, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u16(0, 0x, 0x,
0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u16(1, 0x, 0, 1));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u16(2, 0x, 1, 1));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u16(4, 0xFFFE, 2, 1));
+
+ return 0;
+}
+
+static int
+test_add_overflow_u32(void)
+{
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u32(0, 0, 0, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u32(0, 1, 1, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u32(0, 0x,
0x, 0));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u32(1, 0x, 0, 1));
+ TEST_MATH_RETURN_IF_ERROR(verify_add_overflow_u32(2, 0x, 1, 1));
+ TEST_MATH_RETURN_IF_ERROR(verify_add
[PATCH 4/5] drivers/net: use portable version of __builtin_add_overflow
__builtin_add_overflow is gcc specific. It should be replaced with
a portable version that can also be used with other compilers.
Signed-off-by: Andre Muezerie
---
drivers/net/ice/base/ice_nvm.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c
index 56c6c96a95..1fc64b502c 100644
--- a/drivers/net/ice/base/ice_nvm.c
+++ b/drivers/net/ice/base/ice_nvm.c
@@ -3,6 +3,7 @@
*/
#include "ice_common.h"
+#include
#define GL_MNG_DEF_DEVID 0x000B611C
@@ -469,8 +470,6 @@ int ice_read_sr_word(struct ice_hw *hw, u16 offset, u16
*data)
return status;
}
-#define check_add_overflow __builtin_add_overflow
-
/**
* ice_get_pfa_module_tlv - Reads sub module TLV from NVM PFA
* @hw: pointer to hardware structure
@@ -500,7 +499,7 @@ ice_get_pfa_module_tlv(struct ice_hw *hw, u16 *module_tlv,
u16 *module_tlv_len,
return status;
}
- if (check_add_overflow(pfa_ptr, (u16)(pfa_len - 1), &max_tlv)) {
+ if (__rte_add_overflow_u16(pfa_ptr, (u16)(pfa_len - 1), &max_tlv)) {
ice_debug(hw, ICE_DBG_INIT, "PFA starts at offset %u. PFA
length of %u caused 16-bit arithmetic overflow.\n",
pfa_ptr, pfa_len);
return ICE_ERR_INVAL_SIZE;
@@ -541,8 +540,8 @@ ice_get_pfa_module_tlv(struct ice_hw *hw, u16 *module_tlv,
u16 *module_tlv_len,
return ICE_ERR_INVAL_SIZE;
}
- if (check_add_overflow(next_tlv, (u16)2, &next_tlv) ||
- check_add_overflow(next_tlv, tlv_len, &next_tlv)) {
+ if (__rte_add_overflow_u16(next_tlv, (u16)2, &next_tlv) ||
+ __rte_add_overflow_u16(next_tlv, tlv_len, &next_tlv)) {
ice_debug(hw, ICE_DBG_INIT, "TLV of type %u and length
0x%04x caused 16-bit arithmetic overflow. The PFA starts at 0x%04x and has
length of 0x%04x\n",
tlv_sub_module_type, tlv_len,
pfa_ptr, pfa_len);
return ICE_ERR_INVAL_SIZE;
--
2.47.0.vfs.0.3
[PATCH 1/5] maintainers: add portable version of __builtin_add_overflow
__builtin_add_overflow is gcc specific. There's a need for a portable version that can also be used with other compilers. Signed-off-by: Andre Muezerie --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 60bdcce543..4b03b6752e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,6 +180,7 @@ F: app/test/test_devargs.c F: app/test/test_eal* F: app/test/test_errno.c F: app/test/test_lcores.c +F: app/test/test_math.c F: app/test/test_memcpy* F: app/test/test_per_lcore.c F: app/test/test_pflock.c -- 2.47.0.vfs.0.3
[PATCH 2/5] lib/eal: add portable version of __builtin_add_overflow
__builtin_add_overflow is gcc specific. There's a need for a portable
version that can also be used with other compilers.
This patch introduces __rte_add_overflow_u8, __rte_add_overflow_u16
and __rte_add_overflow_u32.
Signed-off-by: Andre Muezerie
---
lib/eal/include/meson.build | 1 +
lib/eal/include/rte_math.h | 42 +
2 files changed, 43 insertions(+)
create mode 100644 lib/eal/include/rte_math.h
diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
index d903577caa..041a4105b5 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -31,6 +31,7 @@ headers += files(
'rte_lcore_var.h',
'rte_lock_annotations.h',
'rte_malloc.h',
+'rte_math.h',
'rte_mcslock.h',
'rte_memory.h',
'rte_memzone.h',
diff --git a/lib/eal/include/rte_math.h b/lib/eal/include/rte_math.h
new file mode 100644
index 00..df2f3d4d34
--- /dev/null
+++ b/lib/eal/include/rte_math.h
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2025 Microsoft Corporation
+ */
+
+#ifndef _RTE_MATH_H_
+#define _RTE_MATH_H_
+
+/**
+ * @file
+ *
+ * Math function definitions for DPDK.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Functions that allow performing simple arithmetic operations together with
+ * checking whether the operations overflowed.
+ * Example of usage:
+ * uint8_t overflow;
+ * uint16_t a, b, result;
+ * a = 1;
+ * b = 2;
+ * overflow = __rte_add_overflow_u16(a, b, &result);
+ */
+#ifdef RTE_TOOLCHAIN_MSVC
+#define __rte_add_overflow_u8(a, b, res) _addcarry_u8(0, a, b, res)
+#define __rte_add_overflow_u16(a, b, res) _addcarry_u16(0, a, b, res)
+#define __rte_add_overflow_u32(a, b, res) _addcarry_u32(0, a, b, res)
+#else
+#define __rte_add_overflow_u8(a, b, res) __builtin_add_overflow(a, b, res)
+#define __rte_add_overflow_u16(a, b, res) __builtin_add_overflow(a, b, res)
+#define __rte_add_overflow_u32(a, b, res) __builtin_add_overflow(a, b, res)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--
2.47.0.vfs.0.3
[PATCH 0/5] add portable version of __builtin_add_overflow
__builtin_add_overflow is gcc specific. There's a need for a portable version that can also be used with other compilers. Andre Muezerie (5): maintainers: add portable version of __builtin_add_overflow lib/eal: add portable version of __builtin_add_overflow doc/api: add portable version of __builtin_add_overflow drivers/net: use portable version of __builtin_add_overflow app/test: add tests for portable versions of __builtin_add_overflow MAINTAINERS| 1 + app/test/meson.build | 1 + app/test/test_math.c | 125 + doc/api/doxy-api-index.md | 1 + drivers/net/ice/base/ice_nvm.c | 9 ++- lib/eal/include/meson.build| 1 + lib/eal/include/rte_math.h | 42 +++ 7 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 app/test/test_math.c create mode 100644 lib/eal/include/rte_math.h -- 2.47.0.vfs.0.3
[PATCH 3/5] doc/api: add portable version of __builtin_add_overflow
__builtin_add_overflow is gcc specific. There's a need for a portable version that can also be used with other compilers. Signed-off-by: Andre Muezerie --- doc/api/doxy-api-index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index f0193502bc..c95a86448d 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -226,6 +226,7 @@ The public API headers are grouped by topics: [checksum](@ref rte_cksum.h), [config file](@ref rte_cfgfile.h), [key/value args](@ref rte_kvargs.h), + [math](@ref rte_math.h), [argument parsing](@ref rte_argparse.h), [ptr_compress](@ref rte_ptr_compress.h), [string](@ref rte_string_fns.h), -- 2.47.0.vfs.0.3
Re: [PATCH 1/2] net/mlx5: improve socket file path
On 2024/12/14 01:16, Bruce Richardson wrote: On Fri, Dec 13, 2024 at 09:12:39AM -0800, Stephen Hemminger wrote: On Fri, 13 Dec 2024 17:24:42 +0800 Yang Ming wrote: 1. /var/tmp is hard code which is not a good style 2. /var/tmp may be not allowed to be written via container's read only mode. Signed-off-by: Yang Ming Since this is a unix domain socket, why not use abstract socket that doesn't have to be associated with filesystem? In general, I think we should avoid abstract sockets in DPDK. Primary reason is that they are linux-specific. Last time I checked other unixes, like BSD, don't support them. A secondary concern is that having a filesystem path allows permission checks, so for e.g. telemetry sockets, only users with appropriate permissions can connect. With an abstract socket we'd have to open up the area of user authentication. /Bruce Hi Stephen & Bruce, I'm not sure whether abstract socket is a good idea. Maybe it can be improved further or step by step. But we don't need to discuss it for this commit. We do this improvement because "/var/tmp" and "/var/log" can't be write in Readonly mode of container except that we add /var/ specfic for DPDK application in container's setting. But nearly all DPDK modules have already used common runtime path returned from `rte_eal_get_runtime_dir()`. Why not we apply this common path for Mellanox NIC?
[PATCH] net/sxe: add base driver directory and rough doc documentation
Adding a minimum maintainable directory structure for the
network driver and request maintenance of the sxe driver.
Signed-off-by: Jie Liu
---
MAINTAINERS | 6
doc/guides/nics/features/sxe.ini| 10 +++
doc/guides/nics/features/sxe_vf.ini | 10 +++
doc/guides/nics/sxe.rst | 40 +
drivers/net/sxe/meson.build | 9 ++
drivers/net/sxe/pf/sxe_ethdev.c | 3 ++
drivers/net/sxe/pf/sxe_ethdev.h | 3 ++
drivers/net/sxe/rte_pmd_sxe_version.map | 3 ++
drivers/net/sxe/version.map | 3 ++
9 files changed, 87 insertions(+)
create mode 100644 doc/guides/nics/features/sxe.ini
create mode 100644 doc/guides/nics/features/sxe_vf.ini
create mode 100644 doc/guides/nics/sxe.rst
create mode 100644 drivers/net/sxe/meson.build
create mode 100644 drivers/net/sxe/pf/sxe_ethdev.c
create mode 100644 drivers/net/sxe/pf/sxe_ethdev.h
create mode 100644 drivers/net/sxe/rte_pmd_sxe_version.map
create mode 100644 drivers/net/sxe/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 60bdcce543..0af5b437db 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2039,3 +2039,9 @@ F: examples/vmdq/
F: doc/guides/sample_app_ug/vmdq_forwarding.rst
F: examples/vmdq_dcb/
F: doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst
+
+Linkdata sxe
+M: Jie Li
+F: drivers/net/sxe/
+F: doc/guides/nics/sxe.rst
+F: doc/guides/nics/features/sxe*.ini
diff --git a/doc/guides/nics/features/sxe.ini b/doc/guides/nics/features/sxe.ini
new file mode 100644
index 00..173ab48889
--- /dev/null
+++ b/doc/guides/nics/features/sxe.ini
@@ -0,0 +1,10 @@
+;
+; Supported features of the 'sxe' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux= Y
+ARMv8= Y
+x86-32 = Y
+x86-64 = Y
diff --git a/doc/guides/nics/features/sxe_vf.ini
b/doc/guides/nics/features/sxe_vf.ini
new file mode 100644
index 00..76376dd4c3
--- /dev/null
+++ b/doc/guides/nics/features/sxe_vf.ini
@@ -0,0 +1,10 @@
+;
+; Supported features of the 'sxe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux= Y
+ARMv8= Y
+x86-32 = Y
+x86-64 = Y
diff --git a/doc/guides/nics/sxe.rst b/doc/guides/nics/sxe.rst
new file mode 100644
index 00..db42fde98b
--- /dev/null
+++ b/doc/guides/nics/sxe.rst
@@ -0,0 +1,40 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright (C), 2022, Linkdata Technology Co., Ltd.
+
+SXE Poll Mode Driver
+==
+
+The SXE PMD (librte_pmd_sxe) provides poll mode driver support
+for Linkdata 1160-2X 10GE Ethernet Adapter.
+
+
+Configuration
+-
+
+Dynamic Logging Parameters
+~~
+
+One may leverage EAL option "--log-level" to change default levels
+for the log types supported by the driver. The option is used with
+an argument typically consisting of two parts separated by a colon.
+
+SXE PMD provides the following log types available for control:
+
+- ``pmd.net.sxe.drv`` (default level is **DEBUG**)
+
+ Affects driver-wide messages unrelated to any particular devices.
+
+- ``pmd.net.sxe.init`` (default level is **DEBUG**)
+
+ Extra logging of the messages during PMD initialization.
+
+- ``pmd.net.sxe.rx`` (default level is **DEBUG**)
+
+ Affects rx-wide messages.
+- ``pmd.net.sxe.tx`` (default level is **DEBUG**)
+
+ Affects tx-wide messages.
+--
+
+Refer to the document :ref:`compiling and testing a PMD for a NIC
`
+for details.
diff --git a/drivers/net/sxe/meson.build b/drivers/net/sxe/meson.build
new file mode 100644
index 00..9d63ba30a3
--- /dev/null
+++ b/drivers/net/sxe/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (C), 2020, Wuxi Stars Micro System Technologies Co., Ltd.
+
+deps += ['hash']
+sources = files(
+ 'pf/sxe_ethdev.c',
+)
+
+includes += include_directories('pf')
diff --git a/drivers/net/sxe/pf/sxe_ethdev.c b/drivers/net/sxe/pf/sxe_ethdev.c
new file mode 100644
index 00..e31a23deeb
--- /dev/null
+++ b/drivers/net/sxe/pf/sxe_ethdev.c
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
diff --git a/drivers/net/sxe/pf/sxe_ethdev.h b/drivers/net/sxe/pf/sxe_ethdev.h
new file mode 100644
index 00..e31a23deeb
--- /dev/null
+++ b/drivers/net/sxe/pf/sxe_ethdev.h
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
diff --git a/drivers/net/sxe/rte_pmd_sxe_version.map
b/drivers/net/sxe/rte_pmd_sxe_version.map
new file mode 100644
index 00..24d1dd4d55
--- /dev/null
+++ b/drivers/net/sxe/rte_pmd_sxe_version.map
@@ -0,0 +1,3 @@
+DPDK_24.0 {
+ local: *;
+};
diff --git a/drivers/net/sxe/version.map b/drivers/net/sxe/version.map
new file
[PATCH] net/sxe: add base driver directory and doc
Adding a minimum maintainable directory structure for the
network driver and request maintenance of the sxe driver.
Signed-off-by: Jie Liu
---
MAINTAINERS | 6
doc/guides/nics/features/sxe.ini| 10 ++
doc/guides/nics/features/sxe_vf.ini | 10 ++
doc/guides/nics/sxe.rst | 41 +
drivers/net/sxe/meson.build | 9 ++
drivers/net/sxe/pf/sxe_ethdev.c | 3 ++
drivers/net/sxe/pf/sxe_ethdev.h | 3 ++
drivers/net/sxe/rte_pmd_sxe_version.map | 3 ++
drivers/net/sxe/version.map | 3 ++
9 files changed, 88 insertions(+)
create mode 100644 doc/guides/nics/features/sxe.ini
create mode 100644 doc/guides/nics/features/sxe_vf.ini
create mode 100644 doc/guides/nics/sxe.rst
create mode 100644 drivers/net/sxe/meson.build
create mode 100644 drivers/net/sxe/pf/sxe_ethdev.c
create mode 100644 drivers/net/sxe/pf/sxe_ethdev.h
create mode 100644 drivers/net/sxe/rte_pmd_sxe_version.map
create mode 100644 drivers/net/sxe/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 60bdcce543..0af5b437db 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2039,3 +2039,9 @@ F: examples/vmdq/
F: doc/guides/sample_app_ug/vmdq_forwarding.rst
F: examples/vmdq_dcb/
F: doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst
+
+Linkdata sxe
+M: Jie Li
+F: drivers/net/sxe/
+F: doc/guides/nics/sxe.rst
+F: doc/guides/nics/features/sxe*.ini
diff --git a/doc/guides/nics/features/sxe.ini b/doc/guides/nics/features/sxe.ini
new file mode 100644
index 00..173ab48889
--- /dev/null
+++ b/doc/guides/nics/features/sxe.ini
@@ -0,0 +1,10 @@
+;
+; Supported features of the 'sxe' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux= Y
+ARMv8= Y
+x86-32 = Y
+x86-64 = Y
diff --git a/doc/guides/nics/features/sxe_vf.ini
b/doc/guides/nics/features/sxe_vf.ini
new file mode 100644
index 00..76376dd4c3
--- /dev/null
+++ b/doc/guides/nics/features/sxe_vf.ini
@@ -0,0 +1,10 @@
+;
+; Supported features of the 'sxe_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux= Y
+ARMv8= Y
+x86-32 = Y
+x86-64 = Y
diff --git a/doc/guides/nics/sxe.rst b/doc/guides/nics/sxe.rst
new file mode 100644
index 00..0efb220595
--- /dev/null
+++ b/doc/guides/nics/sxe.rst
@@ -0,0 +1,41 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright (C), 2022, Linkdata Technology Co., Ltd.
+
+SXE Poll Mode Driver
+==
+
+The SXE PMD (librte_pmd_sxe) provides poll mode driver support
+for Linkdata 1160-2X 10GE Ethernet Adapter.
+
+
+Configuration
+-
+
+Dynamic Logging Parameters
+~~
+
+One may leverage EAL option "--log-level" to change default levels
+for the log types supported by the driver. The option is used with
+an argument typically consisting of two parts separated by a colon.
+
+SXE PMD provides the following log types available for control:
+
+- ``pmd.net.sxe.drv`` (default level is **DEBUG**)
+
+ Affects driver-wide messages unrelated to any particular devices.
+
+- ``pmd.net.sxe.init`` (default level is **DEBUG**)
+
+ Extra logging of the messages during PMD initialization.
+
+- ``pmd.net.sxe.rx`` (default level is **DEBUG**)
+
+ Affects rx-wide messages.
+- ``pmd.net.sxe.tx`` (default level is **DEBUG**)
+
+ Affects tx-wide messages.
+
+--
+
+Refer to the document :ref:`compiling and testing a PMD for a NIC
`
+for details.
diff --git a/drivers/net/sxe/meson.build b/drivers/net/sxe/meson.build
new file mode 100644
index 00..dad9ee44a0
--- /dev/null
+++ b/drivers/net/sxe/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (C), 2020, Wuxi Stars Micro System Technologies Co., Ltd.
+
+deps += ['hash']
+sources = files(
+'pf/sxe_ethdev.c',
+)
+
+includes += include_directories('pf')
diff --git a/drivers/net/sxe/pf/sxe_ethdev.c b/drivers/net/sxe/pf/sxe_ethdev.c
new file mode 100644
index 00..e31a23deeb
--- /dev/null
+++ b/drivers/net/sxe/pf/sxe_ethdev.c
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
diff --git a/drivers/net/sxe/pf/sxe_ethdev.h b/drivers/net/sxe/pf/sxe_ethdev.h
new file mode 100644
index 00..e31a23deeb
--- /dev/null
+++ b/drivers/net/sxe/pf/sxe_ethdev.h
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2024
+ */
diff --git a/drivers/net/sxe/rte_pmd_sxe_version.map
b/drivers/net/sxe/rte_pmd_sxe_version.map
new file mode 100644
index 00..24d1dd4d55
--- /dev/null
+++ b/drivers/net/sxe/rte_pmd_sxe_version.map
@@ -0,0 +1,3 @@
+DPDK_24.0 {
+ local: *;
+};
diff --git a/drivers/net/sxe/version.map b/drivers/net/sxe/version.map
new file
[PATCH v6 0/4] add feature arc in rte_graph
Feature arc represents an ordered list of features/protocols at a given networking layer. It is a high level abstraction to connect various rte_graph nodes, as feature nodes, and allow packets steering across these nodes in a generic manner. Features (or feature nodes) are nodes which handles partial or complete handling of a protocol in fast path. Like ipv4-rewrite node, which adds rewrite data to an outgoing IPv4 packet. However in above example, outgoing interface(say "eth0") may have outbound IPsec policy enabled, hence packets must be steered from ipv4-rewrite node to ipsec-outbound-policy node for outbound IPsec policy lookup. On the other hand, packets routed to another interface (eth1) will not be sent to ipsec-outbound-policy node as IPsec feature is disabled on eth1. Feature-arc allows rte_graph applications to manage such constraints easily Feature arc abstraction allows rte_graph based application to 1. Seamlessly steer packets across feature nodes based on whether feature is enabled or disabled on an interface. Features enabled on one interface may not be enabled on another interface with in a same feature arc. 2. Allow enabling/disabling of features on an interface at runtime, so that if a feature is disabled, packets associated with that interface won't be steered to corresponding feature node. 3. Provides mechanism to hook custom/user-defined nodes to a feature node and allow packet steering from feature node to custom node without changing former's fast path function 4. Allow expressing features in a particular sequential order so that packets are steered in an ordered way across nodes in fast path. For eg: if IPsec and IPv4 features are enabled on an ingress interface, packets must be sent to IPsec inbound policy node first and then to ipv4 lookup node. This patch series adds feature arc library in rte_graph and also adds "ipv4-output" feature arc handling in "ipv4-rewrite" node. Changes in v6: - Rebased to latest main for DPDK-25.03 - Added constructor based feature arc/feature registration - Changed design to handle fast path synchronization via RCU mechanism when any feature is enabled or disabled - Added feature arc specific mbuf dynamic field to carry feature data across nodes - Added feature arc example in app/graph - Programming guide and functional test cases in future versions Nitin Saxena (4): graph: add API to override node process function graph: add feature arc abstraction ip4: add ip4 output feature arc app/graph: add custom feature nodes for ip4 output arc app/graph/commands.list |6 + app/graph/feature.c | 141 ++ app/graph/feature.h | 13 + app/graph/graph.c|4 + app/graph/ip4_output_hook.c | 169 ++ app/graph/main.c | 15 +- app/graph/meson.build|2 + app/graph/module_api.h |2 + doc/api/doxy-api-index.md|2 + doc/guides/rel_notes/release_25_03.rst | 10 + lib/graph/graph_feature_arc.c| 1780 ++ lib/graph/graph_private.h| 15 + lib/graph/meson.build|4 +- lib/graph/node.c | 23 + lib/graph/rte_graph_feature_arc.h| 552 +++ lib/graph/rte_graph_feature_arc_worker.h | 608 lib/graph/version.map| 20 + lib/node/ethdev_ctrl.c |8 + lib/node/interface_tx_feature.c | 133 ++ lib/node/interface_tx_feature_priv.h | 33 + lib/node/ip4_rewrite.c | 298 +++- lib/node/meson.build |1 + lib/node/node_private.h |1 + lib/node/rte_node_ip4_api.h |4 + 24 files changed, 3838 insertions(+), 6 deletions(-) create mode 100644 app/graph/feature.c create mode 100644 app/graph/feature.h create mode 100644 app/graph/ip4_output_hook.c create mode 100644 lib/graph/graph_feature_arc.c create mode 100644 lib/graph/rte_graph_feature_arc.h create mode 100644 lib/graph/rte_graph_feature_arc_worker.h create mode 100644 lib/node/interface_tx_feature.c create mode 100644 lib/node/interface_tx_feature_priv.h -- 2.43.0
[PATCH v6 1/4] graph: add API to override node process function
New API used by feature arc library to override node's original
process() func.
Signed-off-by: Nitin Saxena
---
lib/graph/graph_private.h | 11 +++
lib/graph/node.c | 23 +++
2 files changed, 34 insertions(+)
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index da48d73587..ceff0c8f50 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -198,6 +198,17 @@ struct node_head *node_list_head_get(void);
*/
struct node *node_from_name(const char *name);
+/**
+ * @internal
+ *
+ * Override process func of a node.
+ *
+ * @return
+ * - 0: Success.
+ * - <0: Error
+ */
+int node_override_process_func(rte_node_t id, rte_node_process_t process);
+
/* Graph list functions */
STAILQ_HEAD(graph_head, graph);
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 63db629da8..82834a6634 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -419,3 +419,26 @@ rte_node_max_count(void)
{
return node_id;
}
+
+int
+node_override_process_func(rte_node_t id, rte_node_process_t process)
+{
+ struct node *node;
+
+ NODE_ID_CHECK(id);
+ graph_spinlock_lock();
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (node->id == id) {
+ node->process = process;
+ graph_spinlock_unlock();
+ return 0;
+ }
+ }
+
+ graph_spinlock_unlock();
+
+ return 0;
+fail:
+ return -1;
+}
--
2.43.0
[PATCH v6 2/4] graph: add feature arc abstraction
Feature arc abstraction allows rte_graph based applications to
- Hook feature nodes between start_node and end_node of an arc
- Feature arc's are created via RTE_GRAPH_FEATURE_ARC_REGISTER()
- Feature nodes are added to an arc via RTE_GRAPH_FEATURE_REGISTER()
- If application explicitly calls rte_graph_feature_arc_init(), before
rte_graph_create(), all features arcs and associated feature nodes
are automatically connected
- If rte_graph_feature_arc_init() is not called, feature arc module has
no affect
- Packet path towards feature node(s) is enabled/disabled at
runtime on per interface basis.
- More than one feature nodes can be added/enabled in an arc
- If any feature node is enabled on any interface, feature arc fast path
APIs provide next edge for each mbuf
Once DPDK inbuilt nodes adopts feature arc abstraction, out-of-tree
nodes can be hooked in a generic manner
Signed-off-by: Nitin Saxena
---
doc/api/doxy-api-index.md|2 +
doc/guides/rel_notes/release_25_03.rst | 10 +
lib/graph/graph_feature_arc.c| 1780 ++
lib/graph/graph_private.h|4 +
lib/graph/meson.build|4 +-
lib/graph/rte_graph_feature_arc.h| 552 +++
lib/graph/rte_graph_feature_arc_worker.h | 608
lib/graph/version.map| 20 +
8 files changed, 2979 insertions(+), 1 deletion(-)
create mode 100644 lib/graph/graph_feature_arc.c
create mode 100644 lib/graph/rte_graph_feature_arc.h
create mode 100644 lib/graph/rte_graph_feature_arc_worker.h
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index f0193502bc..b6a5dedee5 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -213,6 +213,8 @@ The public API headers are grouped by topics:
[table_wm](@ref rte_swx_table_wm.h)
* [graph](@ref rte_graph.h):
[graph_worker](@ref rte_graph_worker.h)
+[graph_feature_arc](@ref rte_graph_feature_arc.h)
+[graph_feature_arc_worker](@ref rte_graph_feature_arc_worker.h)
* graph_nodes:
[eth_node](@ref rte_node_eth_api.h),
[ip4_node](@ref rte_node_ip4_api.h),
diff --git a/doc/guides/rel_notes/release_25_03.rst
b/doc/guides/rel_notes/release_25_03.rst
index 426dfcd982..205215b5de 100644
--- a/doc/guides/rel_notes/release_25_03.rst
+++ b/doc/guides/rel_notes/release_25_03.rst
@@ -55,6 +55,16 @@ New Features
Also, make sure to start the actual text at the margin.
===
+* **Added feature arc abstraction in graph library.**
+
+ Feature arc abstraction helps ``rte_graph`` based applications to steer
+ packets across different node path(s) based on the features (or protocols)
+ enabled on interfaces. Different feature node paths can be enabled/disabled
+ at runtime on some or on all interfaces. This abstraction also help
+ applications to hook ``out-of-tree nodes`` in in-built DPDK node paths
+ in a generic manner.
+
+ * Added ``ip4_output`` feature arc processing in ``ip4_rewrite`` node.
Removed Items
-
diff --git a/lib/graph/graph_feature_arc.c b/lib/graph/graph_feature_arc.c
new file mode 100644
index 00..895ec68f86
--- /dev/null
+++ b/lib/graph/graph_feature_arc.c
@@ -0,0 +1,1780 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+
+#include "graph_private.h"
+#include
+#include
+#include
+
+#define GRAPH_FEATURE_ARC_INITIALIZER UINT64_MAX
+#define GRAPH_FEATURE_MAX_NUM_PER_ARC (64)
+
+#define connect_graph_nodes(node1, node2, edge, arc_name) \
+ __connect_graph_nodes(node1, node2, edge, arc_name, __LINE__)
+
+#define FEATURE_ARC_MEMZONE_NAME "__rte_feature_arc_main_mz"
+
+#define graph_uint_cast(f) ((unsigned int)f)
+
+#define fdata_from_feat(arc, feat, index) \
+ RTE_GRAPH_FEATURE_TO_FEATURE_DATA(arc, feat, index)
+
+#define feat_dbg graph_dbg
+
+#define FEAT_COND_ERR(cond, ...) \
+ do { \
+ if (cond) \
+ graph_err(__VA_ARGS__);\
+ } while (0)
+
+#define FEAT_ERR(fn, ln, ...) \
+ GRAPH_LOG2(ERR, fn, ln, __VA_ARGS__)
+
+#define FEAT_ERR_JMP(_err, fn, ln, ...)\
+ do { \
+ FEAT_ERR(fn, ln, __VA_ARGS__); \
+ rte_errno = _err; \
+ } while (0)
+
+static struct rte_mbuf_dynfield rte_graph_feature_arc_mbuf_desc = {
+ .name = RTE_GRAPH_FEATURE_ARC_DYNFIELD_NAME,
+ .size = sizeof(struct rte_graph_feature_arc_mbuf_dynfields),
+ .align = alignof(struct rte_g
[PATCH v6 3/4] ip4: add ip4 output feature arc
Added ip4 output arc to allow applications to hook feature nodes in ip4
egress direction
Signed-off-by: Nitin Saxena
---
lib/node/ethdev_ctrl.c | 8 +
lib/node/interface_tx_feature.c | 133
lib/node/interface_tx_feature_priv.h | 33 +++
lib/node/ip4_rewrite.c | 298 ++-
lib/node/meson.build | 1 +
lib/node/node_private.h | 1 +
lib/node/rte_node_ip4_api.h | 4 +
7 files changed, 474 insertions(+), 4 deletions(-)
create mode 100644 lib/node/interface_tx_feature.c
create mode 100644 lib/node/interface_tx_feature_priv.h
diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
index cd52e8be08..93ef7fbb95 100644
--- a/lib/node/ethdev_ctrl.c
+++ b/lib/node/ethdev_ctrl.c
@@ -14,6 +14,7 @@
#include "ethdev_tx_priv.h"
#include "ip4_rewrite_priv.h"
#include "ip6_rewrite_priv.h"
+#include "interface_tx_feature_priv.h"
#include "node_private.h"
static struct ethdev_ctrl {
@@ -24,6 +25,7 @@ int
rte_node_eth_config(struct rte_node_ethdev_config *conf, uint16_t nb_confs,
uint16_t nb_graphs)
{
+ struct rte_node_register *if_tx_feature_node;
struct rte_node_register *ip4_rewrite_node;
struct rte_node_register *ip6_rewrite_node;
struct ethdev_tx_node_main *tx_node_data;
@@ -35,6 +37,7 @@ rte_node_eth_config(struct rte_node_ethdev_config *conf,
uint16_t nb_confs,
int i, j, rc;
uint32_t id;
+ if_tx_feature_node = if_tx_feature_node_get();
ip4_rewrite_node = ip4_rewrite_node_get();
ip6_rewrite_node = ip6_rewrite_node_get();
tx_node_data = ethdev_tx_node_data_get();
@@ -125,6 +128,11 @@ rte_node_eth_config(struct rte_node_ethdev_config *conf,
uint16_t nb_confs,
if (rc < 0)
return rc;
+ /* Add this tx port node to if_tx_feature_node */
+ rte_node_edge_update(if_tx_feature_node->id,
RTE_EDGE_ID_INVALID,
+&next_nodes, 1);
+ rc = if_tx_feature_node_set_next(port_id,
+
rte_node_edge_count(if_tx_feature_node->id) - 1);
}
ctrl.nb_graphs = nb_graphs;
diff --git a/lib/node/interface_tx_feature.c b/lib/node/interface_tx_feature.c
new file mode 100644
index 00..35ac00f21e
--- /dev/null
+++ b/lib/node/interface_tx_feature.c
@@ -0,0 +1,133 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include "rte_node_ip4_api.h"
+#include "node_private.h"
+#include "interface_tx_feature_priv.h"
+
+#define IF_TX_FEATURE_LAST_NEXT_INDEX(ctx) \
+ (((struct if_tx_feature_node_ctx *)ctx)->last_index)
+/*
+ * @internal array for mapping port to next node index
+ */
+struct if_tx_feature_node_main {
+ uint16_t next_index[RTE_MAX_ETHPORTS];
+};
+
+struct if_tx_feature_node_ctx {
+ uint16_t last_index;
+};
+
+static struct if_tx_feature_node_main *if_tx_feature_nm;
+
+int
+if_tx_feature_node_set_next(uint16_t port_id, uint16_t next_index)
+{
+ if (if_tx_feature_nm == NULL) {
+ if_tx_feature_nm = rte_zmalloc(
+ "if_tx_feature_nm", sizeof(struct
if_tx_feature_node_main),
+ RTE_CACHE_LINE_SIZE);
+ if (if_tx_feature_nm == NULL)
+ return -ENOMEM;
+ }
+ if_tx_feature_nm->next_index[port_id] = next_index;
+
+ return 0;
+}
+
+static int
+if_tx_feature_node_init(const struct rte_graph *graph, struct rte_node *node)
+{
+ RTE_SET_USED(graph);
+
+ /* pkt_drop */
+ IF_TX_FEATURE_LAST_NEXT_INDEX(node->ctx) = 0;
+
+ return 0;
+}
+
+static uint16_t
+if_tx_feature_node_process(struct rte_graph *graph, struct rte_node *node,
+ void **objs, uint16_t nb_objs)
+{
+ uint16_t held = 0, next;
+ void **to_next, **from;
+ uint16_t last_spec = 0;
+ rte_edge_t next_index;
+ struct rte_mbuf *mbuf;
+ int i;
+
+ /* Speculative next */
+ next_index = IF_TX_FEATURE_LAST_NEXT_INDEX(node->ctx);
+
+ from = objs;
+ to_next = rte_node_next_stream_get(graph, node, next_index, nb_objs);
+ for (i = 0; i < nb_objs; i++) {
+
+ mbuf = (struct rte_mbuf *)objs[i];
+
+ /* port-tx node starts from next edge 1*/
+ next = if_tx_feature_nm->next_index[mbuf->port];
+
+ if (unlikely(next_index != next)) {
+ /* Copy things successfully speculated till now */
+ rte_memcpy(to_next, from, last_spec * sizeof(from[0]));
+ from += last_spec;
+ to_next += last_spec;
+ held += last_spec;
+ last_spec = 0;
+
+ rte_node_enqueu
[PATCH v6 4/4] app/graph: add custom feature nodes for ip4 output arc
- Added cmdline argument "--enable-graph-feature-arc" to call
rte_graph_feature_arc_init() before rte_graph_create() which creates
in-built arcs and feature nodes
- Added custom feature nodes in app/graph which are added to ip4 output
arc.
- Custom features can be enabled/disabled at runtime on any ethdev via
CLI.
graph> help feature
graph> feature enable
graph> feature disable
graph> graph stats show
Signed-off-by: Nitin Saxena
---
app/graph/commands.list | 6 ++
app/graph/feature.c | 141 ++
app/graph/feature.h | 13 +++
app/graph/graph.c | 4 +
app/graph/ip4_output_hook.c | 169
app/graph/main.c| 15 +++-
app/graph/meson.build | 2 +
app/graph/module_api.h | 2 +
8 files changed, 351 insertions(+), 1 deletion(-)
create mode 100644 app/graph/feature.c
create mode 100644 app/graph/feature.h
create mode 100644 app/graph/ip4_output_hook.c
diff --git a/app/graph/commands.list b/app/graph/commands.list
index c027f73b0e..49d81f50ae 100644
--- a/app/graph/commands.list
+++ b/app/graph/commands.list
@@ -31,3 +31,9 @@ help ipv6_lookup #
Print help on ipv6_lo
neigh add ipv4 ip mac # Add static
neighbour for IPv4
neigh add ipv6 ip mac # Add static
neighbour for IPv6
help neigh # Print help on neigh
commands
+
+feature arcs # show all feature
arcs
+feature name show# Show feature arc
details
+feature enable arc_name feature_name interface #
Enable feature on interface
+feature disable arc_name feature_name interface #
Disable feature on interface
+help feature # Print help on
feature command
diff --git a/app/graph/feature.c b/app/graph/feature.c
new file mode 100644
index 00..2cf21b11ce
--- /dev/null
+++ b/app/graph/feature.c
@@ -0,0 +1,141 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "module_api.h"
+
+static const char
+cmd_feature_arcs_help[] = "feature arcs# Display all feature arcs";
+
+static const char
+cmd_feature_show_help[] = "feature show # Display features within
an arc";
+
+static const char
+cmd_feature_enable_help[] = "feature enable
";
+
+static const char
+cmd_feature_disable_help[] = "feature disable
";
+
+static void
+feature_show(const char *arc_name)
+{
+ rte_graph_feature_arc_t _arc;
+ uint32_t length, count, i;
+
+ length = strlen(conn->msg_out);
+ conn->msg_out += length;
+
+ if (rte_graph_feature_arc_lookup_by_name(arc_name, &_arc) < 0)
+ return;
+
+ count = rte_graph_feature_arc_num_features(_arc);
+
+ if (count) {
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s%s%s\n",
+"- feature arc: ",
+rte_graph_feature_arc_get(_arc)->feature_arc_name,
+" -");
+ for (i = 0; i < count; i++)
+ snprintf(conn->msg_out + strlen(conn->msg_out),
+conn->msg_out_len_max, "%s\n",
+rte_graph_feature_arc_feature_to_name(_arc,
i));
+ }
+ length = strlen(conn->msg_out);
+ conn->msg_out_len_max -= length;
+}
+
+static void
+feature_arcs_show(void)
+{
+ uint32_t length, count, i;
+ char **names;
+
+ length = strlen(conn->msg_out);
+ conn->msg_out += length;
+
+ count = rte_graph_feature_arc_names_get(NULL);
+
+ if (count) {
+ names = malloc(count);
+ if (!names) {
+ snprintf(conn->msg_out, conn->msg_out_len_max, "Failed
to allocate memory\n");
+ return;
+ }
+ count = rte_graph_feature_arc_names_get(names);
+ snprintf(conn->msg_out, conn->msg_out_len_max, "\n%s\n",
+"- feature arcs
-");
+ for (i = 0; i < count; i++)
+ feature_show(names[i]);
+ free(names);
+ }
+ length = strlen(conn->msg_out);
+ conn->msg_out_len_max -= length;
+}
+
+void
+cmd_feature_parsed(void *parsed_result, __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_feature_result *res = parsed_result;
+
+ feature_show(res->name);
+}
+
+
+void
+cmd_feature_arcs_parsed(__rte_unused void *parsed_result, __rte_unused struct
cmdline *cl,
+ __rte_unused void *data)
+{
+ feature_a
[PATCH v2] eal: fix unused memseg length
Fix the issue where OS memory is mistakenly freed with rte_free
by setting the length (len) of unused memseg to 0.
When `eal_legacy_hugepage_init()` releases the VA space for
unused memseg lists(MSLs), it does not reset MSLs' length to 0.
As a result, `mlx5_mem_is_rte()` may incorrectly identify OS
memory as rte memory.
This can lead to `mlx_free()` calling `rte_free()` on OS memory,
causing an "EAL: Error: Invalid memory" log and failing to free
the OS memory.
This issue is occasional and occurs when the DPDK program’s
memory map places the heap address range between 0 and len(32G).
In such cases, malloc may return an address less than len,
causing `mlx5_mem_is_rte()` to incorrectly treat it as rte
memory.
Also, consider how the MSL with `base_va == NULL` ends up in
`mlx5_mem_is_rte()`. It comes from `rte_mem_virt2memseg_list()`
which iterates MSLs and checks that an address belongs to
[`base_va`; `base_va+len`) without checking whether
`base_va == NULL` i.e. that the MSL is inactive. So this patch
also corrects `rte_mem_virt2memseg_list()` behavior.
Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
Cc: anatoly.bura...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Yang Ming
Acked-by: Dmitry Kozlyuk
---
lib/eal/linux/eal_memory.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c
index 45879ca743..9dda60c0e1 100644
--- a/lib/eal/linux/eal_memory.c
+++ b/lib/eal/linux/eal_memory.c
@@ -1472,6 +1472,7 @@ eal_legacy_hugepage_init(void)
mem_sz = msl->len;
munmap(msl->base_va, mem_sz);
msl->base_va = NULL;
+ msl->len = 0;
msl->heap = 0;
/* destroy backing fbarray */
--
2.34.1
Re: [PATCH 0/5] add portable version of __builtin_add_overflow
On Thu, Jan 02, 2025 at 04:15:31PM -0800, Andre Muezerie wrote: > On Thu, Jan 02, 2025 at 03:51:55PM -0800, Stephen Hemminger wrote: > > On Thu, 2 Jan 2025 14:32:43 -0800 > > Andre Muezerie wrote: > > > > > __builtin_add_overflow is gcc specific. There's a need for a portable > > > version that can also be used with other compilers. > > > > > > Andre Muezerie (5): > > > maintainers: add portable version of __builtin_add_overflow > > > lib/eal: add portable version of __builtin_add_overflow > > > doc/api: add portable version of __builtin_add_overflow > > > drivers/net: use portable version of __builtin_add_overflow > > > app/test: add tests for portable versions of __builtin_add_overflow > > > > > > MAINTAINERS| 1 + > > > app/test/meson.build | 1 + > > > app/test/test_math.c | 125 + > > > doc/api/doxy-api-index.md | 1 + > > > drivers/net/ice/base/ice_nvm.c | 9 ++- > > > lib/eal/include/meson.build| 1 + > > > lib/eal/include/rte_math.h | 42 +++ > > > 7 files changed, 175 insertions(+), 5 deletions(-) > > > create mode 100644 app/test/test_math.c > > > create mode 100644 lib/eal/include/rte_math.h > > > > > > -- > > > 2.47.0.vfs.0.3 > > > > > > > You should add _builtin_add_overflow into the checkpatch naughty list. > > Or maybe all the _builtin_XXX functions? > > Absolutely! Let me add that for a v2 series. Turns out such check was already added recently (MESSAGE='Using __builtin helpers, prefer EAL macros'), so further changes needed at this point.
Re: [PATCH 0/5] add portable version of __builtin_add_overflow
On Thu, 2 Jan 2025 14:32:43 -0800 Andre Muezerie wrote: > __builtin_add_overflow is gcc specific. There's a need for a portable > version that can also be used with other compilers. > > Andre Muezerie (5): > maintainers: add portable version of __builtin_add_overflow > lib/eal: add portable version of __builtin_add_overflow > doc/api: add portable version of __builtin_add_overflow > drivers/net: use portable version of __builtin_add_overflow > app/test: add tests for portable versions of __builtin_add_overflow > > MAINTAINERS| 1 + > app/test/meson.build | 1 + > app/test/test_math.c | 125 + > doc/api/doxy-api-index.md | 1 + > drivers/net/ice/base/ice_nvm.c | 9 ++- > lib/eal/include/meson.build| 1 + > lib/eal/include/rte_math.h | 42 +++ > 7 files changed, 175 insertions(+), 5 deletions(-) > create mode 100644 app/test/test_math.c > create mode 100644 lib/eal/include/rte_math.h > > -- > 2.47.0.vfs.0.3 > You should add _builtin_add_overflow into the checkpatch naughty list. Or maybe all the _builtin_XXX functions?
[PATCH v10 1/3] lib/eal: add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas
sprinkled over the code and only activate these pragmas for certain
compilers (gcc and clang). Clang supports GCC's pragma for
compatibility with existing source code, so #pragma GCC diagnostic
and #pragma clang diagnostic are synonyms for Clang
(https://clang.llvm.org/docs/UsersManual.html).
Now that effort is being made to make the code compatible with MSVC
these expressions would become more complex. It makes sense to hide
this complexity behind macros. This makes maintenance easier as these
macros are defined in a single place. As a plus the code becomes
more readable as well.
Signed-off-by: Andre Muezerie
---
lib/eal/include/rte_common.h | 23 +++
1 file changed, 23 insertions(+)
diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h
index 4d299f2b36..13b7b92f46 100644
--- a/lib/eal/include/rte_common.h
+++ b/lib/eal/include/rte_common.h
@@ -137,6 +137,29 @@ typedef uint16_t unaligned_uint16_t;
#define RTE_DEPRECATED(x)
#endif
+/*
+ * Macro to ignore whenever a pointer is cast so as to remove a type
+ * qualifier from the target type.
+ */
+#if !defined __INTEL_COMPILER && !defined RTE_TOOLCHAIN_MSVC
+#define __rte_diagnostic_ignored_wcast_qual \
+ _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+#define __rte_diagnostic_ignored_wcast_qual
+#endif
+
+/*
+ * Macros to cause the compiler to remember the state of the diagnostics as of
+ * each push, and restore to that point at each pop.
+ */
+#if !defined __INTEL_COMPILER && !defined RTE_TOOLCHAIN_MSVC
+#define __rte_diagnostic_push _Pragma("GCC diagnostic push")
+#define __rte_diagnostic_pop _Pragma("GCC diagnostic pop")
+#else
+#define __rte_diagnostic_push
+#define __rte_diagnostic_pop
+#endif
+
/**
* Mark a function or variable to a weak reference.
*/
--
2.47.0.vfs.0.3
[PATCH v10 3/3] drivers/net: add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas sprinkled over the code and only activate these pragmas for certain compilers (gcc and clang). Clang supports GCC's pragma for compatibility with existing source code, so #pragma GCC diagnostic and #pragma clang diagnostic are synonyms for Clang (https://clang.llvm.org/docs/UsersManual.html). Now that effort is being made to make the code compatible with MSVC these expressions would become more complex. It makes sense to hide this complexity behind macros. This makes maintenance easier as these macros are defined in a single place. As a plus the code becomes more readable as well. Signed-off-by: Andre Muezerie --- drivers/net/axgbe/axgbe_rxtx.h| 9 -- drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 --- drivers/net/dpaa2/dpaa2_rxtx.c| 16 ++ drivers/net/fm10k/fm10k_rxtx_vec.c| 19 +--- drivers/net/hns3/hns3_rxtx_vec_neon.h | 5 ++-- .../net/i40e/i40e_recycle_mbufs_vec_common.c | 2 -- drivers/net/i40e/i40e_rxtx_common_avx.h | 16 +++--- drivers/net/i40e/i40e_rxtx_vec_altivec.c | 17 +-- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 16 +++--- drivers/net/i40e/i40e_rxtx_vec_avx512.c | 16 +++--- drivers/net/i40e/i40e_rxtx_vec_common.h | 4 --- drivers/net/i40e/i40e_rxtx_vec_neon.c | 18 +-- drivers/net/i40e/i40e_rxtx_vec_sse.c | 22 +++--- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 21 + drivers/net/iavf/iavf_rxtx_vec_avx512.c | 27 + drivers/net/iavf/iavf_rxtx_vec_common.h | 10 --- drivers/net/iavf/iavf_rxtx_vec_neon.c | 9 ++ drivers/net/iavf/iavf_rxtx_vec_sse.c | 30 +++ drivers/net/ice/ice_rxtx_common_avx.h | 16 +++--- drivers/net/ice/ice_rxtx_vec_avx2.c | 16 +++--- drivers/net/ice/ice_rxtx_vec_avx512.c | 16 +++--- drivers/net/ice/ice_rxtx_vec_common.h | 4 --- drivers/net/ice/ice_rxtx_vec_sse.c| 22 +++--- drivers/net/idpf/idpf_rxtx_vec_common.h | 4 --- .../ixgbe/ixgbe_recycle_mbufs_vec_common.c| 2 -- drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 14 +++-- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c| 19 +--- drivers/net/mlx5/mlx5_flow.c | 6 ++-- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 5 drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 15 +- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 26 +++- drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 9 ++ drivers/net/tap/tap_flow.c| 6 ++-- drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 9 ++ drivers/net/virtio/virtio_rxtx_simple.c | 4 --- 35 files changed, 315 insertions(+), 139 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h index a326ba9ac8..f5f74a0a39 100644 --- a/drivers/net/axgbe/axgbe_rxtx.h +++ b/drivers/net/axgbe/axgbe_rxtx.h @@ -6,15 +6,6 @@ #ifndef _AXGBE_RXTX_H_ #define _AXGBE_RXTX_H_ -/* to suppress gcc warnings related to descriptor casting*/ -#ifdef RTE_TOOLCHAIN_GCC -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - -#ifdef RTE_TOOLCHAIN_CLANG -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - /* Descriptor related defines */ #define AXGBE_MAX_RING_DESC4096 /*should be power of 2*/ #define AXGBE_TX_DESC_MIN_FREE (AXGBE_MAX_RING_DESC >> 3) diff --git a/drivers/net/cpfl/cpfl_rxtx_vec_common.h b/drivers/net/cpfl/cpfl_rxtx_vec_common.h index 479e1ddcb9..5b98f86932 100644 --- a/drivers/net/cpfl/cpfl_rxtx_vec_common.h +++ b/drivers/net/cpfl/cpfl_rxtx_vec_common.h @@ -11,10 +11,6 @@ #include "cpfl_ethdev.h" #include "cpfl_rxtx.h" -#ifndef __INTEL_COMPILER -#pragma GCC diagnostic ignored "-Wcast-qual" -#endif - #define CPFL_SCALAR_PATH 0 #define CPFL_VECTOR_PATH 1 #define CPFL_RX_NO_VECTOR_FLAGS ( \ diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index e3b6c7e460..21c306fd94 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -1962,14 +1962,6 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) return num_tx; } -#if defined(RTE_TOOLCHAIN_GCC) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wcast-qual" -#elif defined(RTE_TOOLCHAIN_CLANG) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wcast-qual" -#endif - /* This function loopbacks all the received packets.*/ uint16_t dpaa2_dev_loopback_rx(void *queue, @@ -2083,7 +2075,10 @@ dpaa2_dev_loopback_rx(void *queue, if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) continue; } +__rte_diagnostic_push +__rte_diagnostic_ignored_wcast_qual fd[num_rx] = (stru
[PATCH v10 0/3] add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas sprinkled over the code and only activate these pragmas for certain compilers (gcc and clang). Clang supports GCC's pragma for compatibility with existing source code, so #pragma GCC diagnostic and #pragma clang diagnostic are synonyms for Clang (https://clang.llvm.org/docs/UsersManual.html). Now that effort is being made to make the code compatible with MSVC these expressions would become more complex. It makes sense to hide this complexity behind macros. This makes maintenance easier as these macros are defined in a single place. As a plus the code becomes more readable as well. v10: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v9: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v8: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v7: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v6: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v5: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v4: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v3: * Added __rte_diagnostic_ignored_wcast_qual to a few more places where it was needed. v2: * Removed __rte_diagnostic_ignored_wstrict_aliasing (introduced in v1). * Removed the pragmas from many files where they were not needed. * In the files where the pragmas were indeed needed, reduced the scope during which they are active, reducing the chance that unforeseen issues are hidden due to warning suppression. Andre Muezerie (3): lib/eal: add diagnostics macros to make code portable drivers/common: add diagnostics macros to make code portable drivers/net: add diagnostics macros to make code portable drivers/common/idpf/idpf_common_rxtx_avx512.c | 46 +-- drivers/net/axgbe/axgbe_rxtx.h| 9 drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 -- drivers/net/dpaa2/dpaa2_rxtx.c| 16 ++- drivers/net/fm10k/fm10k_rxtx_vec.c| 19 ++-- drivers/net/hns3/hns3_rxtx_vec_neon.h | 5 +- .../net/i40e/i40e_recycle_mbufs_vec_common.c | 2 - drivers/net/i40e/i40e_rxtx_common_avx.h | 16 +-- drivers/net/i40e/i40e_rxtx_vec_altivec.c | 17 ++- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 16 +-- drivers/net/i40e/i40e_rxtx_vec_avx512.c | 16 +-- drivers/net/i40e/i40e_rxtx_vec_common.h | 4 -- drivers/net/i40e/i40e_rxtx_vec_neon.c | 18 ++-- drivers/net/i40e/i40e_rxtx_vec_sse.c | 22 +++-- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 21 +++-- drivers/net/iavf/iavf_rxtx_vec_avx512.c | 27 +-- drivers/net/iavf/iavf_rxtx_vec_common.h | 10 ++-- drivers/net/iavf/iavf_rxtx_vec_neon.c | 9 drivers/net/iavf/iavf_rxtx_vec_sse.c | 30 ++-- drivers/net/ice/ice_rxtx_common_avx.h | 16 +-- drivers/net/ice/ice_rxtx_vec_avx2.c | 16 +-- drivers/net/ice/ice_rxtx_vec_avx512.c | 16 +-- drivers/net/ice/ice_rxtx_vec_common.h | 4 -- drivers/net/ice/ice_rxtx_vec_sse.c| 22 +++-- drivers/net/idpf/idpf_rxtx_vec_common.h | 4 -- .../ixgbe/ixgbe_recycle_mbufs_vec_common.c| 2 - drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 14 +- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c| 19 ++-- drivers/net/mlx5/mlx5_flow.c | 6 +-- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 5 -- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 15 +++--- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 26 --- drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 9 drivers/net/tap/tap_flow.c| 6 +-- drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 9 drivers/net/virtio/virtio_rxtx_simple.c | 4 -- lib/eal/include/rte_common.h | 23 ++ 37 files changed, 380 insertions(+), 143 deletions(-) -- 2.47.0.vfs.0.3
[PATCH v10 2/3] drivers/common: add diagnostics macros to make code portable
It was a common pattern to have "GCC diagnostic ignored" pragmas
sprinkled over the code and only activate these pragmas for certain
compilers (gcc and clang). Clang supports GCC's pragma for
compatibility with existing source code, so #pragma GCC diagnostic
and #pragma clang diagnostic are synonyms for Clang
(https://clang.llvm.org/docs/UsersManual.html).
Now that effort is being made to make the code compatible with MSVC
these expressions would become more complex. It makes sense to hide
this complexity behind macros. This makes maintenance easier as these
macros are defined in a single place. As a plus the code becomes
more readable as well.
Signed-off-by: Andre Muezerie
---
drivers/common/idpf/idpf_common_rxtx_avx512.c | 46 +--
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c
b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index b8450b03ae..37cd0a43e2 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -6,10 +6,6 @@
#include "idpf_common_device.h"
#include "idpf_common_rxtx.h"
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
#define IDPF_DESCS_PER_LOOP_AVX 8
#define PKTLEN_SHIFT 10
@@ -34,8 +30,11 @@ idpf_singleq_rearm_common(struct idpf_rx_queue *rxq)
dma_addr0 = _mm_setzero_si128();
for (i = 0; i < IDPF_VPMD_DESCS_PER_LOOP; i++) {
rxp[i] = &rxq->fake_mbuf;
+__rte_diagnostic_push
+__rte_diagnostic_ignored_wcast_qual
_mm_store_si128((__m128i *)&rxdp[i].read,
dma_addr0);
+__rte_diagnostic_pop
}
}
rte_atomic_fetch_add_explicit(&rxq->rx_stats.mbuf_alloc_failed,
@@ -108,8 +107,11 @@ idpf_singleq_rearm_common(struct idpf_rx_queue *rxq)
dma_addr4_7 = _mm512_add_epi64(dma_addr4_7, hdr_room);
/* flush desc with pa dma_addr */
+__rte_diagnostic_push
+__rte_diagnostic_ignored_wcast_qual
_mm512_store_si512((__m512i *)&rxdp->read, dma_addr0_3);
_mm512_store_si512((__m512i *)&(rxdp + 4)->read, dma_addr4_7);
+__rte_diagnostic_pop
}
rxq->rxrearm_start += IDPF_RXQ_REARM_THRESH;
@@ -164,8 +166,11 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
dma_addr0 = _mm_setzero_si128();
for (i = 0; i < IDPF_VPMD_DESCS_PER_LOOP; i++) {
rxp[i] = &rxq->fake_mbuf;
+__rte_diagnostic_push
+__rte_diagnostic_ignored_wcast_qual
_mm_storeu_si128((__m128i
*)&rxdp[i].read,
dma_addr0);
+__rte_diagnostic_pop
}
}
rte_atomic_fetch_add_explicit(&rxq->rx_stats.mbuf_alloc_failed,
@@ -216,10 +221,13 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
iovas1);
const __m512i desc6_7 = _mm512_bsrli_epi128(desc4_5, 8);
+__rte_diagnostic_push
+__rte_diagnostic_ignored_wcast_qual
_mm512_storeu_si512((void *)rxdp, desc0_1);
_mm512_storeu_si512((void *)(rxdp + 2), desc2_3);
_mm512_storeu_si512((void *)(rxdp + 4), desc4_5);
_mm512_storeu_si512((void *)(rxdp + 6), desc6_7);
+__rte_diagnostic_pop
rxp += IDPF_DESCS_PER_LOOP_AVX;
rxdp += IDPF_DESCS_PER_LOOP_AVX;
@@ -336,6 +344,8 @@ _idpf_singleq_recv_raw_pkts_avx512(struct idpf_rx_queue
*rxq,
#endif
__m512i raw_desc0_3, raw_desc4_7;
+__rte_diagnostic_push
+__rte_diagnostic_ignored_wcast_qual
const __m128i raw_desc7 =
_mm_load_si128((void *)(rxdp + 7));
rte_compiler_barrier();
@@ -359,6 +369,7 @@ _idpf_singleq_recv_raw_pkts_avx512(struct idpf_rx_queue
*rxq,
rte_compiler_barrier();
const __m128i raw_desc0 =
_mm_load_si128((void *)(rxdp + 0));
+__rte_diagnostic_pop
raw_desc4_7 = _mm512_broadcast_i32x4(raw_desc4);
raw_desc4_7 = _mm512_inserti32x4(raw_desc4_7, raw_desc5, 1);
@@ -560,8 +571,11 @@ idpf_splitq_rearm_common(struct idpf_rx_queue *rx_bufq)
dma_addr0 = _mm_setzero_si128();
for (i = 0; i < IDPF_VPMD_DESCS_PER_LOOP; i++) {
rxp[i] = &rx_bufq->fake_mbuf;
+__rte_diagnostic_push
+__rte_diagnostic_ignored_wcast_qual
_mm_store_si128((__m128i *)&rxdp[i],
dma_addr0);
+__rte_diagnostic_pop
}
}
rte_atomic_fetch_add_explicit(&rx_bufq->rx_stats.mbuf_alloc_
Re: [PATCH 0/5] add portable version of __builtin_add_overflow
On Thu, Jan 02, 2025 at 03:51:55PM -0800, Stephen Hemminger wrote: > On Thu, 2 Jan 2025 14:32:43 -0800 > Andre Muezerie wrote: > > > __builtin_add_overflow is gcc specific. There's a need for a portable > > version that can also be used with other compilers. > > > > Andre Muezerie (5): > > maintainers: add portable version of __builtin_add_overflow > > lib/eal: add portable version of __builtin_add_overflow > > doc/api: add portable version of __builtin_add_overflow > > drivers/net: use portable version of __builtin_add_overflow > > app/test: add tests for portable versions of __builtin_add_overflow > > > > MAINTAINERS| 1 + > > app/test/meson.build | 1 + > > app/test/test_math.c | 125 + > > doc/api/doxy-api-index.md | 1 + > > drivers/net/ice/base/ice_nvm.c | 9 ++- > > lib/eal/include/meson.build| 1 + > > lib/eal/include/rte_math.h | 42 +++ > > 7 files changed, 175 insertions(+), 5 deletions(-) > > create mode 100644 app/test/test_math.c > > create mode 100644 lib/eal/include/rte_math.h > > > > -- > > 2.47.0.vfs.0.3 > > > > You should add _builtin_add_overflow into the checkpatch naughty list. > Or maybe all the _builtin_XXX functions? Absolutely! Let me add that for a v2 series.
Re: [v6,00/15] net/zxdh: updated net zxdh driver
Hi, Maintainer A few days ago, I pushed the v6 version. Is there anything else that needs to be modified? If so, please let me know. Thank you for your time！ > V6: > - Remove unnecessary __rte_packed in the virtqueue structure and others. > - Remove Some blank before or after log message, > and remove some end with period in log message. > > V5: > - Simplify the notify_data part in the zxdh_notify_queue function. > - Replace rte_zmalloc with rte_calloc in the rss_reta_update function. > - Remove unnecessary check in mtu_set function. > > V4: > - resolved ci compile issues. > > V3: > - use rte_zmalloc and rte_calloc to avoid memset. > - remove unnecessary initialization, which first usage will set. > - adjust some function which is always return 0, changed to void > and skip the ASSERTION later. > - resolved some WARNING:MACRO_ARG_UNUSED issues. > - resolved some other issues. > > V2: > - resolve code style and github-robot build issue. > > V1: > - updated net zxdh driver > provided insert/delete/get table code funcs. > provided link/mac/vlan/promiscuous/rss/mtu ops.
[PATCH v2] cryptodev: not close device when secondary exit
The secordary process should not close the crypto device when
it exits because the primary process still manage the device.
There is no reason with occurring error log below when
secordary process exits without any operation on the crypto
device while primary process starts the device.
Case situation:
eal_bus_cleanup has been added in rte_eal_cleanup. But for
secondary process, eal_bus_cleanup will trigger vdev_cleanup
which trigger rte_vdev_driver to remove. Then crypto devices
will execute ipsec_mb_remove to rte_cryptodev_pmd_destroy.
Finially, rte_cryptodev_close will be called by secordary
process exit.
Error logs occur as below when the secordary process exit:
CRYPTODEV: rte_cryptodev_close() line 1453: Device 0 must be
stopped before closing
Function call trace: rte_eal_cleanup->eal_bus_cleanup->
vdev_cleanup->rte_vdev_driver_remove->ipsec_mb_remove->
rte_cryptodev_pmd_destroy->rte_cryptodev_pmd_release_device->
rte_cryptodev_close
Signed-off-by: Yang Ming
---
lib/cryptodev/rte_cryptodev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 85a4b46ac9..ed1021f635 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -1142,7 +1142,7 @@ rte_cryptodev_pmd_release_device(struct rte_cryptodev
*cryptodev)
cryptodev_fp_ops_reset(rte_crypto_fp_ops + dev_id);
/* Close device only if device operations have been set */
- if (cryptodev->dev_ops) {
+ if (cryptodev->dev_ops && (rte_eal_process_type() == RTE_PROC_PRIMARY))
{
ret = rte_cryptodev_close(dev_id);
if (ret < 0)
return ret;
--
2.34.1
[DPDK/ethdev Bug 1609] memif jumbo support broken
https://bugs.dpdk.org/show_bug.cgi?id=1609
Bug ID: 1609
Summary: memif jumbo support broken
Product: DPDK
Version: 23.11
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: normal
Priority: Normal
Component: ethdev
Assignee: dev@dpdk.org
Reporter: bly...@gmail.com
Target Milestone: ---
We just completed our upgrade from DPDK 21.11.2 to 23.11.1. Our testing found a
defect with the current 23.11 code. This can/may impact other releases.
Please review the "dst_off" changes below, which restore jumbo (frames larger
than 2KB) support relative to multiple memif buffer handling. You will also
note we have disabled the new "bulk" functionality as we have not had time to
review it. For now, we have disabled it in preference to using the original
"else" code with these fixes. Similar fixes/logic should be confirmed present
as well in VPP's libmemif solution.
We recommend a new UT be added, which tests randomly sized frames consisting of
1, 2 & 3 memif buffers to validate jumbo frame support.
diff --git a/drivers/net/memif/rte_eth_memif.c
b/drivers/net/memif/rte_eth_memif.c
index 2c2fafadf9..4a3a46c34a 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -357,7 +357,7 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
goto refill;
n_slots = (last_slot - cur_slot) & mask;
- if (likely(mbuf_size >= pmd->cfg.pkt_buffer_size)) {
+ if (0 /*likely(mbuf_size >= pmd->cfg.pkt_buffer_size)*/) {
struct rte_mbuf *mbufs[MAX_PKT_BURST];
next_bulk:
ret = rte_pktmbuf_alloc_bulk(mq->mempool, mbufs,
MAX_PKT_BURST);
@@ -428,12 +428,12 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
mbuf = mbuf_head;
mbuf->port = mq->in_port;
+ dst_off = 0;
next_slot2:
s0 = cur_slot & mask;
d0 = &ring->desc[s0];
src_len = d0->length;
- dst_off = 0;
src_off = 0;
do {
@@ -722,7 +722,7 @@ eth_memif_tx(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
}
uint16_t mbuf_size = rte_pktmbuf_data_room_size(mp) -
RTE_PKTMBUF_HEADROOM;
- if (i == nb_pkts && pmd->cfg.pkt_buffer_size >= mbuf_size) {
+ if ( 0 /*i == nb_pkts && pmd->cfg.pkt_buffer_size >= mbuf_size*/) {
buf_tmp = bufs;
while (n_tx_pkts < nb_pkts && n_free) {
mbuf_head = *bufs++;
@@ -772,6 +772,7 @@ eth_memif_tx(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
dst_off = 0;
dst_len = (type == MEMIF_RING_C2S) ?
pmd->run.pkt_buffer_size : d0->length;
+ d0->flags = 0;
next_in_chain2:
src_off = 0;
--
You are receiving this mail because:
You are the assignee for the bug.
RE: [RFC PATCH] eventdev: adapter API to configure multiple Rx queues
>>
>> This RFC introduces a new API, rte_event_eth_rx_adapter_queues_add(),
>> designed to enhance the flexibility of configuring multiple Rx queues in
>> eventdev Rx adapter.
>>
>> The existing rte_event_eth_rx_adapter_queue_add() API supports adding
>> multiple queues by specifying rx_queue_id = -1, but it lacks the ability to
>> apply
>> specific configurations to each of the added queues.
>>
>
>The application can still use the existing
>rte_event_eth_rx_adapter_queue_add() API
>in a loop with different configurations for different queues.
>
>The proposed API is not enabling new features that cannot be achieved with
>the existing API.
>Adding new APIs without much usefulness causes unnecessary
>complexity/confusion for users.
>
The new API was introduced because the existing API does not support adding
multiple
queues with specific configurations. It serves as a burst variant of the
existing API,
like many other APIs in DPDK.
For better clarity, the API can be renamed to
rte_event_eth_rx_adapter_queue_add_burst() if needed.
In hardware, adding each queue individually incurs significant overheads, such
as
mailbox operations. A burst API helps to amortize this overhead. Since
real-world
applications often call the API with specific queue_ids, the burst API can
provide
considerable benefits. Testing shows a 75% reduction in time when adding
multiple
queues to the RX adapter using the burst API on our platform.
I can modify the old API implementation to act as a wrapper around the burst
API,
with number of queues equal to 1. If concerns remain, we can explore
deprecation
as an alternative.
Thanks,
Shijith
>> The proposed API, rte_event_eth_rx_adapter_queues_add, addresses this
>> limitation by:
>>
>> - Enabling users to specify an array of rx_queue_id values alongside
>> individual configurations for each queue.
>>
>> - Supporting a nb_rx_queues argument to define the number of queues to
>> configure. When set to 0, the API applies a common configuration to
>> all queues, similar to the existing rx_queue_id = -1 behavior.
>>
>> This enhancement allows for more granular control when configuring multiple
>> Rx queues. Additionally, the API can act as a replacement for the older API,
>> offering both flexibility and improved functionality.
>>
>> Signed-off-by: Shijith Thotton
>> ---
>> lib/eventdev/eventdev_pmd.h | 34 +
>> lib/eventdev/rte_event_eth_rx_adapter.h | 34
>> +
>> 2 files changed, 68 insertions(+)
>>
>> diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
>> index 36148f8d86..2e458a9779 100644
>> --- a/lib/eventdev/eventdev_pmd.h
>> +++ b/lib/eventdev/eventdev_pmd.h
>> @@ -25,6 +25,7 @@
>> #include
>>
>> #include "event_timer_adapter_pmd.h"
>> +#include "rte_event_eth_rx_adapter.h"
>> #include "rte_eventdev.h"
>>
>> #ifdef __cplusplus
>> @@ -708,6 +709,37 @@ typedef int
>> (*eventdev_eth_rx_adapter_queue_add_t)(
>> int32_t rx_queue_id,
>> const struct rte_event_eth_rx_adapter_queue_conf
>> *queue_conf);
>>
>> +/**
>> + * Add ethernet Rx queues to event device. This callback is invoked if
>> + * the caps returned from rte_eventdev_eth_rx_adapter_caps_get(,
>> +eth_port_id)
>> + * has RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT set.
>> + *
>> + * @param dev
>> + * Event device pointer
>> + *
>> + * @param eth_dev
>> + * Ethernet device pointer
>> + *
>> + * @param rx_queue_id
>> + * Ethernet device receive queue index array
>> + *
>> + * @param queue_conf
>> + * Additional configuration structure array
>> + *
>> + * @param nb_rx_queues
>> + * Number of ethernet device receive queues
>> + *
>> + * @return
>> + * - 0: Success, ethernet receive queues added successfully.
>> + * - <0: Error code returned by the driver function.
>> + */
>> +typedef int (*eventdev_eth_rx_adapter_queues_add_t)(
>> +const struct rte_eventdev *dev,
>> +const struct rte_eth_dev *eth_dev,
>> +int32_t rx_queue_id[],
>> +const struct rte_event_eth_rx_adapter_queue_conf
>> queue_conf[],
>> +uint16_t nb_rx_queues);
>> +
>> /**
>> * Delete ethernet Rx queues from event device. This callback is invoked if
>> * the caps returned from eventdev_eth_rx_adapter_caps_get(, eth_port_id)
>> @@ -1578,6 +1610,8 @@ struct eventdev_ops {
>> /**< Get ethernet Rx adapter capabilities */
>> eventdev_eth_rx_adapter_queue_add_t eth_rx_adapter_queue_add;
>> /**< Add Rx queues to ethernet Rx adapter */
>> +eventdev_eth_rx_adapter_queues_add_t
>> eth_rx_adapter_queues_add;
>> +/**< Add Rx queues to ethernet Rx adapter */
>> eventdev_eth_rx_adapter_queue_del_t eth_rx_adapter_queue_del;
>> /**< Delete Rx queues from ethernet Rx adapter */
>> eventdev_eth_rx_adapter_queue_conf_get_t
>> eth_rx_adapter_queue_conf_get; diff --git
>> a/lib/eventdev/rte_event_eth_rx_adapter.h
>> b/lib/eventdev/rte_event_eth_rx_a
Yunsilicon Roadmap for 25.03
Hello, We will continue to upstream our PMD into DPDK 25.03. Based on the review comments from previous versions, we have refactored the driver. The new version eliminates the dependency on the rdma core library and proprietary kernel driver, while adding support for the vfio kernel driver. BTW: if I continue to upstream the new version, should the version number continue from the last or start 0? Thanks, WanRenyong
Re: [v6,00/15] net/zxdh: updated net zxdh driver
On Thu, 2 Jan 2025 19:39:50 +0800 Junlong Wang wrote: > From: Junlong Wang > To: step...@networkplumber.org > Cc: dev@dpdk.org > Subject: Re: [v6,00/15] net/zxdh: updated net zxdh driver > Date: Thu, 2 Jan 2025 19:39:50 +0800 > X-Mailer: git-send-email 2.43.0 > > Hi, Maintainer > A few days ago, I pushed the v6 version. Is there anything else that > needs to be modified? If so, please let me know. > Thank you for your time！ It is the holiday period in US and Europe. So review is slower.
