Re: [PATCH v2 01/10] net/ngbe: fix Rx buffer size in configure register
On 2/14/2023 9:55 AM, Ferruh Yigit wrote:
> On 2/14/2023 8:15 AM, Jiawen Wu wrote:
>> On Thursday, February 9, 2023 5:00 PM, Jiawen Wu wrote:
>>> On Wednesday, February 8, 2023 6:28 PM, Ferruh Yigit wrote:
On 2/2/2023 9:21 AM, Jiawen Wu wrote:
> When buffer size is less than 1K, round down makes it 0, which is an
> error value.
>
> Fixes: 62fc35e63d0e ("net/ngbe: support Rx queue start/stop")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Jiawen Wu
> ---
> drivers/net/ngbe/ngbe_rxtx.c | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ngbe/ngbe_rxtx.c
> b/drivers/net/ngbe/ngbe_rxtx.c index 9fd24fa444..9a646cb6a7 100644
> --- a/drivers/net/ngbe/ngbe_rxtx.c
> +++ b/drivers/net/ngbe/ngbe_rxtx.c
> @@ -2944,7 +2944,10 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)
>*/
> buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) -
> RTE_PKTMBUF_HEADROOM);
> - buf_size = ROUND_DOWN(buf_size, 0x1 << 10);
> + if (buf_size < 1024)
> + buf_size = ROUND_UP(buf_size, 0x1 << 10);
Back to original problem statement in previous version, can't this
cause HW to receive packets exceeding the buffer size?
If HW accepts buffer size in multiple of 1K, does this mean any buffer
size less than 1K is an error condition for this HW?
>>>
>>> After rechecking the code, the minimum buffer size is limited to 1K by the
>>> txgbe/ngbe [1].
>>> I think v1 patch for txgbe is enough.
>>>
>>> [1]
>>> static int
>>> txgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info
>>> *dev_info) {
>>> struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
>>> struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
>>>
>>> dev_info->min_rx_bufsize = 1024;
>>>
>>>
> + else
> + buf_size = ROUND_DOWN(buf_size, 0x1 << 10);
> srrctl |= NGBE_RXCFG_PKTLEN(buf_size);
>
> wr32(hw, NGBE_RXCFG(rxq->reg_idx), srrctl);
>>>
>>
>> Hi Ferruh,
>>
>> Is my proposal feasible or do I need to send v3 patch for it?
>>
>>
>
> Sorry Jiawen, I missed your response.
>
> Yes, you are right, 'dev_info->min_rx_bufsize' prevents user to set
> buffer size less than 1K, so change in V1 is good.
>
> There were some other changes too, instead of getting this patch from
> v1, can you please send a new version with latest updates?
We can drop 1/10 and you have sent a v3 for 2/10, right?
[PATCH v3 0/5] remove internal tracepoints from version map
The internal tracepoints of a library are not needed to be exported in
version.map file, as they will not be called from outside the library.
This patch removes the internal tracepoints from version.map for mempool,
cryptodev, eal, ethdev and eventdev library.
v3:
- Updated the trace document in patch (3/5).
- Removed internal trace file from meson.build in ethdev and eventdev
library, in patches (4/5) and (5/5).
- Added acked by from Jerin for series.
v2:
- Removed the internal tracepoint header files from meson.build.
- Updated the trace document in
"eal: remove internal tracepoints from version map"
- Added acked by from Ferruh for
"ethdev: remove internal tracepoints from version map"
Ankur Dwivedi (5):
mempool: remove internal tracepoints from version map
cryptodev: remove internal tracepoints from version map
eal: remove internal tracepoints from version map
ethdev: remove internal tracepoints from version map
eventdev: remove internal tracepoints from version map
doc/guides/prog_guide/trace_lib.rst | 3 +-
...te_cryptodev_trace.h => cryptodev_trace.h} | 6 +-
lib/cryptodev/cryptodev_trace_points.c| 2 +-
lib/cryptodev/meson.build | 1 -
lib/cryptodev/rte_cryptodev.c | 2 +-
lib/cryptodev/version.map | 62 --
lib/eal/common/eal_common_launch.c| 2 +-
lib/eal/common/eal_common_memzone.c | 2 +-
lib/eal/common/eal_common_thread.c| 2 +-
lib/eal/common/eal_common_trace_points.c | 2 +
lib/eal/common/rte_malloc.c | 2 +-
lib/eal/freebsd/eal_alarm.c | 2 +-
lib/eal/freebsd/eal_interrupts.c | 2 +-
lib/eal/include/eal_trace_internal.h | 182 ++
lib/eal/include/rte_eal_trace.h | 158 ---
lib/eal/linux/eal_alarm.c | 2 +-
lib/eal/linux/eal_interrupts.c| 2 +-
lib/eal/version.map | 15 --
lib/eal/windows/eal_alarm.c | 3 +-
lib/ethdev/ethdev_trace.h | 6 +-
lib/ethdev/meson.build| 1 -
lib/ethdev/version.map| 6 -
lib/eventdev/eventdev_trace.h | 6 +-
lib/eventdev/meson.build | 1 -
lib/eventdev/version.map | 30 ---
.../{rte_mempool_trace.h => mempool_trace.h} | 6 +-
lib/mempool/mempool_trace_points.c| 2 +-
lib/mempool/meson.build | 1 -
lib/mempool/rte_mempool.c | 2 +-
lib/mempool/rte_mempool_ops.c | 2 +-
lib/mempool/version.map | 14 --
31 files changed, 212 insertions(+), 317 deletions(-)
rename lib/cryptodev/{rte_cryptodev_trace.h => cryptodev_trace.h} (99%)
create mode 100644 lib/eal/include/eal_trace_internal.h
rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%)
--
2.25.1
[PATCH v3 1/5] mempool: remove internal tracepoints from version map
The file rte_mempool_trace.h contains tracepoints which are internal to the
mempool library. This file is renamed to mempool_trace.h, and is made an
internal header. The tracepoints in this file are removed from the
experimental section in version.map file.
Signed-off-by: Ankur Dwivedi
Acked-by: Jerin Jacob
---
.../{rte_mempool_trace.h => mempool_trace.h} | 6 +++---
lib/mempool/mempool_trace_points.c | 2 +-
lib/mempool/meson.build| 1 -
lib/mempool/rte_mempool.c | 2 +-
lib/mempool/rte_mempool_ops.c | 2 +-
lib/mempool/version.map| 14 --
6 files changed, 6 insertions(+), 21 deletions(-)
rename lib/mempool/{rte_mempool_trace.h => mempool_trace.h} (98%)
diff --git a/lib/mempool/rte_mempool_trace.h b/lib/mempool/mempool_trace.h
similarity index 98%
rename from lib/mempool/rte_mempool_trace.h
rename to lib/mempool/mempool_trace.h
index 087c913c8c..3e663c72e4 100644
--- a/lib/mempool/rte_mempool_trace.h
+++ b/lib/mempool/mempool_trace.h
@@ -2,8 +2,8 @@
* Copyright(C) 2020 Marvell International Ltd.
*/
-#ifndef _RTE_MEMPOOL_TRACE_H_
-#define _RTE_MEMPOOL_TRACE_H_
+#ifndef _MEMPOOL_TRACE_H_
+#define _MEMPOOL_TRACE_H_
/**
* @file
@@ -172,4 +172,4 @@ RTE_TRACE_POINT(
}
#endif
-#endif /* _RTE_MEMPOOL_TRACE_H_ */
+#endif /* _MEMPOOL_TRACE_H_ */
diff --git a/lib/mempool/mempool_trace_points.c
b/lib/mempool/mempool_trace_points.c
index 4ad76deb34..307018094d 100644
--- a/lib/mempool/mempool_trace_points.c
+++ b/lib/mempool/mempool_trace_points.c
@@ -4,7 +4,7 @@
#include
-#include "rte_mempool_trace.h"
+#include "mempool_trace.h"
RTE_TRACE_POINT_REGISTER(rte_mempool_trace_ops_dequeue_bulk,
lib.mempool.ops.deq.bulk)
diff --git a/lib/mempool/meson.build b/lib/mempool/meson.build
index b8aaa00694..8099a56466 100644
--- a/lib/mempool/meson.build
+++ b/lib/mempool/meson.build
@@ -17,7 +17,6 @@ sources = files(
)
headers = files(
'rte_mempool.h',
-'rte_mempool_trace.h',
'rte_mempool_trace_fp.h',
)
deps += ['ring', 'telemetry']
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 45b5df6199..cf5dea2304 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -28,8 +28,8 @@
#include
#include
+#include "mempool_trace.h"
#include "rte_mempool.h"
-#include "rte_mempool_trace.h"
TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
diff --git a/lib/mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
index 3b43edc548..ae1d288f27 100644
--- a/lib/mempool/rte_mempool_ops.c
+++ b/lib/mempool/rte_mempool_ops.c
@@ -11,7 +11,7 @@
#include
#include
-#include "rte_mempool_trace.h"
+#include "mempool_trace.h"
/* indirect jump table to support external memory pools. */
struct rte_mempool_ops_table rte_mempool_ops_table = {
diff --git a/lib/mempool/version.map b/lib/mempool/version.map
index b67d7aace7..dff2d1cb55 100644
--- a/lib/mempool/version.map
+++ b/lib/mempool/version.map
@@ -47,22 +47,8 @@ EXPERIMENTAL {
__rte_mempool_trace_generic_get;
__rte_mempool_trace_get_bulk;
__rte_mempool_trace_get_contig_blocks;
- __rte_mempool_trace_create;
- __rte_mempool_trace_create_empty;
- __rte_mempool_trace_free;
- __rte_mempool_trace_populate_iova;
- __rte_mempool_trace_populate_virt;
- __rte_mempool_trace_populate_default;
- __rte_mempool_trace_populate_anon;
- __rte_mempool_trace_cache_create;
- __rte_mempool_trace_cache_free;
__rte_mempool_trace_default_cache;
- __rte_mempool_trace_get_page_size;
__rte_mempool_trace_cache_flush;
- __rte_mempool_trace_ops_populate;
- __rte_mempool_trace_ops_alloc;
- __rte_mempool_trace_ops_free;
- __rte_mempool_trace_set_ops_byname;
};
INTERNAL {
--
2.25.1
[PATCH v3 2/5] cryptodev: remove internal tracepoints from version map
The file rte_cryptodev_trace.h contains tracepoints which are internal to
the cryptodev library. This file is renamed to cryptodev_trace.h, and is
made an internal header. The tracepoints in this file are removed from the
experimental and internal section in version.map file.
Signed-off-by: Ankur Dwivedi
Acked-by: Jerin Jacob
---
...te_cryptodev_trace.h => cryptodev_trace.h} | 6 +-
lib/cryptodev/cryptodev_trace_points.c| 2 +-
lib/cryptodev/meson.build | 1 -
lib/cryptodev/rte_cryptodev.c | 2 +-
lib/cryptodev/version.map | 62 ---
5 files changed, 5 insertions(+), 68 deletions(-)
rename lib/cryptodev/{rte_cryptodev_trace.h => cryptodev_trace.h} (99%)
diff --git a/lib/cryptodev/rte_cryptodev_trace.h
b/lib/cryptodev/cryptodev_trace.h
similarity index 99%
rename from lib/cryptodev/rte_cryptodev_trace.h
rename to lib/cryptodev/cryptodev_trace.h
index 5e694379b1..637baa31b3 100644
--- a/lib/cryptodev/rte_cryptodev_trace.h
+++ b/lib/cryptodev/cryptodev_trace.h
@@ -2,8 +2,8 @@
* Copyright(C) 2020 Marvell International Ltd.
*/
-#ifndef _RTE_CRYPTODEV_TRACE_H_
-#define _RTE_CRYPTODEV_TRACE_H_
+#ifndef _CRYPTODEV_TRACE_H_
+#define _CRYPTODEV_TRACE_H_
/**
* @file
@@ -530,4 +530,4 @@ RTE_TRACE_POINT(
}
#endif
-#endif /* _RTE_CRYPTODEV_TRACE_H_ */
+#endif /* _CRYPTODEV_TRACE_H_ */
diff --git a/lib/cryptodev/cryptodev_trace_points.c
b/lib/cryptodev/cryptodev_trace_points.c
index 4980bcc9be..e2303fdb52 100644
--- a/lib/cryptodev/cryptodev_trace_points.c
+++ b/lib/cryptodev/cryptodev_trace_points.c
@@ -4,7 +4,7 @@
#include
-#include "rte_cryptodev_trace.h"
+#include "cryptodev_trace.h"
RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_configure,
lib.cryptodev.configure)
diff --git a/lib/cryptodev/meson.build b/lib/cryptodev/meson.build
index 19de3073bb..4734acf321 100644
--- a/lib/cryptodev/meson.build
+++ b/lib/cryptodev/meson.build
@@ -8,7 +8,6 @@ sources = files(
)
headers = files(
'rte_cryptodev.h',
-'rte_cryptodev_trace.h',
'rte_cryptodev_trace_fp.h',
'rte_crypto.h',
'rte_crypto_sym.h',
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index cf06511ae7..a96114b2da 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -29,7 +29,7 @@
#include "rte_crypto.h"
#include "rte_cryptodev.h"
#include "cryptodev_pmd.h"
-#include "rte_cryptodev_trace.h"
+#include "cryptodev_trace.h"
static uint8_t nb_drivers;
diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map
index 91c734dd7b..24ff90799c 100644
--- a/lib/cryptodev/version.map
+++ b/lib/cryptodev/version.map
@@ -64,16 +64,6 @@ EXPERIMENTAL {
rte_crypto_asym_xform_strings;
# added in 20.05
- __rte_cryptodev_trace_configure;
- __rte_cryptodev_trace_start;
- __rte_cryptodev_trace_stop;
- __rte_cryptodev_trace_close;
- __rte_cryptodev_trace_queue_pair_setup;
- __rte_cryptodev_trace_sym_session_pool_create;
- __rte_cryptodev_trace_sym_session_create;
- __rte_cryptodev_trace_asym_session_create;
- __rte_cryptodev_trace_sym_session_free;
- __rte_cryptodev_trace_asym_session_free;
__rte_cryptodev_trace_dequeue_burst;
__rte_cryptodev_trace_enqueue_burst;
@@ -98,59 +88,11 @@ EXPERIMENTAL {
rte_cryptodev_asym_session_get_user_data;
rte_cryptodev_asym_session_pool_create;
rte_cryptodev_asym_session_set_user_data;
- __rte_cryptodev_trace_asym_session_pool_create;
#added in 22.07
rte_cryptodev_session_event_mdata_set;
rte_crypto_asym_ke_strings;
- #added in 22.11
- __rte_cryptodev_trace_add_deq_callback;
- __rte_cryptodev_trace_add_enq_callback;
- __rte_cryptodev_trace_allocate_driver;
- __rte_cryptodev_trace_asym_capability_get;
- __rte_cryptodev_trace_asym_get_private_session_size;
- __rte_cryptodev_trace_asym_get_xform_enum;
- __rte_cryptodev_trace_asym_session_get_user_data;
- __rte_cryptodev_trace_asym_session_set_user_data;
- __rte_cryptodev_trace_asym_xform_capability_check_modlen;
- __rte_cryptodev_trace_asym_xform_capability_check_optype;
- __rte_cryptodev_trace_callback_register;
- __rte_cryptodev_trace_callback_unregister;
- __rte_cryptodev_trace_configure_raw_dp_ctx;
- __rte_cryptodev_trace_device_count_by_driver;
- __rte_cryptodev_trace_devices_get;
- __rte_cryptodev_trace_driver_id_get;
- __rte_cryptodev_trace_driver_name_get;
- __rte_cryptodev_trace_get_aead_algo_enum;
- __rte_cryptodev_trace_get_auth_algo_enum;
- __rte_cryptodev_trace_get_cipher_algo_enum;
- __rte_cryptodev_trace_get_dev_id;
- __rte_cryptodev_trace_get_feature_name;
- __rte_cryptodev_trace_get_qp_status;
- __rte_cryptodev_trace_get_raw_dp_ctx_size;
- __rte_cryptodev_t
[PATCH v3 3/5] eal: remove internal tracepoints from version map
The file rte_eal_trace.h contains some tracepoints which are internal to
the eal library. Those tracepoints are moved to a new file
eal_trace_internal.h. The internal tracepoints are removed from the
version.map file.
Signed-off-by: Ankur Dwivedi
Acked-by: Jerin Jacob
---
doc/guides/prog_guide/trace_lib.rst | 3 +-
lib/eal/common/eal_common_launch.c | 2 +-
lib/eal/common/eal_common_memzone.c | 2 +-
lib/eal/common/eal_common_thread.c | 2 +-
lib/eal/common/eal_common_trace_points.c | 2 +
lib/eal/common/rte_malloc.c | 2 +-
lib/eal/freebsd/eal_alarm.c | 2 +-
lib/eal/freebsd/eal_interrupts.c | 2 +-
lib/eal/include/eal_trace_internal.h | 182 +++
lib/eal/include/rte_eal_trace.h | 158
lib/eal/linux/eal_alarm.c| 2 +-
lib/eal/linux/eal_interrupts.c | 2 +-
lib/eal/version.map | 15 --
lib/eal/windows/eal_alarm.c | 3 +-
14 files changed, 195 insertions(+), 184 deletions(-)
create mode 100644 lib/eal/include/eal_trace_internal.h
diff --git a/doc/guides/prog_guide/trace_lib.rst
b/doc/guides/prog_guide/trace_lib.rst
index 3e0ea5835c..6f19efb3f9 100644
--- a/doc/guides/prog_guide/trace_lib.rst
+++ b/doc/guides/prog_guide/trace_lib.rst
@@ -121,7 +121,8 @@ convention.
.. note::
The ``RTE_TRACE_POINT_REGISTER`` defines the placeholder for the
- ``rte_trace_point_t`` tracepoint object. The user must export a
+ ``rte_trace_point_t`` tracepoint object. For generic tracepoint or for
+ tracepoint used in public header files, the user must export a
``__`` symbol in the library ``.map`` file for this
tracepoint to be used out of the library, in shared builds.
For example, ``__app_trace_string`` will be the exported symbol in the
diff --git a/lib/eal/common/eal_common_launch.c
b/lib/eal/common/eal_common_launch.c
index 487e58c124..050459857a 100644
--- a/lib/eal/common/eal_common_launch.c
+++ b/lib/eal/common/eal_common_launch.c
@@ -4,8 +4,8 @@
#include
+#include
#include
-#include
#include
#include
diff --git a/lib/eal/common/eal_common_memzone.c
b/lib/eal/common/eal_common_memzone.c
index 860fb5fb64..a9cd91ffea 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -8,6 +8,7 @@
#include
#include
+#include
#include
#include
#include
@@ -15,7 +16,6 @@
#include
#include
#include
-#include
#include "malloc_heap.h"
#include "malloc_elem.h"
diff --git a/lib/eal/common/eal_common_thread.c
b/lib/eal/common/eal_common_thread.c
index 7d60eaf1df..edb9d4ead2 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -10,7 +10,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/lib/eal/common/eal_common_trace_points.c
b/lib/eal/common/eal_common_trace_points.c
index 051f89809c..3f5bf5c55c 100644
--- a/lib/eal/common/eal_common_trace_points.c
+++ b/lib/eal/common/eal_common_trace_points.c
@@ -6,6 +6,8 @@
#include
+#include
+
RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_void,
lib.eal.generic.void)
RTE_TRACE_POINT_REGISTER(rte_eal_trace_generic_u64,
diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 48db264449..d39870bf3c 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -16,7 +16,7 @@
#include
#include
-#include
+#include
#include
#include "malloc_elem.h"
diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c
index 1023c32937..177897fbc4 100644
--- a/lib/eal/freebsd/eal_alarm.c
+++ b/lib/eal/freebsd/eal_alarm.c
@@ -11,13 +11,13 @@
#include
#include
+#include
#include
#include
#include
#include
#include
#include
-#include
#include "eal_private.h"
#include "eal_alarm_private.h"
diff --git a/lib/eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c
index 9f720bdc8f..ffcf97ad4c 100644
--- a/lib/eal/freebsd/eal_interrupts.c
+++ b/lib/eal/freebsd/eal_interrupts.c
@@ -8,12 +8,12 @@
#include
#include
+#include
#include
#include
#include
#include
#include
-#include
#include "eal_private.h"
#include "eal_alarm_private.h"
diff --git a/lib/eal/include/eal_trace_internal.h
b/lib/eal/include/eal_trace_internal.h
new file mode 100644
index 00..9d678b3f76
--- /dev/null
+++ b/lib/eal/include/eal_trace_internal.h
@@ -0,0 +1,182 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell International Ltd.
+ */
+
+#ifndef _EAL_TRACE_INTERNAL_H_
+#define _EAL_TRACE_INTERNAL_H_
+
+/**
+ * @file
+ *
+ * API for EAL trace support
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include
+#include
+#include
+
+#include "eal_interrupts.h"
+
+/* Alarm */
+RTE_TRACE_POINT(
+ rte_eal_trace_alarm_set,
+ RTE_TRACE_POINT_ARGS(uint64_t us, rte_eal_alarm_callback cb_fn,
+ void
[PATCH v3 4/5] ethdev: remove internal tracepoints from version map
The internal tracepoints are removed from the version.map file.
Also, removed ethdev_trace.h from meson.build.
Signed-off-by: Ankur Dwivedi
Acked-by: Ferruh Yigit
Acked-by: Jerin Jacob
---
lib/ethdev/ethdev_trace.h | 6 +++---
lib/ethdev/meson.build| 1 -
lib/ethdev/version.map| 6 --
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h
index 9fae22c490..54d9106a65 100644
--- a/lib/ethdev/ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -2,8 +2,8 @@
* Copyright(C) 2023 Marvell International Ltd.
*/
-#ifndef _RTE_ETHDEV_TRACE_H_
-#define _RTE_ETHDEV_TRACE_H_
+#ifndef _ETHDEV_TRACE_H_
+#define _ETHDEV_TRACE_H_
/**
* @file
@@ -2522,4 +2522,4 @@ RTE_TRACE_POINT_FP(
}
#endif
-#endif /* _RTE_ETHDEV_TRACE_H_ */
+#endif /* _ETHDEV_TRACE_H_ */
diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build
index 7835c96601..9e97f05983 100644
--- a/lib/ethdev/meson.build
+++ b/lib/ethdev/meson.build
@@ -40,7 +40,6 @@ indirect_headers += files(
driver_sdk_headers += files(
'ethdev_driver.h',
'ethdev_pci.h',
-'ethdev_trace.h',
'ethdev_vdev.h',
)
diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map
index dbc2bffe64..b5260a8349 100644
--- a/lib/ethdev/version.map
+++ b/lib/ethdev/version.map
@@ -177,12 +177,6 @@ EXPERIMENTAL {
rte_flow_dev_dump;
# added in 20.05
- __rte_ethdev_trace_configure;
- __rte_ethdev_trace_rxq_setup;
- __rte_ethdev_trace_txq_setup;
- __rte_ethdev_trace_start;
- __rte_ethdev_trace_stop;
- __rte_ethdev_trace_close;
__rte_ethdev_trace_rx_burst;
__rte_ethdev_trace_tx_burst;
rte_flow_get_aged_flows;
--
2.25.1
[PATCH v3 5/5] eventdev: remove internal tracepoints from version map
The internal tracepoints are removed from the version.map file.
Also, removed eventdev_trace.h from meson.build.
Signed-off-by: Ankur Dwivedi
Acked-by: Jerin Jacob
---
lib/eventdev/eventdev_trace.h | 6 +++---
lib/eventdev/meson.build | 1 -
lib/eventdev/version.map | 30 --
3 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/lib/eventdev/eventdev_trace.h b/lib/eventdev/eventdev_trace.h
index e1f7b45940..8340ea6dde 100644
--- a/lib/eventdev/eventdev_trace.h
+++ b/lib/eventdev/eventdev_trace.h
@@ -2,8 +2,8 @@
* Copyright(C) 2020 Marvell International Ltd.
*/
-#ifndef _RTE_EVENTDEV_TRACE_H_
-#define _RTE_EVENTDEV_TRACE_H_
+#ifndef _EVENTDEV_TRACE_H_
+#define _EVENTDEV_TRACE_H_
/**
* @file
@@ -786,4 +786,4 @@ RTE_TRACE_POINT(
}
#endif
-#endif /* _RTE_EVENTDEV_TRACE_H_ */
+#endif /* _EVENTDEV_TRACE_H_ */
diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build
index 6b2c381811..6edf98dfa5 100644
--- a/lib/eventdev/meson.build
+++ b/lib/eventdev/meson.build
@@ -39,7 +39,6 @@ driver_sdk_headers += files(
'eventdev_pmd.h',
'eventdev_pmd_pci.h',
'eventdev_pmd_vdev.h',
-'eventdev_trace.h',
'event_timer_adapter_pmd.h',
)
diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index 3add5e3088..9153c09b42 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -127,36 +127,6 @@ EXPERIMENTAL {
INTERNAL {
global:
- __rte_eventdev_trace_close;
- __rte_eventdev_trace_configure;
- __rte_eventdev_trace_crypto_adapter_create;
- __rte_eventdev_trace_crypto_adapter_free;
- __rte_eventdev_trace_crypto_adapter_queue_pair_add;
- __rte_eventdev_trace_crypto_adapter_queue_pair_del;
- __rte_eventdev_trace_crypto_adapter_start;
- __rte_eventdev_trace_crypto_adapter_stop;
- __rte_eventdev_trace_eth_rx_adapter_create;
- __rte_eventdev_trace_eth_rx_adapter_free;
- __rte_eventdev_trace_eth_rx_adapter_queue_add;
- __rte_eventdev_trace_eth_rx_adapter_queue_del;
- __rte_eventdev_trace_eth_rx_adapter_start;
- __rte_eventdev_trace_eth_rx_adapter_stop;
- __rte_eventdev_trace_eth_tx_adapter_create;
- __rte_eventdev_trace_eth_tx_adapter_free;
- __rte_eventdev_trace_eth_tx_adapter_queue_add;
- __rte_eventdev_trace_eth_tx_adapter_queue_del;
- __rte_eventdev_trace_eth_tx_adapter_start;
- __rte_eventdev_trace_eth_tx_adapter_stop;
- __rte_eventdev_trace_port_link;
- __rte_eventdev_trace_port_setup;
- __rte_eventdev_trace_port_unlink;
- __rte_eventdev_trace_queue_setup;
- __rte_eventdev_trace_start;
- __rte_eventdev_trace_stop;
- __rte_eventdev_trace_timer_adapter_create;
- __rte_eventdev_trace_timer_adapter_free;
- __rte_eventdev_trace_timer_adapter_start;
- __rte_eventdev_trace_timer_adapter_stop;
event_dev_fp_ops_reset;
event_dev_fp_ops_set;
event_dev_probing_finish;
--
2.25.1
Re: [PATCH v9 1/3] ethdev: skip congestion management configuration
On 2/15/2023 6:25 AM, Rakesh Kudurumalla wrote:
> Introduce new flow action to skip congestion management configuration
> This feature helps to skip the congestion management processing
> based on per flow or the packet color identified by
> rte_flow meter object. For example, If one Rx queue configured as
> RED congestion and application wants tobypass the RED congestion
> processing for all GREEN color packet can be expressed though
> RTE_FLOW_ACTION_TYPE_SKIP_CMAN flow action
>
> Signed-off-by: Rakesh Kudurumalla
> Acked-by: Ori Kam
> Acked-by: Jerin Jacob
> ---
> v9: Distributed doc updates to relevant patches
>
> doc/guides/nics/features/default.ini | 1 +
> doc/guides/prog_guide/rte_flow.rst | 22 ++
> doc/guides/rel_notes/release_23_03.rst | 6 ++
> lib/ethdev/rte_flow.h | 11 +++
> 4 files changed, 40 insertions(+)
>
> diff --git a/doc/guides/nics/features/default.ini
> b/doc/guides/nics/features/default.ini
> index 510cc6679d..b93f053a2b 100644
> --- a/doc/guides/nics/features/default.ini
> +++ b/doc/guides/nics/features/default.ini
> @@ -198,6 +198,7 @@ set_tag =
> set_tp_dst =
> set_tp_src =
> set_ttl =
> +skip_cman=
> vf =
> vxlan_decap =
> vxlan_encap =
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index 3e6242803d..4efadcc87b 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1840,6 +1840,28 @@ Drop packets.
> | no properties |
> +---+
>
> +
> +Action: ``SKIP_CMAN``
> +^
> +
> +Skip congestion management on received packets
> +
> +- Using ``rte_eth_cman_config_set()``, application can configure ethdev Rx
> + queue's congestion mechanism.Once applied packets congestion configuration
> + is bypassed on that particular ethdev Rx queue for all packets directed
> + to that receive queue
> +
> +.. _table_rte_flow_action_skip_cman:
> +
> +.. table:: SKIP_CMAN
> +
> + +---+
> + | Field |
> + +===+
> + | no properties |
> + +---+
> +
> +
> Action: ``COUNT``
> ^
>
> diff --git a/doc/guides/rel_notes/release_23_03.rst
> b/doc/guides/rel_notes/release_23_03.rst
> index bf90feba68..1dd10e26db 100644
> --- a/doc/guides/rel_notes/release_23_03.rst
> +++ b/doc/guides/rel_notes/release_23_03.rst
> @@ -60,6 +60,12 @@ New Features
>Added lock annotations attributes so that clang can statically analyze lock
>correctness.
>
> +* **Added support to skip congestion management configuration.**
> +
> + Added a new action ``RTE_FLOW_ACTION_TYPE_SKIP_CMAN`` to skip
> + congestion management processing based on per flow or packet color
> + identified by rte_flow meter object
> +
Can you please rebase on next-net [1], there you will see other flow API
entries?
[1]
https://dpdk.org/git/next/dpdk-next-net
> * **Updated AMD axgbe driver.**
>
>* Added multi-process support.
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> index b60987db4b..6ab632df9d 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -2736,6 +2736,17 @@ enum rte_flow_action_type {
>* No associated configuration structure.
>*/
> RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL,
> +
> + /**
> + * Skip congestion management configuration
> + *
> + * Using rte_eth_cman_config_set() API the application
> + * can configure ethdev Rx queue's congestion mechanism.
> + * Introducing RTE_FLOW_ACTION_TYPE_SKIP_CMAN flow action to skip the
> + * congestion configuration applied to the given ethdev Rx queue.
> + *
> + */
> + RTE_FLOW_ACTION_TYPE_SKIP_CMAN,
> };
>
> /**
Re: [PATCH v9 3/3] net/cnxk: skip red drop for ingress policer
On 2/15/2023 6:25 AM, Rakesh Kudurumalla wrote:
> Dropping of packets is based on action configured
> to meter.If both skip_red and drop actions are configured
> then tail dropping in invoked else if only drop action is
> configured then RED drop is invoked.This action is supported
> only when RED is configured using rte_eth_cman_config_set()
>
> Signed-off-by: Rakesh Kudurumalla
Ack from driver maintainers required to proceed.
> ---
> doc/guides/nics/features/cnxk.ini | 1 +
> doc/guides/nics/features/cnxk_vf.ini | 1 +
> doc/guides/rel_notes/release_23_03.rst | 4 +++
> drivers/net/cnxk/cnxk_ethdev.h | 1 +
> drivers/net/cnxk/cnxk_ethdev_mtr.c | 50 ++
> 5 files changed, 57 insertions(+)
>
> diff --git a/doc/guides/nics/features/cnxk.ini
> b/doc/guides/nics/features/cnxk.ini
> index f81628da77..7947c044bb 100644
> --- a/doc/guides/nics/features/cnxk.ini
> +++ b/doc/guides/nics/features/cnxk.ini
> @@ -94,4 +94,5 @@ queue= Y
> represented_port = Y
> rss = Y
> security = Y
> +skip_cman= Y
> vf = Y
> diff --git a/doc/guides/nics/features/cnxk_vf.ini
> b/doc/guides/nics/features/cnxk_vf.ini
> index c4ee32a9ad..873e1dcc0a 100644
> --- a/doc/guides/nics/features/cnxk_vf.ini
> +++ b/doc/guides/nics/features/cnxk_vf.ini
> @@ -83,4 +83,5 @@ pf = Y
> queue= Y
> rss = Y
> security = Y
> +skip_cman= Y
> vf = Y
> diff --git a/doc/guides/rel_notes/release_23_03.rst
> b/doc/guides/rel_notes/release_23_03.rst
> index 1dd10e26db..9f53ded5fb 100644
> --- a/doc/guides/rel_notes/release_23_03.rst
> +++ b/doc/guides/rel_notes/release_23_03.rst
> @@ -98,6 +98,10 @@ New Features
> ``rte_event_dev_config::nb_single_link_event_port_queues`` parameter
> required for eth_rx, eth_tx, crypto and timer eventdev adapters.
>
> +* **Updated Marvell cnxk ethdev PMD.**
> +
> + Added support to skip RED using new action
> + ``RTE_FLOW_ACTION_TYPE_SKIP_CMAN``
>
Can you please move this entry alphabetically ordered by vendor to the
block where has ethdev drivers, a little above in this section.
> Removed Items
> -
> diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
> index f0eab4244c..ba35873124 100644
> --- a/drivers/net/cnxk/cnxk_ethdev.h
> +++ b/drivers/net/cnxk/cnxk_ethdev.h
> @@ -168,6 +168,7 @@ struct policy_actions {
> uint16_t queue;
> uint32_t mtr_id;
> struct action_rss *rss_desc;
> + bool skip_red;
> };
> };
>
> diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c
> b/drivers/net/cnxk/cnxk_ethdev_mtr.c
> index dcfa4223d5..27a6e4ef3d 100644
> --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c
> +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c
> @@ -358,6 +358,9 @@ cnxk_nix_mtr_policy_validate(struct rte_eth_dev *dev,
> if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
> supported[i] = true;
>
> + if (action->type ==
> RTE_FLOW_ACTION_TYPE_SKIP_CMAN)
> + supported[i] = true;
> +
> if (!supported[i])
> return update_mtr_err(i, error, true);
> }
> @@ -397,6 +400,10 @@ cnxk_fill_policy_actions(struct cnxk_mtr_policy_node
> *fmp,
> fmp->actions[i].action_fate =
> action->type;
> }
> +
> + if (action->type ==
> + RTE_FLOW_ACTION_TYPE_SKIP_CMAN)
> + fmp->actions[i].skip_red = true;
> }
> }
> }
> @@ -1306,6 +1313,45 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct
> roc_nix_bpf_cfg *cfg)
> cfg->action[ROC_NIX_BPF_COLOR_RED] = ROC_NIX_BPF_ACTION_DROP;
> }
>
> +static void
> +nix_mtr_config_red(struct cnxk_meter_node *mtr, struct roc_nix_rq *rq,
> +struct roc_nix_bpf_cfg *cfg)
> +{
> + struct cnxk_mtr_policy_node *policy = mtr->policy;
> +
> + if ((rq->red_pass && rq->red_pass >= rq->red_drop) ||
> +(rq->spb_red_pass && rq->spb_red_pass >= rq->spb_red_drop) ||
> +(rq->xqe_red_pass && rq->xqe_red_pass >= rq->xqe_red_drop)) {
> + if (policy->actions[RTE_COLOR_GREEN].action_fate ==
> + RTE_FLOW_ACTION_TYPE_DROP) {
> + if (policy->actions[RTE_COLOR_GREEN].skip_red)
> + cfg->action[ROC_NIX_BPF_COLOR_GREEN] =
> + ROC_NIX_BPF_ACTION_DROP;
> + else
> + cfg->action[ROC_NIX_BPF_COLOR_GREEN] =
> +
RE: [PATCH v9 3/3] net/cnxk: skip red drop for ingress policer
Acked-by: Nithin Dabilpuram
> -Original Message-
> From: Rakesh Kudurumalla
> Sent: Wednesday, February 15, 2023 11:56 AM
> To: Nithin Kumar Dabilpuram ; Kiran Kumar
> Kokkilagadda
> ; Sunil Kumar Kori ; Satha
> Koteswara Rao
> Kottidi
> Cc: Jerin Jacob Kollanukkaran ; dev@dpdk.org; Rakesh
> Kudurumalla
>
> Subject: [PATCH v9 3/3] net/cnxk: skip red drop for ingress policer
>
> Dropping of packets is based on action configured
> to meter.If both skip_red and drop actions are configured
> then tail dropping in invoked else if only drop action is
> configured then RED drop is invoked.This action is supported
> only when RED is configured using rte_eth_cman_config_set()
>
> Signed-off-by: Rakesh Kudurumalla
> ---
> doc/guides/nics/features/cnxk.ini | 1 +
> doc/guides/nics/features/cnxk_vf.ini | 1 +
> doc/guides/rel_notes/release_23_03.rst | 4 +++
> drivers/net/cnxk/cnxk_ethdev.h | 1 +
> drivers/net/cnxk/cnxk_ethdev_mtr.c | 50 ++
> 5 files changed, 57 insertions(+)
>
> diff --git a/doc/guides/nics/features/cnxk.ini
> b/doc/guides/nics/features/cnxk.ini
> index f81628da77..7947c044bb 100644
> --- a/doc/guides/nics/features/cnxk.ini
> +++ b/doc/guides/nics/features/cnxk.ini
> @@ -94,4 +94,5 @@ queue= Y
> represented_port = Y
> rss = Y
> security = Y
> +skip_cman= Y
> vf = Y
> diff --git a/doc/guides/nics/features/cnxk_vf.ini
> b/doc/guides/nics/features/cnxk_vf.ini
> index c4ee32a9ad..873e1dcc0a 100644
> --- a/doc/guides/nics/features/cnxk_vf.ini
> +++ b/doc/guides/nics/features/cnxk_vf.ini
> @@ -83,4 +83,5 @@ pf = Y
> queue= Y
> rss = Y
> security = Y
> +skip_cman= Y
> vf = Y
> diff --git a/doc/guides/rel_notes/release_23_03.rst
> b/doc/guides/rel_notes/release_23_03.rst
> index 1dd10e26db..9f53ded5fb 100644
> --- a/doc/guides/rel_notes/release_23_03.rst
> +++ b/doc/guides/rel_notes/release_23_03.rst
> @@ -98,6 +98,10 @@ New Features
> ``rte_event_dev_config::nb_single_link_event_port_queues`` parameter
> required for eth_rx, eth_tx, crypto and timer eventdev adapters.
>
> +* **Updated Marvell cnxk ethdev PMD.**
> +
> + Added support to skip RED using new action
> + ``RTE_FLOW_ACTION_TYPE_SKIP_CMAN``
>
> Removed Items
> -
> diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
> index f0eab4244c..ba35873124 100644
> --- a/drivers/net/cnxk/cnxk_ethdev.h
> +++ b/drivers/net/cnxk/cnxk_ethdev.h
> @@ -168,6 +168,7 @@ struct policy_actions {
> uint16_t queue;
> uint32_t mtr_id;
> struct action_rss *rss_desc;
> + bool skip_red;
> };
> };
>
> diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c
> b/drivers/net/cnxk/cnxk_ethdev_mtr.c
> index dcfa4223d5..27a6e4ef3d 100644
> --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c
> +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c
> @@ -358,6 +358,9 @@ cnxk_nix_mtr_policy_validate(struct rte_eth_dev *dev,
> if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
> supported[i] = true;
>
> + if (action->type ==
> RTE_FLOW_ACTION_TYPE_SKIP_CMAN)
> + supported[i] = true;
> +
> if (!supported[i])
> return update_mtr_err(i, error, true);
> }
> @@ -397,6 +400,10 @@ cnxk_fill_policy_actions(struct cnxk_mtr_policy_node
> *fmp,
> fmp->actions[i].action_fate =
> action->type;
> }
> +
> + if (action->type ==
> + RTE_FLOW_ACTION_TYPE_SKIP_CMAN)
> + fmp->actions[i].skip_red = true;
> }
> }
> }
> @@ -1306,6 +1313,45 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct
> roc_nix_bpf_cfg *cfg)
> cfg->action[ROC_NIX_BPF_COLOR_RED] = ROC_NIX_BPF_ACTION_DROP;
> }
>
> +static void
> +nix_mtr_config_red(struct cnxk_meter_node *mtr, struct roc_nix_rq *rq,
> +struct roc_nix_bpf_cfg *cfg)
> +{
> + struct cnxk_mtr_policy_node *policy = mtr->policy;
> +
> + if ((rq->red_pass && rq->red_pass >= rq->red_drop) ||
> +(rq->spb_red_pass && rq->spb_red_pass >= rq->spb_red_drop) ||
> +(rq->xqe_red_pass && rq->xqe_red_pass >= rq->xqe_red_drop)) {
> + if (policy->actions[RTE_COLOR_GREEN].action_fate ==
> + RTE_FLOW_ACTION_TYPE_DROP) {
> + if (policy->actions[RTE_COLOR_GREEN].skip_red)
> + cfg->action[ROC_NIX_BPF_COLOR_GREEN] =
> +
Re: [PATCH] net/sfc: enforce fate action in transfer flow rules
On 2/14/2023 1:40 PM, Andrew Rybchenko wrote:
> On 2/14/23 16:12, Ivan Malov wrote:
>> According to DPDK documentation, not specifying a
>> fate action in a flow rule results in undefined
>> behaviour. Define right behaviour in the driver.
>>
>> Fixes: 0839236d0391 ("net/sfc: support flow action drop in transfer
>> rules")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Ivan Malov
>> Reviewed-by: Viacheslav Galaktionov
>>
>> Reviewed-by: Andy Moreton
>
> Acked-by: Andrew Rybchenko
>
>
Applied to dpdk-next-net/main, thanks.
RE: [PATCH v2 01/10] net/ngbe: fix Rx buffer size in configure register
On Wednesday, February 15, 2023 5:36 PM, Ferruh Yigit wrote:
> On 2/14/2023 9:55 AM, Ferruh Yigit wrote:
> > On 2/14/2023 8:15 AM, Jiawen Wu wrote:
> >> On Thursday, February 9, 2023 5:00 PM, Jiawen Wu wrote:
> >>> On Wednesday, February 8, 2023 6:28 PM, Ferruh Yigit wrote:
> On 2/2/2023 9:21 AM, Jiawen Wu wrote:
> > When buffer size is less than 1K, round down makes it 0, which is
> > an error value.
> >
> > Fixes: 62fc35e63d0e ("net/ngbe: support Rx queue start/stop")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Jiawen Wu
> > ---
> > drivers/net/ngbe/ngbe_rxtx.c | 5 -
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ngbe/ngbe_rxtx.c
> > b/drivers/net/ngbe/ngbe_rxtx.c index 9fd24fa444..9a646cb6a7 100644
> > --- a/drivers/net/ngbe/ngbe_rxtx.c
> > +++ b/drivers/net/ngbe/ngbe_rxtx.c
> > @@ -2944,7 +2944,10 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)
> > */
> > buf_size =
> > (uint16_t)(rte_pktmbuf_data_room_size(rxq->mb_pool) -
> > RTE_PKTMBUF_HEADROOM);
> > - buf_size = ROUND_DOWN(buf_size, 0x1 << 10);
> > + if (buf_size < 1024)
> > + buf_size = ROUND_UP(buf_size, 0x1 << 10);
>
> Back to original problem statement in previous version, can't this
> cause HW to receive packets exceeding the buffer size?
>
> If HW accepts buffer size in multiple of 1K, does this mean any
> buffer size less than 1K is an error condition for this HW?
>
> >>>
> >>> After rechecking the code, the minimum buffer size is limited to 1K
> >>> by the txgbe/ngbe [1].
> >>> I think v1 patch for txgbe is enough.
> >>>
> >>> [1]
> >>> static int
> >>> txgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info
> >>> *dev_info) {
> >>> struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
> >>> struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
> >>>
> >>> dev_info->min_rx_bufsize = 1024;
> >>>
> >>>
> > + else
> > + buf_size = ROUND_DOWN(buf_size, 0x1 << 10);
> > srrctl |= NGBE_RXCFG_PKTLEN(buf_size);
> >
> > wr32(hw, NGBE_RXCFG(rxq->reg_idx), srrctl);
>
>
> >>>
> >>
> >> Hi Ferruh,
> >>
> >> Is my proposal feasible or do I need to send v3 patch for it?
> >>
> >>
> >
> > Sorry Jiawen, I missed your response.
> >
> > Yes, you are right, 'dev_info->min_rx_bufsize' prevents user to set
> > buffer size less than 1K, so change in V1 is good.
> >
> > There were some other changes too, instead of getting this patch from
> > v1, can you please send a new version with latest updates?
>
> We can drop 1/10 and you have sent a v3 for 2/10, right?
>
>
Yes.
Re: [PATCH] malloc: fix malloc performance may becomes worse as the number of malloc increases
Looking for reviewers please.
10/02/2023 07:30, Fengnan Chang:
> Here is a simple test case:
> "
> uint64_t entry_time, time;
> size_t size = 4096;
> unsigned align = 4096;
> for (int j = 0; j < 10; j++) {
> entry_time = rte_get_timer_cycles();
> for (int i = 0; i < 2000; i++) {
> rte_malloc(NULL, size, align);
> }
> time = (rte_get_timer_cycles()-entry_time) * 100 /
> rte_get_timer_hz();
> printf("total open time %lu avg time %lu\n", time, time/2000);
> }
> "
>
> Single rte_malloc cost time may becomes wrose as the number of malloc
> increases, In my env, first round avg time is 15us, second is 44us,
> third is 77us, fourth is 168us...
>
> The reason is,in the malloc process, malloc_elem_alloc may split new_elem
> if there have too much free space after new_elem, and insert the trailer
> into freelist. When alloc 4k with align 4k, the trailer very likely insert
> to free_head[2] again, it makes free_head[2] longer. when alloc 4k again,
> it will search free_head[2] from begin, with the number of malloc increases,
> search free_head[2] need more time, so the performance will become worse.
> Same problem will also occurs in alloc 64k with align 64k, but if alloc
> 4k with align 64, doesn't have this problem.
>
> Fix this by adjust free_head list size range, make free_head[3] hold
> elements which bigger or equal 4k, free_head[4] hold elements which bigger
> or equal 16k.
> In terms of probabilities, when alloc 4k or 16k, the probability of finding
> a suitable elem from a larger size list is greater than from a smaller
> size list.
>
> Signed-off-by: Fengnan Chang
> ---
> lib/eal/common/malloc_elem.c | 14 +++---
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/lib/eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
> index 83f05497cc..35a2313d04 100644
> --- a/lib/eal/common/malloc_elem.c
> +++ b/lib/eal/common/malloc_elem.c
> @@ -367,11 +367,11 @@ prev_elem_is_adjacent(struct malloc_elem *elem)
> * containing larger elements.
> *
> * Example element size ranges for a heap with five free lists:
> - * heap->free_head[0] - (0 , 2^8]
> - * heap->free_head[1] - (2^8 , 2^10]
> - * heap->free_head[2] - (2^10 ,2^12]
> - * heap->free_head[3] - (2^12, 2^14]
> - * heap->free_head[4] - (2^14, MAX_SIZE]
> + * heap->free_head[0] - (0 , 2^8)
> + * heap->free_head[1] - [2^8 , 2^10)
> + * heap->free_head[2] - [2^10 ,2^12)
> + * heap->free_head[3] - [2^12, 2^14)
> + * heap->free_head[4] - [2^14, MAX_SIZE]
> */
> size_t
> malloc_elem_free_list_index(size_t size)
> @@ -385,8 +385,8 @@ malloc_elem_free_list_index(size_t size)
> if (size <= (1UL << MALLOC_MINSIZE_LOG2))
> return 0;
>
> - /* Find next power of 2 >= size. */
> - log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
> + /* Find next power of 2 > size. */
> + log2 = sizeof(size) * 8 - __builtin_clzl(size);
>
> /* Compute freelist index, based on log2(size). */
> index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1) /
>
[PATCH 3/3] net/gve: add standard and extended statistics
TX side statistics is updated Signed-off-by: Levend Sayar --- drivers/net/gve/gve_tx.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c index d4e52e3ea5..5c8a3b4379 100644 --- a/drivers/net/gve/gve_tx.c +++ b/drivers/net/gve/gve_tx.c @@ -364,11 +364,11 @@ gve_tx_burst_qpl(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) rte_write32(rte_cpu_to_be_32(tx_tail), txq->qtx_tail); txq->tx_tail = tx_tail; txq->sw_tail = sw_id; - } - /* update stats */ - txq->packets += nb_tx; - txq->bytes += total_len; + /* update stats */ + txq->packets += nb_tx; + txq->bytes += total_len; + } return nb_tx; } -- 2.37.1 (Apple Git-137.1)
RE: [PATCH v3 0/5] add IPv6 routing extension implementation
Hi, > -Original Message- > From: Rongwei Liu > Sent: Tuesday, February 14, 2023 2:57 PM > To: dev@dpdk.org; Matan Azrad ; Slava Ovsiienko > ; Ori Kam ; NBU-Contact- > Thomas Monjalon (EXTERNAL) > Cc: Raslan Darawsheh > Subject: [PATCH v3 0/5] add IPv6 routing extension implementation > > Add IPv6 routing extension matching and IPv6 protocol modify filed support. > > This patch relies on the preceding ethdev one: > http://patches.dpdk.org/project/dpdk/patch/20230202100021.2445976-2- > rongw...@nvidia.com/ > > Including one commit from Gregory to pass the compilation. > > v3: add more sentences into mlx5.rst. > > Gregory Etelson (1): > net/mlx5/hws: Definer, add mlx5dr context to definer_conv_data > > Rongwei Liu (4): > net/mlx5: adopt IPv6 routing extension prm definition > net/mlx5/hws: add IPv6 routing extension matching support > net/mlx5/hws: add modify IPv6 protocol implementation > doc/mlx5: add IPv6 routing extension matching docs > > doc/guides/nics/features/default.ini | 1 + > doc/guides/nics/features/mlx5.ini | 1 + > doc/guides/nics/mlx5.rst | 10 ++ > drivers/common/mlx5/mlx5_devx_cmds.c | 17 +++- > drivers/common/mlx5/mlx5_devx_cmds.h | 7 +- > drivers/common/mlx5/mlx5_prm.h| 29 +- > drivers/net/mlx5/hws/mlx5dr_definer.c | 132 ++- > --- drivers/net/mlx5/hws/mlx5dr_definer.h | 15 +++ > drivers/net/mlx5/mlx5.c | 103 +++- > drivers/net/mlx5/mlx5.h | 19 +++- > drivers/net/mlx5/mlx5_flow.h | 28 ++ > drivers/net/mlx5/mlx5_flow_dv.c | 10 ++ > drivers/net/mlx5/mlx5_flow_flex.c | 14 ++- > drivers/net/mlx5/mlx5_flow_hw.c | 29 +- > 14 files changed, 376 insertions(+), 39 deletions(-) > > -- > 2.27.0 Series applied to next-net-mlx, Kindest regards, Raslan Darawsheh
Re: [PATCH v3] net/txgbe: fix Rx buffer size in configure register
On 2/15/2023 2:00 AM, Jiawen Wu wrote:
> When round up buffer size to 1K, to configure the register, hardware will
> receive packets exceeding the buffer size in LRO mode. It will cause a
> segment fault in the receive function.
>
> Fixes: be797cbf4582 ("net/txgbe: add Rx and Tx init")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Jiawen Wu
Applied to dpdk-next-net/main, thanks.
[PATCH 1/2] drivers: replace printf with log macros
This patch replaces the printf with related log macros and functions at
various places in NXP dpaaX drivers.
Signed-off-by: Hemant Agrawal
---
drivers/bus/dpaa/base/fman/fman.c | 8 +++
drivers/bus/dpaa/base/qbman/process.c | 29 +-
drivers/bus/dpaa/base/qbman/qman.c | 2 +-
drivers/bus/fslmc/fslmc_vfio.c | 2 +-
drivers/bus/fslmc/qbman/qbman_portal.c | 2 +-
drivers/crypto/caam_jr/caam_jr.c | 2 +-
drivers/crypto/caam_jr/caam_jr_uio.c | 2 +-
drivers/net/dpaa/dpaa_ethdev.c | 6 +++---
drivers/net/dpaa/dpaa_flow.c | 8 +++
drivers/net/dpaa/dpaa_rxtx.c | 2 +-
drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-
drivers/net/dpaa2/dpaa2_tm.c | 10 -
12 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/fman.c
b/drivers/bus/dpaa/base/fman/fman.c
index 1814372a40..2fc1e64f36 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -425,7 +425,7 @@ fman_if_init(const struct device_node *dpa_node)
char_prop = of_get_property(mac_node, "phy-connection-type",
NULL);
if (!char_prop) {
- printf("memac: unknown MII type assuming 1G\n");
+ FMAN_ERR(-EINVAL, "memac: unknown MII type assuming
1G\n");
/* Right now forcing memac to 1g in case of error*/
__if->__if.mac_type = fman_mac_1g;
} else {
@@ -723,10 +723,8 @@ fman_finish(void)
/* release the mapping */
_errno = munmap(__if->ccsr_map, __if->regs_size);
if (unlikely(_errno < 0))
- fprintf(stderr, "%s:%d:%s(): munmap() = %d (%s)\n",
- __FILE__, __LINE__, __func__,
- -errno, strerror(errno));
- printf("Tearing down %s\n", __if->node_path);
+ FMAN_ERR(_errno, "munmap() = (%s)\n", strerror(errno));
+ DPAA_BUS_INFO("Tearing down %s\n", __if->node_path);
list_del(&__if->__if.node);
rte_free(__if);
}
diff --git a/drivers/bus/dpaa/base/qbman/process.c
b/drivers/bus/dpaa/base/qbman/process.c
index 3504ec97db..af1e459641 100644
--- a/drivers/bus/dpaa/base/qbman/process.c
+++ b/drivers/bus/dpaa/base/qbman/process.c
@@ -13,6 +13,7 @@
#include "process.h"
#include
+#include "rte_dpaa_logs.h"
/* As higher-level drivers will be built on top of this (dma_mem, qbman, ...),
* it's preferable that the process driver itself not provide any exported API.
@@ -99,12 +100,12 @@ void process_release(enum dpaa_id_type id_type, uint32_t
base, uint32_t num)
int ret = check_fd();
if (ret) {
- fprintf(stderr, "Process FD failure\n");
+ DPAA_BUS_ERR("Process FD failure\n");
return;
}
ret = ioctl(fd, DPAA_IOCTL_ID_RELEASE, &id);
if (ret)
- fprintf(stderr, "Process FD ioctl failure type %d base 0x%x num
%d\n",
+ DPAA_BUS_ERR("Process FD ioctl failure type %d base 0x%x num
%d\n",
id_type, base, num);
}
@@ -333,9 +334,9 @@ int dpaa_intr_disable(char *if_name)
ret = ioctl(fd, DPAA_IOCTL_DISABLE_LINK_STATUS_INTERRUPT, if_name);
if (ret) {
if (errno == EINVAL)
- printf("Failed to disable interrupt: Not Supported\n");
+ DPAA_BUS_ERR("Failed to disable interrupt: Not
Supported\n");
else
- printf("Failed to disable interrupt\n");
+ DPAA_BUS_ERR("Failed to disable interrupt\n");
return ret;
}
@@ -357,7 +358,7 @@ int dpaa_get_ioctl_version_number(void)
if (errno == EINVAL) {
version_num = 1;
} else {
- printf("Failed to get ioctl version number\n");
+ DPAA_BUS_ERR("Failed to get ioctl version number\n");
version_num = -1;
}
}
@@ -388,7 +389,7 @@ int dpaa_get_link_status(char *if_name, struct rte_eth_link
*link)
ret = ioctl(fd, DPAA_IOCTL_GET_LINK_STATUS, &args);
if (ret) {
- printf("Failed to get link status\n");
+ DPAA_BUS_ERR("Failed to get link status\n");
return ret;
}
@@ -404,9 +405,9 @@ int dpaa_get_link_status(char *if_name, struct rte_eth_link
*link)
ret = ioctl(fd, DPAA_IOCTL_GET_LINK_STATUS_OLD, &args);
if (ret) {
if (errno == EINVAL)
- printf("Get link status: Not Supported\n");
+ DPAA_BUS_ERR("Get link status: Not
Supported\n")
[PATCH 2/2] drivers: replace printf with fprintf for debug functions
This patch replaces simple printf with fprintf for debug dump
related functions for various NXP dpaaX related drivers.
Signed-off-by: Hemant Agrawal
---
drivers/bus/dpaa/base/fman/netcfg_layer.c | 20
drivers/crypto/caam_jr/caam_jr.c| 4 +-
drivers/crypto/caam_jr/caam_jr_desc.h | 2 +-
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 20
drivers/crypto/dpaa_sec/dpaa_sec.c | 52 ++---
drivers/net/dpaa2/dpaa2_flow.c | 40
6 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c
b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 6a405c984d..69cee08fb9 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -33,33 +33,33 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
{
int i;
- printf(".. DPAA Configuration ..\n\n");
+ fprintf(stdout, ".. DPAA Configuration ..\n\n");
/* Network interfaces */
- printf("Network interfaces: %d\n", cfg_ptr->num_ethports);
+ fprintf(stdout, "Network interfaces: %d\n", cfg_ptr->num_ethports);
for (i = 0; i < cfg_ptr->num_ethports; i++) {
struct fman_if_bpool *bpool;
struct fm_eth_port_cfg *p_cfg = &cfg_ptr->port_cfg[i];
struct fman_if *__if = p_cfg->fman_if;
- printf("\n+ Fman %d, MAC %d (%s);\n",
+ fprintf(stdout, "\n+ Fman %d, MAC %d (%s);\n",
__if->fman_idx, __if->mac_idx,
(__if->mac_type == fman_mac_1g) ? "1G" :
(__if->mac_type == fman_mac_2_5g) ? "2.5G" : "10G");
- printf("\tmac_addr: " RTE_ETHER_ADDR_PRT_FMT "\n",
+ fprintf(stdout, "\tmac_addr: " RTE_ETHER_ADDR_PRT_FMT "\n",
RTE_ETHER_ADDR_BYTES(&__if->mac_addr));
- printf("\ttx_channel_id: 0x%02x\n",
+ fprintf(stdout, "\ttx_channel_id: 0x%02x\n",
__if->tx_channel_id);
- printf("\tfqid_rx_def: 0x%x\n", p_cfg->rx_def);
- printf("\tfqid_rx_err: 0x%x\n", __if->fqid_rx_err);
+ fprintf(stdout, "\tfqid_rx_def: 0x%x\n", p_cfg->rx_def);
+ fprintf(stdout, "\tfqid_rx_err: 0x%x\n", __if->fqid_rx_err);
- printf("\tfqid_tx_err: 0x%x\n", __if->fqid_tx_err);
- printf("\tfqid_tx_confirm: 0x%x\n", __if->fqid_tx_confirm);
+ fprintf(stdout, "\tfqid_tx_err: 0x%x\n", __if->fqid_tx_err);
+ fprintf(stdout, "\tfqid_tx_confirm: 0x%x\n",
__if->fqid_tx_confirm);
fman_if_for_each_bpool(bpool, __if)
- printf("\tbuffer pool: (bpid=%d, count=%"PRId64
+ fprintf(stdout, "\tbuffer pool: (bpid=%d, count=%"PRId64
" size=%"PRId64", addr=0x%"PRIx64")\n",
bpool->bpid, bpool->count, bpool->size,
bpool->addr);
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 9373cee57d..d19738b7bf 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -1410,9 +1410,9 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct
caam_jr_qp *qp)
rte_pktmbuf_mtod(op->sym->m_src, void *),
rte_pktmbuf_data_len(op->sym->m_src));
- printf("\n JD before conversion\n");
+ fprintf(stdout, "\n JD before conversion\n");
for (i = 0; i < 12; i++)
- printf("\n 0x%08x", ctx->jobdes.desc[i]);
+ fprintf(stdout, "\n 0x%08x", ctx->jobdes.desc[i]);
#endif
CAAM_JR_DP_DEBUG("Jr[%p] pi[%d] ci[%d].Before sending desc",
diff --git a/drivers/crypto/caam_jr/caam_jr_desc.h
b/drivers/crypto/caam_jr/caam_jr_desc.h
index 135d51c392..1b6a8f9efa 100644
--- a/drivers/crypto/caam_jr/caam_jr_desc.h
+++ b/drivers/crypto/caam_jr/caam_jr_desc.h
@@ -116,7 +116,7 @@
for (__i = 0; \
__i < SEC_GET_DESC_LEN(descriptor); \
__i++) {\
- printf("0x%08x: 0x%08x\n", \
+ fprintf(stdout, "0x%08x: 0x%08x\n", \
(uint32_t)(((uint32_t *)(descriptor)) + __i), \
*(((uint32_t *)(descriptor)) + __i)); \
} \
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index c25e40030b..c707666f35 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1685,7 +1685,7 @@ dpaa2_sec_dump(struct rte_crypto_op *op)
goto mbuf_dump;
[PATCH] hash: add XOR32 hash function
An XOR32 hash is needed in the Software Switch (SWX) Pipeline for its
use case in P4. We implement it in this patch so it could be easily
registered in the pipeline later.
Signed-off-by: Bili Dong
---
.mailmap | 1 +
app/test/test_hash_functions.c | 33 +++--
lib/hash/rte_hash_xor.h| 65 ++
3 files changed, 96 insertions(+), 3 deletions(-)
create mode 100644 lib/hash/rte_hash_xor.h
diff --git a/.mailmap b/.mailmap
index 5015494210..176dd93b66 100644
--- a/.mailmap
+++ b/.mailmap
@@ -159,6 +159,7 @@ Bernard Iremonger
Bert van Leeuwen
Bhagyada Modali
Bharat Mota
+Bili Dong
Bill Hong
Billy McFall
Billy O'Mahony
diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c
index 76d51b6e71..14d69d90c4 100644
--- a/app/test/test_hash_functions.c
+++ b/app/test/test_hash_functions.c
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include "test.h"
@@ -22,8 +23,8 @@
* Hash values calculated for key sizes from array "hashtest_key_lens"
* and for initial values from array "hashtest_initvals.
* Each key will be formed by increasing each byte by 1:
- * e.g.: key size = 4, key = 0x03020100
- * key size = 8, key = 0x0706050403020100
+ * e.g.: key size = 4, key = 0x00010203
+ * key size = 8, key = 0x0001020304050607
*/
static uint32_t hash_values_jhash[2][12] = {{
0x8ba9414b, 0xdf0d39c9,
@@ -51,6 +52,19 @@ static uint32_t hash_values_crc[2][12] = {{
0x789c104f, 0x53028d3e
}
};
+static uint32_t hash_values_xor[2][12] = {{
+ 0x, 0x0001,
+ 0x00010203, 0x04040404, 0x, 0x,
+ 0x, 0x, 0x0c040404, 0x000d0e0f,
+ 0x04212223, 0x04040404
+},
+{
+ 0xdeadbeef, 0xdeacbeef,
+ 0xdeacbcec, 0xdaa9baeb, 0xdeadbeef, 0xdeadbeef,
+ 0xdeadbeef, 0xdeadbeef, 0xd2a9baeb, 0xdea0b0e0,
+ 0xda8c9ccc, 0xdaa9baeb
+}
+};
/***
* Hash function performance test configuration section. Each performance test
@@ -61,7 +75,7 @@ static uint32_t hash_values_crc[2][12] = {{
*/
#define HASHTEST_ITERATIONS 100
#define MAX_KEYSIZE 64
-static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc};
+static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc,
rte_hash_xor};
static uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
static uint32_t hashtest_key_lens[] = {
1, 2, /* Unusual key sizes */
@@ -85,6 +99,9 @@ get_hash_name(rte_hash_function f)
if (f == rte_hash_crc)
return "rte_hash_crc";
+ if (f == rte_hash_xor)
+ return "rte_hash_xor";
+
return "UnknownHash";
}
@@ -173,6 +190,16 @@ verify_precalculated_hash_func_tests(void)
hash_values_crc[j][i], hash);
return -1;
}
+
+ hash = rte_hash_xor(key, hashtest_key_lens[i],
+ hashtest_initvals[j]);
+ if (hash != hash_values_xor[j][i]) {
+ printf("XOR for %u bytes with initial value
0x%x."
+ "Expected 0x%x, but got 0x%x\n",
+ hashtest_key_lens[i],
hashtest_initvals[j],
+ hash_values_xor[j][i], hash);
+ return -1;
+ }
}
}
diff --git a/lib/hash/rte_hash_xor.h b/lib/hash/rte_hash_xor.h
new file mode 100644
index 00..61ca8bee73
--- /dev/null
+++ b/lib/hash/rte_hash_xor.h
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_HASH_XOR_H_
+#define _RTE_HASH_XOR_H_
+
+/**
+ * @file
+ *
+ * RTE XOR Hash
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include
+
+#include
+
+#define LEFT8b_MASK rte_cpu_to_be_32(0xff00)
+#define LEFT16b_MASK rte_cpu_to_be_32(0x)
+
+/**
+ * Calculate XOR32 hash on user-supplied byte array.
+ *
+ * @param data
+ * Data to perform hash on.
+ * @param data_len
+ * How many bytes to use to calculate hash value.
+ * @param init_val
+ * Value to initialise hash generator.
+ * @return
+ * 32bit calculated hash value.
+ */
+static inline uint32_t
+rte_hash_xor(const void *data, uint32_t data_len, uint32_t init_val)
+{
+ unsigned i;
+ uintptr_t pd = (uintptr_t) data;
+ init_val = rte_cpu_to_be_32(init_val);
+
+ for (i = 0; i < data_len / 4; i++) {
+ init_val ^= *(const uint32_t *)pd;
+ pd += 4;
+ }
+
+ if (data_len & 0x2) {
+ init_val ^= *(const uint32_t *)pd & LEFT16b_MASK;
+ pd += 2;
+ }
+
+ if (data_len & 0x1)
+ init_val ^= *(const uint32_t *)pd & LEFT8b_MASK;
[PATCH v2] hash: add XOR32 hash function
An XOR32 hash is needed in the Software Switch (SWX) Pipeline for its
use case in P4. We implement it in this patch so it could be easily
registered in the pipeline later.
Signed-off-by: Bili Dong
---
.mailmap | 1 +
app/test/test_hash_functions.c | 33 --
lib/hash/rte_hash_xor.h| 64 ++
3 files changed, 95 insertions(+), 3 deletions(-)
create mode 100644 lib/hash/rte_hash_xor.h
diff --git a/.mailmap b/.mailmap
index 5015494210..176dd93b66 100644
--- a/.mailmap
+++ b/.mailmap
@@ -159,6 +159,7 @@ Bernard Iremonger
Bert van Leeuwen
Bhagyada Modali
Bharat Mota
+Bili Dong
Bill Hong
Billy McFall
Billy O'Mahony
diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c
index 76d51b6e71..14d69d90c4 100644
--- a/app/test/test_hash_functions.c
+++ b/app/test/test_hash_functions.c
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include "test.h"
@@ -22,8 +23,8 @@
* Hash values calculated for key sizes from array "hashtest_key_lens"
* and for initial values from array "hashtest_initvals.
* Each key will be formed by increasing each byte by 1:
- * e.g.: key size = 4, key = 0x03020100
- * key size = 8, key = 0x0706050403020100
+ * e.g.: key size = 4, key = 0x00010203
+ * key size = 8, key = 0x0001020304050607
*/
static uint32_t hash_values_jhash[2][12] = {{
0x8ba9414b, 0xdf0d39c9,
@@ -51,6 +52,19 @@ static uint32_t hash_values_crc[2][12] = {{
0x789c104f, 0x53028d3e
}
};
+static uint32_t hash_values_xor[2][12] = {{
+ 0x, 0x0001,
+ 0x00010203, 0x04040404, 0x, 0x,
+ 0x, 0x, 0x0c040404, 0x000d0e0f,
+ 0x04212223, 0x04040404
+},
+{
+ 0xdeadbeef, 0xdeacbeef,
+ 0xdeacbcec, 0xdaa9baeb, 0xdeadbeef, 0xdeadbeef,
+ 0xdeadbeef, 0xdeadbeef, 0xd2a9baeb, 0xdea0b0e0,
+ 0xda8c9ccc, 0xdaa9baeb
+}
+};
/***
* Hash function performance test configuration section. Each performance test
@@ -61,7 +75,7 @@ static uint32_t hash_values_crc[2][12] = {{
*/
#define HASHTEST_ITERATIONS 100
#define MAX_KEYSIZE 64
-static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc};
+static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc,
rte_hash_xor};
static uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
static uint32_t hashtest_key_lens[] = {
1, 2, /* Unusual key sizes */
@@ -85,6 +99,9 @@ get_hash_name(rte_hash_function f)
if (f == rte_hash_crc)
return "rte_hash_crc";
+ if (f == rte_hash_xor)
+ return "rte_hash_xor";
+
return "UnknownHash";
}
@@ -173,6 +190,16 @@ verify_precalculated_hash_func_tests(void)
hash_values_crc[j][i], hash);
return -1;
}
+
+ hash = rte_hash_xor(key, hashtest_key_lens[i],
+ hashtest_initvals[j]);
+ if (hash != hash_values_xor[j][i]) {
+ printf("XOR for %u bytes with initial value
0x%x."
+ "Expected 0x%x, but got 0x%x\n",
+ hashtest_key_lens[i],
hashtest_initvals[j],
+ hash_values_xor[j][i], hash);
+ return -1;
+ }
}
}
diff --git a/lib/hash/rte_hash_xor.h b/lib/hash/rte_hash_xor.h
new file mode 100644
index 00..8420fe997b
--- /dev/null
+++ b/lib/hash/rte_hash_xor.h
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_HASH_XOR_H_
+#define _RTE_HASH_XOR_H_
+
+/**
+ * @file
+ *
+ * RTE XOR Hash
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include
+
+#include
+
+#define LEFT8b_MASK rte_cpu_to_be_32(0xff00)
+#define LEFT16b_MASK rte_cpu_to_be_32(0x)
+
+/**
+ * Calculate XOR32 hash on user-supplied byte array.
+ *
+ * @param data
+ * Data to perform hash on.
+ * @param data_len
+ * How many bytes to use to calculate hash value.
+ * @param init_val
+ * Value to initialise hash generator.
+ * @return
+ * 32bit calculated hash value.
+ */
+static inline uint32_t
+rte_hash_xor(const void *data, uint32_t data_len, uint32_t init_val)
+{
+ uintptr_t pd = (uintptr_t) data;
+ init_val = rte_cpu_to_be_32(init_val);
+
+ for (uint32_t i = 0; i < data_len / 4; i++) {
+ init_val ^= *(const uint32_t *)pd;
+ pd += 4;
+ }
+
+ if (data_len & 0x2) {
+ init_val ^= *(const uint32_t *)pd & LEFT16b_MASK;
+ pd += 2;
+ }
+
+ if (data_len & 0x1)
+ init_val ^= *(const uint32_t *)pd & LEFT8b_MASK;
+
+
[PATCH v3] hash: add XOR32 hash function
An XOR32 hash is needed in the Software Switch (SWX) Pipeline for its
use case in P4. We implement it in this patch so it could be easily
registered in the pipeline later.
Signed-off-by: Bili Dong
---
.mailmap | 1 +
app/test/test_hash_functions.c | 33 +++--
lib/hash/rte_hash_xor.h| 65 ++
3 files changed, 96 insertions(+), 3 deletions(-)
create mode 100644 lib/hash/rte_hash_xor.h
diff --git a/.mailmap b/.mailmap
index 5015494210..176dd93b66 100644
--- a/.mailmap
+++ b/.mailmap
@@ -159,6 +159,7 @@ Bernard Iremonger
Bert van Leeuwen
Bhagyada Modali
Bharat Mota
+Bili Dong
Bill Hong
Billy McFall
Billy O'Mahony
diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c
index 76d51b6e71..14d69d90c4 100644
--- a/app/test/test_hash_functions.c
+++ b/app/test/test_hash_functions.c
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include "test.h"
@@ -22,8 +23,8 @@
* Hash values calculated for key sizes from array "hashtest_key_lens"
* and for initial values from array "hashtest_initvals.
* Each key will be formed by increasing each byte by 1:
- * e.g.: key size = 4, key = 0x03020100
- * key size = 8, key = 0x0706050403020100
+ * e.g.: key size = 4, key = 0x00010203
+ * key size = 8, key = 0x0001020304050607
*/
static uint32_t hash_values_jhash[2][12] = {{
0x8ba9414b, 0xdf0d39c9,
@@ -51,6 +52,19 @@ static uint32_t hash_values_crc[2][12] = {{
0x789c104f, 0x53028d3e
}
};
+static uint32_t hash_values_xor[2][12] = {{
+ 0x, 0x0001,
+ 0x00010203, 0x04040404, 0x, 0x,
+ 0x, 0x, 0x0c040404, 0x000d0e0f,
+ 0x04212223, 0x04040404
+},
+{
+ 0xdeadbeef, 0xdeacbeef,
+ 0xdeacbcec, 0xdaa9baeb, 0xdeadbeef, 0xdeadbeef,
+ 0xdeadbeef, 0xdeadbeef, 0xd2a9baeb, 0xdea0b0e0,
+ 0xda8c9ccc, 0xdaa9baeb
+}
+};
/***
* Hash function performance test configuration section. Each performance test
@@ -61,7 +75,7 @@ static uint32_t hash_values_crc[2][12] = {{
*/
#define HASHTEST_ITERATIONS 100
#define MAX_KEYSIZE 64
-static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc};
+static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc,
rte_hash_xor};
static uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
static uint32_t hashtest_key_lens[] = {
1, 2, /* Unusual key sizes */
@@ -85,6 +99,9 @@ get_hash_name(rte_hash_function f)
if (f == rte_hash_crc)
return "rte_hash_crc";
+ if (f == rte_hash_xor)
+ return "rte_hash_xor";
+
return "UnknownHash";
}
@@ -173,6 +190,16 @@ verify_precalculated_hash_func_tests(void)
hash_values_crc[j][i], hash);
return -1;
}
+
+ hash = rte_hash_xor(key, hashtest_key_lens[i],
+ hashtest_initvals[j]);
+ if (hash != hash_values_xor[j][i]) {
+ printf("XOR for %u bytes with initial value
0x%x."
+ "Expected 0x%x, but got 0x%x\n",
+ hashtest_key_lens[i],
hashtest_initvals[j],
+ hash_values_xor[j][i], hash);
+ return -1;
+ }
}
}
diff --git a/lib/hash/rte_hash_xor.h b/lib/hash/rte_hash_xor.h
new file mode 100644
index 00..7004f83ec2
--- /dev/null
+++ b/lib/hash/rte_hash_xor.h
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Intel Corporation
+ */
+
+#ifndef _RTE_HASH_XOR_H_
+#define _RTE_HASH_XOR_H_
+
+/**
+ * @file
+ *
+ * RTE XOR Hash
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include
+
+#include
+
+#define LEFT8b_MASK rte_cpu_to_be_32(0xff00)
+#define LEFT16b_MASK rte_cpu_to_be_32(0x)
+
+/**
+ * Calculate XOR32 hash on user-supplied byte array.
+ *
+ * @param data
+ * Data to perform hash on.
+ * @param data_len
+ * How many bytes to use to calculate hash value.
+ * @param init_val
+ * Value to initialise hash generator.
+ * @return
+ * 32bit calculated hash value.
+ */
+static inline uint32_t
+rte_hash_xor(const void *data, uint32_t data_len, uint32_t init_val)
+{
+ uint32_t i;
+ uintptr_t pd = (uintptr_t) data;
+ init_val = rte_cpu_to_be_32(init_val);
+
+ for (i = 0; i < data_len / 4; i++) {
+ init_val ^= *(const uint32_t *)pd;
+ pd += 4;
+ }
+
+ if (data_len & 0x2) {
+ init_val ^= *(const uint32_t *)pd & LEFT16b_MASK;
+ pd += 2;
+ }
+
+ if (data_len & 0x1)
+ init_val ^= *(const uint32_t *)pd & LEFT8b_MASK;
RE: [PATCH] malloc: fix malloc performance may becomes worse as the number of malloc increases
+CC: Fidaullah Noonari , your name also shows up
in the git log; perhaps you can help review this patch.
> From: Thomas Monjalon [mailto:tho...@monjalon.net]
> Sent: Wednesday, 15 February 2023 11.10
>
> Looking for reviewers please.
>
> 10/02/2023 07:30, Fengnan Chang:
> > Here is a simple test case:
> > "
> > uint64_t entry_time, time;
> > size_t size = 4096;
> > unsigned align = 4096;
> > for (int j = 0; j < 10; j++) {
> > entry_time = rte_get_timer_cycles();
> > for (int i = 0; i < 2000; i++) {
> > rte_malloc(NULL, size, align);
> > }
> > time = (rte_get_timer_cycles()-entry_time) * 100 /
> > rte_get_timer_hz();
> > printf("total open time %lu avg time %lu\n", time, time/2000);
> > }
> > "
> >
> > Single rte_malloc cost time may becomes wrose as the number of malloc
> > increases, In my env, first round avg time is 15us, second is 44us,
> > third is 77us, fourth is 168us...
> >
> > The reason is,in the malloc process, malloc_elem_alloc may split
> new_elem
> > if there have too much free space after new_elem, and insert the
> trailer
> > into freelist. When alloc 4k with align 4k, the trailer very likely
> insert
> > to free_head[2] again, it makes free_head[2] longer. when alloc 4k
> again,
> > it will search free_head[2] from begin, with the number of malloc
> increases,
> > search free_head[2] need more time, so the performance will become
> worse.
> > Same problem will also occurs in alloc 64k with align 64k, but if
> alloc
> > 4k with align 64, doesn't have this problem.
> >
> > Fix this by adjust free_head list size range, make free_head[3] hold
> > elements which bigger or equal 4k, free_head[4] hold elements which
> bigger
> > or equal 16k.
> > In terms of probabilities, when alloc 4k or 16k, the probability of
> finding
> > a suitable elem from a larger size list is greater than from a
> smaller
> > size list.
> >
> > Signed-off-by: Fengnan Chang
> > ---
> > lib/eal/common/malloc_elem.c | 14 +++---
> > 1 file changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/lib/eal/common/malloc_elem.c
> b/lib/eal/common/malloc_elem.c
> > index 83f05497cc..35a2313d04 100644
> > --- a/lib/eal/common/malloc_elem.c
> > +++ b/lib/eal/common/malloc_elem.c
> > @@ -367,11 +367,11 @@ prev_elem_is_adjacent(struct malloc_elem *elem)
> > * containing larger elements.
> > *
> > * Example element size ranges for a heap with five free lists:
> > - * heap->free_head[0] - (0 , 2^8]
> > - * heap->free_head[1] - (2^8 , 2^10]
> > - * heap->free_head[2] - (2^10 ,2^12]
> > - * heap->free_head[3] - (2^12, 2^14]
> > - * heap->free_head[4] - (2^14, MAX_SIZE]
> > + * heap->free_head[0] - (0 , 2^8)
> > + * heap->free_head[1] - [2^8 , 2^10)
> > + * heap->free_head[2] - [2^10 ,2^12)
> > + * heap->free_head[3] - [2^12, 2^14)
> > + * heap->free_head[4] - [2^14, MAX_SIZE]
> > */
> > size_t
> > malloc_elem_free_list_index(size_t size)
> > @@ -385,8 +385,8 @@ malloc_elem_free_list_index(size_t size)
> > if (size <= (1UL << MALLOC_MINSIZE_LOG2))
> > return 0;
> >
> > - /* Find next power of 2 >= size. */
> > - log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
> > + /* Find next power of 2 > size. */
> > + log2 = sizeof(size) * 8 - __builtin_clzl(size);
> >
> > /* Compute freelist index, based on log2(size). */
> > index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1)
> /
> >
I gave up reviewing in depth, because the existing code is not easy to quickly
understand, and it would take too long for me. E.g. the malloc_elem->size is
field is undocumented, and find_suitable_element() calls the
malloc_elem_free_list_index() function with the raw size (as passed to the
function), but malloc_elem_free_list_insert() calls the
malloc_elem_free_list_index() with malloc_elem->size - MALLOC_ELEM_HEADER_LEN.
Looking isolated at the patch itself...
I agree with the way the patch modifies the ranges of the free list, and the
consequential removal of the "- 1" from the calculation of log2.
Intuitively, the lists should cover ranges such as [0x100..0x3FF], which this
patch does, not [0x101..0x400], how it was previously... The ranges with this
patch make much more sense.
So if the existing code is otherwise correct, i.e. handles the size
with/without MALLOC_ELEM_HEADER_LEN correctly, my gut feeling says this patch
is an improvement.
Acked-by: Morten Brørup
[PATCH v3] bus: add platform bus
Platform bus is a software bus under Linux that manages devices which
generally do not have built-in discovery mechanisms. Linux normally
learns about platform devices directly from device-tree during
boot-up phase.
Up to this point, whenever some userspace app needed control over
platform device or a range of thereof some sort of driver being
a mixture of vdev/rawdev was required.
In order to simplify this task, provide an auto-probe
experience and separate bus logic from the driver itself,
add platform bus support.
Currently devices backed up by vfio-platform kernel driver
are supported.
Signed-off-by: Tomasz Duszynski
---
v3:
- fix device blocking
- fix conditional compilation based on VFIO_PRESENT
v2:
- take a step back and do not add eal changes that simplify parsing
sysfs string. That should be moved to a more generic library and
submitted separately.
- compile code conditionally based on VFIO_PRESENT
MAINTAINERS| 4 +
doc/guides/rel_notes/release_23_03.rst | 5 +
drivers/bus/meson.build| 1 +
drivers/bus/platform/bus_platform_driver.h | 193 +++
drivers/bus/platform/meson.build | 16 +
drivers/bus/platform/platform.c| 635 +
drivers/bus/platform/platform_params.c | 75 +++
drivers/bus/platform/private.h | 48 ++
drivers/bus/platform/version.map | 10 +
9 files changed, 987 insertions(+)
create mode 100644 drivers/bus/platform/bus_platform_driver.h
create mode 100644 drivers/bus/platform/meson.build
create mode 100644 drivers/bus/platform/platform.c
create mode 100644 drivers/bus/platform/platform_params.c
create mode 100644 drivers/bus/platform/private.h
create mode 100644 drivers/bus/platform/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 3495946d0f..7a28f8c2b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -581,6 +581,10 @@ VDEV bus driver
F: drivers/bus/vdev/
F: app/test/test_vdev.c
+Platform bus driver
+M: Tomasz Duszynski
+F: drivers/bus/platform
+
VMBUS bus driver
M: Long Li
F: drivers/bus/vmbus/
diff --git a/doc/guides/rel_notes/release_23_03.rst
b/doc/guides/rel_notes/release_23_03.rst
index ad23355e54..e3e2b84e65 100644
--- a/doc/guides/rel_notes/release_23_03.rst
+++ b/doc/guides/rel_notes/release_23_03.rst
@@ -151,6 +151,11 @@ New Features
* Added support to capture packets at each graph node with packet metadata
and
node name.
+* **Added platform bus support.**
+
+ A platform bus provides a way to use Linux platform devices which
+ are compatible with vfio-platform kernel driver.
+
Removed Items
-
diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build
index 45eab5233d..6d2520c543 100644
--- a/drivers/bus/meson.build
+++ b/drivers/bus/meson.build
@@ -7,6 +7,7 @@ drivers = [
'fslmc',
'ifpga',
'pci',
+'platform',
'vdev',
'vmbus',
]
diff --git a/drivers/bus/platform/bus_platform_driver.h
b/drivers/bus/platform/bus_platform_driver.h
new file mode 100644
index 00..a7445f77de
--- /dev/null
+++ b/drivers/bus/platform/bus_platform_driver.h
@@ -0,0 +1,193 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell.
+ */
+
+#ifndef _BUS_PLATFORM_DRIVER_H_
+#define _BUS_PLATFORM_DRIVER_H_
+
+/**
+ * @file
+ * Platform bus interface.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+/* Forward declarations */
+struct rte_platform_bus;
+struct rte_platform_device;
+struct rte_platform_driver;
+
+/**
+ * Initialization function for the driver called during platform device
probing.
+ *
+ * @param pdev
+ * Pointer to the platform device.
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+typedef int (rte_platform_probe_t)(struct rte_platform_device *pdev);
+
+/**
+ * Removal function for the driver called during platform device removal.
+ *
+ * @param pdev
+ * Pointer to the platform device.
+ * @return
+ * 0 on success, negative value otherwise.
+ */
+typedef int (rte_platform_remove_t)(struct rte_platform_device *pdev);
+
+/**
+ * Driver specific DMA mapping.
+ *
+ * @param pdev
+ * Pointer to the platform device.
+ * @param addr
+ * Starting virtual address of memory to be mapped.
+ * @param iova
+ * Starting IOVA address of memory to be mapped.
+ * @param len
+ * Length of memory segment being mapped.
+ * @return
+ * - 0 on success, negative value and rte_errno is set otherwise.
+ */
+typedef int (rte_platform_dma_map_t)(struct rte_platform_device *pdev, void
*addr, uint64_t iova,
+size_t len);
+
+/**
+ * Driver specific DMA unmapping.
+ *
+ * @param pdev
+ * Pointer to the platform device.
+ * @param addr
+ * Starting virtual address of memory to be mapped.
+ * @param iova
+ * Starting IOVA address of memory to be mapped.
+ * @param len
+ * Length of memory segme
RE: [PATCH v3] hash: add XOR32 hash function
> From: Bili Dong [mailto:qobili...@gmail.com]
> Sent: Wednesday, 15 February 2023 12.07
>
> An XOR32 hash is needed in the Software Switch (SWX) Pipeline for its
> use case in P4. We implement it in this patch so it could be easily
> registered in the pipeline later.
>
> Signed-off-by: Bili Dong
> ---
[...]
> +#define LEFT8b_MASK rte_cpu_to_be_32(0xff00)
> +#define LEFT16b_MASK rte_cpu_to_be_32(0x)
> +
> +/**
> + * Calculate XOR32 hash on user-supplied byte array.
> + *
> + * @param data
> + * Data to perform hash on.
> + * @param data_len
> + * How many bytes to use to calculate hash value.
> + * @param init_val
> + * Value to initialise hash generator.
> + * @return
> + * 32bit calculated hash value.
> + */
> +static inline uint32_t
> +rte_hash_xor(const void *data, uint32_t data_len, uint32_t init_val)
> +{
> + uint32_t i;
> + uintptr_t pd = (uintptr_t) data;
> + init_val = rte_cpu_to_be_32(init_val);
> +
> + for (i = 0; i < data_len / 4; i++) {
> + init_val ^= *(const uint32_t *)pd;
> + pd += 4;
> + }
> +
> + if (data_len & 0x2) {
> + init_val ^= *(const uint32_t *)pd & LEFT16b_MASK;
> + pd += 2;
> + }
> +
> + if (data_len & 0x1)
> + init_val ^= *(const uint32_t *)pd & LEFT8b_MASK;
> +
> + init_val = rte_be_to_cpu_32(init_val);
> + return init_val;
> +}
I think that this function has swapped big endian and CPU endian everywhere.
The result is the same, but the code would be much less confusing if using
rte_cpu_32_to_be() when converting from CPU endian to big endian, and
rte_be_to_cpu_32() when converting the other way.
I also suppose that the return type and the init_val parameter were meant to be
rte_be32_t.
Also, please document that the byte array must be 32 bit aligned.
Alternatively, implement support for unaligned data. You can find inspiration
for handling of unaligned data in the __rte_raw_cksum() function:
https://elixir.bootlin.com/dpdk/v22.11.1/source/lib/net/rte_ip.h#L162
RE: [PATCH v5 1/2] ethdev: introduce the Tx map API for aggregated ports
Hi Ori, Thomas and Ferruh, Could you please help to review it? Thanks. > -Original Message- > From: Jiawei Wang > Sent: Tuesday, February 14, 2023 11:49 PM > To: Slava Ovsiienko ; Ori Kam ; > NBU-Contact-Thomas Monjalon (EXTERNAL) ; > andrew.rybche...@oktetlabs.ru; Aman Singh ; > Yuying Zhang ; Ferruh Yigit > Cc: dev@dpdk.org; Raslan Darawsheh > Subject: [PATCH v5 1/2] ethdev: introduce the Tx map API for aggregated ports > > When multiple ports are aggregated into a single DPDK port, > (example: Linux bonding, DPDK bonding, failsafe, etc.), we want to know which > port use for Tx via a queue. > > This patch introduces the new ethdev API rte_eth_dev_map_aggr_tx_affinity(), > it's used to map a Tx queue with an aggregated port of the DPDK port > (specified with port_id), The affinity is the number of the aggregated port. > Value 0 means no affinity and traffic could be routed to any aggregated port, > this is the default current behavior. > > The maximum number of affinity is given by rte_eth_dev_count_aggr_ports(). > > Add the trace point for ethdev rte_eth_dev_count_aggr_ports() and > rte_eth_dev_map_aggr_tx_affinity() functions. > > Add the testpmd command line: > testpmd> port config (port_id) txq (queue_id) affinity (value) > > For example, there're two physical ports connected to a single DPDK port (port > id 0), and affinity 1 stood for the first physical port and affinity 2 stood > for the > second physical port. > Use the below commands to config tx phy affinity for per Tx Queue: > port config 0 txq 0 affinity 1 > port config 0 txq 1 affinity 1 > port config 0 txq 2 affinity 2 > port config 0 txq 3 affinity 2 > > These commands config the Tx Queue index 0 and Tx Queue index 1 with phy > affinity 1, uses Tx Queue 0 or Tx Queue 1 send packets, these packets will be > sent from the first physical port, and similar with the second physical port > if > sending packets with Tx Queue 2 or Tx Queue 3. > > Signed-off-by: Jiawei Wang > --- > app/test-pmd/cmdline.c | 96 + > doc/guides/rel_notes/release_23_03.rst | 7 ++ > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 +++ > lib/ethdev/ethdev_driver.h | 39 + > lib/ethdev/ethdev_trace.h | 17 > lib/ethdev/ethdev_trace_points.c| 6 ++ > lib/ethdev/rte_ethdev.c | 49 +++ > lib/ethdev/rte_ethdev.h | 46 ++ > lib/ethdev/version.map | 2 + > 9 files changed, 276 insertions(+) > snip > 2.18.1
[PATCH v1 0/6] add flex item implementation
Implement the flex item matching and modify field in HWS. Rongwei Liu (6): net/mlx5: enable hws flex item create net/mlx5: add IPv6 protocol as flex item input net/mlx5/hws: add hws flex item matching support net/mlx5: add flex item modify field implementation net/mlx5: return error for sws modify field doc/mlx5: update mlx5 doc doc/guides/nics/mlx5.rst | 4 +- drivers/common/mlx5/mlx5_prm.h| 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 83 drivers/net/mlx5/linux/mlx5_os.c | 27 ++-- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5.h | 6 + drivers/net/mlx5/mlx5_flow.h | 4 + drivers/net/mlx5/mlx5_flow_dv.c | 186 +++--- drivers/net/mlx5/mlx5_flow_flex.c | 135 --- drivers/net/mlx5/mlx5_flow_hw.c | 64 - 10 files changed, 460 insertions(+), 52 deletions(-) -- 2.27.0
[PATCH v1 1/6] net/mlx5: enable hws flex item create
Enable flex item create and destroy with dv_flow_en=2
Signed-off-by: Rongwei Liu
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/linux/mlx5_os.c | 27 +++
drivers/net/mlx5/mlx5_flow_hw.c | 2 ++
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index a71474c90a..f5b3edea99 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -474,10 +474,20 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
err = mlx5_alloc_table_hash_list(priv);
if (err)
goto error;
- if (priv->sh->config.dv_flow_en == 2)
- return 0;
/* The resources below are only valid with DV support. */
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+ /* Init shared flex parsers list, no need lcore_share */
+ snprintf(s, sizeof(s), "%s_flex_parsers_list", sh->ibdev_name);
+ sh->flex_parsers_dv = mlx5_list_create(s, sh, false,
+ mlx5_flex_parser_create_cb,
+ mlx5_flex_parser_match_cb,
+ mlx5_flex_parser_remove_cb,
+ mlx5_flex_parser_clone_cb,
+ mlx5_flex_parser_clone_free_cb);
+ if (!sh->flex_parsers_dv)
+ goto error;
+ if (priv->sh->config.dv_flow_en == 2)
+ return 0;
/* Init port id action list. */
snprintf(s, sizeof(s), "%s_port_id_action_list", sh->ibdev_name);
sh->port_id_action_list = mlx5_list_create(s, sh, true,
@@ -518,16 +528,9 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
flow_dv_dest_array_clone_free_cb);
if (!sh->dest_array_list)
goto error;
- /* Init shared flex parsers list, no need lcore_share */
- snprintf(s, sizeof(s), "%s_flex_parsers_list", sh->ibdev_name);
- sh->flex_parsers_dv = mlx5_list_create(s, sh, false,
- mlx5_flex_parser_create_cb,
- mlx5_flex_parser_match_cb,
- mlx5_flex_parser_remove_cb,
- mlx5_flex_parser_clone_cb,
- mlx5_flex_parser_clone_free_cb);
- if (!sh->flex_parsers_dv)
- goto error;
+#else
+ if (priv->sh->config.dv_flow_en == 2)
+ return 0;
#endif
#ifdef HAVE_MLX5DV_DR
void *domain;
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 6799b8a89f..b1d5b47900 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -8361,6 +8361,8 @@ const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = {
.query = flow_hw_query,
.get_aged_flows = flow_hw_get_aged_flows,
.get_q_aged_flows = flow_hw_get_q_aged_flows,
+ .item_create = flow_dv_item_create,
+ .item_release = flow_dv_item_release,
};
/**
--
2.27.0
[PATCH v1 2/6] net/mlx5: add IPv6 protocol as flex item input
Support IPv6 protocol as new flex item input link.
Signed-off-by: Rongwei Liu
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_flow_flex.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow_flex.c
b/drivers/net/mlx5/mlx5_flow_flex.c
index 35f2a9923d..24b7226ee6 100644
--- a/drivers/net/mlx5/mlx5_flow_flex.c
+++ b/drivers/net/mlx5/mlx5_flow_flex.c
@@ -1050,6 +1050,22 @@ mlx5_flex_arc_in_udp(const struct rte_flow_item *item,
return rte_be_to_cpu_16(spec->hdr.dst_port);
}
+static int
+mlx5_flex_arc_in_ipv6(const struct rte_flow_item *item,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_item_ipv6 *spec = item->spec;
+ const struct rte_flow_item_ipv6 *mask = item->mask;
+ struct rte_flow_item_ipv6 ip = { .hdr.proto = 0xff };
+
+ if (memcmp(mask, &ip, sizeof(struct rte_flow_item_ipv6))) {
+ return rte_flow_error_set
+ (error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item,
+"invalid ipv6 item mask, full mask is desired");
+ }
+ return spec->hdr.proto;
+}
+
static int
mlx5_flex_translate_arc_in(struct mlx5_hca_flex_attr *attr,
const struct rte_flow_item_flex_conf *conf,
@@ -1096,6 +1112,9 @@ mlx5_flex_translate_arc_in(struct mlx5_hca_flex_attr
*attr,
case RTE_FLOW_ITEM_TYPE_UDP:
ret = mlx5_flex_arc_in_udp(rte_item, error);
break;
+ case RTE_FLOW_ITEM_TYPE_IPV6:
+ ret = mlx5_flex_arc_in_ipv6(rte_item, error);
+ break;
default:
MLX5_ASSERT(false);
return rte_flow_error_set
--
2.27.0
[PATCH v1 4/6] net/mlx5: add flex item modify field implementation
Add flex item modify field HWS implementation.
The minimum modify boundary is one byte.
Signed-off-by: Rongwei Liu
Acked-by: Viacheslav Ovsiienko
---
drivers/common/mlx5/mlx5_prm.h | 1 +
drivers/net/mlx5/mlx5_flow.h| 3 +
drivers/net/mlx5/mlx5_flow_dv.c | 165 +---
drivers/net/mlx5/mlx5_flow_hw.c | 14 ++-
4 files changed, 170 insertions(+), 13 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index c05bce714a..ddfe4d0be7 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -761,6 +761,7 @@ enum mlx5_modification_field {
MLX5_MODI_GTPU_FIRST_EXT_DW_0 = 0x76,
MLX5_MODI_HASH_RESULT = 0x81,
MLX5_MODI_OUT_IPV6_NEXT_HDR = 0x4A,
+ MLX5_MODI_INVALID = INT_MAX,
};
/* Total number of metadata reg_c's. */
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index ae2fc0aabe..d6831d849d 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1084,6 +1084,8 @@ struct field_modify_info {
uint32_t size; /* Size of field in protocol header, in bytes. */
uint32_t offset; /* Offset of field in protocol header, in bytes. */
enum mlx5_modification_field id;
+ uint32_t shift;
+ uint8_t is_flex; /* Temporary indicator for flex item modify filed WA.
*/
};
/* HW steering flow attributes. */
@@ -1248,6 +1250,7 @@ struct rte_flow_actions_template {
uint16_t mhdr_off; /* Offset of DR modify header action. */
uint32_t refcnt; /* Reference counter. */
uint16_t rx_cpy_pos; /* Action position of Rx metadata to be copied. */
+ uint8_t flex_item; /* flex item index. */
};
/* Jump action struct. */
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 9e7ab08b32..8355249ce5 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -414,10 +414,15 @@ flow_dv_convert_modify_action(struct rte_flow_item *item,
++field;
continue;
}
- /* Deduce actual data width in bits from mask value. */
- off_b = rte_bsf32(mask) + carry_b;
- size_b = sizeof(uint32_t) * CHAR_BIT -
-off_b - __builtin_clz(mask);
+ if (type == MLX5_MODIFICATION_TYPE_COPY && field->is_flex) {
+ off_b = 32 - field->shift + carry_b - field->size *
CHAR_BIT;
+ size_b = field->size * CHAR_BIT - carry_b;
+ } else {
+ /* Deduce actual data width in bits from mask value. */
+ off_b = rte_bsf32(mask) + carry_b;
+ size_b = sizeof(uint32_t) * CHAR_BIT -
+off_b - __builtin_clz(mask);
+ }
MLX5_ASSERT(size_b);
actions[i] = (struct mlx5_modification_cmd) {
.action_type = type,
@@ -437,40 +442,46 @@ flow_dv_convert_modify_action(struct rte_flow_item *item,
* Destination field overflow. Copy leftovers of
* a source field to the next destination field.
*/
- carry_b = 0;
if ((size_b > dcopy->size * CHAR_BIT - dcopy->offset) &&
dcopy->size != 0) {
actions[i].length =
dcopy->size * CHAR_BIT - dcopy->offset;
- carry_b = actions[i].length;
+ carry_b += actions[i].length;
next_field = false;
+ } else {
+ carry_b = 0;
}
/*
* Not enough bits in a source filed to fill a
* destination field. Switch to the next source.
*/
if ((size_b < dcopy->size * CHAR_BIT - dcopy->offset) &&
- (size_b == field->size * CHAR_BIT - off_b)) {
- actions[i].length =
- field->size * CHAR_BIT - off_b;
+ ((size_b == field->size * CHAR_BIT - off_b) ||
+field->is_flex)) {
+ actions[i].length = size_b;
dcopy->offset += actions[i].length;
next_dcopy = false;
}
- if (next_dcopy)
- ++dcopy;
} else {
MLX5_ASSERT(item->spec);
data = flow_dv_fetch_field((const uint8_t *)item->spec +
field->offset, field->size);
[PATCH v1 6/6] doc/mlx5: update mlx5 doc
Add flex item matching and modify field feature into mlx5 documents. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- doc/guides/nics/mlx5.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index ee2df66e77..0f4a989bbc 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -107,6 +107,7 @@ Features - Sub-Function. - Matching on represented port. - Matching on IPv6 routing extension header. +- Modify flex item field. Limitations @@ -292,11 +293,12 @@ Limitations - Firmware supports 8 global sample fields. Each flex item allocates non-shared sample fields from that pool. - Supported flex item can have 1 input link - ``eth`` or ``udp`` -and up to 2 output links - ``ipv4`` or ``ipv6``. +and up to 3 output links - ``ipv4`` or ``ipv6``. - Flex item fields (``next_header``, ``next_protocol``, ``samples``) do not participate in RSS hash functions. - In flex item configuration, ``next_header.field_base`` value must be byte aligned (multiple of 8). + - Modify field with flex item, the offset must be byte aligned (multiple of 8). - No Tx metadata go to the E-Switch steering domain for the Flow group 0. The flows within group 0 and set metadata action are rejected by hardware. -- 2.27.0
[PATCH v1 3/6] net/mlx5/hws: add hws flex item matching support
Support flex item matching in hws and syntax follows
sws exactly.
Flex item should be created in advance and follow current
json mapping logic.
Signed-off-by: Rongwei Liu
Reviewed-by: Alex Vesker
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 83 ++
drivers/net/mlx5/mlx5.c | 2 +-
drivers/net/mlx5/mlx5.h | 6 ++
drivers/net/mlx5/mlx5_flow.h | 1 +
drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
drivers/net/mlx5/mlx5_flow_flex.c | 116 ++
drivers/net/mlx5/mlx5_flow_hw.c | 48 ++-
7 files changed, 239 insertions(+), 19 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index ce7cf0504d..29df6823dd 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -309,6 +309,43 @@ mlx5dr_definer_ipv6_routing_ext_set(struct
mlx5dr_definer_fc *fc,
DR_SET(tag, val, fc->byte_off, 0, fc->bit_mask);
}
+static void
+mlx5dr_definer_flex_parser_set(struct mlx5dr_definer_fc *fc,
+ const void *item,
+ uint8_t *tag, bool is_inner)
+{
+ const struct rte_flow_item_flex *flex = item;
+ uint32_t byte_off, val, idx;
+ int ret;
+
+ val = 0;
+ byte_off = MLX5_BYTE_OFF(definer_hl, flex_parser.flex_parser_0);
+ idx = fc->fname - MLX5DR_DEFINER_FNAME_FLEX_PARSER_0;
+ byte_off -= idx * sizeof(uint32_t);
+ ret = mlx5_flex_get_parser_value_per_byte_off(flex, flex->handle,
byte_off,
+ false, is_inner, &val);
+ if (ret == -1 || !val)
+ return;
+
+ DR_SET(tag, val, fc->byte_off, 0, fc->bit_mask);
+}
+
+static void
+mlx5dr_definer_flex_parser_inner_set(struct mlx5dr_definer_fc *fc,
+const void *item,
+uint8_t *tag)
+{
+ mlx5dr_definer_flex_parser_set(fc, item, tag, true);
+}
+
+static void
+mlx5dr_definer_flex_parser_outer_set(struct mlx5dr_definer_fc *fc,
+const void *item,
+uint8_t *tag)
+{
+ mlx5dr_definer_flex_parser_set(fc, item, tag, false);
+}
+
static void
mlx5dr_definer_gre_key_set(struct mlx5dr_definer_fc *fc,
const void *item_spec,
@@ -1750,6 +1787,47 @@ mlx5dr_definer_check_item_range_supp(struct
rte_flow_item *item)
}
}
+static int
+mlx5dr_definer_conv_item_flex_parser(struct mlx5dr_definer_conv_data *cd,
+struct rte_flow_item *item,
+int item_idx)
+{
+ uint32_t base_off = MLX5_BYTE_OFF(definer_hl,
flex_parser.flex_parser_0);
+ const struct rte_flow_item_flex *v, *m;
+ enum mlx5dr_definer_fname fname;
+ struct mlx5dr_definer_fc *fc;
+ uint32_t i, mask, byte_off;
+ bool is_inner = cd->tunnel;
+ int ret;
+
+ m = item->mask;
+ v = item->spec;
+ mask = 0;
+ for (i = 0; i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) {
+ byte_off = base_off - i * sizeof(uint32_t);
+ ret = mlx5_flex_get_parser_value_per_byte_off(m, v->handle,
byte_off,
+ true, is_inner,
&mask);
+ if (ret == -1) {
+ rte_errno = EINVAL;
+ return rte_errno;
+ }
+
+ if (!mask)
+ continue;
+
+ fname = MLX5DR_DEFINER_FNAME_FLEX_PARSER_0;
+ fname += (enum mlx5dr_definer_fname)i;
+ fc = &cd->fc[fname];
+ fc->byte_off = byte_off;
+ fc->item_idx = item_idx;
+ fc->tag_set = cd->tunnel ?
&mlx5dr_definer_flex_parser_inner_set :
+
&mlx5dr_definer_flex_parser_outer_set;
+ fc->tag_mask_set = &mlx5dr_definer_ones_set;
+ fc->bit_mask = mask;
+ }
+ return 0;
+}
+
static int
mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
struct mlx5dr_match_template *mt,
@@ -1877,6 +1955,11 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context
*ctx,
item_flags |= cd.tunnel ?
MLX5_FLOW_ITEM_INNER_IPV6_ROUTING_EXT :
MLX5_FLOW_ITEM_OUTER_IPV6_ROUTING_EXT;
break;
+ case RTE_FLOW_ITEM_TYPE_FLEX:
+ ret = mlx5dr_definer_conv_item_flex_parser(&cd, items,
i);
+ item_flags |= cd.tunnel ? MLX5_FLOW_ITEM_INNER_FLEX :
+ MLX5_FLOW_ITEM_OUTER_FLEX;
+ break;
default:
DR_LOG(ERR, "Unsupported item type %d", items-
[PATCH v1 5/6] net/mlx5: return error for sws modify field
Return unsupported error message when application tries to modify flex item field. Validation of packet modifications actions for SW Steering checked if either source or destination field of MODIFY_FIELD action was a flex item. When DEC_TTL action is used, DEC_TTL action does not have any action configuration and dereferencing source or destination field is invalid, so validation of source and destination field types should be moved to MODIFY_FIELD specific validation function, then field types are validated if and only if action type is MODIFY_FIELD. Signed-off-by: Dariusz Sosnowski Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8355249ce5..3d760d1913 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4838,6 +4838,7 @@ flow_dv_validate_action_modify_hdr(const uint64_t action_flags, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, "action configuration not set"); + if (action_flags & MLX5_FLOW_ACTION_ENCAP) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, @@ -5163,17 +5164,21 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev, struct mlx5_hca_attr *hca_attr = &priv->sh->cdev->config.hca_attr; const struct rte_flow_action_modify_field *action_modify_field = action->conf; - uint32_t dst_width = mlx5_flow_item_field_width(dev, - action_modify_field->dst.field, - -1, attr, error); - uint32_t src_width = mlx5_flow_item_field_width(dev, - action_modify_field->src.field, - dst_width, attr, error); + uint32_t dst_width, src_width; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (ret) return ret; - + if (action_modify_field->src.field == RTE_FLOW_FIELD_FLEX_ITEM || + action_modify_field->dst.field == RTE_FLOW_FIELD_FLEX_ITEM) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "flex item fields modification" + " is not supported"); + dst_width = mlx5_flow_item_field_width(dev, action_modify_field->dst.field, + -1, attr, error); + src_width = mlx5_flow_item_field_width(dev, action_modify_field->src.field, + dst_width, attr, error); if (action_modify_field->width == 0) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, -- 2.27.0
[PATCH v1] net/mlx5: support live migration
When a DPDK application must be upgraded,
the traffic downtime should be shortened as much as possible.
During the migration time, the old application may stay alive
while the new application is starting and being configured.
In order to optimize the switch to the new application,
the old application may need to be aware of the presence
of the new application being prepared.
This is achieved with a new API allowing the user to change the
new application state to standby and active later.
The added function is trying to apply the new mode to all probed
mlx5 ports. To make this API simple and easy to use,
the same flags have to be accepted by all devices.
This is the scenario of operations in the old and new applications:
. device: already configured by the old application
. new:start as active
. new:probe the same device
. new:set as standby
. new:configure the device
. device: has configurations from old and new applications
. old:clear its device configuration
. device: has only 1 configuration from new application
. new:set as active
. device: downtime for connecting all to the new application
. old:shutdown
The active mode means network handling configurations are programmed
to the HW immediately, and no behavior changed. This is the default state.
The standby mode means configurations are queued in the HW.
If there is no application with active mode,
any configuration is effective immediately.
Signed-off-by: Rongwei Liu
Acked-by: Viacheslav Ovsiienko
---
doc/guides/nics/mlx5.rst| 8 +
drivers/net/mlx5/mlx5.h | 24 +++
drivers/net/mlx5/mlx5_flow.c| 313 +++-
drivers/net/mlx5/rte_pmd_mlx5.h | 66 +++
drivers/net/mlx5/version.map| 2 +
5 files changed, 409 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index ee2df66e77..f232efad36 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -612,6 +612,14 @@ Limitations
- When using DV/verbs flow engine (``dv_flow_en`` = 1/0 respectively), Match
on SPI field
in ESP header for group 0 needs MLNX_OFED 5.6+.
+- During live migration to a new process set its flow engine as standby mode,
+ the user should only program flow rules in group 0 (``fdb_def_rule_en=0``).
+ Live migration is only supported under SWS (``dv_flow_en=1``).
+ The flow group 0 is shared between DPDK processes
+ while the other flow groups are limited to the current process.
+ The flow engine of a process cannot move from active to standby mode
+ if preceding active application rules are still present and vice versa.
+
Statistics
--
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index bea1f62ea8..e16ff288af 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -33,6 +33,7 @@
#include "mlx5_utils.h"
#include "mlx5_os.h"
#include "mlx5_autoconf.h"
+#include "rte_pmd_mlx5.h"
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
#ifndef RTE_EXEC_ENV_WINDOWS
#define HAVE_MLX5_HWS_SUPPORT 1
@@ -1656,6 +1657,28 @@ struct mlx5_hw_ctrl_flow {
struct rte_flow *flow;
};
+/*
+ * Flow rule structure for flow engine mode control, focus on group 0.
+ * Apply to all supported domains.
+ */
+struct mlx5_dv_flow_info {
+ LIST_ENTRY(mlx5_dv_flow_info) next;
+ uint32_t orig_prio; /* prio set by user */
+ uint32_t flow_idx_high_prio;
+ /* flow index owned by standby mode. priority is lower unless DUP
flags. */
+ uint32_t flow_idx_low_prio;
+ struct rte_flow_item *items;
+ struct rte_flow_action *actions;
+ struct rte_flow_attr attr;
+};
+
+struct mlx5_flow_engine_mode_info {
+ enum mlx5_flow_engine_mode mode;
+ uint32_t mode_flag;
+ /* The list is maintained in insertion order. */
+ LIST_HEAD(hot_up_info, mlx5_dv_flow_info) hot_upgrade;
+};
+
struct mlx5_flow_hw_ctrl_rx;
struct mlx5_priv {
@@ -1763,6 +1786,7 @@ struct mlx5_priv {
uint32_t nb_queue; /* HW steering queue number. */
struct mlx5_hws_cnt_pool *hws_cpool; /* HW steering's counter pool. */
uint32_t hws_mark_refcnt; /* HWS mark action reference counter. */
+ struct mlx5_flow_engine_mode_info mode_info; /* Process set flow engine
info. */
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
/* Item template list. */
LIST_HEAD(flow_hw_itt, rte_flow_pattern_template) flow_hw_itt;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 73e6d3b486..360d7a9dbb 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -164,6 +164,16 @@ mlx5_flow_expand_rss_adjust_node(const struct
rte_flow_item *pattern,
const struct mlx5_flow_expand_node graph[],
const struct mlx5_flow_expand_node *node);
+static __rte_always_inline int
+ml
Re: [PATCH v2 6/6] test/dmadev: add tests for stopping and restarting dev
On Wed, Feb 15, 2023 at 09:59:06AM +0800, fengchengwen wrote:
> On 2023/1/17 1:37, Bruce Richardson wrote:
> > Validate device operation when a device is stopped or restarted.
> >
> > The only complication - and gap in the dmadev ABI specification - is
> > what happens to the job ids on restart. Some drivers reset them to 0,
> > while others continue where things left off. Take account of both
> > possibilities in the test case.
> >
> > Signed-off-by: Bruce Richardson ---
> > app/test/test_dmadev.c | 46 ++
> > 1 file changed, 46 insertions(+)
> >
> > diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c index
> > de787c14e2..8fb73a41e2 100644 --- a/app/test/test_dmadev.c +++
> > b/app/test/test_dmadev.c @@ -304,6 +304,48 @@
> > test_enqueue_copies(int16_t dev_id, uint16_t vchan) ||
> > do_multi_copies(dev_id, vchan, 0, 0, 1); }
> >
> > +static int +test_stop_start(int16_t dev_id, uint16_t vchan) +{ + /*
> > device is already started on input, should be (re)started on output */
> > + + uint16_t id = 0; + enum rte_dma_status_code status =
> > RTE_DMA_STATUS_SUCCESSFUL; + + /* - test stopping a device works
> > ok, +* - then do a start-stop without doing a copy + *
> > - finally restart the device + * checking for errors at each
> > stage, and validating we can still copy at the end. + */ + if
> > (rte_dma_stop(dev_id) < 0) +ERR_RETURN("Error stopping
> > device\n"); + + if (rte_dma_start(dev_id) < 0) +
> > ERR_RETURN("Error restarting device\n"); + if (rte_dma_stop(dev_id) <
> > 0) +ERR_RETURN("Error stopping device after restart (no
> > jobs executed)\n"); + + if (rte_dma_start(dev_id) < 0) +
> > ERR_RETURN("Error restarting device after multiple stop-starts\n"); + +
> > /* before doing a copy, we need to know what the next id will be it
> > should + * either be: + * - the last completed job before start if
> > driver does not reset id on stop + * - or -1 i.e. next job is 0, if
> > driver does reset the job ids on stop + */ + if
> > (rte_dma_completed_status(dev_id, vchan, 1, &id, &status) != 0) +
> > ERR_RETURN("Error with rte_dma_completed_status when no job done\n"); +
> > id += 1; /* id_count is next job id */ +if (id != id_count && id !=
> > 0) +ERR_RETURN("Unexpected next id from device after
> > stop-start. Got %u, expected %u or 0\n", + id,
> > id_count);
>
> Hi Bruce,
>
> Suggest add a warn LOG to identify the id was not reset zero. So that
> new driver could detect break ABI specification.
>
Not sure that that is necessary. The actual ABI, nor the doxygen docs,
doesn't specify what happens to the values on doing stop and then start. My
thinking was that it should continue numbering as it would be equivalent to
suspend and resume, but other drivers appear to treat it as a "reset". I
suspect there are advantages and disadvantages to both schemes. Until we
decide on what the correct behaviour should be - or decide to allow both -
I don't think warning is the right thing to do here.
/Bruce
Re: [PATCH v2 4/6] test/dmadev: check result for device stop
On Wed, Feb 15, 2023 at 09:26:01AM +0800, fengchengwen wrote:
> Sorry late to see.
>
> On 2023/1/17 1:37, Bruce Richardson wrote:
> > The DMA device stop API can return an error value so check that return
> > value when running dmadev unit tests.
> >
> > Signed-off-by: Bruce Richardson
> > ---
> > app/test/test_dmadev.c | 6 +-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
> > index fe62e98af8..4e1dbcaa19 100644
> > --- a/app/test/test_dmadev.c
> > +++ b/app/test/test_dmadev.c
> > @@ -837,7 +837,11 @@ test_dmadev_instance(int16_t dev_id)
> > goto err;
> >
> > rte_mempool_free(pool);
> > - rte_dma_stop(dev_id);
> > +
> > + if (rte_dma_stop(dev_id) < 0) {
> > + rte_mempool_free(pool);
>
> The pool already freed in above.
> I think just add ERR_RETURN here.
>
Yep, good catch. Will fix in v3.
[PATCH v2] net/mlx5: support live migration
When a DPDK application must be upgraded,
the traffic downtime should be shortened as much as possible.
During the migration time, the old application may stay alive
while the new application is starting and being configured.
In order to optimize the switch to the new application,
the old application may need to be aware of the presence
of the new application being prepared.
This is achieved with a new API allowing the user to change the
new application state to standby and active later.
The added function is trying to apply the new mode to all probed
mlx5 ports. To make this API simple and easy to use,
the same flags have to be accepted by all devices.
This is the scenario of operations in the old and new applications:
. device: already configured by the old application
. new:start as active
. new:probe the same device
. new:set as standby
. new:configure the device
. device: has configurations from old and new applications
. old:clear its device configuration
. device: has only 1 configuration from new application
. new:set as active
. device: downtime for connecting all to the new application
. old:shutdown
The active mode means network handling configurations are programmed
to the HW immediately, and no behavior changed. This is the default state.
The standby mode means configurations are queued in the HW.
If there is no application with active mode,
any configuration is effective immediately.
Signed-off-by: Rongwei Liu
Acked-by: Viacheslav Ovsiienko
---
doc/guides/nics/mlx5.rst| 8 +
drivers/net/mlx5/mlx5.h | 24 +++
drivers/net/mlx5/mlx5_flow.c| 313 +++-
drivers/net/mlx5/rte_pmd_mlx5.h | 66 +++
drivers/net/mlx5/version.map| 2 +
5 files changed, 409 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index ee2df66e77..f232efad36 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -612,6 +612,14 @@ Limitations
- When using DV/verbs flow engine (``dv_flow_en`` = 1/0 respectively), Match
on SPI field
in ESP header for group 0 needs MLNX_OFED 5.6+.
+- During live migration to a new process set its flow engine as standby mode,
+ the user should only program flow rules in group 0 (``fdb_def_rule_en=0``).
+ Live migration is only supported under SWS (``dv_flow_en=1``).
+ The flow group 0 is shared between DPDK processes
+ while the other flow groups are limited to the current process.
+ The flow engine of a process cannot move from active to standby mode
+ if preceding active application rules are still present and vice versa.
+
Statistics
--
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index bea1f62ea8..e16ff288af 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -33,6 +33,7 @@
#include "mlx5_utils.h"
#include "mlx5_os.h"
#include "mlx5_autoconf.h"
+#include "rte_pmd_mlx5.h"
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
#ifndef RTE_EXEC_ENV_WINDOWS
#define HAVE_MLX5_HWS_SUPPORT 1
@@ -1656,6 +1657,28 @@ struct mlx5_hw_ctrl_flow {
struct rte_flow *flow;
};
+/*
+ * Flow rule structure for flow engine mode control, focus on group 0.
+ * Apply to all supported domains.
+ */
+struct mlx5_dv_flow_info {
+ LIST_ENTRY(mlx5_dv_flow_info) next;
+ uint32_t orig_prio; /* prio set by user */
+ uint32_t flow_idx_high_prio;
+ /* flow index owned by standby mode. priority is lower unless DUP
flags. */
+ uint32_t flow_idx_low_prio;
+ struct rte_flow_item *items;
+ struct rte_flow_action *actions;
+ struct rte_flow_attr attr;
+};
+
+struct mlx5_flow_engine_mode_info {
+ enum mlx5_flow_engine_mode mode;
+ uint32_t mode_flag;
+ /* The list is maintained in insertion order. */
+ LIST_HEAD(hot_up_info, mlx5_dv_flow_info) hot_upgrade;
+};
+
struct mlx5_flow_hw_ctrl_rx;
struct mlx5_priv {
@@ -1763,6 +1786,7 @@ struct mlx5_priv {
uint32_t nb_queue; /* HW steering queue number. */
struct mlx5_hws_cnt_pool *hws_cpool; /* HW steering's counter pool. */
uint32_t hws_mark_refcnt; /* HWS mark action reference counter. */
+ struct mlx5_flow_engine_mode_info mode_info; /* Process set flow engine
info. */
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
/* Item template list. */
LIST_HEAD(flow_hw_itt, rte_flow_pattern_template) flow_hw_itt;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 73e6d3b486..360d7a9dbb 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -164,6 +164,16 @@ mlx5_flow_expand_rss_adjust_node(const struct
rte_flow_item *pattern,
const struct mlx5_flow_expand_node graph[],
const struct mlx5_flow_expand_node *node);
+static __rte_always_inline int
+ml
[PATCH v3] net/mlx5: support live migration
When a DPDK application must be upgraded,
the traffic downtime should be shortened as much as possible.
During the migration time, the old application may stay alive
while the new application is starting and being configured.
In order to optimize the switch to the new application,
the old application may need to be aware of the presence
of the new application being prepared.
This is achieved with a new API allowing the user to change the
new application state to standby and active later.
The added function is trying to apply the new mode to all probed
mlx5 ports. To make this API simple and easy to use,
the same flags have to be accepted by all devices.
This is the scenario of operations in the old and new applications:
. device: already configured by the old application
. new:start as active
. new:probe the same device
. new:set as standby
. new:configure the device
. device: has configurations from old and new applications
. old:clear its device configuration
. device: has only 1 configuration from new application
. new:set as active
. device: downtime for connecting all to the new application
. old:shutdown
The active mode means network handling configurations are programmed
to the HW immediately, and no behavior changed. This is the default state.
The standby mode means configurations are queued in the HW.
If there is no application with active mode,
any configuration is effective immediately.
Signed-off-by: Rongwei Liu
Acked-by: Viacheslav Ovsiienko
---
doc/guides/nics/mlx5.rst| 8 +
drivers/net/mlx5/mlx5.h | 24 +++
drivers/net/mlx5/mlx5_flow.c| 315 +++-
drivers/net/mlx5/rte_pmd_mlx5.h | 66 +++
drivers/net/mlx5/version.map| 2 +
5 files changed, 411 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index ee2df66e77..f232efad36 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -612,6 +612,14 @@ Limitations
- When using DV/verbs flow engine (``dv_flow_en`` = 1/0 respectively), Match
on SPI field
in ESP header for group 0 needs MLNX_OFED 5.6+.
+- During live migration to a new process set its flow engine as standby mode,
+ the user should only program flow rules in group 0 (``fdb_def_rule_en=0``).
+ Live migration is only supported under SWS (``dv_flow_en=1``).
+ The flow group 0 is shared between DPDK processes
+ while the other flow groups are limited to the current process.
+ The flow engine of a process cannot move from active to standby mode
+ if preceding active application rules are still present and vice versa.
+
Statistics
--
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index bea1f62ea8..e16ff288af 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -33,6 +33,7 @@
#include "mlx5_utils.h"
#include "mlx5_os.h"
#include "mlx5_autoconf.h"
+#include "rte_pmd_mlx5.h"
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
#ifndef RTE_EXEC_ENV_WINDOWS
#define HAVE_MLX5_HWS_SUPPORT 1
@@ -1656,6 +1657,28 @@ struct mlx5_hw_ctrl_flow {
struct rte_flow *flow;
};
+/*
+ * Flow rule structure for flow engine mode control, focus on group 0.
+ * Apply to all supported domains.
+ */
+struct mlx5_dv_flow_info {
+ LIST_ENTRY(mlx5_dv_flow_info) next;
+ uint32_t orig_prio; /* prio set by user */
+ uint32_t flow_idx_high_prio;
+ /* flow index owned by standby mode. priority is lower unless DUP
flags. */
+ uint32_t flow_idx_low_prio;
+ struct rte_flow_item *items;
+ struct rte_flow_action *actions;
+ struct rte_flow_attr attr;
+};
+
+struct mlx5_flow_engine_mode_info {
+ enum mlx5_flow_engine_mode mode;
+ uint32_t mode_flag;
+ /* The list is maintained in insertion order. */
+ LIST_HEAD(hot_up_info, mlx5_dv_flow_info) hot_upgrade;
+};
+
struct mlx5_flow_hw_ctrl_rx;
struct mlx5_priv {
@@ -1763,6 +1786,7 @@ struct mlx5_priv {
uint32_t nb_queue; /* HW steering queue number. */
struct mlx5_hws_cnt_pool *hws_cpool; /* HW steering's counter pool. */
uint32_t hws_mark_refcnt; /* HWS mark action reference counter. */
+ struct mlx5_flow_engine_mode_info mode_info; /* Process set flow engine
info. */
#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
/* Item template list. */
LIST_HEAD(flow_hw_itt, rte_flow_pattern_template) flow_hw_itt;
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 73e6d3b486..2bc9626993 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -164,6 +164,16 @@ mlx5_flow_expand_rss_adjust_node(const struct
rte_flow_item *pattern,
const struct mlx5_flow_expand_node graph[],
const struct mlx5_flow_expand_node *node);
+static __rte_always_inline int
+ml
RE: [PATCH v4 12/12] app/mldev: add documentation for mldev test cases
> -Original Message- > From: Srikanth Yalavarthi > Sent: Tuesday, February 7, 2023 9:20 PM > To: Thomas Monjalon ; Srikanth Yalavarthi > > Cc: dev@dpdk.org; Shivah Shankar Shankar Narayan Rao > ; Jerin Jacob Kollanukkaran > ; Anup Prabhu ; Prince Takkar > ; Parijat Shukla > Subject: [PATCH v4 12/12] app/mldev: add documentation for mldev test > cases > > Added documentation specific to mldev test cases. Added details > about all test cases and option supported by individual tests. > > Signed-off-by: Srikanth Yalavarthi Acked-by: Shivah Shankar S <>
RE: [PATCH v5 39/39] ml/cnxk: enable support for configurable ocm page
> -Original Message- > From: Srikanth Yalavarthi > Sent: Tuesday, February 7, 2023 9:37 PM > To: Srikanth Yalavarthi > Cc: dev@dpdk.org; Shivah Shankar Shankar Narayan Rao > ; Jerin Jacob Kollanukkaran > ; Anup Prabhu ; Prince Takkar > ; Parijat Shukla > Subject: [PATCH v5 39/39] ml/cnxk: enable support for configurable ocm > page > > Enabled support for configurable OCM page size. A new device argument > "ocm_page_size" is added to specify the page size for OCM management. > Supported page sizes are 1KB, 2KB, 4KB, 8KB and 16KB. Default page size is > 16KB. > > Signed-off-by: Srikanth Yalavarthi Acked-by: Shivah Shankar S <>
RE: [PATCH v5 32/39] ml/cnxk: enable support to get xstats in cycles
> -Original Message- > From: Srikanth Yalavarthi > Sent: Tuesday, February 7, 2023 9:37 PM > To: Srikanth Yalavarthi > Cc: dev@dpdk.org; Shivah Shankar Shankar Narayan Rao > ; Jerin Jacob Kollanukkaran > ; Anup Prabhu ; Prince Takkar > ; Parijat Shukla > Subject: [PATCH v5 32/39] ml/cnxk: enable support to get xstats in cycles > > Enabled support to retrieve xstats in either cycles or ns. > Access to sclk is enabled only if an RVU device is probed during > initialization. > Driver would return the xstats in nanoseconds only when an RVU device is > probed, else would fallback to cycles. > > Signed-off-by: Srikanth Yalavarthi Acked-by: Shivah Shankar S <>
RE: [PATCH v5 38/39] ml/cnxk: add user guide for marvell cnxk ml driver
> -Original Message- > From: Srikanth Yalavarthi > Sent: Tuesday, February 7, 2023 9:37 PM > To: Thomas Monjalon ; Srikanth Yalavarthi > > Cc: dev@dpdk.org; Shivah Shankar Shankar Narayan Rao > ; Jerin Jacob Kollanukkaran > ; Anup Prabhu ; Prince Takkar > ; Parijat Shukla > Subject: [PATCH v5 38/39] ml/cnxk: add user guide for marvell cnxk ml driver > > Added user guide for Marvell cnxk ML driver for Marvell Octeon cnxk Soc > family. Added details about device initialization, debug options and runtime > device args supported by the driver. > > Signed-off-by: Srikanth Yalavarthi Acked-by: Shivah Shankar S <>
Re: [dpdk-dev] [PATCH v3 00/12] mldev: introduce machine learning device library
On 2/7/2023 3:13 PM, jer...@marvell.com wrote: > From: Jerin Jacob > Hi Jerin, Please find some comments/questions gathered with the help of some collegues. > Machine learning inference library > == > > Definition of machine learning inference > > Inference in machine learning is the process of making an output prediction > based on new input data using a pre-trained machine learning model. > > The scope of the RFC would include only inferencing with pre-trained machine > learning models, > training and building/compiling the ML models is out of scope for this RFC or > DPDK mldev API. Use existing machine learning compiler frameworks for model > creation. > > Motivation for the new library > -- > Multiple semiconductor vendors are offering accelerator products such as DPU > (often called Smart-NIC), FPGA, GPU, etc., which have ML inferencing > capabilities > integrated as part of the product. Use of ML inferencing is increasing in the > domain > of packet processing for flow classification, intrusion, malware and anomaly > detection. > Agree on this need. > Lack of inferencing support through DPDK APIs will involve complexities and > increased latency from moving data across frameworks (i.e, dataplane to > non dataplane ML frameworks and vice-versa). Having a standardized DPDK APIs > for ML > inferencing would enable the dataplane solutions to harness the benefit of > inline > inferencing supported by the hardware. > ack > Contents > --- > A) API specification for: > > 1) Discovery of ML capabilities (e.g., device specific features) in a vendor > independent fashion > 2) Definition of functions to handle ML devices, which includes probing, > initialization and termination of the devices. > 3) Definition of functions to handle ML models used to perform inference > operations. > 4) Definition of function to handle quantize and dequantize operations > > B) Common code for above specification > > rfc..v1: > - Added programmer guide documentation > - Added implementation for common code > > v2..v1: > - Moved dynamic log (Stephen) > - model id to uint16_t from int16t_t (Stephen) > - added release note updates > > v3..v2: > - Introduced rte_ml_dev_init() similar to rte_gpu_init() (Stephen, Thomas) > - In struct rte_ml_dev_data, removed reserved[3] and __rte_cache_aligned. > Also, moved name field to the end(Stephen) > > Machine learning library framework > -- > > The ML framework is built on the following model: > > > +-+ rte_ml_[en|de]queue_burst() > | | | > | Machine o--+ ++| > | Learning| | | queue ||+--+ > | Inference o--+-o|<===o===>|Core 0| > | Engine | | | pair 0 | +--+ > | o+ | ++ > | || | > +-+| | ++ > ^ | | | queue | +--+ > | | +-o|<===>|Core 1| > | | | pair 1 | +--+ > | | ++ > +++| > | +-+ || ++ > | | Model 0 | || | queue | +--+ > | +-+ |+---o|<===>|Core N| > | +-+ || pair N | +--+ > | | Model 1 | |++ > | +-+ | > | +-+ |<--- rte_ml_model_load() > | | Model .. | |---> rte_ml_model_info() > | +-+ |<--- rte_ml_model_start() > | +-+ |<--- rte_ml_model_stop() > | | Model N | |<--- rte_ml_model_params_update() > | +-+ |<--- rte_ml_model_unload() > +-+ > Should model load/unload, params_update be part of dpdk, or dpdk can assume these are already in place. For FPGA both options works, what is the benefit to have these APIs part of DPDK? What are usecases for other architectures? Is multiple active models at same time supported? For FPGA case multiple models may exist at same time, it would be good to have a way to select the model to use, like a handle for model that API accepts. Similarly a handle for model may help chaining models, possibly with help of additional APIs to define the chaining. > ML Device: A hardware or software-based implementation of ML device API for > running inferences using a pre-trained ML model. > Can this device consume multiple queues in parallel? > ML Model: An ML model is an algorithm trained over a dataset. A model > consists of > procedure/algorithm and data/pattern required to make predictions on live > data
RE: [PATCH v4 0/5] net/mlx5: sharing indirect actions between port
Hi, > -Original Message- > From: Slava Ovsiienko > Sent: Monday, February 13, 2023 3:38 PM > To: dev@dpdk.org > Cc: Ori Kam ; Raslan Darawsheh ; > Matan Azrad > Subject: [PATCH v4 0/5] net/mlx5: sharing indirect actions between port > > Adds shared indirect action support to mlx5 PMD. > > Erez Shitrit (2): > net/mlx5/hws: free FT from RTC ID before set the new value > net/mlx5/hws: fix disconnecting matcher > > Viacheslav Ovsiienko (3): > common/mlx5: add cross port object sharing capability > net/mlx5: add cross port shared mode for HW steering > net/mlx5: support counters in cross port shared mode > > drivers/common/mlx5/mlx5_devx_cmds.c | 13 ++ > drivers/common/mlx5/mlx5_devx_cmds.h | 1 + > drivers/net/mlx5/hws/mlx5dr_matcher.c | 12 ++ > drivers/net/mlx5/mlx5.c | 6 + > drivers/net/mlx5/mlx5.h | 2 + > drivers/net/mlx5/mlx5_flow_hw.c | 90 -- > drivers/net/mlx5/mlx5_hws_cnt.c | 167 ++ > drivers/net/mlx5/mlx5_hws_cnt.h | 109 + > 8 files changed, 266 insertions(+), 134 deletions(-) > > -- > 2.18.1 > > --- > RFC: https://inbox.dpdk.org/dev/20221228165433.18185-1- > viachesl...@nvidia.com/ > v1: https://inbox.dpdk.org/dev/20230206095229.23027-1- > viachesl...@nvidia.com/ > v2: https://inbox.dpdk.org/dev/20230207140206.29139-1- > viachesl...@nvidia.com/ > minor comilation issues, rebase, typos > v3: series split to ethdev/testpmd and mlx5 PMD patch to be smoothly > applied > over dpdk-next/main. The mlx5 PMD seris is coming. > v4: the remaining part of original series split for mlx5 PMD Series applied to next-net-mlx, Kindest regards, Raslan Darawsheh
Re: [PATCH] doc: update NFP documentation with Corigine information
On 2/3/2023 8:08 AM, Chaoyong He wrote: > From: Walter Heymans > > The NFP PMD documentation is updated to include information about > Corigine and their new vendor device ID. > > Outdated information regarding the use of the PMD is also updated. > > While making major changes to the document, the maximum number of > characters per line is updated to 80 characters to improve the > readability in raw format. > There are three groups of changes done to documentation as explained in three paragraphs above. To help review, is it possible to separate this patch into three patches? Later they can be squashed and merged as a single patch. But as it is, easy to miss content changes among formatting changes. (You can include simple grammar updates (that doesn't change either content or Corigine related information) to formatting update patch) > Signed-off-by: Walter Heymans > Reviewed-by: Niklas Söderlund > Reviewed-by: Chaoyong He > --- > doc/guides/nics/nfp.rst | 168 +--- > 1 file changed, 90 insertions(+), 78 deletions(-) > > diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst > index a085d7d9ae..6fea280411 100644 > --- a/doc/guides/nics/nfp.rst > +++ b/doc/guides/nics/nfp.rst > @@ -1,35 +1,34 @@ > .. SPDX-License-Identifier: BSD-3-Clause > Copyright(c) 2015-2017 Netronome Systems, Inc. All rights reserved. > -All rights reserved. > +Copyright(c) 2021 Corigine, Inc. All rights reserved. > > NFP poll mode driver library > > > -Netronome's sixth generation of flow processors pack 216 programmable > -cores and over 100 hardware accelerators that uniquely combine packet, > -flow, security and content processing in a single device that scales > +Netronome and Corigine's sixth generation of flow processors pack 216 > +programmable cores and over 100 hardware accelerators that uniquely combine > +packet, flow, security and content processing in a single device that scales > up to 400-Gb/s. > > -This document explains how to use DPDK with the Netronome Poll Mode > -Driver (PMD) supporting Netronome's Network Flow Processor 6xxx > -(NFP-6xxx), Netronome's Network Flow Processor 4xxx (NFP-4xxx) and > -Netronome's Network Flow Processor 38xx (NFP-38xx). > +This document explains how to use DPDK with the Network Flow Processor (NFP) > +Poll Mode Driver (PMD) supporting Netronome and Corigine's NFP-6xxx, NFP-4xxx > +and NFP-38xx product lines. > > -NFP is a SRIOV capable device and the PMD supports the physical > -function (PF) and the virtual functions (VFs). > +NFP is a SR-IOV capable device and the PMD supports the physical function > (PF) > +and the virtual functions (VFs). > > Dependencies > > > -Before using the Netronome's DPDK PMD some NFP configuration, > -which is not related to DPDK, is required. The system requires > -installation of **Netronome's BSP (Board Support Package)** along > -with a specific NFP firmware application. Netronome's NSP ABI > -version should be 0.20 or higher. > +Before using the NFP DPDK PMD some NFP configuration, which is not related to > +DPDK, is required. The system requires installation of > +**NFP-BSP (Board Support Package)** along with a specific NFP firmware > +application. The NSP ABI version should be 0.20 or higher. > > -If you have a NFP device you should already have the code and > -documentation for this configuration. Contact > -**supp...@netronome.com** to obtain the latest available firmware. > +If you have a NFP device you should already have the documentation to perform > +this configuration. Contact **supp...@netronome.com** (for Netronome > products) > +or **smartnic-supp...@corigine.com** (for Corigine products) to obtain the > +latest available firmware. > > The NFP Linux netdev kernel driver for VFs has been a part of the > vanilla kernel since kernel version 4.5, and support for the PF > @@ -44,11 +43,11 @@ Linux kernel driver. > Building the software > - > > -Netronome's PMD code is provided in the **drivers/net/nfp** directory. > -Although NFP PMD has Netronome´s BSP dependencies, it is possible to > -compile it along with other DPDK PMDs even if no BSP was installed > previously. > -Of course, a DPDK app will require such a BSP installed for using the > -NFP PMD, along with a specific NFP firmware application. > +The NFP PMD code is provided in the **drivers/net/nfp** directory. Although > +NFP PMD has BSP dependencies, it is possible to compile it along with other > +DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will > +require such a BSP installed for using the NFP PMD, along with a specific NFP > +firmware application. > > Once the DPDK is built all the DPDK apps and examples include support for > the NFP PMD. > @@ -57,27 +56,20 @@ the NFP PMD. > Driver compilation and testing > -- > > -Refer to the document :ref:`compiling and
Re: [PATCH] net/nfp: support 48-bit DMA address for firmware with NFDk
On 2/8/2023 9:15 AM, Chaoyong He wrote:
> From: Peng Zhang
>
> 48-bit DMA address is supported in the firmware with NFDk, so enable
> this feature in PMD now. But the firmware with NFD3 still just
> support 40-bit DMA address.
>
> RX free list descriptor, used by both NFD3 and NFDk, is also modified
> to support 48-bit DMA address. That's OK because the top bits is always
> set to 0 when assigned with 40-bit DMA address.
>
> Fixes: c73dced48c8c ("net/nfp: add NFDk Tx")
> Cc: jin@corigine.com
> Cc: sta...@dpdk.org
>
Why a backport is requested? As far as I understand this is not fixing
anything but extending device capability. Is this a fix?
> Signed-off-by: Peng Zhang
> Reviewed-by: Chaoyong He
> Reviewed-by: Niklas Söderlund
Re: [PATCH] net/nfp: fix the incorrect vni of VXLAN encap action
On 2/8/2023 9:23 AM, Chaoyong He wrote:
> The helper function which send the tunnel configuration to
> firmware requires the vni with CPU endian.
> The original VXLAN encap logic wrongly invoke it with the
> big-endian value.
>
> Fixes: 724662b4ce5b ("net/nfp: support IPv4 VXLAN encap flow action")
> Fixes: c3b7254093c2 ("net/nfp: support IPv6 VXLAN encap flow action")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Chaoyong He
> Reviewed-by: Niklas Söderlund
Applied to dpdk-next-net/main, thanks.
Re: [PATCH v6 00/21] add support for cpfl PMD in DPDK
On 2/13/2023 2:19 AM, Mingxia Liu wrote: > The patchset introduced the cpfl (Control Plane Function Library) PMD > for Intel® IPU E2100’s Configure Physical Function (Device ID: 0x1453) > > The cpfl PMD inherits all the features from idpf PMD which will follow > an ongoing standard data plan function spec > https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=idpf > Besides, it will also support more device specific hardware offloading > features from DPDK’s control path (e.g.: hairpin, rte_flow …). which is > different from idpf PMD, and that's why we need a new cpfl PMD. > > This patchset mainly focuses on idpf PMD’s equivalent features. > To avoid duplicated code, the patchset depends on below patchsets which > move the common part from net/idpf into common/idpf as a shared library. > > v2 changes: > - rebase to the new baseline. > - Fix rss lut config issue. > v3 changes: > - rebase to the new baseline. > v4 changes: > - Resend v3. No code changed. > v5 changes: > - rebase to the new baseline. > - optimize some code > - give "not supported" tips when user want to config rss hash type > - if stats reset fails at initialization time, don't rollback, just >print ERROR info > v6 changes: > - for small fixed size structure, change rte_memcpy to memcpy() > - fix compilation for AVX512DQ > - update cpfl maintainers > > Mingxia Liu (21): > net/cpfl: support device initialization > net/cpfl: add Tx queue setup > net/cpfl: add Rx queue setup > net/cpfl: support device start and stop > net/cpfl: support queue start > net/cpfl: support queue stop > net/cpfl: support queue release > net/cpfl: support MTU configuration > net/cpfl: support basic Rx data path > net/cpfl: support basic Tx data path > net/cpfl: support write back based on ITR expire > net/cpfl: support RSS > net/cpfl: support Rx offloading > net/cpfl: support Tx offloading > net/cpfl: add AVX512 data path for single queue model > net/cpfl: support timestamp offload > net/cpfl: add AVX512 data path for split queue model > net/cpfl: add HW statistics > net/cpfl: add RSS set/get ops > net/cpfl: support scalar scatter Rx datapath for single queue model > net/cpfl: add xstats ops Hi Mingxia, Beilei, Is there any missing dependency at this point?
Re: [PATCH v5] enhance NUMA affinity heuristic
On 2/1/2023 12:20 PM, Kaisen You wrote:
Trying to allocate memory on the first detected numa node has less
chance to find some memory actually available rather than on the main
lcore numa node (especially when the DPDK application is started only
on one numa node).
Fixes: 705356f0811f ("eal: simplify control thread creation")
Fixes: bb0bd346d5c1 ("eal: suggest using --lcores option")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
Signed-off-by: Kaisen You
---
Changes since v4:
- mod the patch title,
Changes since v3:
- add the assignment of socket_id in thread initialization,
Changes since v2:
- add uncommitted local change and fix compilation,
Changes since v1:
- accomodate for configurations with main lcore running on multiples
physical cores belonging to different numa,
---
lib/eal/common/eal_common_thread.c | 1 +
lib/eal/common/malloc_heap.c | 4
2 files changed, 5 insertions(+)
diff --git a/lib/eal/common/eal_common_thread.c
b/lib/eal/common/eal_common_thread.c
index 38d83a6885..21bff971f8 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -251,6 +251,7 @@ static void *ctrl_thread_init(void *arg)
void *routine_arg = params->arg;
__rte_thread_init(rte_lcore_id(), cpuset);
+ RTE_PER_LCORE(_socket_id) = SOCKET_ID_ANY;
params->ret = rte_thread_set_affinity_by_id(rte_thread_self(), cpuset);
if (params->ret != 0) {
__atomic_store_n(¶ms->ctrl_thread_status,
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index d7c410b786..3ee19aee15 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -717,6 +717,10 @@ malloc_get_numa_socket(void)
return socket_id;
}
+ socket_id = rte_lcore_to_socket_id(rte_get_main_lcore());
+ if (socket_id != (unsigned int)SOCKET_ID_ANY)
+ return socket_id;
+
return rte_socket_id_by_idx(0);
}
I may be lacking context, but I don't quite get the suggested change.
From what I understand, the original has to do with assigning lcore
cpusets in such a way that an lcore ends up having two socket ID's
(because it's been assigned to CPU's on different sockets). Why is this
allowed in the first place? It seems like a user error to me, as it
breaks many of the fundamental assumptions DPDK makes.
I'm fine with using main lcore socket for control threads, I just don't
think the `socket_id != SOCKET_ID_ANY` thing should be checked here,
because it apparently tries to compensate for a problem with cpuset of
the main thread, which shouldn't have happened to begin with.
--
Thanks,
Anatoly
Re: [PATCH v5] enhance NUMA affinity heuristic
On 2/15/2023 2:22 PM, Burakov, Anatoly wrote:
On 2/1/2023 12:20 PM, Kaisen You wrote:
Trying to allocate memory on the first detected numa node has less
chance to find some memory actually available rather than on the main
lcore numa node (especially when the DPDK application is started only
on one numa node).
Fixes: 705356f0811f ("eal: simplify control thread creation")
Fixes: bb0bd346d5c1 ("eal: suggest using --lcores option")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
Signed-off-by: Kaisen You
---
Changes since v4:
- mod the patch title,
Changes since v3:
- add the assignment of socket_id in thread initialization,
Changes since v2:
- add uncommitted local change and fix compilation,
Changes since v1:
- accomodate for configurations with main lcore running on multiples
physical cores belonging to different numa,
---
lib/eal/common/eal_common_thread.c | 1 +
lib/eal/common/malloc_heap.c | 4
2 files changed, 5 insertions(+)
diff --git a/lib/eal/common/eal_common_thread.c
b/lib/eal/common/eal_common_thread.c
index 38d83a6885..21bff971f8 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -251,6 +251,7 @@ static void *ctrl_thread_init(void *arg)
void *routine_arg = params->arg;
__rte_thread_init(rte_lcore_id(), cpuset);
+ RTE_PER_LCORE(_socket_id) = SOCKET_ID_ANY;
params->ret = rte_thread_set_affinity_by_id(rte_thread_self(),
cpuset);
if (params->ret != 0) {
__atomic_store_n(¶ms->ctrl_thread_status,
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index d7c410b786..3ee19aee15 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -717,6 +717,10 @@ malloc_get_numa_socket(void)
return socket_id;
}
+ socket_id = rte_lcore_to_socket_id(rte_get_main_lcore());
+ if (socket_id != (unsigned int)SOCKET_ID_ANY)
+ return socket_id;
+
return rte_socket_id_by_idx(0);
}
I may be lacking context, but I don't quite get the suggested change.
From what I understand, the original has to do with assigning lcore
cpusets in such a way that an lcore ends up having two socket ID's
(because it's been assigned to CPU's on different sockets). Why is this
allowed in the first place? It seems like a user error to me, as it
breaks many of the fundamental assumptions DPDK makes.
I'm fine with using main lcore socket for control threads, I just don't
think the `socket_id != SOCKET_ID_ANY` thing should be checked here,
because it apparently tries to compensate for a problem with cpuset of
the main thread, which shouldn't have happened to begin with.
Just to be clear: I don't have any objections to this patch otherwise.
Acked-by: Anatoly Burakov
--
Thanks,
Anatoly
RE: DPDK rte flow raw encap & decap actions
Ping
From: Vamsi Krishna Attunuru
Sent: Tuesday, February 14, 2023 2:22 PM
To: or...@nvidia.com; dev@dpdk.org
Subject: DPDK rte flow raw encap & decap actions
Hi Ori Kam & dpdk dev team,
For the below rte flow action types, the description sounds a bit confusing to
me. Description says the data must start with ETH header up to the tunnel item.
But the next following statement(that describes MPLSoGRE example) mentions data
just holds layer 2 header. Same is described for raw_decap action also. Could
you please elaborate on what exactly data must hold and the expected actual
packet's header(before/after the action) for the example (MPLSoGRE) mentioned
or for any other tunnel encap/decap types.
/**
* @warning
* @b EXPERIMENTAL: this structure may change without prior notice
*
* RTE_FLOW_ACTION_TYPE_RAW_ENCAP
*
* Raw tunnel end-point encapsulation data definition.
*
* The data holds the headers definitions to be applied on the packet.
* The data must start with ETH header up to the tunnel item header itself.
* When used right after RAW_DECAP (for decapsulating L3 tunnel type for
* example MPLSoGRE) the data will just hold layer 2 header.
*
* The preserve parameter holds which bits in the packet the PMD is not allowed
* to change, this parameter can also be NULL and then the PMD is allowed
* to update any field.
*
* size holds the number of bytes in @p data and @p preserve.
*/
struct rte_flow_action_raw_encap {
uint8_t *data; /**< Encapsulation data. */
uint8_t *preserve; /**< Bit-mask of @p data to preserve on output. */
size_t size; /**< Size of @p data and @p preserve. */
};
/**
* @warning
* @b EXPERIMENTAL: this structure may change without prior notice
*
* RTE_FLOW_ACTION_TYPE_RAW_DECAP
*
* Raw tunnel end-point decapsulation data definition.
*
* The data holds the headers definitions to be removed from the packet.
* The data must start with ETH header up to the tunnel item header itself.
* When used right before RAW_DECAP (for encapsulating L3 tunnel type for
* example MPLSoGRE) the data will just hold layer 2 header.
*
* size holds the number of bytes in @p data.
*/
struct rte_flow_action_raw_decap {
uint8_t *data; /**< Encapsulation data. */
size_t size; /**< Size of @p data and @p preserve. */
};
Regards
Vamsi
Re: [PATCH v2] eal: cleanup alarm and multiprocess hotplug before memory detach
21/12/2022 04:41, Fengnan Chang:
> Alarm and multiprocess hotplug still need access hugepage memory,
> if alarm event processed after memory detach, it may cause SEGV.
> So cleanup alarm and multiprocess hotplug before memory detach.
>
> Fixes: 90b13ab8d4f7 ("alarm: remove direct access to interrupt handle")
> Fixes: a0cc7be20dd1 ("mem: cleanup multiprocess resources")
>
> Signed-off-by: Fengnan Chang
Cc: sta...@dpdk.org
Applied, thanks.
Re: [PATCH 2/2] drivers: replace printf with fprintf for debug functions
15/02/2023 11:29, Hemant Agrawal: > This patch replaces simple printf with fprintf for debug dump > related functions for various NXP dpaaX related drivers. Why replacing with fprintf(stdout)? Would it be better to provide a FILE* parameter to the functions?
Re: [PATCH V4 1/5] drivers/bus: restore driver assignment at front of probing
On 1/12/2023 2:44 AM, lihuisong (C) wrote:
>
> 在 2023/1/11 20:51, Ferruh Yigit 写道:
>> On 12/6/2022 9:26 AM, Huisong Li wrote:
>>> The driver assignment was moved back at the end of the device probing
>>> because there is no something to use rte_driver during the phase of
>>> probing. See commit 391797f04208 ("drivers/bus: move driver assignment
>>> to end of probing")
>>>
>>> However, it is necessary for probing callback to reference rte_driver
>>> before probing. For example, probing callback may call some APIs which
>>> access the rte_pci_driver::driver by the device::driver pointer to get
>>> driver information. In this case, a segment fault will occur in probing
>>> callback if there is not this assignment.
>>>
>> Probing callback gets driver as parameter, so callback function can
>> access it via 'drv->driver', is there a specific usecase that
>> 'dev->device->driver' needs to be accessed explicitly?
>>
>> I assume this is related to coming patches that setting up device in
>> testpmd event callback, but can you please clarify exact need.
>
> For example, rte_eth_dev_info_get is called in this event callback to get
> driver name.
>
Why 'rte_eth_dev_info_get()' is called in the event called at first place?
This set updates multiple things to extend 'RTE_ETH_EVENT_NEW' event
callback function support, like:
- Assign device driver *before* probing completed, so that even callback
can run 'rte_eth_dev_info_get()'
- Add a new ethdev state so that port can be recognized as valid port in
the even callback.
- Stop forwarding implicitly in even callback in case event callback run
while forwarding is on.
All looks to me hack/complexity to make a specific case work, which is
make secondary *testmp* application work with attached/detached device.
And finally patch 4/5 adds port setup to testpmd event callback for this.
I understand the intention, but I disagree with bus and ethdev level
changes for this.
Event callback may not be only way to share port attach/detach
information between primary and secondary, there is a MP socket and
'rte_mp_handle' thread to handle communication between primary and
secondary process, this should be able to use carrying device
information, as far as I remember this is why it is introduced at first
place.
Did you consider using MP socket for your use case?
Following is a sample usage:
Primary:
started as:
sudo ./build/app/dpdk-testpmd --no-pci --proc-type=auto -l 0-1
--log-level=*:debug -- -i --num-procs=2 --proc-id=0
``
testpmd> show port summary all
Number of available ports: 0
Port MAC Address Name Driver Status Link
testpmd> port attach net_null0
Attaching a new port...
dpaa: rte_dpaa_bus_parse(): Parse device name (net_null0 )
fslmc: rte_fslmc_parse(): Parsing dev=(net_null0 )
fslmc: rte_fslmc_parse(): Unknown or unsupported device (net_null0 )
vdev_probe_all_drivers(): Search driver to probe device net_null0
rte_pmd_null_probe(): Initializing pmd_null for net_null0
rte_pmd_null_probe(): Configure pmd_null: packet size is 64, packet copy
is disabled
eth_dev_null_create(): Creating null ethdev on numa socket 0
EAL: request: eal_dev_mp_request
EAL: msg: bus_vdev_mp
vdev_action(): send vdev, net_null0
EAL: sendmsg: bus_vdev_mp
EAL: reply: bus_vdev_mp
EAL: msg: eal_dev_mp_request
Port 0 is attached. Now total ports is 1
Done
testpmd> show port summary all
Number of available ports: 1
Port MAC Address Name Driver Status Link
0DE:E5:79:00:A9:68 net_null0net_null down 10 Gbps
testpmd> port detach 0
Port was not closed
Removing a device...
EAL: request: eal_dev_mp_request
EAL: msg: eal_dev_mp_request
eth_dev_close(): Closing null ethdev on NUMA socket 0
Port 0 is closed
Device is detached
Now total ports is 0
Done
testpmd> show port summary all
Number of available ports: 0
Port MAC Address Name Driver Status Link
testpmd>
``
Secondary:
started as:
sudo ./build/app/dpdk-testpmd --no-pci --proc-type=auto -l 2-3
--log-level=*:debug -- -i --num-procs=2 --proc-id=1
``
testpmd> show port summary all
Number of available ports: 0
Port MAC Address Name Driver Status Link
testpmd> EAL: msg: eal_dev_mp_request
dpaa: rte_dpaa_bus_parse(): Parse device name (net_null0 )
fslmc: rte_fslmc_parse(): Parsing dev=(net_null0 )
fslmc: rte_fslmc_parse(): Unknown or unsupported device (net_null0 )
EAL: request: bus_vdev_mp
EAL: msg: bus_vdev_mp
vdev_action(): receive vdev, net_null0
EAL: msg: bus_vdev_mp
vdev_scan(): Received 1 vdevs
vdev_probe_all_drivers(): Search driver to probe device net_null0
rte_pmd_null_probe(): Initializing pmd_null for net_null0
EAL: reply: eal_dev_mp_request
testpmd> show port summary all
Number of available ports: 1
Port MAC Address Name Driver Status Link
0DE:E5:79:00:A9:68 net_null0net_null down 10 Gbps
testpmd> EAL: msg: eal_dev_mp_request
dpaa: rte_dpaa_bus_parse(): Parse device name (net_nu
[PATCH v6] net/af_xdp: support CNI Integration
Integrate support for the AF_XDP CNI and device plugin [1] so that the DPDK AF_XDP PMD can work in an unprivileged container environment. Part of the AF_XDP PMD initialization process involves loading an eBPF program onto the given netdev. This operation requires privileges, which prevents the PMD from being able to work in an unprivileged container (without root access). The plugin CNI handles the program loading. CNI open Unix Domain Socket (UDS) and waits listening for a client to make requests over that UDS. The client(DPDK) connects and a "handshake" occurs, then the File Descriptor which points to the XSKMAP associated with the loaded eBPF program is handed over to the client. The client can then proceed with creating an AF_XDP socket and inserting the socket into the XSKMAP pointed to by the FD received on the UDS. A new vdev arg "use_cni" is created to indicate user wishes to run the PMD in unprivileged mode and to receive the XSKMAP FD from the CNI. When this flag is set, the XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD libbpf flag should be used when creating the socket, which tells libbpf not to load the default libbpf program on the netdev. We tell libbpf not to do this because the loading is handled by the CNI in this scenario. Patch include howto doc explain how to configure AF_XDP CNI to working with DPDK. [1]: https://github.com/intel/afxdp-plugins-for-kubernetes Signed-off-by: Shibin Koikkara Reeny --- v6: Updated documentation and added error message for invalid parameters. v5: Updated patch title. v4: updated documentation and also updated the macro for pmdinfo.py. v3: add documentation. v2: corrected the typo. --- --- doc/guides/howto/af_xdp_cni.rst | 251 doc/guides/howto/index.rst | 1 + doc/guides/nics/af_xdp.rst | 19 ++ drivers/net/af_xdp/rte_eth_af_xdp.c | 349 +++- 4 files changed, 609 insertions(+), 11 deletions(-) create mode 100644 doc/guides/howto/af_xdp_cni.rst diff --git a/doc/guides/howto/af_xdp_cni.rst b/doc/guides/howto/af_xdp_cni.rst new file mode 100644 index 00..72613a0dd7 --- /dev/null +++ b/doc/guides/howto/af_xdp_cni.rst @@ -0,0 +1,251 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2023 Intel Corporation. + +Using a CNI with the AF_XDP driver +== + +Introduction + + +CNI, the Container Network Interface, is a technology for configuring container +network interfaces and which can be used to setup Kubernetes networking. AF_XDP +is a Linux socket Address Family that enables an XDP program to redirect packets +to a memory buffer in userspace. + +This document explains how to enable the `AF_XDP Plugin for Kubernetes`_ within +a DPDK application using the `AF_XDP PMD`_ to connect and use these technologies. + +.. _AF_XDP Plugin for Kubernetes: https://github.com/intel/afxdp-plugins-for-kubernetes + +Background +-- + +The standard `AF_XDP PMD`_ initialization process involves loading an eBPF program +onto the kernel netdev to be used by the PMD. This operation requires root or +escalated Linux privileges and thus prevents the PMD from working in an +unprivileged container. The AF_XDP CNI plugin handles this situation by +providing a device plugin that performs the program loading. + +At a technical level the CNI opens a Unix Domain Socket and listens for a client +to make requests over that socket. A DPDK application acting as a client +connects and initiates a configuration "handshake". The client then receives a +file descriptor which points to the XSKMAP associated with the loaded eBPF +program. The XSKMAP is a BPF map of AF_XDP sockets (XSK). The client can then +proceed with creating an AF_XDP socket and inserting that socket into the XSKMAP +pointed to by the descriptor. + +The EAL vdev argument ``use_cni`` is used to indicate that the user wishes to +run the PMD in unprivileged mode and to receive the XSKMAP file descriptor from +the CNI. When this flag is set, the ``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` +libbpf flag should be used when creating the socket to instruct libbpf not to +load the default libbpf program on the netdev. Instead the loading is handled by +the CNI. + +.. _AF_XDP PMD: https://doc.dpdk.org/guides/nics/af_xdp.html + +.. Note:: + + The Unix Domain Socket file path appear in the end user is "/tmp/afxdp.sock". + +Prerequisites +- + +Docker and container prerequisites: + +* Set up the device plugin as described in the instructions for `AF_XDP Plugin + for Kubernetes`_. + +* The Docker image should contain the libbpf and libxdp libraries, which + are dependencies for AF_XDP, and should include support for the ``ethtool`` + command. + +* The Pod should have enabled the capabilities ``CAP_NET_RAW`` and ``CAP_BPF`` + for AF_XDP along with support for hugepages. + +* Increase locked memory limit so containers have enough memory for packet + buffers. + For example: + + .. code-b
Re: [dpdk-dev] [PATCH v3 00/12] mldev: introduce machine learning device library
On Wed, Feb 15, 2023 at 6:25 PM Ferruh Yigit wrote: > > On 2/7/2023 3:13 PM, jer...@marvell.com wrote: > > From: Jerin Jacob > > > > Hi Jerin, > > Please find some comments/questions gathered with the help of some > collegues. Thanks Ferruh for the review. > > > Machine learning inference library > > == > > > > Definition of machine learning inference > > > > Inference in machine learning is the process of making an output prediction > > based on new input data using a pre-trained machine learning model. > > > > The scope of the RFC would include only inferencing with pre-trained > > machine learning models, > > training and building/compiling the ML models is out of scope for this RFC > > or > > DPDK mldev API. Use existing machine learning compiler frameworks for model > > creation. > > > > Motivation for the new library > > -- > > Multiple semiconductor vendors are offering accelerator products such as DPU > > (often called Smart-NIC), FPGA, GPU, etc., which have ML inferencing > > capabilities > > integrated as part of the product. Use of ML inferencing is increasing in > > the domain > > of packet processing for flow classification, intrusion, malware and > > anomaly detection. > > > > Agree on this need. > > > Lack of inferencing support through DPDK APIs will involve complexities and > > increased latency from moving data across frameworks (i.e, dataplane to > > non dataplane ML frameworks and vice-versa). Having a standardized DPDK > > APIs for ML > > inferencing would enable the dataplane solutions to harness the benefit of > > inline > > inferencing supported by the hardware. > > > > ack > > > Contents > > --- > > A) API specification for: > > > > 1) Discovery of ML capabilities (e.g., device specific features) in a vendor > > independent fashion > > 2) Definition of functions to handle ML devices, which includes probing, > > initialization and termination of the devices. > > 3) Definition of functions to handle ML models used to perform inference > > operations. > > 4) Definition of function to handle quantize and dequantize operations > > > > B) Common code for above specification > > > > rfc..v1: > > - Added programmer guide documentation > > - Added implementation for common code > > > > v2..v1: > > - Moved dynamic log (Stephen) > > - model id to uint16_t from int16t_t (Stephen) > > - added release note updates > > > > v3..v2: > > - Introduced rte_ml_dev_init() similar to rte_gpu_init() (Stephen, Thomas) > > - In struct rte_ml_dev_data, removed reserved[3] and __rte_cache_aligned. > > Also, moved name field to the end(Stephen) > > > > Machine learning library framework > > -- > > > > The ML framework is built on the following model: > > > > > > +-+ rte_ml_[en|de]queue_burst() > > | | | > > | Machine o--+ ++| > > | Learning| | | queue ||+--+ > > | Inference o--+-o|<===o===>|Core 0| > > | Engine | | | pair 0 | +--+ > > | o+ | ++ > > | || | > > +-+| | ++ > > ^ | | | queue | +--+ > > | | +-o|<===>|Core 1| > > | | | pair 1 | +--+ > > | | ++ > > +++| > > | +-+ || ++ > > | | Model 0 | || | queue | +--+ > > | +-+ |+---o|<===>|Core N| > > | +-+ || pair N | +--+ > > | | Model 1 | |++ > > | +-+ | > > | +-+ |<--- rte_ml_model_load() > > | | Model .. | |---> rte_ml_model_info() > > | +-+ |<--- rte_ml_model_start() > > | +-+ |<--- rte_ml_model_stop() > > | | Model N | |<--- rte_ml_model_params_update() > > | +-+ |<--- rte_ml_model_unload() > > +-+ > > > > > Should model load/unload, params_update be part of dpdk, or dpdk can > assume these are already in place. The driver hooks can be NOPs if the model is already loaded or fixed model FPGA solutions. Probably we can add parameter info_get() in case if someone think user needs to be aware of it. Currently its an experimental API, when such device comes we can extent the rte_ml_dev_infostructure if/as needed. > For FPGA both options works, what is > the benefit to have these APIs part of DPDK? Support for runtime load/unload model if ml devices supports it. Also it has some bearing on data-path as inference needs
Re: [PATCH v6 01/22] gso: don't log message on non TCP/UDP
On Wed, 15 Feb 2023 07:26:22 +
"Hu, Jiayu" wrote:
> > -Original Message-
> > From: Stephen Hemminger
> > Sent: Wednesday, February 15, 2023 6:47 AM
> > To: dev@dpdk.org
> > Cc: Stephen Hemminger ; Hu, Jiayu
> > ; Konstantin Ananyev
> > ; Mark Kavanagh
> >
> > Subject: [PATCH v6 01/22] gso: don't log message on non TCP/UDP
> >
> > If a large packet is passed into GSO routines of unknown protocol then
> > library
> > would log a message.
> > Better to tell the application instead of logging.
> >
> > Fixes: 119583797b6a ("gso: support TCP/IPv4 GSO")
> > Cc: jiayu...@intel.com
> > Signed-off-by: Stephen Hemminger
> > ---
> > lib/gso/rte_gso.c | 5 ++---
> > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/lib/gso/rte_gso.c b/lib/gso/rte_gso.c index
> > 4b59217c16ee..c8e67c2d4b48 100644
> > --- a/lib/gso/rte_gso.c
> > +++ b/lib/gso/rte_gso.c
> > @@ -80,9 +80,8 @@ rte_gso_segment(struct rte_mbuf *pkt,
> > ret = gso_udp4_segment(pkt, gso_size, direct_pool,
> > indirect_pool, pkts_out, nb_pkts_out);
> > } else {
> > - /* unsupported packet, skip */
> > - RTE_LOG(DEBUG, GSO, "Unsupported packet type\n");
> > - ret = 0;
> > + ret = -ENOTSUP; /* only UDP or TCP allowed */
> > +
>
> The function signature annotation in rte_gso.h also needs update for ENOTSUP.
> In addition, will it break ABI?
Not really, if anybody hits this error case, nothing good would have
been happening.
[PATCH v2 00/16] test/bbdev: changes for 23.03
v2: Made changes requested during review. Added 3 commits. v1: Upstreaming bbdev-test changes for 23.03. Hernan Vargas (16): test/bbdev: fix seg fault for non supported HARQ len test/bbdev: extend HARQ tolerance test/bbdev: refactor TB throughput report test/bbdev: add timeout for latency tests test/bbdev: enable early termination for validation test/bbdev: report device status in test-bbdev test/bbdev: test start/stop bbdev API test/bbdev: add support for BLER for 4G test/bbdev: extend support for large TB test/bbdev: adjustment for soft output test/bbdev: expose warning counters test/bbdev: remove check for invalid opaque data test/bbdev: remove iteration count check test/bbdev: use mbuf reset function test/bbdev: remove max iteration from vectors test/bbdev: remove iter count from bler test app/test-bbdev/test_bbdev_perf.c | 400 +- app/test-bbdev/test_bbdev_vector.c| 14 - app/test-bbdev/test_bbdev_vector.h| 1 - .../test_vectors/ldpc_dec_HARQ_1_0.data | 3 - .../test_vectors/ldpc_dec_HARQ_1_1.data | 3 - .../test_vectors/ldpc_dec_HARQ_1_2.data | 3 - .../test_vectors/ldpc_dec_v11835.data | 3 - .../test_vectors/ldpc_dec_v2342_drop.data | 3 - .../test_vectors/ldpc_dec_v7813.data | 3 - .../test_vectors/ldpc_dec_v8480.data | 3 - .../test_vectors/ldpc_dec_v8568.data | 3 - .../test_vectors/ldpc_dec_v9503.data | 3 - ...turbo_dec_c1_k40_r0_e17280_sbd_negllr.data | 3 - ..._r0_e10376_crc24b_sbd_negllr_high_snr.data | 3 - ...4_r0_e10376_crc24b_sbd_negllr_low_snr.data | 3 - .../turbo_dec_c1_k6144_r0_e34560_posllr.data | 3 - ...rbo_dec_c1_k6144_r0_e34560_sbd_negllr.data | 3 - ...rbo_dec_c1_k6144_r0_e34560_sbd_posllr.data | 3 - ...c_c2_k3136_r0_e4920_sbd_negllr_crc24b.data | 3 - 19 files changed, 301 insertions(+), 162 deletions(-) -- 2.37.1
[PATCH v2 02/16] test/bbdev: extend HARQ tolerance
HARQ memory implementation could have different size assumptions.
Extending HARQ tolerance to cover different implementations.
Fixes: 335c11fd276 ("app/bbdev: support HARQ validation")
Cc: sta...@dpdk.org
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 027f32cbf1..74e7e13940 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -95,6 +95,7 @@
#define K0_3_1 56 /* K0 fraction numerator for rv 3 and BG 1 */
#define K0_3_2 43 /* K0 fraction numerator for rv 3 and BG 2 */
+#define HARQ_MEM_TOLERANCE 256
static struct test_bbdev_vector test_vector;
/* Switch between PMD and Interrupt for throughput TC */
@@ -2090,13 +2091,17 @@ validate_op_harq_chain(struct rte_bbdev_op_data *op,
uint16_t data_len = rte_pktmbuf_data_len(m) - offset;
total_data_size += orig_op->segments[i].length;
- TEST_ASSERT(orig_op->segments[i].length <
- (uint32_t)(data_len + 64),
+ TEST_ASSERT(orig_op->segments[i].length < (uint32_t)(data_len +
HARQ_MEM_TOLERANCE),
"Length of segment differ in original (%u) and
filled (%u) op",
orig_op->segments[i].length, data_len);
harq_orig = (int8_t *) orig_op->segments[i].addr;
harq_out = rte_pktmbuf_mtod_offset(m, int8_t *, offset);
+ /* Cannot compare HARQ output data for such cases */
+ if ((ldpc_llr_decimals > 1) && ((ops_ld->op_flags &
RTE_BBDEV_LDPC_LLR_COMPRESSION)
+ || (ops_ld->op_flags &
RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION)))
+ break;
+
if (!(ldpc_cap_flags &
RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_FILLERS
) || (ops_ld->op_flags &
@@ -2172,7 +2177,7 @@ validate_op_harq_chain(struct rte_bbdev_op_data *op,
/* Validate total mbuf pkt length */
uint32_t pkt_len = rte_pktmbuf_pkt_len(op->data) - op->offset;
- TEST_ASSERT(total_data_size < pkt_len + 64,
+ TEST_ASSERT(total_data_size < pkt_len + HARQ_MEM_TOLERANCE,
"Length of data differ in original (%u) and filled (%u)
op",
total_data_size, pkt_len);
--
2.37.1
[PATCH v2 01/16] test/bbdev: fix seg fault for non supported HARQ len
Fix segmentation fault happening in corner case in test-bbdev.
This fault could happen when running some specific vectors which size
are not supported by the PMD.
Fixes: 335c11fd276 ("app/bbdev: support HARQ validation")
Cc: sta...@dpdk.org
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 45e1780df7..027f32cbf1 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -84,7 +84,7 @@
/* Increment for next code block in external HARQ memory */
#define HARQ_INCR 32768
/* Headroom for filler LLRs insertion in HARQ buffer */
-#define FILLER_HEADROOM 1024
+#define FILLER_HEADROOM 2048
/* Constants from K0 computation from 3GPP 38.212 Table 5.4.2.1-2 */
#define N_ZC_1 66 /* N = 66 Zc for BG 1 */
#define N_ZC_2 50 /* N = 50 Zc for BG 2 */
@@ -2111,9 +2111,9 @@ validate_op_harq_chain(struct rte_bbdev_op_data *op,
ops_ld->n_filler;
if (data_len > deRmOutSize)
data_len = deRmOutSize;
- if (data_len > orig_op->segments[i].length)
- data_len = orig_op->segments[i].length;
}
+ if (data_len > orig_op->segments[i].length)
+ data_len = orig_op->segments[i].length;
/*
* HARQ output can have minor differences
* due to integer representation and related scaling
--
2.37.1
[PATCH v2 03/16] test/bbdev: refactor TB throughput report
Refactor calculation for tb_size.
No functional impact.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 38 ++--
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 74e7e13940..19b9a5b119 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -2580,19 +2580,16 @@ calc_dec_TB_size(struct rte_bbdev_dec_op *op)
static uint32_t
calc_ldpc_dec_TB_size(struct rte_bbdev_dec_op *op)
{
- uint8_t i;
- uint32_t c, r, tb_size = 0;
+ uint8_t num_cbs = 0;
+ uint32_t tb_size = 0;
uint16_t sys_cols = (op->ldpc_dec.basegraph == 1) ? 22 : 10;
- if (op->ldpc_dec.code_block_mode == RTE_BBDEV_CODE_BLOCK) {
- tb_size = sys_cols * op->ldpc_dec.z_c - op->ldpc_dec.n_filler;
- } else {
- c = op->ldpc_dec.tb_params.c;
- r = op->ldpc_dec.tb_params.r;
- for (i = 0; i < c-r; i++)
- tb_size += sys_cols * op->ldpc_dec.z_c
- - op->ldpc_dec.n_filler;
- }
+ if (op->ldpc_dec.code_block_mode == RTE_BBDEV_CODE_BLOCK)
+ num_cbs = 1;
+ else
+ num_cbs = op->ldpc_dec.tb_params.c - op->ldpc_dec.tb_params.r;
+
+ tb_size = (sys_cols * op->ldpc_dec.z_c - op->ldpc_dec.n_filler) *
num_cbs;
return tb_size;
}
@@ -2618,19 +2615,16 @@ calc_enc_TB_size(struct rte_bbdev_enc_op *op)
static uint32_t
calc_ldpc_enc_TB_size(struct rte_bbdev_enc_op *op)
{
- uint8_t i;
- uint32_t c, r, tb_size = 0;
+ uint8_t num_cbs = 0;
+ uint32_t tb_size = 0;
uint16_t sys_cols = (op->ldpc_enc.basegraph == 1) ? 22 : 10;
- if (op->ldpc_enc.code_block_mode == RTE_BBDEV_CODE_BLOCK) {
- tb_size = sys_cols * op->ldpc_enc.z_c - op->ldpc_enc.n_filler;
- } else {
- c = op->turbo_enc.tb_params.c;
- r = op->turbo_enc.tb_params.r;
- for (i = 0; i < c-r; i++)
- tb_size += sys_cols * op->ldpc_enc.z_c
- - op->ldpc_enc.n_filler;
- }
+ if (op->ldpc_enc.code_block_mode == RTE_BBDEV_CODE_BLOCK)
+ num_cbs = 1;
+ else
+ num_cbs = op->ldpc_enc.tb_params.c - op->ldpc_enc.tb_params.r;
+
+ tb_size = (sys_cols * op->ldpc_enc.z_c - op->ldpc_enc.n_filler) *
num_cbs;
return tb_size;
}
--
2.37.1
[PATCH v2 05/16] test/bbdev: enable early termination for validation
Enhancement to enable early termination for validation tests if the
device supports it.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 30 +++---
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index dede0f900e..8c4b82efca 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -3775,11 +3775,11 @@ throughput_pmd_lcore_ldpc_dec(void *arg)
TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", num_ops);
/* For throughput tests we need to disable early termination */
- if (check_bit(ref_op->ldpc_dec.op_flags,
- RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE))
- ref_op->ldpc_dec.op_flags -=
- RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE;
+ if (check_bit(ref_op->ldpc_dec.op_flags,
RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE))
+ ref_op->ldpc_dec.op_flags -=
RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE;
+
ref_op->ldpc_dec.iter_max = get_iter_max();
+ /* Since ET is disabled, the expected iter_count is iter_max */
ref_op->ldpc_dec.iter_count = ref_op->ldpc_dec.iter_max;
if (test_vector.op_type != RTE_BBDEV_OP_NONE)
@@ -4465,7 +4465,7 @@ latency_test_dec(struct rte_mempool *mempool,
struct test_buffers *bufs, struct rte_bbdev_dec_op *ref_op,
int vector_mask, uint16_t dev_id, uint16_t queue_id,
const uint16_t num_to_process, uint16_t burst_sz,
- uint64_t *total_time, uint64_t *min_time, uint64_t *max_time)
+ uint64_t *total_time, uint64_t *min_time, uint64_t *max_time,
bool disable_et)
{
int ret = TEST_SUCCESS;
uint16_t i, j, dequeued;
@@ -4481,8 +4481,14 @@ latency_test_dec(struct rte_mempool *mempool,
burst_sz = num_to_process - dequeued;
ret = rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz);
- TEST_ASSERT_SUCCESS(ret,
- "rte_bbdev_dec_op_alloc_bulk() failed");
+ TEST_ASSERT_SUCCESS(ret, "rte_bbdev_dec_op_alloc_bulk()
failed");
+
+ ref_op->turbo_dec.iter_max = get_iter_max();
+ /* For validation tests we want to enable early termination */
+ if (!disable_et && !check_bit(ref_op->turbo_dec.op_flags,
+ RTE_BBDEV_TURBO_EARLY_TERMINATION))
+ ref_op->turbo_dec.op_flags |=
RTE_BBDEV_TURBO_EARLY_TERMINATION;
+
if (test_vector.op_type != RTE_BBDEV_OP_NONE)
copy_reference_dec_op(ops_enq, burst_sz, dequeued,
bufs->inputs,
@@ -4561,10 +4567,12 @@ latency_test_ldpc_dec(struct rte_mempool *mempool,
/* For latency tests we need to disable early termination */
if (disable_et && check_bit(ref_op->ldpc_dec.op_flags,
RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE))
- ref_op->ldpc_dec.op_flags -=
- RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE;
+ ref_op->ldpc_dec.op_flags -=
RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE;
+
ref_op->ldpc_dec.iter_max = get_iter_max();
- ref_op->ldpc_dec.iter_count = ref_op->ldpc_dec.iter_max;
+ /* When ET is disabled, the expected iter_count is iter_max */
+ if (disable_et)
+ ref_op->ldpc_dec.iter_count = ref_op->ldpc_dec.iter_max;
if (test_vector.op_type != RTE_BBDEV_OP_NONE)
copy_reference_ldpc_dec_op(ops_enq, burst_sz, dequeued,
@@ -4873,7 +4881,7 @@ validation_latency_test(struct active_device *ad,
iter = latency_test_dec(op_params->mp, bufs,
op_params->ref_dec_op, op_params->vector_mask,
ad->dev_id, queue_id, num_to_process,
- burst_sz, &total_time, &min_time, &max_time);
+ burst_sz, &total_time, &min_time, &max_time,
latency_flag);
else if (op_type == RTE_BBDEV_OP_LDPC_ENC)
iter = latency_test_ldpc_enc(op_params->mp, bufs,
op_params->ref_enc_op, ad->dev_id, queue_id,
--
2.37.1
[PATCH v2 04/16] test/bbdev: add timeout for latency tests
Add a timeout to force exit the latency tests in case dequeue never
happens.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 24 +++-
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 19b9a5b119..dede0f900e 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -26,6 +26,7 @@
#define MAX_QUEUES RTE_MAX_LCORE
#define TEST_REPETITIONS 100
+#define TIME_OUT_POLL 1e8
#define WAIT_OFFLOAD_US 1000
#ifdef RTE_BASEBAND_FPGA_LTE_FEC
@@ -4546,6 +4547,7 @@ latency_test_ldpc_dec(struct rte_mempool *mempool,
for (i = 0, dequeued = 0; dequeued < num_to_process; ++i) {
uint16_t enq = 0, deq = 0;
+ uint32_t time_out = 0;
bool first_time = true;
last_time = 0;
@@ -4597,7 +4599,8 @@ latency_test_ldpc_dec(struct rte_mempool *mempool,
last_time = rte_rdtsc_precise() - start_time;
first_time = false;
}
- } while (unlikely(burst_sz != deq));
+ time_out++;
+ } while ((burst_sz != deq) && (time_out < TIME_OUT_POLL));
*max_time = RTE_MAX(*max_time, last_time);
*min_time = RTE_MIN(*min_time, last_time);
@@ -4606,7 +4609,12 @@ latency_test_ldpc_dec(struct rte_mempool *mempool,
if (extDdr)
retrieve_harq_ddr(dev_id, queue_id, ops_enq, burst_sz);
- if (test_vector.op_type != RTE_BBDEV_OP_NONE) {
+ if (burst_sz != deq) {
+ struct rte_bbdev_info info;
+ ret = TEST_FAILED;
+ rte_bbdev_info_get(dev_id, &info);
+ TEST_ASSERT_SUCCESS(ret, "Dequeue timeout!");
+ } else if (test_vector.op_type != RTE_BBDEV_OP_NONE) {
ret = validate_ldpc_dec_op(ops_deq, burst_sz, ref_op,
vector_mask);
TEST_ASSERT_SUCCESS(ret, "Validation failed!");
@@ -4632,6 +4640,7 @@ latency_test_enc(struct rte_mempool *mempool,
for (i = 0, dequeued = 0; dequeued < num_to_process; ++i) {
uint16_t enq = 0, deq = 0;
+ uint32_t time_out = 0;
bool first_time = true;
last_time = 0;
@@ -4667,13 +4676,18 @@ latency_test_enc(struct rte_mempool *mempool,
last_time += rte_rdtsc_precise() - start_time;
first_time = false;
}
- } while (unlikely(burst_sz != deq));
+ time_out++;
+ } while ((burst_sz != deq) && (time_out < TIME_OUT_POLL));
*max_time = RTE_MAX(*max_time, last_time);
*min_time = RTE_MIN(*min_time, last_time);
*total_time += last_time;
-
- if (test_vector.op_type != RTE_BBDEV_OP_NONE) {
+ if (burst_sz != deq) {
+ struct rte_bbdev_info info;
+ ret = TEST_FAILED;
+ rte_bbdev_info_get(dev_id, &info);
+ TEST_ASSERT_SUCCESS(ret, "Dequeue timeout!");
+ } else if (test_vector.op_type != RTE_BBDEV_OP_NONE) {
ret = validate_enc_op(ops_deq, burst_sz, ref_op);
TEST_ASSERT_SUCCESS(ret, "Validation failed!");
}
--
2.37.1
[PATCH v2 06/16] test/bbdev: report device status in test-bbdev
No functional impact.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 8c4b82efca..057fb5ac9e 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -850,6 +850,8 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
#endif
/* Let's refresh this now this is configured */
rte_bbdev_info_get(dev_id, info);
+ if (info->drv.device_status == RTE_BBDEV_DEV_FATAL_ERR)
+ printf("Device Status %s\n",
rte_bbdev_device_status_str(info->drv.device_status));
nb_queues = RTE_MIN(rte_lcore_count(), info->drv.max_num_queues);
nb_queues = RTE_MIN(nb_queues, (unsigned int) MAX_QUEUES);
--
2.37.1
[PATCH v2 11/16] test/bbdev: expose warning counters
Print warnings reported on queues for offload test.
No functional impact.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 00090f863f..a19eda2de8 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -5673,6 +5673,9 @@ offload_cost_test(struct active_device *ad,
struct rte_bbdev_stats stats = {0};
get_bbdev_queue_stats(ad->dev_id, queue_id, &stats);
+ if (stats.enqueue_warn_count > 0)
+ printf("Warning reported on the queue : %10"PRIu64"\n",
+ stats.enqueue_warn_count);
if (op_type != RTE_BBDEV_OP_LDPC_DEC) {
TEST_ASSERT_SUCCESS(stats.enqueued_count != num_to_process,
"Mismatch in enqueue count %10"PRIu64" %d",
--
2.37.1
[PATCH v2 07/16] test/bbdev: test start/stop bbdev API
Add a call to queue start and queue stop specifically for testing the
bbdev API.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 057fb5ac9e..e4eb71050a 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -890,6 +890,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
ret = rte_bbdev_queue_configure(ad->dev_id, queue_id,
&qconf);
}
+ rte_bbdev_queue_start(ad->dev_id, queue_id);
if (ret != 0) {
printf("All queues on dev %u allocated: %u\n",
dev_id, queue_id);
@@ -898,8 +899,8 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
ad->queue_ids[queue_id] = queue_id;
}
TEST_ASSERT(queue_id != 0,
- "ERROR Failed to configure any queues on dev %u",
- dev_id);
+ "ERROR Failed to configure any queues on dev %u\n"
+ "\tthe device may not support or have been configured",
dev_id);
ad->nb_queues = queue_id;
set_avail_op(ad, op_type);
@@ -3846,6 +3847,7 @@ throughput_pmd_lcore_ldpc_dec(void *arg)
TEST_ASSERT_SUCCESS(ret, "Validation failed!");
}
+ rte_bbdev_queue_stop(tp->dev_id, queue_id);
rte_bbdev_dec_op_free_bulk(ops_enq, num_ops);
double tb_len_bits = calc_ldpc_dec_TB_size(ref_op);
--
2.37.1
[PATCH v2 09/16] test/bbdev: extend support for large TB
Add support for large TB when it cannot fit into a true mbuf.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index acfefb7efa..bdddf4f8b2 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -1073,8 +1073,6 @@ init_op_data_objs(struct rte_bbdev_op_data *bufs,
* Special case when DPDK mbuf cannot handle
* the required input size
*/
- printf("Warning: Larger input size than DPDK mbuf %d\n",
- seg->length);
large_input = true;
}
bufs[i].data = m_head;
@@ -2031,6 +2029,7 @@ validate_op_chain(struct rte_bbdev_op_data *op,
struct rte_mbuf *m = op->data;
uint8_t nb_dst_segments = orig_op->nb_segments;
uint32_t total_data_size = 0;
+ bool ignore_mbuf = false; /* ignore mbuf limitations */
TEST_ASSERT(nb_dst_segments == m->nb_segs,
"Number of segments differ in original (%u) and filled
(%u) op",
@@ -2043,21 +2042,25 @@ validate_op_chain(struct rte_bbdev_op_data *op,
uint16_t data_len = rte_pktmbuf_data_len(m) - offset;
total_data_size += orig_op->segments[i].length;
- TEST_ASSERT(orig_op->segments[i].length == data_len,
- "Length of segment differ in original (%u) and
filled (%u) op",
- orig_op->segments[i].length, data_len);
+ if (orig_op->segments[i].length > RTE_BBDEV_LDPC_E_MAX_MBUF)
+ ignore_mbuf = true;
+ if (!ignore_mbuf)
+ TEST_ASSERT(orig_op->segments[i].length == data_len,
+ "Length of segment differ in original
(%u) and filled (%u) op",
+ orig_op->segments[i].length, data_len);
TEST_ASSERT_BUFFERS_ARE_EQUAL(orig_op->segments[i].addr,
rte_pktmbuf_mtod_offset(m, uint32_t *, offset),
- data_len,
+ orig_op->segments[i].length,
"Output buffers (CB=%u) are not equal", i);
m = m->next;
}
/* Validate total mbuf pkt length */
uint32_t pkt_len = rte_pktmbuf_pkt_len(op->data) - op->offset;
- TEST_ASSERT(total_data_size == pkt_len,
- "Length of data differ in original (%u) and filled (%u)
op",
- total_data_size, pkt_len);
+ if (!ignore_mbuf)
+ TEST_ASSERT(total_data_size == pkt_len,
+ "Length of data differ in original (%u) and
filled (%u) op",
+ total_data_size, pkt_len);
return TEST_SUCCESS;
}
--
2.37.1
[PATCH v2 10/16] test/bbdev: adjustment for soft output
Extend test-bbdev for soft output check, notably due to the logic in
test-bbdev to enable termination changing.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index bdddf4f8b2..00090f863f 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -1349,6 +1349,7 @@ fill_queue_buffers(struct test_op_params *op_params,
RTE_BBDEV_LDPC_LLR_COMPRESSION;
bool harq_comp = op_params->ref_dec_op->ldpc_dec.op_flags &
RTE_BBDEV_LDPC_HARQ_6BIT_COMPRESSION;
+
ldpc_llr_decimals = capabilities->cap.ldpc_dec.llr_decimals;
ldpc_llr_size = capabilities->cap.ldpc_dec.llr_size;
ldpc_cap_flags = capabilities->cap.ldpc_dec.capability_flags;
@@ -2424,7 +2425,7 @@ validate_ldpc_dec_op(struct rte_bbdev_dec_op **ops, const
uint16_t n,
i);
if (ref_op->ldpc_dec.op_flags & RTE_BBDEV_LDPC_SOFT_OUT_ENABLE)
- TEST_ASSERT_SUCCESS(validate_op_chain(soft_output,
+ TEST_ASSERT_SUCCESS(validate_op_so_chain(soft_output,
soft_data_orig),
"Soft output buffers (CB=%u) are not
equal",
i);
@@ -2494,7 +2495,6 @@ validate_ldpc_enc_op(struct rte_bbdev_enc_op **ops, const
uint16_t n,
return TEST_SUCCESS;
}
-
static inline int
validate_op_fft_chain(struct rte_bbdev_op_data *op, struct op_data_entries
*orig_op)
{
@@ -3181,11 +3181,11 @@ throughput_intr_lcore_ldpc_dec(void *arg)
for (j = 0; j < TEST_REPETITIONS; ++j) {
for (i = 0; i < num_to_process; ++i) {
if (!loopback)
- rte_pktmbuf_reset(
- ops[i]->ldpc_dec.hard_output.data);
+
rte_pktmbuf_reset(ops[i]->ldpc_dec.hard_output.data);
if (hc_out || loopback)
- mbuf_reset(
- ops[i]->ldpc_dec.harq_combined_output.data);
+
mbuf_reset(ops[i]->ldpc_dec.harq_combined_output.data);
+ if (ops[i]->ldpc_dec.soft_output.data != NULL)
+
rte_pktmbuf_reset(ops[i]->ldpc_dec.soft_output.data);
}
tp->start_time = rte_rdtsc_precise();
@@ -3280,7 +3280,6 @@ throughput_intr_lcore_dec(void *arg)
rte_pktmbuf_reset(ops[i]->turbo_dec.soft_output.data);
}
-
tp->start_time = rte_rdtsc_precise();
for (enqueued = 0; enqueued < num_to_process;) {
num_to_enq = burst_sz;
@@ -3742,10 +3741,11 @@ bler_pmd_lcore_ldpc_dec(void *arg)
for (i = 0; i < 1; ++i) { /* Could add more iterations */
for (j = 0; j < num_ops; ++j) {
if (!loopback)
- mbuf_reset(
- ops_enq[j]->ldpc_dec.hard_output.data);
+
mbuf_reset(ops_enq[j]->ldpc_dec.hard_output.data);
if (hc_out || loopback)
mbuf_reset(ops_enq[j]->ldpc_dec.harq_combined_output.data);
+ if (ops_enq[j]->ldpc_dec.soft_output.data != NULL)
+
mbuf_reset(ops_enq[j]->ldpc_dec.soft_output.data);
}
if (extDdr)
preload_harq_ddr(tp->dev_id, queue_id, ops_enq,
@@ -3977,11 +3977,11 @@ throughput_pmd_lcore_ldpc_dec(void *arg)
for (i = 0; i < TEST_REPETITIONS; ++i) {
for (j = 0; j < num_ops; ++j) {
if (!loopback)
- mbuf_reset(
- ops_enq[j]->ldpc_dec.hard_output.data);
+
mbuf_reset(ops_enq[j]->ldpc_dec.hard_output.data);
if (hc_out || loopback)
- mbuf_reset(
- ops_enq[j]->ldpc_dec.harq_combined_output.data);
+
mbuf_reset(ops_enq[j]->ldpc_dec.harq_combined_output.data);
+ if (ops_enq[j]->ldpc_dec.soft_output.data != NULL)
+
mbuf_reset(ops_enq[j]->ldpc_dec.soft_output.data);
}
if (extDdr)
preload_harq_ddr(tp->dev_id, queue_id, ops_enq,
--
2.37.1
[PATCH v2 08/16] test/bbdev: add support for BLER for 4G
New feature to add BLER support for 4G in test-bbdev.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 183 ++-
1 file changed, 182 insertions(+), 1 deletion(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index e4eb71050a..acfefb7efa 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -1757,6 +1757,30 @@ gen_qm2_llr(int8_t *llrs, uint32_t j, double N0, double
llr_max)
llrs[j] = (int8_t) b;
}
+/* Simple LLR generation assuming AWGN and QPSK */
+static void
+gen_turbo_llr(int8_t *llrs, uint32_t j, double N0, double llr_max)
+{
+ double b, b1, n;
+ double coeff = 2.0 * sqrt(N0);
+
+ /* Ignore in vectors null LLRs not to be saturated */
+ if (llrs[j] == 0)
+ return;
+
+ /* Note don't change sign here */
+ n = randn(j % 2);
+ b1 = ((llrs[j] > 0 ? 2.0 : -2.0)
+ + coeff * n) / N0;
+ b = b1 * (1 << 4);
+ b = round(b);
+ if (b > llr_max)
+ b = llr_max;
+ if (b < -llr_max)
+ b = -llr_max;
+ llrs[j] = (int8_t) b;
+}
+
/* Generate LLR for a given SNR */
static void
generate_llr_input(uint16_t n, struct rte_bbdev_op_data *inputs,
@@ -1792,6 +1816,27 @@ generate_llr_input(uint16_t n, struct rte_bbdev_op_data
*inputs,
}
}
+/* Generate LLR for turbo decoder for a given SNR */
+static void
+generate_turbo_llr_input(uint16_t n, struct rte_bbdev_op_data *inputs,
+ struct rte_bbdev_dec_op *ref_op)
+{
+ struct rte_mbuf *m;
+ uint32_t i, j, range;
+ double N0, llr_max;
+
+ llr_max = 127;
+ range = ref_op->turbo_dec.input.length;
+ N0 = 1.0 / pow(10.0, get_snr() / 10.0);
+
+ for (i = 0; i < n; ++i) {
+ m = inputs[i].data;
+ int8_t *llrs = rte_pktmbuf_mtod_offset(m, int8_t *, 0);
+ for (j = 0; j < range; ++j)
+ gen_turbo_llr(llrs, j, N0, llr_max);
+ }
+}
+
static void
copy_reference_ldpc_dec_op(struct rte_bbdev_dec_op **ops, unsigned int n,
unsigned int start_idx,
@@ -2306,6 +2351,30 @@ validate_ldpc_bler(struct rte_bbdev_dec_op **ops, const
uint16_t n)
return errors;
}
+/* Check Number of code blocks errors */
+static int
+validate_turbo_bler(struct rte_bbdev_dec_op **ops, const uint16_t n)
+{
+ unsigned int i;
+ struct op_data_entries *hard_data_orig =
&test_vector.entries[DATA_HARD_OUTPUT];
+ struct rte_bbdev_op_turbo_dec *ops_td;
+ struct rte_bbdev_op_data *hard_output;
+ int errors = 0;
+ struct rte_mbuf *m;
+
+ for (i = 0; i < n; ++i) {
+ ops_td = &ops[i]->turbo_dec;
+ hard_output = &ops_td->hard_output;
+ m = hard_output->data;
+ if (memcmp(rte_pktmbuf_mtod_offset(m, uint32_t *, 0),
+ hard_data_orig->segments[0].addr,
+ hard_data_orig->segments[0].length))
+ errors++;
+ }
+ return errors;
+}
+
+
static int
validate_ldpc_dec_op(struct rte_bbdev_dec_op **ops, const uint16_t n,
struct rte_bbdev_dec_op *ref_op, const int vector_mask)
@@ -3738,6 +3807,114 @@ bler_pmd_lcore_ldpc_dec(void *arg)
return TEST_SUCCESS;
}
+
+static int
+bler_pmd_lcore_turbo_dec(void *arg)
+{
+ struct thread_params *tp = arg;
+ uint16_t enq, deq;
+ uint64_t total_time = 0, start_time;
+ const uint16_t queue_id = tp->queue_id;
+ const uint16_t burst_sz = tp->op_params->burst_sz;
+ const uint16_t num_ops = tp->op_params->num_to_process;
+ struct rte_bbdev_dec_op *ops_enq[num_ops];
+ struct rte_bbdev_dec_op *ops_deq[num_ops];
+ struct rte_bbdev_dec_op *ref_op = tp->op_params->ref_dec_op;
+ struct test_buffers *bufs = NULL;
+ int i, j, ret;
+ struct rte_bbdev_info info;
+ uint16_t num_to_enq;
+
+ TEST_ASSERT_SUCCESS((burst_sz > MAX_BURST),
+ "BURST_SIZE should be <= %u", MAX_BURST);
+
+ rte_bbdev_info_get(tp->dev_id, &info);
+
+ TEST_ASSERT_SUCCESS((num_ops > info.drv.queue_size_lim),
+ "NUM_OPS cannot exceed %u for this device",
+ info.drv.queue_size_lim);
+
+ bufs = &tp->op_params->q_bufs[GET_SOCKET(info.socket_id)][queue_id];
+
+ rte_wait_until_equal_16(&tp->op_params->sync, SYNC_START,
__ATOMIC_RELAXED);
+
+ ret = rte_bbdev_dec_op_alloc_bulk(tp->op_params->mp, ops_enq, num_ops);
+ TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", num_ops);
+
+ /* For BLER tests we need to enable early termination */
+ if (!check_bit(ref_op->turbo_dec.op_flags,
+ RTE_BBDEV_TURBO_EARLY_TERMINATION))
+ ref_op->turbo_dec.op_flags +=
+ RTE_BBDEV_TURBO_EAR
[PATCH v2 12/16] test/bbdev: remove check for invalid opaque data
Assert also if the opaque data is invalid.
Fixes: 335c11fd276 ("app/bbdev: support HARQ validation")
Cc: sta...@dpdk.org
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index a19eda2de8..2ce1c7e7d3 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -79,7 +79,6 @@
#define SYNC_WAIT 0
#define SYNC_START 1
-#define INVALID_OPAQUE -1
#define INVALID_QUEUE_ID -1
/* Increment for next code block in external HARQ memory */
@@ -1999,10 +1998,9 @@ check_enc_status_and_ordering(struct rte_bbdev_enc_op
*op,
"op_status (%d) != expected_status (%d)",
op->status, expected_status);
- if (op->opaque_data != (void *)(uintptr_t)INVALID_OPAQUE)
- TEST_ASSERT((void *)(uintptr_t)order_idx == op->opaque_data,
- "Ordering error, expected %p, got %p",
- (void *)(uintptr_t)order_idx, op->opaque_data);
+ TEST_ASSERT((void *)(uintptr_t)order_idx == op->opaque_data,
+ "Ordering error, expected %p, got %p",
+ (void *)(uintptr_t)order_idx, op->opaque_data);
return TEST_SUCCESS;
}
--
2.37.1
[PATCH v2 14/16] test/bbdev: use mbuf reset function
Use mbuf_reset function for code consistency.
No functional impact.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 5259404ff6..535b9d73dd 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -3173,11 +3173,11 @@ throughput_intr_lcore_ldpc_dec(void *arg)
for (j = 0; j < TEST_REPETITIONS; ++j) {
for (i = 0; i < num_to_process; ++i) {
if (!loopback)
-
rte_pktmbuf_reset(ops[i]->ldpc_dec.hard_output.data);
+ mbuf_reset(ops[i]->ldpc_dec.hard_output.data);
if (hc_out || loopback)
mbuf_reset(ops[i]->ldpc_dec.harq_combined_output.data);
if (ops[i]->ldpc_dec.soft_output.data != NULL)
-
rte_pktmbuf_reset(ops[i]->ldpc_dec.soft_output.data);
+ mbuf_reset(ops[i]->ldpc_dec.soft_output.data);
}
tp->start_time = rte_rdtsc_precise();
@@ -3267,9 +3267,9 @@ throughput_intr_lcore_dec(void *arg)
for (j = 0; j < TEST_REPETITIONS; ++j) {
for (i = 0; i < num_to_process; ++i) {
- rte_pktmbuf_reset(ops[i]->turbo_dec.hard_output.data);
+ mbuf_reset(ops[i]->turbo_dec.hard_output.data);
if (ops[i]->turbo_dec.soft_output.data != NULL)
-
rte_pktmbuf_reset(ops[i]->turbo_dec.soft_output.data);
+ mbuf_reset(ops[i]->turbo_dec.soft_output.data);
}
tp->start_time = rte_rdtsc_precise();
@@ -3356,7 +3356,7 @@ throughput_intr_lcore_enc(void *arg)
for (j = 0; j < TEST_REPETITIONS; ++j) {
for (i = 0; i < num_to_process; ++i)
- rte_pktmbuf_reset(ops[i]->turbo_enc.output.data);
+ mbuf_reset(ops[i]->turbo_enc.output.data);
tp->start_time = rte_rdtsc_precise();
for (enqueued = 0; enqueued < num_to_process;) {
@@ -3444,7 +3444,7 @@ throughput_intr_lcore_ldpc_enc(void *arg)
for (j = 0; j < TEST_REPETITIONS; ++j) {
for (i = 0; i < num_to_process; ++i)
- rte_pktmbuf_reset(ops[i]->turbo_enc.output.data);
+ mbuf_reset(ops[i]->turbo_enc.output.data);
tp->start_time = rte_rdtsc_precise();
for (enqueued = 0; enqueued < num_to_process;) {
@@ -3532,7 +3532,7 @@ throughput_intr_lcore_fft(void *arg)
for (j = 0; j < TEST_REPETITIONS; ++j) {
for (i = 0; i < num_to_process; ++i)
- rte_pktmbuf_reset(ops[i]->fft.base_output.data);
+ mbuf_reset(ops[i]->fft.base_output.data);
tp->start_time = rte_rdtsc_precise();
for (enqueued = 0; enqueued < num_to_process;) {
--
2.37.1
[PATCH v2 13/16] test/bbdev: remove iteration count check
To make the test compatible with devices that do not support early
termination, the iteration count assert can be removed.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 24
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 2ce1c7e7d3..5259404ff6 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -2288,7 +2288,7 @@ validate_op_so_chain(struct rte_bbdev_op_data *op,
static int
validate_dec_op(struct rte_bbdev_dec_op **ops, const uint16_t n,
- struct rte_bbdev_dec_op *ref_op, const int vector_mask)
+ struct rte_bbdev_dec_op *ref_op)
{
unsigned int i;
int ret;
@@ -2299,17 +2299,12 @@ validate_dec_op(struct rte_bbdev_dec_op **ops, const
uint16_t n,
struct rte_bbdev_op_turbo_dec *ops_td;
struct rte_bbdev_op_data *hard_output;
struct rte_bbdev_op_data *soft_output;
- struct rte_bbdev_op_turbo_dec *ref_td = &ref_op->turbo_dec;
for (i = 0; i < n; ++i) {
ops_td = &ops[i]->turbo_dec;
hard_output = &ops_td->hard_output;
soft_output = &ops_td->soft_output;
- if (vector_mask & TEST_BBDEV_VF_EXPECTED_ITER_COUNT)
- TEST_ASSERT(ops_td->iter_count <= ref_td->iter_count,
- "Returned iter_count (%d) > expected
iter_count (%d)",
- ops_td->iter_count, ref_td->iter_count);
ret = check_dec_status_and_ordering(ops[i], i, ref_op->status);
TEST_ASSERT_SUCCESS(ret,
"Checking status and ordering for decoder
failed");
@@ -3058,8 +3053,7 @@ dequeue_event_callback(uint16_t dev_id,
if (test_vector.op_type == RTE_BBDEV_OP_TURBO_DEC) {
struct rte_bbdev_dec_op *ref_op = tp->op_params->ref_dec_op;
- ret = validate_dec_op(tp->dec_ops, num_ops, ref_op,
- tp->op_params->vector_mask);
+ ret = validate_dec_op(tp->dec_ops, num_ops, ref_op);
/* get the max of iter_count for all dequeued ops */
for (i = 0; i < num_ops; ++i)
tp->iter_count = RTE_MAX(
@@ -3660,8 +3654,7 @@ throughput_pmd_lcore_dec(void *arg)
}
if (test_vector.op_type != RTE_BBDEV_OP_NONE) {
- ret = validate_dec_op(ops_deq, num_ops, ref_op,
- tp->op_params->vector_mask);
+ ret = validate_dec_op(ops_deq, num_ops, ref_op);
TEST_ASSERT_SUCCESS(ret, "Validation failed!");
}
@@ -4649,7 +4642,7 @@ throughput_test(struct active_device *ad,
static int
latency_test_dec(struct rte_mempool *mempool,
struct test_buffers *bufs, struct rte_bbdev_dec_op *ref_op,
- int vector_mask, uint16_t dev_id, uint16_t queue_id,
+ uint16_t dev_id, uint16_t queue_id,
const uint16_t num_to_process, uint16_t burst_sz,
uint64_t *total_time, uint64_t *min_time, uint64_t *max_time,
bool disable_et)
{
@@ -4709,8 +4702,7 @@ latency_test_dec(struct rte_mempool *mempool,
*total_time += last_time;
if (test_vector.op_type != RTE_BBDEV_OP_NONE) {
- ret = validate_dec_op(ops_deq, burst_sz, ref_op,
- vector_mask);
+ ret = validate_dec_op(ops_deq, burst_sz, ref_op);
TEST_ASSERT_SUCCESS(ret, "Validation failed!");
}
@@ -5065,9 +5057,9 @@ validation_latency_test(struct active_device *ad,
if (op_type == RTE_BBDEV_OP_TURBO_DEC)
iter = latency_test_dec(op_params->mp, bufs,
- op_params->ref_dec_op, op_params->vector_mask,
- ad->dev_id, queue_id, num_to_process,
- burst_sz, &total_time, &min_time, &max_time,
latency_flag);
+ op_params->ref_dec_op, ad->dev_id, queue_id,
+ num_to_process, burst_sz, &total_time,
+ &min_time, &max_time, latency_flag);
else if (op_type == RTE_BBDEV_OP_LDPC_ENC)
iter = latency_test_ldpc_enc(op_params->mp, bufs,
op_params->ref_enc_op, ad->dev_id, queue_id,
--
2.37.1
[PATCH v2 16/16] test/bbdev: remove iter count from bler test
iter_count doesn't need to be set equal to iter_max for bler tests. This is only needed in throughput and latency tests because early termination is disabled for those tests. Signed-off-by: Hernan Vargas --- app/test-bbdev/test_bbdev_perf.c | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c index 2baa2a0e62..621feee42b 100644 --- a/app/test-bbdev/test_bbdev_perf.c +++ b/app/test-bbdev/test_bbdev_perf.c @@ -3714,12 +3714,10 @@ bler_pmd_lcore_ldpc_dec(void *arg) TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", num_ops); /* For BLER tests we need to enable early termination */ - if (!check_bit(ref_op->ldpc_dec.op_flags, - RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE)) - ref_op->ldpc_dec.op_flags += - RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE; + if (!check_bit(ref_op->ldpc_dec.op_flags, RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE)) + ref_op->ldpc_dec.op_flags += RTE_BBDEV_LDPC_ITERATION_STOP_ENABLE; + ref_op->ldpc_dec.iter_max = get_iter_max(); - ref_op->ldpc_dec.iter_count = ref_op->ldpc_dec.iter_max; if (test_vector.op_type != RTE_BBDEV_OP_NONE) copy_reference_ldpc_dec_op(ops_enq, num_ops, 0, bufs->inputs, @@ -3838,12 +3836,10 @@ bler_pmd_lcore_turbo_dec(void *arg) TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", num_ops); /* For BLER tests we need to enable early termination */ - if (!check_bit(ref_op->turbo_dec.op_flags, - RTE_BBDEV_TURBO_EARLY_TERMINATION)) - ref_op->turbo_dec.op_flags += - RTE_BBDEV_TURBO_EARLY_TERMINATION; + if (!check_bit(ref_op->turbo_dec.op_flags, RTE_BBDEV_TURBO_EARLY_TERMINATION)) + ref_op->turbo_dec.op_flags += RTE_BBDEV_TURBO_EARLY_TERMINATION; + ref_op->turbo_dec.iter_max = get_iter_max(); - ref_op->turbo_dec.iter_count = ref_op->turbo_dec.iter_max; if (test_vector.op_type != RTE_BBDEV_OP_NONE) copy_reference_dec_op(ops_enq, num_ops, 0, bufs->inputs, -- 2.37.1
[PATCH v2 15/16] test/bbdev: remove max iteration from vectors
Remove iter_max from test vectors as this value is passed as an argument
to the test.
No functional impact.
Signed-off-by: Hernan Vargas
---
app/test-bbdev/test_bbdev_perf.c | 4
app/test-bbdev/test_bbdev_vector.c | 14 --
app/test-bbdev/test_bbdev_vector.h | 1 -
app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data | 3 ---
app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_1.data | 3 ---
app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_2.data | 3 ---
app/test-bbdev/test_vectors/ldpc_dec_v11835.data | 3 ---
.../test_vectors/ldpc_dec_v2342_drop.data | 3 ---
app/test-bbdev/test_vectors/ldpc_dec_v7813.data| 3 ---
app/test-bbdev/test_vectors/ldpc_dec_v8480.data| 3 ---
app/test-bbdev/test_vectors/ldpc_dec_v8568.data| 3 ---
app/test-bbdev/test_vectors/ldpc_dec_v9503.data| 3 ---
.../turbo_dec_c1_k40_r0_e17280_sbd_negllr.data | 3 ---
...k6144_r0_e10376_crc24b_sbd_negllr_high_snr.data | 3 ---
..._k6144_r0_e10376_crc24b_sbd_negllr_low_snr.data | 3 ---
.../turbo_dec_c1_k6144_r0_e34560_posllr.data | 3 ---
.../turbo_dec_c1_k6144_r0_e34560_sbd_negllr.data | 3 ---
.../turbo_dec_c1_k6144_r0_e34560_sbd_posllr.data | 3 ---
...bo_dec_c2_k3136_r0_e4920_sbd_negllr_crc24b.data | 3 ---
19 files changed, 4 insertions(+), 63 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 535b9d73dd..2baa2a0e62 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -3161,6 +3161,8 @@ throughput_intr_lcore_ldpc_dec(void *arg)
num_to_process);
TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops",
num_to_process);
+ ref_op->ldpc_dec.iter_max = get_iter_max();
+
if (test_vector.op_type != RTE_BBDEV_OP_NONE)
copy_reference_ldpc_dec_op(ops, num_to_process, 0, bufs->inputs,
bufs->hard_outputs, bufs->soft_outputs,
@@ -5238,6 +5240,7 @@ offload_latency_test_dec(struct rte_mempool *mempool,
struct test_buffers *bufs,
ret = rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz);
TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops",
burst_sz);
+ ref_op->turbo_dec.iter_max = get_iter_max();
if (test_vector.op_type != RTE_BBDEV_OP_NONE)
copy_reference_dec_op(ops_enq, burst_sz, dequeued,
bufs->inputs,
@@ -5324,6 +5327,7 @@ offload_latency_test_ldpc_dec(struct rte_mempool *mempool,
ret = rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz);
TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops",
burst_sz);
+ ref_op->ldpc_dec.iter_max = get_iter_max();
if (test_vector.op_type != RTE_BBDEV_OP_NONE)
copy_reference_ldpc_dec_op(ops_enq, burst_sz, dequeued,
bufs->inputs,
diff --git a/app/test-bbdev/test_bbdev_vector.c
b/app/test-bbdev/test_bbdev_vector.c
index 1125395dbf..c26727cd35 100644
--- a/app/test-bbdev/test_bbdev_vector.c
+++ b/app/test-bbdev/test_bbdev_vector.c
@@ -532,10 +532,6 @@ parse_decoder_params(const char *key_token, char *token,
vector->mask |= TEST_BBDEV_VF_RV_INDEX;
turbo_dec->rv_index = (uint8_t) strtoul(token, &err, 0);
ret = ((err == NULL) || (*err != '\0')) ? -1 : 0;
- } else if (!strcmp(key_token, "iter_max")) {
- vector->mask |= TEST_BBDEV_VF_ITER_MAX;
- turbo_dec->iter_max = (uint8_t) strtoul(token, &err, 0);
- ret = ((err == NULL) || (*err != '\0')) ? -1 : 0;
} else if (!strcmp(key_token, "iter_min")) {
vector->mask |= TEST_BBDEV_VF_ITER_MIN;
turbo_dec->iter_min = (uint8_t) strtoul(token, &err, 0);
@@ -862,10 +858,6 @@ parse_ldpc_decoder_params(const char *key_token, char
*token,
vector->mask |= TEST_BBDEV_VF_EXPECTED_ITER_COUNT;
ldpc_dec->iter_count = (uint8_t) strtoul(token, &err, 0);
ret = ((err == NULL) || (*err != '\0')) ? -1 : 0;
- } else if (!strcmp(key_token, "iter_max")) {
- vector->mask |= TEST_BBDEV_VF_ITER_MAX;
- ldpc_dec->iter_max = (uint8_t) strtoul(token, &err, 0);
- ret = ((err == NULL) || (*err != '\0')) ? -1 : 0;
} else if (!strcmp(key_token, "code_block_mode")) {
vector->mask |= TEST_BBDEV_VF_CODE_BLOCK_MODE;
ldpc_dec->code_block_mode = (uint8_t) strtoul(token, &err, 0);
@@ -1260,9 +1252,6 @@ check_decoder(struct test_bbdev_vector *vector)
if (!(mask & TEST_BBDEV_VF_ITER_MIN))
printf(
"WARNING: iter_min was not specified in vector file and
will be set to 0\n");
- if (!(mask & TEST_BBDEV_VF_ITER_MAX)
Re: [PATCH] malloc: fix malloc performance may becomes worse as the number of malloc increases
On Wed, 15 Feb 2023 12:10:23 +0100 Morten Brørup wrote: > Looking isolated at the patch itself... > > I agree with the way the patch modifies the ranges of the free list, and the > consequential removal of the "- 1" from the calculation of log2. > > Intuitively, the lists should cover ranges such as [0x100..0x3FF], which this > patch does, not [0x101..0x400], how it was previously... The ranges with this > patch make much more sense. > > So if the existing code is otherwise correct, i.e. handles the size > with/without MALLOC_ELEM_HEADER_LEN correctly, my gut feeling says this patch > is an improvement. > > Acked-by: Morten Brørup It would be good to have a malloc performance test. Possibly something reused from some other project.
Re: [PATCH 2/2] drivers: replace printf with fprintf for debug functions
On Wed, 15 Feb 2023 15:59:05 +0530
Hemant Agrawal wrote:
> diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c
> b/drivers/bus/dpaa/base/fman/netcfg_layer.c
> index 6a405c984d..69cee08fb9 100644
> --- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
> +++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
> @@ -33,33 +33,33 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
> {
> int i;
>
> - printf(".. DPAA Configuration ..\n\n");
> + fprintf(stdout, ".. DPAA Configuration ..\n\n");
>
If you only do "printf -> fprintf(stdout," then it doesn't make sense.
Ideally change debug interface to take a user supplied output FILE *
like other dump routines.
[PATCH v7 00/22] Replace use of static logtypes in libraries
This patchset removes the main uses of static LOGTYPE's in DPDK libraries. It starts with the easy one and goes on to the more complex ones. Note: there is one patch in this series that will get flagged incorrectly as an ABI change. v7 - fix commit message typ add error to gso_segment function doc fix missing cpuflags.h on arm Stephen Hemminger (22): gso: don't log message on non TCP/UDP eal: drop no longer used GSO logtype log: drop unused RTE_LOGTYPE_TIMER efd: replace RTE_LOGTYPE_EFD with dynamic type mbuf: replace RTE_LOGTYPE_MBUF with dynamic type acl: replace LOGTYPE_ACL with dynamic type examples/power: replace use of RTE_LOGTYPE_POWER examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER power: replace RTE_LOGTYPE_POWER with dynamic type ring: replace RTE_LOGTYPE_RING with dynamic type mempool: replace RTE_LOGTYPE_MEMPOOL with dynamic type lpm: replace RTE_LOGTYPE_LPM with dynamic types kni: replace RTE_LOGTYPE_KNI with dynamic type sched: replace RTE_LOGTYPE_SCHED with dynamic type examples/ipsecgw: replace RTE_LOGTYPE_PORT port: replace RTE_LOGTYPE_PORT with dynamic type table: convert RTE_LOGTYPE_TABLE to dynamic logtype app/test: remove use of RTE_LOGTYPE_PIPELINE pipeline: replace RTE_LOGTYPE_PIPELINE with dynamic type hash: move rte_thash_gfni stubs out of header file hash: move rte_hash_set_alg out header hash: convert RTE_LOGTYPE_HASH to dynamic type app/test/test_acl.c | 3 +- app/test/test_table_acl.c | 50 +++ app/test/test_table_pipeline.c| 40 +-- examples/distributor/main.c | 2 +- examples/ipsec-secgw/sa.c | 6 +-- examples/l3fwd-power/main.c | 15 +++ lib/acl/acl_bld.c | 1 + lib/acl/acl_gen.c | 1 + lib/acl/acl_log.h | 4 ++ lib/acl/rte_acl.c | 4 ++ lib/acl/tb_mem.c | 3 +- lib/eal/common/eal_common_log.c | 17 lib/eal/include/rte_log.h | 34 lib/efd/rte_efd.c | 3 ++ lib/fib/fib_log.h | 4 ++ lib/fib/rte_fib.c | 3 ++ lib/fib/rte_fib6.c| 2 + lib/gso/rte_gso.c | 5 +-- lib/gso/rte_gso.h | 1 + lib/hash/meson.build | 9 - lib/hash/rte_cuckoo_hash.c| 5 +++ lib/hash/rte_fbk_hash.c | 5 +++ lib/hash/rte_hash_crc.c | 66 +++ lib/hash/rte_hash_crc.h | 46 + lib/hash/rte_thash.c | 3 ++ lib/hash/rte_thash_gfni.c | 46 + lib/hash/rte_thash_gfni.h | 28 +++-- lib/hash/version.map | 5 +++ lib/kni/rte_kni.c | 3 ++ lib/lpm/lpm_log.h | 4 ++ lib/lpm/rte_lpm.c | 3 ++ lib/lpm/rte_lpm6.c| 1 + lib/mbuf/mbuf_log.h | 4 ++ lib/mbuf/rte_mbuf.c | 4 ++ lib/mbuf/rte_mbuf_dyn.c | 2 + lib/mbuf/rte_mbuf_pool_ops.c | 2 + lib/mempool/rte_mempool.c | 3 ++ lib/mempool/rte_mempool_log.h | 4 ++ lib/mempool/rte_mempool_ops.c | 1 + lib/pipeline/rte_pipeline.c | 3 ++ lib/port/rte_port_ethdev.c| 3 ++ lib/port/rte_port_eventdev.c | 4 ++ lib/port/rte_port_fd.c| 3 ++ lib/port/rte_port_frag.c | 3 ++ lib/port/rte_port_kni.c | 3 ++ lib/port/rte_port_ras.c | 3 ++ lib/port/rte_port_ring.c | 3 ++ lib/port/rte_port_sched.c | 3 ++ lib/port/rte_port_source_sink.c | 3 ++ lib/port/rte_port_sym_crypto.c| 3 ++ lib/power/guest_channel.c | 3 +- lib/power/power_common.c | 2 + lib/power/power_common.h | 3 +- lib/power/power_kvm_vm.c | 1 + lib/power/rte_power.c | 1 + lib/power/rte_power_empty_poll.c | 1 + lib/rib/rib_log.h | 4 ++ lib/rib/rte_rib.c | 3 ++ lib/rib/rte_rib6.c| 3 ++ lib/ring/rte_ring.c | 3 ++ lib/sched/rte_pie.c | 1 + lib/sched/rte_sched.c | 5 +++ lib/sched/rte_sched_log.h | 4 ++ lib/table/rte_table_acl.c | 3 ++ lib/table/rte_table_array.c | 3 ++ lib/table/rte_table_hash_cuckoo.c | 3 ++ lib/table/rte_table_hash_ext.c| 3 ++ lib/table/rte_table_hash_key16.c | 3 ++ lib/table/rte_table_hash_key32.c | 5 ++- lib/table/rte_table_hash_key8.c | 5 ++- lib/table/rte_table_hash_lru.c| 3 ++ lib/table/rte_table_lpm.c | 3 ++ lib/table/rte_table_lpm_ipv6.c| 3 ++ lib/table/rte_table_stub.c| 3 ++ 74 files changed, 378 insertions(+), 169 deletions(-) create mode 100644 lib/acl/acl_log.h create mode 100644 lib/fib/fib_log.h create mode 100644 lib/hash/rte_hash_crc.c create mode 100644 lib/hash/rte_thash_gfni.c create m
[PATCH v7 01/22] gso: don't log message on non TCP/UDP
If a large packet is passed into GSO routines of unknown protocol
then library would log a message.
Better to tell the application instead of logging.
Fixes: 119583797b6a ("gso: support TCP/IPv4 GSO")
Cc: jiayu...@intel.com
Signed-off-by: Stephen Hemminger
---
lib/gso/rte_gso.c | 5 ++---
lib/gso/rte_gso.h | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/gso/rte_gso.c b/lib/gso/rte_gso.c
index 4b59217c16ee..c8e67c2d4b48 100644
--- a/lib/gso/rte_gso.c
+++ b/lib/gso/rte_gso.c
@@ -80,9 +80,8 @@ rte_gso_segment(struct rte_mbuf *pkt,
ret = gso_udp4_segment(pkt, gso_size, direct_pool,
indirect_pool, pkts_out, nb_pkts_out);
} else {
- /* unsupported packet, skip */
- RTE_LOG(DEBUG, GSO, "Unsupported packet type\n");
- ret = 0;
+ ret = -ENOTSUP; /* only UDP or TCP allowed */
+
}
if (ret < 0) {
diff --git a/lib/gso/rte_gso.h b/lib/gso/rte_gso.h
index 40922524df42..23d6980aff9f 100644
--- a/lib/gso/rte_gso.h
+++ b/lib/gso/rte_gso.h
@@ -114,6 +114,7 @@ struct rte_gso_ctx {
* - The number of GSO segments filled in pkts_out on success.
* - Return 0 if it does not need to be GSO'd.
* - Return -ENOMEM if run out of memory in MBUF pools.
+ * - Return -ENOTSUP for protocols that can not be segmentd (not UDP or TCP)
* - Return -EINVAL for invalid parameters.
*/
int rte_gso_segment(struct rte_mbuf *pkt,
--
2.39.1
[PATCH v7 03/22] log: drop unused RTE_LOGTYPE_TIMER
The timer code does not use rte_log.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 894701e8c19c..5421da008f5b 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -352,7 +352,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_MALLOC, "lib.malloc"},
{RTE_LOGTYPE_RING, "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
- {RTE_LOGTYPE_TIMER, "lib.timer"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 11d517806054..16d6ea31583d 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -30,7 +30,7 @@ extern "C" {
#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
#define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
-#define RTE_LOGTYPE_TIMER 4 /**< Log related to timers. */
+/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
#define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
--
2.39.1
[PATCH v7 02/22] eal: drop no longer used GSO logtype
The message that used this was replaced in previous patch.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index bd7b188ceb4a..894701e8c19c 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -368,7 +368,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
{RTE_LOGTYPE_EFD,"lib.efd"},
{RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
- {RTE_LOGTYPE_GSO,"lib.gso"},
{RTE_LOGTYPE_USER1, "user1"},
{RTE_LOGTYPE_USER2, "user2"},
{RTE_LOGTYPE_USER3, "user3"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 6d2b0856a565..11d517806054 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -46,7 +46,7 @@ extern "C" {
#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
#define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */
#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
-#define RTE_LOGTYPE_GSO 20 /**< Log related to GSO. */
+/* was RTE_LOGTYPE_GSO */
/* these log types can be used in an application */
#define RTE_LOGTYPE_USER1 24 /**< User-defined log type 1. */
--
2.39.1
[PATCH v7 04/22] efd: replace RTE_LOGTYPE_EFD with dynamic type
Replace all uses of the global logtype with a dynamic log type.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/efd/rte_efd.c | 3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 5421da008f5b..25bb17938cc1 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -365,7 +365,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
{RTE_LOGTYPE_MBUF, "lib.mbuf"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
- {RTE_LOGTYPE_EFD,"lib.efd"},
{RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
{RTE_LOGTYPE_USER1, "user1"},
{RTE_LOGTYPE_USER2, "user2"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 16d6ea31583d..0b39795b4d06 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -44,7 +44,7 @@ extern "C" {
#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */
#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
-#define RTE_LOGTYPE_EFD 18 /**< Log related to EFD. */
+/* was RTE_LOGTYPE_EFD */
#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
/* was RTE_LOGTYPE_GSO */
diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
index 686a13775742..9cfa75bf93b0 100644
--- a/lib/efd/rte_efd.c
+++ b/lib/efd/rte_efd.c
@@ -28,6 +28,9 @@
#include "rte_efd_arm64.h"
#endif
+RTE_LOG_REGISTER_DEFAULT(efd_logtype, INFO);
+#define RTE_LOGTYPE_EFDefd_logtype
+
#define EFD_KEY(key_idx, table) (table->keys + ((key_idx) * table->key_len))
/** Hash function used to determine chunk_id and bin_id for a group */
#define EFD_HASH(key, table) \
--
2.39.1
[PATCH v7 05/22] mbuf: replace RTE_LOGTYPE_MBUF with dynamic type
Introduce a new dynamic logtype for mbuf related messages.
Since this is used in multiple files put one macro in mbuf_log.h
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/mbuf/mbuf_log.h | 4
lib/mbuf/rte_mbuf.c | 4
lib/mbuf/rte_mbuf_dyn.c | 2 ++
lib/mbuf/rte_mbuf_pool_ops.c| 2 ++
6 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 lib/mbuf/mbuf_log.h
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 25bb17938cc1..d4389e436913 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -363,7 +363,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PORT, "lib.port"},
{RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
- {RTE_LOGTYPE_MBUF, "lib.mbuf"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
{RTE_LOGTYPE_USER1, "user1"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 0b39795b4d06..941fbe51fd30 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -42,7 +42,7 @@ extern "C" {
#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
-#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */
+/* was RTE_LOGTYPE_MBUF */
#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
/* was RTE_LOGTYPE_EFD */
#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
diff --git a/lib/mbuf/mbuf_log.h b/lib/mbuf/mbuf_log.h
new file mode 100644
index ..d759a9a25501
--- /dev/null
+++ b/lib/mbuf/mbuf_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int mbuf_logtype;
+#define RTE_LOGTYPE_MBUF mbuf_logtype
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index cfd8062f1e6a..4a379a5185d5 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -20,6 +20,10 @@
#include
#include
+#include "mbuf_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(mbuf_logtype, INFO);
+
/*
* pktmbuf pool constructor, given as a callback function to
* rte_mempool_create(), or called directly if using
diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index 35839e938cc5..01654db03fc8 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -17,6 +17,8 @@
#include
#include
+#include "mbuf_log.h"
+
#define RTE_MBUF_DYN_MZNAME "rte_mbuf_dyn"
struct mbuf_dynfield_elt {
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index 4c91f4ce8569..5318430126cb 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -8,6 +8,8 @@
#include
#include
+#include "mbuf_log.h"
+
int
rte_mbuf_set_platform_mempool_ops(const char *ops_name)
{
--
2.39.1
[PATCH v7 06/22] acl: replace LOGTYPE_ACL with dynamic type
Get rid of RTE_LOGTYPE_ACL and RTE_LOGTYPE_MALLOC.
For ACL library use a dynamic type.
The one message using RTE_LOGTYPE_MALLOC should have been
under the ACL logtype anyway.
The test code should not have been using fixed log type
so just change that to stderr.
Signed-off-by: Stephen Hemminger
---
app/test/test_acl.c | 3 ++-
lib/acl/acl_bld.c | 1 +
lib/acl/acl_gen.c | 1 +
lib/acl/acl_log.h | 4
lib/acl/rte_acl.c | 4
lib/acl/tb_mem.c| 3 ++-
lib/eal/common/eal_common_log.c | 2 --
lib/eal/include/rte_log.h | 4 ++--
8 files changed, 16 insertions(+), 6 deletions(-)
create mode 100644 lib/acl/acl_log.h
diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 623f34682e69..75588978a720 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -154,7 +154,8 @@ rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx,
for (i = 0; i != num; i++) {
rc = acl_ipv4vlan_check_rule(rules + i);
if (rc != 0) {
- RTE_LOG(ERR, ACL, "%s: rule #%u is invalid\n",
+ fprintf(stderr,
+ "%s: rule #%u is invalid\n",
__func__, i + 1);
return rc;
}
diff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c
index 2816632803bd..f38e6478315f 100644
--- a/lib/acl/acl_bld.c
+++ b/lib/acl/acl_bld.c
@@ -5,6 +5,7 @@
#include
#include "tb_mem.h"
#include "acl.h"
+#include "acl_log.h"
#defineACL_POOL_ALIGN 8
#defineACL_POOL_ALLOC_MIN 0x80
diff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c
index e759a2ca1598..54ec485d0c58 100644
--- a/lib/acl/acl_gen.c
+++ b/lib/acl/acl_gen.c
@@ -4,6 +4,7 @@
#include
#include "acl.h"
+#include "acl_log.h"
#defineQRANGE_MIN ((uint8_t)INT8_MIN)
diff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h
new file mode 100644
index ..b55573cbe207
--- /dev/null
+++ b/lib/acl/acl_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int acl_logtype;
+#define RTE_LOGTYPE_ACLacl_logtype
diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c
index a61c3ba188da..a29decb1f6ca 100644
--- a/lib/acl/rte_acl.c
+++ b/lib/acl/rte_acl.c
@@ -6,8 +6,12 @@
#include
#include
#include
+#include
#include "acl.h"
+#include "acl_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO);
TAILQ_HEAD(rte_acl_list, rte_tailq_entry);
diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c
index f14d7b4fa26e..6a9d96aaeda2 100644
--- a/lib/acl/tb_mem.c
+++ b/lib/acl/tb_mem.c
@@ -3,6 +3,7 @@
*/
#include "tb_mem.h"
+#include "acl_log.h"
/*
* Memory management routines for temporary memory.
@@ -25,7 +26,7 @@ tb_pool(struct tb_mem_pool *pool, size_t sz)
size = sz + pool->alignment - 1;
block = calloc(1, size + sizeof(*pool->block));
if (block == NULL) {
- RTE_LOG(ERR, MALLOC, "%s(%zu)\n failed, currently allocated "
+ RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated "
"by pool: %zu bytes\n", __func__, sz, pool->alloc);
siglongjmp(pool->fail, -ENOMEM);
return NULL;
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index d4389e436913..9e853addb717 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,14 +349,12 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
- {RTE_LOGTYPE_MALLOC, "lib.malloc"},
{RTE_LOGTYPE_RING, "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_KNI,"lib.kni"},
- {RTE_LOGTYPE_ACL,"lib.acl"},
{RTE_LOGTYPE_POWER, "lib.power"},
{RTE_LOGTYPE_METER, "lib.meter"},
{RTE_LOGTYPE_SCHED, "lib.sched"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 941fbe51fd30..1408722b2c2f 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -27,7 +27,7 @@ extern "C" {
/* SDK log type */
#define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
-#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
+/* was RTE_LOGTYPE_MALLOC */
#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
#define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
/* was RTE_LOGTYPE_TIMER */
@@ -35,7 +35,7 @@ extern "C" {
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
#define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
#define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
-#define RTE_LOGTYPE_ACL9 /**< Log
[PATCH v7 07/22] examples/power: replace use of RTE_LOGTYPE_POWER
Don't use static logtype in sample application.
Signed-off-by: Stephen Hemminger
---
examples/distributor/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index 21304d661873..542f76cf9664 100644
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -679,7 +679,7 @@ init_power_library(void)
/* init power management library */
ret = rte_power_init(lcore_id);
if (ret) {
- RTE_LOG(ERR, POWER,
+ fprintf(stderr,
"Library initialization failed on core %u\n",
lcore_id);
/*
--
2.39.1
[PATCH v7 08/22] examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER
Convert to using a dynamic logtype for the application.
Signed-off-by: Stephen Hemminger
---
examples/l3fwd-power/main.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index caf26b373e8d..8e094c1bdda5 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -52,7 +52,8 @@
#include "perf_core.h"
#include "main.h"
-#define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1
+RTE_LOG_REGISTER(l3fwd_power_logtype, l3fwd.power, INFO);
+#define RTE_LOGTYPE_L3FWD_POWER l3fwd_power_logtype
#define MAX_PKT_BURST 32
@@ -2445,7 +2446,7 @@ init_power_library(void)
/* init power management library */
ret = rte_power_init(lcore_id);
if (ret) {
- RTE_LOG(ERR, POWER,
+ RTE_LOG(ERR, L3FWD_POWER,
"Library initialization failed on core %u\n",
lcore_id);
return ret;
@@ -2454,7 +2455,7 @@ init_power_library(void)
env = rte_power_get_env();
if (env != PM_ENV_ACPI_CPUFREQ &&
env != PM_ENV_PSTATE_CPUFREQ) {
- RTE_LOG(ERR, POWER,
+ RTE_LOG(ERR, L3FWD_POWER,
"Only ACPI and PSTATE mode are supported\n");
return -1;
}
@@ -2472,7 +2473,7 @@ deinit_power_library(void)
/* deinit power management library */
ret = rte_power_exit(lcore_id);
if (ret) {
- RTE_LOG(ERR, POWER,
+ RTE_LOG(ERR, L3FWD_POWER,
"Library deinitialization failed on core %u\n",
lcore_id);
return ret;
@@ -2541,7 +2542,7 @@ update_telemetry(__rte_unused struct rte_timer *tim,
ret = rte_metrics_update_values(RTE_METRICS_GLOBAL, telstats_index,
values, RTE_DIM(values));
if (ret < 0)
- RTE_LOG(WARNING, POWER, "failed to update metrics\n");
+ RTE_LOG(WARNING, L3FWD_POWER, "failed to update metrics\n");
}
static int
@@ -2607,7 +2608,7 @@ launch_timer(unsigned int lcore_id)
rte_get_main_lcore());
}
- RTE_LOG(INFO, POWER, "Bring up the Timer\n");
+ RTE_LOG(INFO, L3FWD_POWER, "Bring up the Timer\n");
if (app_mode == APP_MODE_EMPTY_POLL)
empty_poll_setup_timer();
@@ -2626,7 +2627,7 @@ launch_timer(unsigned int lcore_id)
}
}
- RTE_LOG(INFO, POWER, "Timer_subsystem is done\n");
+ RTE_LOG(INFO, L3FWD_POWER, "Timer_subsystem is done\n");
return 0;
}
--
2.39.1
[PATCH v7 09/22] power: replace RTE_LOGTYPE_POWER with dynamic type
Use dynamic log type for power library.
Also replace use of RTE_LOGTYPE_USER1 with lib.power.guest.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h| 2 +-
lib/power/guest_channel.c| 3 ++-
lib/power/power_common.c | 2 ++
lib/power/power_common.h | 3 ++-
lib/power/power_kvm_vm.c | 1 +
lib/power/rte_power.c| 1 +
lib/power/rte_power_empty_poll.c | 1 +
8 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 9e853addb717..39e1e6680dea 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -355,7 +355,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_KNI,"lib.kni"},
- {RTE_LOGTYPE_POWER, "lib.power"},
{RTE_LOGTYPE_METER, "lib.meter"},
{RTE_LOGTYPE_SCHED, "lib.sched"},
{RTE_LOGTYPE_PORT, "lib.port"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 1408722b2c2f..7d4345acceca 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -36,7 +36,7 @@ extern "C" {
#define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
#define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
/* was RTE_LOGTYPE_ACL */
-#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */
+/* was RTE_LOGTYPE_POWER */
#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
index 969a9e5aaa06..efc326d520ca 100644
--- a/lib/power/guest_channel.c
+++ b/lib/power/guest_channel.c
@@ -17,7 +17,8 @@
#include "guest_channel.h"
-#define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1
+RTE_LOG_REGISTER_SUFFIX(guest_channel_logtype, guest, INFO);
+#define RTE_LOGTYPE_GUEST_CHANNEL guest_channel_logtype
/* Timeout for incoming message in milliseconds. */
#define TIMEOUT 10
diff --git a/lib/power/power_common.c b/lib/power/power_common.c
index 1e09facb863f..bf77eafa886b 100644
--- a/lib/power/power_common.c
+++ b/lib/power/power_common.c
@@ -12,6 +12,8 @@
#include "power_common.h"
+RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO);
+
#define POWER_SYSFILE_SCALING_DRIVER \
"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver"
#define POWER_SYSFILE_GOVERNOR \
diff --git a/lib/power/power_common.h b/lib/power/power_common.h
index c1c713927621..63a3a443509e 100644
--- a/lib/power/power_common.h
+++ b/lib/power/power_common.h
@@ -5,11 +5,12 @@
#ifndef _POWER_COMMON_H_
#define _POWER_COMMON_H_
-
#include
#define RTE_POWER_INVALID_FREQ_INDEX (~0)
+extern int power_logtype;
+#define RTE_LOGTYPE_POWER power_logtype
#ifdef RTE_LIBRTE_POWER_DEBUG
#define POWER_DEBUG_TRACE(fmt, args...) \
diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
index 6a8109d44959..db031f43105a 100644
--- a/lib/power/power_kvm_vm.c
+++ b/lib/power/power_kvm_vm.c
@@ -8,6 +8,7 @@
#include "rte_power_guest_channel.h"
#include "guest_channel.h"
+#include "power_common.h"
#include "power_kvm_vm.h"
#define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent"
diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c
index 63a43bd8f5ae..db0e7705a9ef 100644
--- a/lib/power/rte_power.c
+++ b/lib/power/rte_power.c
@@ -10,6 +10,7 @@
#include "rte_power.h"
#include "power_acpi_cpufreq.h"
#include "power_cppc_cpufreq.h"
+#include "power_common.h"
#include "power_kvm_vm.h"
#include "power_pstate_cpufreq.h"
diff --git a/lib/power/rte_power_empty_poll.c b/lib/power/rte_power_empty_poll.c
index 4a4db512474e..64e3b4b46d5e 100644
--- a/lib/power/rte_power_empty_poll.c
+++ b/lib/power/rte_power_empty_poll.c
@@ -10,6 +10,7 @@
#include "rte_power.h"
#include "rte_power_empty_poll.h"
+#include "power_common.h"
#define INTERVALS_PER_SECOND 100 /* (10ms) */
#define SECONDS_TO_TRAIN_FOR 2
--
2.39.1
[PATCH v7 10/22] ring: replace RTE_LOGTYPE_RING with dynamic type
The logtype for ring only used in library.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/ring/rte_ring.c | 3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 39e1e6680dea..5f15e312f15b 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,7 +349,6 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
- {RTE_LOGTYPE_RING, "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 7d4345acceca..31a2ee2f6b6f 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -28,7 +28,7 @@ extern "C" {
/* SDK log type */
#define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
/* was RTE_LOGTYPE_MALLOC */
-#define RTE_LOGTYPE_RING 2 /**< Log related to ring. */
+/* was RTE_LOGTYPE_RING */
#define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index cddaf6b2876f..8c5f2575d6ef 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -26,6 +26,9 @@
#include "rte_ring.h"
#include "rte_ring_elem.h"
+RTE_LOG_REGISTER_DEFAULT(ring_logtype, INFO);
+#define RTE_LOGTYPE_RING ring_logtype
+
TAILQ_HEAD(rte_ring_list, rte_tailq_entry);
static struct rte_tailq_elem rte_ring_tailq = {
--
2.39.1
[PATCH v7 11/22] mempool: replace RTE_LOGTYPE_MEMPOOL with dynamic type
Convert from RTE_LOGTYPE_MEMPOOL to logtype_mempool.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/mempool/rte_mempool.c | 3 +++
lib/mempool/rte_mempool_log.h | 4
lib/mempool/rte_mempool_ops.c | 1 +
5 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 lib/mempool/rte_mempool_log.h
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 5f15e312f15b..4025d2039d55 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -349,7 +349,6 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
- {RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 31a2ee2f6b6f..9f86bfdd0198 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -29,7 +29,7 @@ extern "C" {
#define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
/* was RTE_LOGTYPE_MALLOC */
/* was RTE_LOGTYPE_RING */
-#define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
+/* was RTE_LOGTYPE_MEMPOOL */
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 45b5df6199b0..841abe53e3b9 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -30,6 +30,9 @@
#include "rte_mempool.h"
#include "rte_mempool_trace.h"
+#include "rte_mempool_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(mempool_logtype, INFO);
TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
diff --git a/lib/mempool/rte_mempool_log.h b/lib/mempool/rte_mempool_log.h
new file mode 100644
index ..216401c9f2cd
--- /dev/null
+++ b/lib/mempool/rte_mempool_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int mempool_logtype;
+#define RTE_LOGTYPE_MEMPOOLmempool_logtype
diff --git a/lib/mempool/rte_mempool_ops.c b/lib/mempool/rte_mempool_ops.c
index 3b43edc548a0..ad7c81823ce1 100644
--- a/lib/mempool/rte_mempool_ops.c
+++ b/lib/mempool/rte_mempool_ops.c
@@ -12,6 +12,7 @@
#include
#include "rte_mempool_trace.h"
+#include "rte_mempool_log.h"
/* indirect jump table to support external memory pools. */
struct rte_mempool_ops_table rte_mempool_ops_table = {
--
2.39.1
[PATCH v7 12/22] lpm: replace RTE_LOGTYPE_LPM with dynamic types
Split lpm and lpm6 into separate log types since they
are in different files and user may want to change log
levels for IPv4 vs IPv6.
For rib and fib libraries give them own types as well.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/fib/fib_log.h | 4
lib/fib/rte_fib.c | 3 +++
lib/fib/rte_fib6.c | 2 ++
lib/lpm/lpm_log.h | 4
lib/lpm/rte_lpm.c | 3 +++
lib/lpm/rte_lpm6.c | 1 +
lib/rib/rib_log.h | 4
lib/rib/rte_rib.c | 3 +++
lib/rib/rte_rib6.c | 3 +++
11 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 lib/fib/fib_log.h
create mode 100644 lib/lpm/lpm_log.h
create mode 100644 lib/rib/rib_log.h
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 4025d2039d55..6e2007e6ed4f 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_KNI,"lib.kni"},
{RTE_LOGTYPE_METER, "lib.meter"},
{RTE_LOGTYPE_SCHED, "lib.sched"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 9f86bfdd0198..115a48bf05f5 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -33,7 +33,7 @@ extern "C" {
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
-#define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
+/* was RTE_LOGTYPE_LPM */
#define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
/* was RTE_LOGTYPE_ACL */
/* was RTE_LOGTYPE_POWER */
diff --git a/lib/fib/fib_log.h b/lib/fib/fib_log.h
new file mode 100644
index ..c731c820f621
--- /dev/null
+++ b/lib/fib/fib_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int fib_logtype;
+#define RTE_LOGTYPE_LPM fib_logtype
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 8af4c4091908..5b1815881415 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -16,6 +16,9 @@
#include
#include "dir24_8.h"
+#include "fib_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO);
TAILQ_HEAD(rte_fib_list, rte_tailq_entry);
static struct rte_tailq_elem rte_fib_tailq = {
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index 4b8e22b142b9..762d195fb798 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -9,6 +9,7 @@
#include
#include
#include
+#include
#include
#include
@@ -16,6 +17,7 @@
#include
#include "trie.h"
+#include "fib_log.h"
TAILQ_HEAD(rte_fib6_list, rte_tailq_entry);
static struct rte_tailq_elem rte_fib6_tailq = {
diff --git a/lib/lpm/lpm_log.h b/lib/lpm/lpm_log.h
new file mode 100644
index ..a0621b70a5fe
--- /dev/null
+++ b/lib/lpm/lpm_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int lpm_logtype;
+#define RTE_LOGTYPE_LPM lpm_logtype
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index cdcd1b7f9e47..0ca82147866a 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -18,6 +18,9 @@
#include
#include "rte_lpm.h"
+#include "lpm_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO);
TAILQ_HEAD(rte_lpm_list, rte_tailq_entry);
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 8d21aeddb83c..873cc8bc267d 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -20,6 +20,7 @@
#include
#include "rte_lpm6.h"
+#include "lpm_log.h"
#define RTE_LPM6_TBL24_NUM_ENTRIES(1 << 24)
#define RTE_LPM6_TBL8_GROUP_NUM_ENTRIES 256
diff --git a/lib/rib/rib_log.h b/lib/rib/rib_log.h
new file mode 100644
index ..f3ee513ca854
--- /dev/null
+++ b/lib/rib/rib_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int rib_logtype;
+#define RTE_LOGTYPE_LPM rib_logtype
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index b0794edf66f5..5597c8b899c8 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -15,6 +15,9 @@
#include
+RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO);
+#define RTE_LOGTYPE_LPM rib_logtype
+
TAILQ_HEAD(rte_rib_list, rte_tailq_entry);
static struct rte_tailq_elem rte_rib_tailq = {
.name = "RTE_RIB",
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index 19e4ff97c479..917bede27d24 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -8,6 +8,7 @@
#include
#include
+#include
#include
#include
#include
@@ -15,6 +16,8 @@
#include
+#include "rib_log.h"
+
#define RTE
[PATCH v7 13/22] kni: replace RTE_LOGTYPE_KNI with dynamic type
Even though KNI will eventually disappear, fix the
logtype now.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/kni/rte_kni.c | 3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 6e2007e6ed4f..70d5bb7b1951 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_KNI,"lib.kni"},
{RTE_LOGTYPE_METER, "lib.meter"},
{RTE_LOGTYPE_SCHED, "lib.sched"},
{RTE_LOGTYPE_PORT, "lib.port"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 115a48bf05f5..dc2454a0d9de 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -34,7 +34,7 @@ extern "C" {
#define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
/* was RTE_LOGTYPE_LPM */
-#define RTE_LOGTYPE_KNI8 /**< Log related to KNI. */
+/* was RTE_LOGTYPE_KNI */
/* was RTE_LOGTYPE_ACL */
/* was RTE_LOGTYPE_POWER */
#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c
index 8ab6c4715314..9c37bcabcadd 100644
--- a/lib/kni/rte_kni.c
+++ b/lib/kni/rte_kni.c
@@ -23,6 +23,9 @@
#include
#include "rte_kni_fifo.h"
+RTE_LOG_REGISTER_DEFAULT(kni_logtype, INFO);
+#define RTE_LOGTYPE_KNI kni_logtype
+
#define MAX_MBUF_BURST_NUM32
/* Maximum number of ring entries */
--
2.39.1
[PATCH v7 14/22] sched: replace RTE_LOGTYPE_SCHED with dynamic type
Also can remove unused RTE_LOGTYPE_METER
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 2 --
lib/eal/include/rte_log.h | 4 ++--
lib/sched/rte_pie.c | 1 +
lib/sched/rte_sched.c | 5 +
lib/sched/rte_sched_log.h | 4
5 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 lib/sched/rte_sched_log.h
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 70d5bb7b1951..d4b7088b5cbb 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,8 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_METER, "lib.meter"},
- {RTE_LOGTYPE_SCHED, "lib.sched"},
{RTE_LOGTYPE_PORT, "lib.port"},
{RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index dc2454a0d9de..f185fcbc5a94 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -37,8 +37,8 @@ extern "C" {
/* was RTE_LOGTYPE_KNI */
/* was RTE_LOGTYPE_ACL */
/* was RTE_LOGTYPE_POWER */
-#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
-#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
+/* was RTE_LOGTYPE_METER */
+/* was RTE_LOGTYPE_SCHED */
#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index 947e2a059f6f..cce0ce762da8 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -6,6 +6,7 @@
#include
#include
+#include "rte_sched_log.h"
#include "rte_pie.h"
#ifdef __INTEL_COMPILER
diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index c91697131d3e..c2bd8c785fcd 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -16,9 +16,12 @@
#include
#include "rte_sched.h"
+#include "rte_sched_log.h"
#include "rte_sched_common.h"
+
#include "rte_approx.h"
+
#ifdef __INTEL_COMPILER
#pragma warning(disable:2259) /* conversion may lose significant bits */
#endif
@@ -3002,3 +3005,5 @@ rte_sched_port_dequeue(struct rte_sched_port *port,
struct rte_mbuf **pkts, uint
return count;
}
+
+RTE_LOG_REGISTER_DEFAULT(sched_logtype, INFO);
diff --git a/lib/sched/rte_sched_log.h b/lib/sched/rte_sched_log.h
new file mode 100644
index ..fde051f49d62
--- /dev/null
+++ b/lib/sched/rte_sched_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int sched_logtype;
+#define RTE_LOGTYPE_SCHED sched_logtype
--
2.39.1
[PATCH v7 15/22] examples/ipsecgw: replace RTE_LOGTYPE_PORT
Looks like some code got copy/paste in to the IPSEC gateway
example from another place. Shouldn't be using RTE_LOGTYPE_PORT
here.
Fixes: ec17993a145a ("examples/ipsec-secgw: support security offload")
Cc: akhil.go...@nxp.com
Signed-off-by: Stephen Hemminger
---
examples/ipsec-secgw/sa.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 7da9444a7b8a..67327fda8dbc 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -1127,7 +1127,7 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound,
uint32_t tso)
if (inbound) {
if ((dev_info.rx_offload_capa &
RTE_ETH_RX_OFFLOAD_SECURITY) == 0) {
- RTE_LOG(WARNING, PORT,
+ RTE_LOG(WARNING, IPSEC,
"hardware RX IPSec offload is not supported\n");
return -EINVAL;
}
@@ -1135,13 +1135,13 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound,
uint32_t tso)
} else { /* outbound */
if ((dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_SECURITY) == 0) {
- RTE_LOG(WARNING, PORT,
+ RTE_LOG(WARNING, IPSEC,
"hardware TX IPSec offload is not supported\n");
return -EINVAL;
}
if (tso && (dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) {
- RTE_LOG(WARNING, PORT,
+ RTE_LOG(WARNING, IPSEC,
"hardware TCP TSO offload is not supported\n");
return -EINVAL;
}
--
2.39.1
[PATCH v7 17/22] table: convert RTE_LOGTYPE_TABLE to dynamic logtype
Use logtype suffixes for various components of this library.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/table/rte_table_acl.c | 3 +++
lib/table/rte_table_array.c | 3 +++
lib/table/rte_table_hash_cuckoo.c | 3 +++
lib/table/rte_table_hash_ext.c| 3 +++
lib/table/rte_table_hash_key16.c | 3 +++
lib/table/rte_table_hash_key32.c | 5 -
lib/table/rte_table_hash_key8.c | 5 -
lib/table/rte_table_hash_lru.c| 3 +++
lib/table/rte_table_lpm.c | 3 +++
lib/table/rte_table_lpm_ipv6.c| 3 +++
lib/table/rte_table_stub.c| 3 +++
13 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index 7f1d2c8a256d..d640ed3c88b9 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index b11aec69af78..934bddff9dfa 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -40,7 +40,7 @@ extern "C" {
/* was RTE_LOGTYPE_METER */
/* was RTE_LOGTYPE_SCHED */
/* was RTE_LOGTYPE_PORT */
-#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
+/* was RTE_LOGTYPE_TABLE */
#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
/* was RTE_LOGTYPE_MBUF */
#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
diff --git a/lib/table/rte_table_acl.c b/lib/table/rte_table_acl.c
index 53fd5c66adb5..f44a25a89405 100644
--- a/lib/table/rte_table_acl.c
+++ b/lib/table/rte_table_acl.c
@@ -11,6 +11,9 @@
#include "rte_table_acl.h"
+RTE_LOG_REGISTER_SUFFIX(table_acl_logtype, acl, INFO);
+#define RTE_LOGTYPE_TABLE table_acl_logtype
+
#ifdef RTE_TABLE_STATS_COLLECT
#define RTE_TABLE_ACL_STATS_PKTS_IN_ADD(table, val) \
diff --git a/lib/table/rte_table_array.c b/lib/table/rte_table_array.c
index 54a0c42f7dd2..a7849beaecd6 100644
--- a/lib/table/rte_table_array.c
+++ b/lib/table/rte_table_array.c
@@ -11,6 +11,9 @@
#include "rte_table_array.h"
+RTE_LOG_REGISTER_SUFFIX(table_array_logtype, array, INFO);
+#define RTE_LOGTYPE_TABLE table_array_logtype
+
#ifdef RTE_TABLE_STATS_COLLECT
#define RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(table, val) \
diff --git a/lib/table/rte_table_hash_cuckoo.c
b/lib/table/rte_table_hash_cuckoo.c
index c77eccf52722..12db0b84142f 100644
--- a/lib/table/rte_table_hash_cuckoo.c
+++ b/lib/table/rte_table_hash_cuckoo.c
@@ -10,6 +10,9 @@
#include "rte_table_hash_cuckoo.h"
+RTE_LOG_REGISTER_SUFFIX(table_hash_logtype, hash, INFO);
+#define RTE_LOGTYPE_TABLE table_hash_logtype
+
#ifdef RTE_TABLE_STATS_COLLECT
#define RTE_TABLE_HASH_CUCKOO_STATS_PKTS_IN_ADD(table, val) \
diff --git a/lib/table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
index 70ea84fa2e51..147ecdf082cb 100644
--- a/lib/table/rte_table_hash_ext.c
+++ b/lib/table/rte_table_hash_ext.c
@@ -11,6 +11,9 @@
#include "rte_table_hash.h"
+RTE_LOG_REGISTER_SUFFIX(table_hash_ext_logtype, hash.ext, INFO);
+#define RTE_LOGTYPE_TABLE table_hash_ext_logtype
+
#define KEYS_PER_BUCKET4
struct bucket {
diff --git a/lib/table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
index 04d7fd64bd97..09fef5f14ce7 100644
--- a/lib/table/rte_table_hash_key16.c
+++ b/lib/table/rte_table_hash_key16.c
@@ -11,6 +11,9 @@
#include "rte_table_hash.h"
#include "rte_lru.h"
+RTE_LOG_REGISTER_SUFFIX(table_hash16_logtype, hash16, INFO);
+#define RTE_LOGTYPE_TABLE table_hash16_logtype
+
#define KEY_SIZE 16
#define KEYS_PER_BUCKET4
diff --git a/lib/table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
index 88d8f69c72ed..1abc459eee87 100644
--- a/lib/table/rte_table_hash_key32.c
+++ b/lib/table/rte_table_hash_key32.c
@@ -11,7 +11,10 @@
#include "rte_table_hash.h"
#include "rte_lru.h"
-#define KEY_SIZE 32
+RTE_LOG_REGISTER_SUFFIX(table_hash32_logtype, hash32, INFO);
+#define RTE_LOGTYPE_TABLE table_hash32_logtype
+
+#define KEY_SIZE 32
#define KEYS_PER_BUCKET4
diff --git a/lib/table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
index 035d24276946..d4bcdf9e 100644
--- a/lib/table/rte_table_hash_key8.c
+++ b/lib/ta
[PATCH v7 18/22] app/test: remove use of RTE_LOGTYPE_PIPELINE
Instead of using static type PIPELINE for logging in test application
use stderr instead. If not testing RTE_LOG() better to not use
it since log also goes to syslog.
Signed-off-by: Stephen Hemminger
---
app/test/test_table_acl.c | 50 --
app/test/test_table_pipeline.c | 40 +--
2 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c
index e66f06b84d0a..dff9bddfb948 100644
--- a/app/test/test_table_acl.c
+++ b/app/test/test_table_acl.c
@@ -165,7 +165,7 @@ parse_cb_ipv4_rule(char *str, struct
rte_table_acl_rule_add_params *v)
&v->field_value[SRC_FIELD_IPV4].value.u32,
&v->field_value[SRC_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n",
+ fprintf(stderr, "failed to read src address/mask: %s\n",
in[CB_FLD_SRC_ADDR]);
return rc;
}
@@ -178,7 +178,7 @@ parse_cb_ipv4_rule(char *str, struct
rte_table_acl_rule_add_params *v)
&v->field_value[DST_FIELD_IPV4].value.u32,
&v->field_value[DST_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n",
+ fprintf(stderr, "failed to read dest address/mask: %s\n",
in[CB_FLD_DST_ADDR]);
return rc;
}
@@ -190,7 +190,7 @@ parse_cb_ipv4_rule(char *str, struct
rte_table_acl_rule_add_params *v)
&v->field_value[SRCP_FIELD_IPV4].value.u16,
&v->field_value[SRCP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n",
+ fprintf(stderr, "failed to read source port range: %s\n",
in[CB_FLD_SRC_PORT_RANGE]);
return rc;
}
@@ -202,7 +202,7 @@ parse_cb_ipv4_rule(char *str, struct
rte_table_acl_rule_add_params *v)
&v->field_value[DSTP_FIELD_IPV4].value.u16,
&v->field_value[DSTP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n",
+ fprintf(stderr, "failed to read dest port range: %s\n",
in[CB_FLD_DST_PORT_RANGE]);
return rc;
}
@@ -254,7 +254,7 @@ parse_cb_ipv4_rule_del(char *str, struct
rte_table_acl_rule_delete_params *v)
&v->field_value[SRC_FIELD_IPV4].value.u32,
&v->field_value[SRC_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n",
+ fprintf(stderr, "failed to read src address/mask: %s\n",
in[CB_FLD_SRC_ADDR]);
return rc;
}
@@ -267,7 +267,7 @@ parse_cb_ipv4_rule_del(char *str, struct
rte_table_acl_rule_delete_params *v)
&v->field_value[DST_FIELD_IPV4].value.u32,
&v->field_value[DST_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n",
+ fprintf(stderr, "failed to read dest address/mask: %s\n",
in[CB_FLD_DST_ADDR]);
return rc;
}
@@ -279,7 +279,7 @@ parse_cb_ipv4_rule_del(char *str, struct
rte_table_acl_rule_delete_params *v)
&v->field_value[SRCP_FIELD_IPV4].value.u16,
&v->field_value[SRCP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n",
+ fprintf(stderr, "failed to read source port range: %s\n",
in[CB_FLD_SRC_PORT_RANGE]);
return rc;
}
@@ -291,7 +291,7 @@ parse_cb_ipv4_rule_del(char *str, struct
rte_table_acl_rule_delete_params *v)
&v->field_value[DSTP_FIELD_IPV4].value.u16,
&v->field_value[DSTP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
- RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n",
+ fprintf(stderr, "failed to read dest port range: %s\n",
in[CB_FLD_DST_PORT_RANGE]);
return rc;
}
@@ -346,7 +346,7 @@ setup_acl_pipeline(void)
/* Pipeline configuration */
p = rte_pipeline_create(&pipeline_params);
if (p == NULL) {
- RTE_LOG(INFO, PIPELINE, "%s: Failed to configure pipeline\n",
+ fprintf(stderr, "%s: Failed to configure pipeline\n",
__func__);
goto fail;
}
@@ -410,7 +410,7 @@ setup_acl_pipeline(void)
table_params.f_action_miss = NULL;
table_params.action_data_size = 0;
- RTE_LOG(INFO, PIPELINE,
[PATCH v7 16/22] port: replace RTE_LOGTYPE_PORT with dynamic type
Split up the single static RTE_LOGTYPE_PORT into separate
sub types for each component: port.ethdev, port.evendev, ...
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/port/rte_port_ethdev.c | 3 +++
lib/port/rte_port_eventdev.c| 4
lib/port/rte_port_fd.c | 3 +++
lib/port/rte_port_frag.c| 3 +++
lib/port/rte_port_kni.c | 3 +++
lib/port/rte_port_ras.c | 3 +++
lib/port/rte_port_ring.c| 3 +++
lib/port/rte_port_sched.c | 3 +++
lib/port/rte_port_source_sink.c | 3 +++
lib/port/rte_port_sym_crypto.c | 3 +++
12 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index d4b7088b5cbb..7f1d2c8a256d 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_PORT, "lib.port"},
{RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index f185fcbc5a94..b11aec69af78 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -39,7 +39,7 @@ extern "C" {
/* was RTE_LOGTYPE_POWER */
/* was RTE_LOGTYPE_METER */
/* was RTE_LOGTYPE_SCHED */
-#define RTE_LOGTYPE_PORT 13 /**< Log related to port. */
+/* was RTE_LOGTYPE_PORT */
#define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
/* was RTE_LOGTYPE_MBUF */
diff --git a/lib/port/rte_port_ethdev.c b/lib/port/rte_port_ethdev.c
index 0da7890261e9..6685d304a6e9 100644
--- a/lib/port/rte_port_ethdev.c
+++ b/lib/port/rte_port_ethdev.c
@@ -10,6 +10,9 @@
#include "rte_port_ethdev.h"
+RTE_LOG_REGISTER_SUFFIX(port_ethdev_logtype, ethdev, INFO);
+#define RTE_LOGTYPE_PORT port_ethdev_logtype
+
/*
* Port ETHDEV Reader
*/
diff --git a/lib/port/rte_port_eventdev.c b/lib/port/rte_port_eventdev.c
index fd7dac9a5661..04447bd7f7bc 100644
--- a/lib/port/rte_port_eventdev.c
+++ b/lib/port/rte_port_eventdev.c
@@ -5,11 +5,15 @@
#include
#include
+#include
#include
#include
#include "rte_port_eventdev.h"
+RTE_LOG_REGISTER_SUFFIX(port_eventdev_logtype, eventdev, INFO);
+#define RTE_LOGTYPE_PORT port_eventdev_logtype
+
/*
* Port EVENTDEV Reader
*/
diff --git a/lib/port/rte_port_fd.c b/lib/port/rte_port_fd.c
index 932ecd324e05..b2412e7706ee 100644
--- a/lib/port/rte_port_fd.c
+++ b/lib/port/rte_port_fd.c
@@ -10,6 +10,9 @@
#include "rte_port_fd.h"
+RTE_LOG_REGISTER_SUFFIX(port_fd_logtype, fd, INFO);
+#define RTE_LOGTYPE_PORT port_fd_logtype
+
/*
* Port FD Reader
*/
diff --git a/lib/port/rte_port_frag.c b/lib/port/rte_port_frag.c
index e1f1892176c4..9adcbba47da1 100644
--- a/lib/port/rte_port_frag.c
+++ b/lib/port/rte_port_frag.c
@@ -7,6 +7,9 @@
#include "rte_port_frag.h"
+RTE_LOG_REGISTER_SUFFIX(port_frag_logtype, frag, INFO);
+#define RTE_LOGTYPE_PORT port_frag_logtype
+
/* Max number of fragments per packet allowed */
#defineRTE_PORT_FRAG_MAX_FRAGS_PER_PACKET 0x80
diff --git a/lib/port/rte_port_kni.c b/lib/port/rte_port_kni.c
index 1c7a6cb200ea..d4ac08b4cff0 100644
--- a/lib/port/rte_port_kni.c
+++ b/lib/port/rte_port_kni.c
@@ -9,6 +9,9 @@
#include "rte_port_kni.h"
+RTE_LOG_REGISTER_SUFFIX(port_kni_logtype, kni, INFO);
+#define RTE_LOGTYPE_PORT port_kni_logtype
+
/*
* Port KNI Reader
*/
diff --git a/lib/port/rte_port_ras.c b/lib/port/rte_port_ras.c
index e5de57da42ea..5a610b1ba5b5 100644
--- a/lib/port/rte_port_ras.c
+++ b/lib/port/rte_port_ras.c
@@ -9,6 +9,9 @@
#include "rte_port_ras.h"
+RTE_LOG_REGISTER_SUFFIX(port_ras_logtype, ras, INFO);
+#define RTE_LOGTYPE_PORT port_ras_logtype
+
#ifndef RTE_PORT_RAS_N_BUCKETS
#define RTE_PORT_RAS_N_BUCKETS 4094
#endif
diff --git a/lib/port/rte_port_ring.c b/lib/port/rte_port_ring.c
index 52b2d8e557f0..32a90e836579 100644
--- a/lib/port/rte_port_ring.c
+++ b/lib/port/rte_port_ring.c
@@ -10,6 +10,9 @@
#include "rte_port_ring.h"
+RTE_LOG_REGISTER_SUFFIX(port_ring_logtype, ring, INFO);
+#define RTE_LOGTYPE_PORT port_ring_logtype
+
/*
* Port RING Reader
*/
diff --git a/lib/port/rte_port_sched.c b/lib/port/rte_port_sched.c
index 8a7d815ef323..6e0a8aba5419 100644
--- a/lib/port/rte_port_sched.c
+++ b/lib/port/rte_port_sched.c
@@ -7,6 +7,9 @@
#include "rte_port_sched.h"
+RTE_LOG_REGISTER_SUFFIX(port_sched_logtype, sched, INFO);
+#define RTE_LOGTYPE_PORT port_sched_logtype
+
/*
[PATCH v7 19/22] pipeline: replace RTE_LOGTYPE_PIPELINE with dynamic type
Use a dynamically allocated logtype.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/pipeline/rte_pipeline.c | 3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index d640ed3c88b9..a3498d1a2faf 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH, "lib.hash"},
- {RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
{RTE_LOGTYPE_USER1, "user1"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 934bddff9dfa..7473fd53505a 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -41,7 +41,7 @@ extern "C" {
/* was RTE_LOGTYPE_SCHED */
/* was RTE_LOGTYPE_PORT */
/* was RTE_LOGTYPE_TABLE */
-#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */
+/* was RTE_LOGTYPE_PIPELINE */
/* was RTE_LOGTYPE_MBUF */
#define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
/* was RTE_LOGTYPE_EFD */
diff --git a/lib/pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
index ff86c7cf96bf..30919cd9fe30 100644
--- a/lib/pipeline/rte_pipeline.c
+++ b/lib/pipeline/rte_pipeline.c
@@ -12,6 +12,9 @@
#include "rte_pipeline.h"
+RTE_LOG_REGISTER_DEFAULT(pipeline_logtype, INFO);
+#define RTE_LOGTYPE_PIPELINE pipeline_logtype
+
#define RTE_TABLE_INVALID UINT32_MAX
#ifdef RTE_PIPELINE_STATS_COLLECT
--
2.39.1
[PATCH v7 20/22] hash: move rte_thash_gfni stubs out of header file
Having stubs in header file makes it harder to update
RTE_LOG(). Also modify to only print warning once.
Signed-off-by: Stephen Hemminger
---
lib/hash/meson.build | 8 +++-
lib/hash/rte_thash_gfni.c | 43 +++
lib/hash/rte_thash_gfni.h | 28 +
lib/hash/version.map | 4
4 files changed, 59 insertions(+), 24 deletions(-)
create mode 100644 lib/hash/rte_thash_gfni.c
diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index 2f757d45f9bc..e56ee8572564 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -17,7 +17,13 @@ indirect_headers += files(
'rte_thash_x86_gfni.h',
)
-sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c')
+sources = files(
+'rte_cuckoo_hash.c',
+'rte_fbk_hash.c',
+'rte_thash.c',
+'rte_thash_gfni.c'
+)
+
deps += ['net']
deps += ['ring']
deps += ['rcu']
diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c
new file mode 100644
index ..7617b9d4f630
--- /dev/null
+++ b/lib/hash/rte_thash_gfni.c
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+
+#include
+
+#include
+#include
+#include
+
+uint32_t
+rte_thash_gfni(const uint64_t *mtrx __rte_unused,
+ const uint8_t *key __rte_unused, int len __rte_unused)
+{
+ static bool warned;
+
+ if (!warned) {
+ warned = true;
+ RTE_LOG(ERR, HASH,
+ "%s is undefined under given arch\n", __func__);
+ }
+
+ return 0;
+}
+
+void
+rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused,
+ int len __rte_unused, uint8_t *tuple[] __rte_unused,
+ uint32_t val[], uint32_t num)
+{
+ unsigned int i;
+
+ static bool warned;
+
+ if (!warned) {
+ warned = true;
+ RTE_LOG(ERR, HASH,
+ "%s is undefined under given arch\n", __func__);
+ }
+
+ for (i = 0; i < num; i++)
+ val[i] = 0;
+}
diff --git a/lib/hash/rte_thash_gfni.h b/lib/hash/rte_thash_gfni.h
index ef90faa302d1..86208eb45ebb 100644
--- a/lib/hash/rte_thash_gfni.h
+++ b/lib/hash/rte_thash_gfni.h
@@ -9,13 +9,8 @@
extern "C" {
#endif
-#include
-#include
-
#ifdef RTE_ARCH_X86
-
#include
-
#endif
#ifndef RTE_THASH_GFNI_DEFINED
@@ -38,13 +33,8 @@ extern "C" {
* Calculated Toeplitz hash value.
*/
__rte_experimental
-static inline uint32_t
-rte_thash_gfni(const uint64_t *mtrx __rte_unused,
- const uint8_t *key __rte_unused, int len __rte_unused)
-{
- RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__);
- return 0;
-}
+uint32_t
+rte_thash_gfni(const uint64_t *mtrx, const uint8_t *key, int len);
/**
* Bulk implementation for Toeplitz hash.
@@ -67,17 +57,9 @@ rte_thash_gfni(const uint64_t *mtrx __rte_unused,
* Number of tuples to hash.
*/
__rte_experimental
-static inline void
-rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused,
- int len __rte_unused, uint8_t *tuple[] __rte_unused,
- uint32_t val[], uint32_t num)
-{
- unsigned int i;
-
- RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__);
- for (i = 0; i < num; i++)
- val[i] = 0;
-}
+void
+rte_thash_gfni_bulk(const uint64_t *mtrx, int len, uint8_t *tuple[],
+ uint32_t val[], uint32_t num);
#endif /* RTE_THASH_GFNI_DEFINED */
diff --git a/lib/hash/version.map b/lib/hash/version.map
index bdcebd19c29b..f03b047b2eec 100644
--- a/lib/hash/version.map
+++ b/lib/hash/version.map
@@ -51,4 +51,8 @@ EXPERIMENTAL {
rte_thash_complete_matrix;
rte_thash_get_gfni_matrices;
rte_thash_gfni_supported;
+
+ # added in 22.07
+ rte_thash_gfni;
+ rte_thash_gfni_bulk;
};
--
2.39.1
[PATCH v7 21/22] hash: move rte_hash_set_alg out header
The code for setting algorithm for hash is not at all perf sensitive,
and doing it inline has a couple of problems. First, it means that if
multiple files include the header, then the initialization gets done
multiple times. But also, it makes it harder to fix usage of RTE_LOG().
Despite what the checking script say. This is not an ABI change, the
previous version inlined the same code; therefore both old and new code
will work the same.
Signed-off-by: Stephen Hemminger
---
lib/hash/meson.build| 1 +
lib/hash/rte_hash_crc.c | 63 +
lib/hash/rte_hash_crc.h | 46 ++
lib/hash/version.map| 1 +
4 files changed, 67 insertions(+), 44 deletions(-)
create mode 100644 lib/hash/rte_hash_crc.c
diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index e56ee8572564..c345c6f561fc 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -19,6 +19,7 @@ indirect_headers += files(
sources = files(
'rte_cuckoo_hash.c',
+'rte_hash_crc.c',
'rte_fbk_hash.c',
'rte_thash.c',
'rte_thash_gfni.c'
diff --git a/lib/hash/rte_hash_crc.c b/lib/hash/rte_hash_crc.c
new file mode 100644
index ..c59eebccb1eb
--- /dev/null
+++ b/lib/hash/rte_hash_crc.c
@@ -0,0 +1,63 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include
+#include
+
+#include "rte_hash_crc.h"
+
+/**
+ * Allow or disallow use of SSE4.2/ARMv8 intrinsics for CRC32 hash
+ * calculation.
+ *
+ * @param alg
+ * An OR of following flags:
+ * - (CRC32_SW) Don't use SSE4.2/ARMv8 intrinsics (default non-[x86/ARMv8])
+ * - (CRC32_SSE42) Use SSE4.2 intrinsics if available
+ * - (CRC32_SSE42_x64) Use 64-bit SSE4.2 intrinsic if available (default x86)
+ * - (CRC32_ARM64) Use ARMv8 CRC intrinsic if available (default ARMv8)
+ *
+ */
+void
+rte_hash_crc_set_alg(uint8_t alg)
+{
+ crc32_alg = CRC32_SW;
+
+ if (alg == CRC32_SW)
+ return;
+
+#if defined RTE_ARCH_X86
+ if (!(alg & CRC32_SSE42_x64))
+ RTE_LOG(WARNING, HASH,
+ "Unsupported CRC32 algorithm requested using
CRC32_x64/CRC32_SSE42\n");
+ if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_EM64T) || alg == CRC32_SSE42)
+ crc32_alg = CRC32_SSE42;
+ else
+ crc32_alg = CRC32_SSE42_x64;
+#endif
+
+#if defined RTE_ARCH_ARM64
+ if (!(alg & CRC32_ARM64))
+ RTE_LOG(WARNING, HASH,
+ "Unsupported CRC32 algorithm requested using
CRC32_ARM64\n");
+ if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32))
+ crc32_alg = CRC32_ARM64;
+#endif
+
+ if (crc32_alg == CRC32_SW)
+ RTE_LOG(WARNING, HASH,
+ "Unsupported CRC32 algorithm requested using
CRC32_SW\n");
+}
+
+/* Setting the best available algorithm */
+RTE_INIT(rte_hash_crc_init_alg)
+{
+#if defined(RTE_ARCH_X86)
+ rte_hash_crc_set_alg(CRC32_SSE42_x64);
+#elif defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32)
+ rte_hash_crc_set_alg(CRC32_ARM64);
+#else
+ rte_hash_crc_set_alg(CRC32_SW);
+#endif
+}
diff --git a/lib/hash/rte_hash_crc.h b/lib/hash/rte_hash_crc.h
index 0249ad16c5b6..e4acd99a0c81 100644
--- a/lib/hash/rte_hash_crc.h
+++ b/lib/hash/rte_hash_crc.h
@@ -20,8 +20,6 @@ extern "C" {
#include
#include
#include
-#include
-#include
#include "rte_crc_sw.h"
@@ -53,48 +51,8 @@ static uint8_t crc32_alg = CRC32_SW;
* - (CRC32_ARM64) Use ARMv8 CRC intrinsic if available (default ARMv8)
*
*/
-static inline void
-rte_hash_crc_set_alg(uint8_t alg)
-{
- crc32_alg = CRC32_SW;
-
- if (alg == CRC32_SW)
- return;
-
-#if defined RTE_ARCH_X86
- if (!(alg & CRC32_SSE42_x64))
- RTE_LOG(WARNING, HASH,
- "Unsupported CRC32 algorithm requested using
CRC32_x64/CRC32_SSE42\n");
- if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_EM64T) || alg == CRC32_SSE42)
- crc32_alg = CRC32_SSE42;
- else
- crc32_alg = CRC32_SSE42_x64;
-#endif
-
-#if defined RTE_ARCH_ARM64
- if (!(alg & CRC32_ARM64))
- RTE_LOG(WARNING, HASH,
- "Unsupported CRC32 algorithm requested using
CRC32_ARM64\n");
- if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32))
- crc32_alg = CRC32_ARM64;
-#endif
-
- if (crc32_alg == CRC32_SW)
- RTE_LOG(WARNING, HASH,
- "Unsupported CRC32 algorithm requested using
CRC32_SW\n");
-}
-
-/* Setting the best available algorithm */
-RTE_INIT(rte_hash_crc_init_alg)
-{
-#if defined(RTE_ARCH_X86)
- rte_hash_crc_set_alg(CRC32_SSE42_x64);
-#elif defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_CRC32)
- rte_hash_crc_set_alg(CRC32_ARM64);
-#else
- rte_hash_crc_set_alg(CRC32_SW);
-#endif
-}
+void
+rte_hash_crc_set_alg(uint8_t alg);
#ifdef __DOXYGEN__
diff --git a/lib/hash/version.ma
[PATCH v7 22/22] hash: convert RTE_LOGTYPE_HASH to dynamic type
Use dynamic type for hash and add subtypes for crc and gfni.
Signed-off-by: Stephen Hemminger
---
lib/eal/common/eal_common_log.c | 1 -
lib/eal/include/rte_log.h | 2 +-
lib/hash/rte_cuckoo_hash.c | 5 +
lib/hash/rte_fbk_hash.c | 5 +
lib/hash/rte_hash_crc.c | 3 +++
lib/hash/rte_thash.c| 3 +++
lib/hash/rte_thash_gfni.c | 3 +++
7 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c
index a3498d1a2faf..704924e822d0 100644
--- a/lib/eal/common/eal_common_log.c
+++ b/lib/eal/common/eal_common_log.c
@@ -350,7 +350,6 @@ struct logtype {
static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
- {RTE_LOGTYPE_HASH, "lib.hash"},
{RTE_LOGTYPE_CRYPTODEV, "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
{RTE_LOGTYPE_USER1, "user1"},
diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h
index 7473fd53505a..29db07881a5a 100644
--- a/lib/eal/include/rte_log.h
+++ b/lib/eal/include/rte_log.h
@@ -32,7 +32,7 @@ extern "C" {
/* was RTE_LOGTYPE_MEMPOOL */
/* was RTE_LOGTYPE_TIMER */
#define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
-#define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */
+/* was RTE_LOGTYPE_HASH */
/* was RTE_LOGTYPE_LPM */
/* was RTE_LOGTYPE_KNI */
/* was RTE_LOGTYPE_ACL */
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 829b79c89a27..e2b07bfbad71 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -24,6 +24,11 @@
#include
#include "rte_hash.h"
+
+/* needs to be before rte_cuckoo_hash.h */
+RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO);
+#define RTE_LOGTYPE_HASH hash_logtype
+
#include "rte_cuckoo_hash.h"
/* Mask of all flags supported by this version */
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 538b23a4030a..b4c4c191abdc 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -8,6 +8,8 @@
#include
#include
+
+#include
#include
#include
#include
@@ -18,6 +20,9 @@
#include "rte_fbk_hash.h"
+RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO);
+#define RTE_LOGTYPE_HASH fbk_hash_logtype
+
TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry);
static struct rte_tailq_elem rte_fbk_hash_tailq = {
diff --git a/lib/hash/rte_hash_crc.c b/lib/hash/rte_hash_crc.c
index c59eebccb1eb..7c544a669f8a 100644
--- a/lib/hash/rte_hash_crc.c
+++ b/lib/hash/rte_hash_crc.c
@@ -7,6 +7,9 @@
#include "rte_hash_crc.h"
+RTE_LOG_REGISTER_SUFFIX(hash_crc_logtype, crc, INFO);
+#define RTE_LOGTYPE_HASH hash_crc_logtype
+
/**
* Allow or disallow use of SSE4.2/ARMv8 intrinsics for CRC32 hash
* calculation.
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 0249883b8d07..c1fd2e34c9d4 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -13,6 +13,9 @@
#include
#include
+RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO);
+#define RTE_LOGTYPE_HASH thash_logtype
+
#define THASH_NAME_LEN 64
#define TOEPLITZ_HASH_LEN 32
diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c
index 7617b9d4f630..f17ca222dc32 100644
--- a/lib/hash/rte_thash_gfni.c
+++ b/lib/hash/rte_thash_gfni.c
@@ -8,6 +8,9 @@
#include
#include
+RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO);
+#define RTE_LOGTYPE_HASH hash_gfni_logtype
+
uint32_t
rte_thash_gfni(const uint64_t *mtrx __rte_unused,
const uint8_t *key __rte_unused, int len __rte_unused)
--
2.39.1
[PATCH v10 1/3] ethdev: skip congestion management configuration
Introduce new flow action to skip congestion management configuration
This feature helps to skip the congestion management processing
based on per flow or the packet color identified by
rte_flow meter object. For example, If one Rx queue configured as
RED congestion and application wants tobypass the RED congestion
processing for all GREEN color packet can be expressed though
RTE_FLOW_ACTION_TYPE_SKIP_CMAN flow action
Signed-off-by: Rakesh Kudurumalla
Acked-by: Ori Kam
Acked-by: Jerin Jacob
---
v10: Rebased on top of dpdk-next-net
doc/guides/nics/features/default.ini | 1 +
doc/guides/prog_guide/rte_flow.rst | 22 ++
doc/guides/rel_notes/release_23_03.rst | 6 ++
lib/ethdev/rte_flow.h | 11 +++
4 files changed, 40 insertions(+)
diff --git a/doc/guides/nics/features/default.ini
b/doc/guides/nics/features/default.ini
index 976a020985..49e41b8002 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -200,6 +200,7 @@ set_tag =
set_tp_dst =
set_tp_src =
set_ttl =
+skip_cman=
vf =
vxlan_decap =
vxlan_encap =
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index 161c5dce53..76045386ba 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1832,6 +1832,28 @@ Drop packets.
| no properties |
+---+
+
+Action: ``SKIP_CMAN``
+^
+
+Skip congestion management on received packets
+
+- Using ``rte_eth_cman_config_set()``, application can configure ethdev Rx
+ queue's congestion mechanism.Once applied packets congestion configuration
+ is bypassed on that particular ethdev Rx queue for all packets directed
+ to that receive queue
+
+.. _table_rte_flow_action_skip_cman:
+
+.. table:: SKIP_CMAN
+
+ +---+
+ | Field |
+ +===+
+ | no properties |
+ +---+
+
+
Action: ``COUNT``
^
diff --git a/doc/guides/rel_notes/release_23_03.rst
b/doc/guides/rel_notes/release_23_03.rst
index ad23355e54..286cffab95 100644
--- a/doc/guides/rel_notes/release_23_03.rst
+++ b/doc/guides/rel_notes/release_23_03.rst
@@ -97,6 +97,12 @@ New Features
``rte_flow_configure``.
* Added ``host_port_id`` to ``rte_flow_port_attr`` structure.
+* **Added support to skip congestion management configuration.**
+
+ * Added a new action ``RTE_FLOW_ACTION_TYPE_SKIP_CMAN`` to skip
+congestion management processing based on per flow or packet color
+identified by rte_flow meter object
+
* **Updated AMD axgbe driver.**
* Added multi-process support.
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index 6a51442b8c..069b2210f1 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -2820,6 +2820,17 @@ enum rte_flow_action_type {
* No associated configuration structure.
*/
RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL,
+
+ /**
+* Skip congestion management configuration
+*
+* Using rte_eth_cman_config_set() API the application
+* can configure ethdev Rx queue's congestion mechanism.
+* Introducing RTE_FLOW_ACTION_TYPE_SKIP_CMAN flow action to skip the
+* congestion configuration applied to the given ethdev Rx queue.
+*
+*/
+ RTE_FLOW_ACTION_TYPE_SKIP_CMAN,
};
/**
--
2.25.1
[PATCH v10 2/3] app/testpmd: add skip cman support for testpmd
added support for testpmd application to accept
skip_cman action while configuring policy action
Signed-off-by: Rakesh Kudurumalla
---
app/test-pmd/cmdline_flow.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 63a0b36622..e4b17aa22d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -488,6 +488,7 @@ enum index {
ACTION_END,
ACTION_VOID,
ACTION_PASSTHRU,
+ ACTION_SKIP_CMAN,
ACTION_JUMP,
ACTION_JUMP_GROUP,
ACTION_MARK,
@@ -1896,6 +1897,7 @@ static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
ACTION_PASSTHRU,
+ ACTION_SKIP_CMAN,
ACTION_JUMP,
ACTION_MARK,
ACTION_FLAG,
@@ -5385,6 +5387,13 @@ static const struct token token_list[] = {
.next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
.call = parse_vc,
},
+ [ACTION_SKIP_CMAN] = {
+ .name = "skip_cman",
+ .help = "bypass cman on received packets",
+ .priv = PRIV_ACTION(SKIP_CMAN, 0),
+ .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+ .call = parse_vc,
+ },
[ACTION_JUMP] = {
.name = "jump",
.help = "redirect traffic to a given group",
--
2.25.1
