Re: [PATCH v2 0/4] mempool perf test: test random bulk sizes
On 3/31/25 13:03, Morten Brørup wrote: Bulk requests to get or put objects in a mempool often vary in size. A series of tests with pseudo random request sizes, to mitigate the benefits of the CPU's dynamic branch predictor, was added. Also, various other minor changes: - Improved the output formatting for readability. - Added test for the "default" mempool with cache. - Skip the tests for the "default" mempool, if it happens to use the same driver (i.e. operations) as already tested. - Replaced bare use of "unsigned" with "unsigned int", to make checkpatches happy. v2: * Split patch into individual patches. (Andrew Rybchenko) Thanks Morten, LGTM except a couple of nits Morten Brørup (4): mempool perf test: replace bare unsigned with unsigned int mempool perf test: test default mempool with cache mempool perf test: improve output readability mempool perf test: test random bulk sizes app/test/test_mempool_perf.c | 222 +++ 1 file changed, 173 insertions(+), 49 deletions(-)
RE: [PATCH 10/10] raw/ifpga: use common base code build handling
Hi,
> -Original Message-
> From: Bruce Richardson
> Sent: Tuesday, April 1, 2025 12:10 AM
> To: dev@dpdk.org
> Cc: Bruce Richardson ; Xu, Rosen
>
> Subject: [PATCH 10/10] raw/ifpga: use common base code build handling
>
> [You don't often get email from bruce.richard...@intel.com. Learn why this
> is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> Use the base code build handling logic in the drivers/meson.build file, rather
> than re-implementing it in the driver itself.
>
> While making changes similar to that in other drivers, also move content
> around dependencies from the base/meson.build file to the main driver
> meson.build file, so that the base code file only contains the list of base
> code
> files.
>
> Signed-off-by: Bruce Richardson
> ---
> drivers/raw/ifpga/base/meson.build | 21 ++---
> drivers/raw/ifpga/meson.build | 15 ---
> 2 files changed, 14 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/raw/ifpga/base/meson.build
> b/drivers/raw/ifpga/base/meson.build
> index 2de8e7ea22..efebff94e9 100644
> --- a/drivers/raw/ifpga/base/meson.build
> +++ b/drivers/raw/ifpga/base/meson.build
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel
> Corporation
>
> -sources = [
> +base_sources = files(
> 'ifpga_api.c',
> 'ifpga_enumerate.c',
> 'ifpga_feature_dev.c',
> @@ -23,21 +23,4 @@ sources = [
> 'opae_i2c.c',
> 'opae_at24_eeprom.c',
> 'opae_eth_group.c',
> -]
> -
> -rtdep = dependency('librt', required: false) -if not rtdep.found()
> -rtdep = cc.find_library('rt', required: false)
> -endif
> -if not rtdep.found()
> -build = false
> -reason = 'missing dependency, "librt"'
> -subdir_done()
> -endif
> -
> -ext_deps += rtdep
> -
> -base_lib = static_library('ifpga_rawdev_base', sources,
> -dependencies: static_rte_eal,
> -c_args: cflags)
> -base_objs = base_lib.extract_all_objects(recursive: true)
> +)
> diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
> index 444799cfb2..4295ec04bd 100644
> --- a/drivers/raw/ifpga/meson.build
> +++ b/drivers/raw/ifpga/meson.build
> @@ -7,8 +7,19 @@ if not has_libfdt
> subdir_done()
> endif
>
> +rtdep = dependency('librt', required: false) if not rtdep.found()
> +rtdep = cc.find_library('rt', required: false) endif if not
> +rtdep.found()
> +build = false
> +reason = 'missing dependency, "librt"'
> +subdir_done()
> +endif
> +
> +ext_deps += rtdep
> +
> subdir('base')
> -objs = [base_objs]
>
> deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
> 'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke'] @@ -17,6 +28,4
> @@
> sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c', 'afu_pmd_core.c',
> 'afu_pmd_n3000.c', 'afu_pmd_he_lpbk.c', 'afu_pmd_he_mem.c',
> 'afu_pmd_he_hssi.c')
>
> -includes += include_directories('base')
> -
> headers = files('rte_pmd_ifpga.h')
> --
> 2.45.2
Acked-by: Rosen Xu
[PATCH 2/2] node: use node mbuf dynfield in ip4 nodes
- Used global node mbuf in ip[4|6]_lookup/rewrite nodes
- Redefine node_mbuf_priv1() to rte_node_mbuf_overload_fields_get()
Signed-off-by: Nitin Saxena
---
lib/node/ip4_lookup.c | 14 ---
lib/node/ip4_rewrite.c| 15 +---
lib/node/ip6_lookup.c | 15 +---
lib/node/ip6_rewrite.c| 14 ---
lib/node/node_private.h | 40 +++
lib/node/rte_node_mbuf_dynfield.h | 9 +++
6 files changed, 34 insertions(+), 73 deletions(-)
diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c
index 0b474cd2bc..7e9d21a9c9 100644
--- a/lib/node/ip4_lookup.c
+++ b/lib/node/ip4_lookup.c
@@ -31,8 +31,6 @@ struct ip4_lookup_node_ctx {
int mbuf_priv1_off;
};
-int node_mbuf_priv1_dynfield_offset = -1;
-
static struct ip4_lookup_node_main ip4_lookup_nm;
#define IP4_LOOKUP_NODE_LPM(ctx) \
@@ -180,17 +178,15 @@ ip4_lookup_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
uint16_t socket, lcore_id;
static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip4_lookup_node_ctx) > RTE_NODE_CTX_SZ);
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
if (!init_once) {
- node_mbuf_priv1_dynfield_offset = rte_mbuf_dynfield_register(
- &node_mbuf_priv1_dynfield_desc);
- if (node_mbuf_priv1_dynfield_offset < 0)
- return -rte_errno;
-
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
@@ -208,7 +204,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct
rte_node *node)
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->socket];
- IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
+ IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
#if defined(__ARM_NEON) || defined(RTE_ARCH_X86)
if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128)
diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
index 34a920df5e..b05decc1a3 100644
--- a/lib/node/ip4_rewrite.c
+++ b/lib/node/ip4_rewrite.c
@@ -258,19 +258,16 @@ ip4_rewrite_node_process(struct rte_graph *graph, struct
rte_node *node,
static int
ip4_rewrite_node_init(const struct rte_graph *graph, struct rte_node *node)
{
- static bool init_once;
+ int dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip4_rewrite_node_ctx) > RTE_NODE_CTX_SZ);
- if (!init_once) {
- node_mbuf_priv1_dynfield_offset = rte_mbuf_dynfield_register(
- &node_mbuf_priv1_dynfield_desc);
- if (node_mbuf_priv1_dynfield_offset < 0)
- return -rte_errno;
- init_once = true;
- }
- IP4_REWRITE_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
+
+ IP4_REWRITE_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip4_rewrite", "Initialized ip4_rewrite node initialized");
diff --git a/lib/node/ip6_lookup.c b/lib/node/ip6_lookup.c
index f378d2d064..c140aa9cf3 100644
--- a/lib/node/ip6_lookup.c
+++ b/lib/node/ip6_lookup.c
@@ -316,18 +316,16 @@ ip6_lookup_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
uint16_t socket, lcore_id;
static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip6_lookup_node_ctx) > RTE_NODE_CTX_SZ);
- if (!init_once) {
- node_mbuf_priv1_dynfield_offset =
- rte_mbuf_dynfield_register(
- &node_mbuf_priv1_dynfield_desc);
- if (node_mbuf_priv1_dynfield_offset < 0)
- return -rte_errno;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
+ if (!init_once) {
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
@@ -345,8 +343,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct
rte_node *node)
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->socket];
- IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) =
- node_mbuf_priv1_dynfield_offset;
+ IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup", "Initialized ip6_lookup node");
diff --git a/lib/node/ip6_rewrite.c b/lib/node/ip6_rewrite.c
index 198d8d8820..b9e223ab3a 100644
--- a/lib/node/ip6_rewrite.c
+++ b/lib/node/ip6_rewrite.
[DPDK/meson Bug 909] Build error on CentOS 8.4.2105 with gcc 8.5.0 or clang 11.0
https://bugs.dpdk.org/show_bug.cgi?id=909 Stephen Hemminger (step...@networkplumber.org) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID --- Comment #2 from Stephen Hemminger (step...@networkplumber.org) --- This seems to be a problem with CentOs 8 and it is EOL. Closing the bug. -- You are receiving this mail because: You are the assignee for the bug.
DTS WG Meeting Minutes - March 27, 2025
# March 27, 2025 Attendees * Patrick Robb * Luca Vizzarro # Minutes = General Discussion * DPDK 25.03 has been released * We are aggregating the patches/tickets for the 25.07 DTS roadmap. Initial proposals are: * 1. TG abstraction rework (to facilitate performance TGs), testsuite API additions for perf workloads, and TREX class implementation * Luca raised that it may be best to leave the perf TGs as child classes of the current tg abstract class and simply not implement the capturing methods * Luca also raises that his asyncsniffer patchseries adds some new methods of collecting packets, such as collecting until a stop condition is met (like seeing packet X). This may split out packet send and packet capture from send_packet_and_capture(), making them independent. * 2. Write testsuite perf_single_core_fwd * 3. Write testsuite rte_flow * 4. Port VF support * 5. Docs improvements for new users * Luca has indicated that Thomas Wilks will contribute to this * 6. Smoke test tweaks to ensure they are not a setup burden * 7. Rework packet send and receive functions in the Testsuite API towards supporting IP networking in an L3 environment * 8. DPDK Testsuite API: This will provide a stable API which will not be broken going forward (except at agreed upon intervals) * 9. RSS Support Testsuites * Work for this is basically done - reviews needed though: https://patchwork.dpdk.org/project/dpdk/list/?series=34713 * 10. Non-Development roadmap goals include: Filming a video series explaining DTS usage, scheduling syncs with testers/developers from DPDK member companies to introduce them to DTS. * 11. Update TestResult module in order to give a more human readable summary of the testsuites * 12. Improved interactive shell data collection and logging. * Add a file which exclusively logs the shell interactions * 13. Add dedicated file manager to handle passing files and artifacts between the test engine and nodes in a path agnostic manner * This will be a component of the new DPDK DTS API * 14. Flexible port binding * Give the opportunity to test suites to use all or part of the supplied port topology with the kernel drivers (instead of DPDK). Could be achieved with a decorator * This will require the Topology class to be aware of what’s truly available for DPDK and provide only the right ports for it * Move these over to: https://docs.google.com/document/d/1doTZOOpkv4D5P2w6K7fEJpa_CjzrlMl3mCeDBWtxnko/edit?tab=t.0 * This is a friendly reminder that when you start working on a testsuite, you should make sure there is a ticket documenting that on DPDK/DTS bugzilla * Smoke tests do not run from next-dts currently, due to a patch from the per-test-suites-configuration patch from the end of 25.03. * Patrick will submit a fix * Also, it is worth discussing the usefulness of the smoke tests generally: * Some tests are confirming simple setup correctness and help validate DTS has been configured right, while others are testing DPDK more broadly (like the dpdk-test runs) and may pose a burden to developers * One option is to keep the smoke tests as they are but default them to off instead of on = Patch discussions * Per testsuite configuration: * merged * VF port support: * In progress * TREX perf TG support: * RFC should be submitted this week or next Bugzilla discussions * Thomas M cleaned up the Bugzilla board some * Patrick cleaned up some other tickets - worth taking 1 more look at it will Paul at a future meeting. * No other Bugzilla discussion = Any other business * Next meeting is April 10, 2025
Re: 22.11.8 patches review and test
On Mon, 31 Mar 2025 at 10:08, Yanghang Liu wrote: > > I tested below 18 scenarios on RHEL 9.2 hosts and didn't find any new dpdk > issues. > > VM with device assignment(PF) throughput testing(1G hugepage size): PASS > VM with device assignment(PF) throughput testing(2M hugepage size) : PASS > VM with device assignment(VF) throughput testing: PASS > PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS > PVP vhost-user 2Q throughput testing: PASS > PVP vhost-user 1Q - cross numa node throughput testing: PASS > VM with vhost-user 2 queues throughput testing: PASS > vhost-user reconnect with dpdk-client, qemu-server(qemu reconnect): PASS > vhost-user reconnect with dpdk-client, qemu-server(ovs reconnect): PASS > PVP reconnect with dpdk-client, qemu-server: PASS > PVP 1Q live migration testing: PASS > PVP 1Q cross numa node live migration testing: PASS > VM with ovs+dpdk+vhost-user 1Q live migration testing: PASS > VM with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS > VM with ovs+dpdk+vhost-user 2Q live migration testing: PASS > VM with ovs+dpdk+vhost-user 4Q live migration testing: PASS > Host PF + DPDK testing: PASS > Host VF + DPDK testing: PASS > > > Test Versions: > > qemu-kvm-7.2.0 > kernel 5.14 > libvirt 9.0 > ovs 3.1 > git log > > commit 684d996a201182b5335012055df33284e753d832 > > Author: Luca Boccassi > > Date: Wed Mar 26 11:26:26 2025 + > > version: 22.11.8-rc1 > > Signed-off-by: Luca Boccassi > > Test device : X540-AT2 NIC(ixgbe, 10G) > > Tested-by: Yanghang Liu > > > Best Regards, > Yanghang Liu That's great to hear, thanks!
Re: [PATCH] dma\ae4dma: added AMD user space DMA driver
On Sun, Mar 9, 2025 at 9:46 AM Bhagyada Modali wrote: > > Added a user-space driver with support for the AMD EPYC > 4th Generation DMA (AE4DMA) offload engine. > > Implementation of new user-space driver supporting > DMA memory copy offload on AMD EYPC 9004 & 8004 systems > (Genoa and Siena processors). > > Signed-off-by: Bhagyada Modali This patch failed to apply and did not pass CI. Please rebase and resubmit with comments from Chengwen and Morten addressed. -- David Marchand
Re: [PATCH v2 4/4] mempool perf test: test random bulk sizes
On 3/31/25 13:03, Morten Brørup wrote:
Bulk requests to get or put objects in a mempool often vary in size.
A series of tests with pseudo random request sizes, to mitigate the
benefits of the CPU's dynamic branch predictor, was added.
Signed-off-by: Morten Brørup
Acked-by: Andrew Rybchenko
[snip]
@@ -181,9 +240,9 @@ per_lcore_mempool_test(void *arg)
}
/* n_get_bulk and n_put_bulk must be divisors of n_keep */
- if (((n_keep / n_get_bulk) * n_get_bulk) != n_keep)
+ if (!n_max_bulk && (((n_keep / n_get_bulk) * n_get_bulk) != n_keep))
IMHO n_max_bulk == 0 would be easier to read and as far as I remember
DPDK coding style recommends the same style.
GOTO_ERR(ret, out);
- if (((n_keep / n_put_bulk) * n_put_bulk) != n_keep)
+ if (!n_max_bulk && (((n_keep / n_put_bulk) * n_put_bulk) != n_keep))
same
GOTO_ERR(ret, out);
/* for constant n, n_get_bulk and n_put_bulk must be the same */
if (use_constant_values && n_put_bulk != n_get_bulk)
@@ -200,7 +259,9 @@ per_lcore_mempool_test(void *arg)
start_cycles = rte_get_timer_cycles();
while (time_diff/hz < TIME_S) {
- if (!use_constant_values)
+ if (n_max_bulk)
n_max_bulk != 0
as DPDK coding style says
+ ret = test_loop_random(mp, cache, n_keep, n_max_bulk);
+ else if (!use_constant_values)
ret = test_loop(mp, cache, n_keep, n_get_bulk,
n_put_bulk);
else if (n_get_bulk == 1)
ret = test_loop(mp, cache, n_keep, 1, 1);
@@ -261,9 +322,13 @@ launch_cores(struct rte_mempool *mp, unsigned int cores)
use_external_cache ? external_cache_size : (unsigned int)
mp->cache_size,
cores,
n_keep);
- printf("n_get_bulk=%3u n_put_bulk=%3u constant_n=%u ",
- n_get_bulk, n_put_bulk,
- use_constant_values);
+ if (n_max_bulk)
same
+ printf("n_max_bulk=%3u ",
+ n_max_bulk);
+ else
+ printf("n_get_bulk=%3u n_put_bulk=%3u constant_n=%u ",
+ n_get_bulk, n_put_bulk,
+ use_constant_values);
if (rte_mempool_avail_count(mp) != MEMPOOL_SIZE) {
printf("mempool is not full\n");
[snip]
[PATCH] examples/flow_filtering: fix make clean
make clean is unable to delete build directory because *.o files are not removed. The other way to fix this would be to add all the c files into SRCS-y. Signed-off-by: Tanzeel Ahmed --- examples/flow_filtering/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 9998ed10b5..653e3319a2 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -50,5 +50,5 @@ build: .PHONY: clean clean: - rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared build/*.o test -d build && rmdir -p build || true -- 2.25.1
[PATCH v2 3/4] mempool perf test: improve output readability
Improved the output parameter ordering and formatting for readability.
Signed-off-by: Morten Brørup
Acked-by: Andrew Rybchenko
---
app/test/test_mempool_perf.c | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index 3594d81888..c252f1968a 100644
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -257,11 +257,13 @@ launch_cores(struct rte_mempool *mp, unsigned int cores)
/* reset stats */
memset(stats, 0, sizeof(stats));
- printf("mempool_autotest cache=%u cores=%u n_get_bulk=%u "
- "n_put_bulk=%u n_keep=%u constant_n=%u ",
- use_external_cache ?
- external_cache_size : (unsigned int) mp->cache_size,
- cores, n_get_bulk, n_put_bulk, n_keep, use_constant_values);
+ printf("mempool_autotest cache=%u cores=%u n_keep=%5u ",
+ use_external_cache ? external_cache_size : (unsigned int)
mp->cache_size,
+ cores,
+ n_keep);
+ printf("n_get_bulk=%3u n_put_bulk=%3u constant_n=%u ",
+ n_get_bulk, n_put_bulk,
+ use_constant_values);
if (rte_mempool_avail_count(mp) != MEMPOOL_SIZE) {
printf("mempool is not full\n");
@@ -301,7 +303,7 @@ launch_cores(struct rte_mempool *mp, unsigned int cores)
rate += (double)stats[lcore_id].enq_count * hz /
(double)stats[lcore_id].duration_cycles;
- printf("rate_persec=%" PRIu64 "\n", rate);
+ printf("rate_persec=%10" PRIu64 "\n", rate);
return 0;
}
@@ -320,9 +322,9 @@ do_one_mempool_test(struct rte_mempool *mp, unsigned int
cores, int external_cac
unsigned int *keep_ptr;
int ret;
- for (get_bulk_ptr = bulk_tab_get; *get_bulk_ptr; get_bulk_ptr++) {
- for (put_bulk_ptr = bulk_tab_put; *put_bulk_ptr;
put_bulk_ptr++) {
- for (keep_ptr = keep_tab; *keep_ptr; keep_ptr++) {
+ for (keep_ptr = keep_tab; *keep_ptr; keep_ptr++) {
+ for (get_bulk_ptr = bulk_tab_get; *get_bulk_ptr;
get_bulk_ptr++) {
+ for (put_bulk_ptr = bulk_tab_put; *put_bulk_ptr;
put_bulk_ptr++) {
if (*keep_ptr < *get_bulk_ptr || *keep_ptr <
*put_bulk_ptr)
continue;
--
2.43.0
[PATCH v2 2/4] mempool perf test: test default mempool with cache
Added test for the "default" mempool with cache.
Skip the tests for the "default" mempool, if it happens to use the same
driver (i.e. operations) as already tested.
Signed-off-by: Morten Brørup
Acked-by: Andrew Rybchenko
---
app/test/test_mempool_perf.c | 84 +---
1 file changed, 59 insertions(+), 25 deletions(-)
diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index d4271a5ef9..3594d81888 100644
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -354,7 +354,10 @@ do_all_mempool_perf_tests(unsigned int cores)
{
struct rte_mempool *mp_cache = NULL;
struct rte_mempool *mp_nocache = NULL;
- struct rte_mempool *default_pool = NULL;
+ struct rte_mempool *default_pool_cache = NULL;
+ struct rte_mempool *default_pool_nocache = NULL;
+ const char *mp_cache_ops;
+ const char *mp_nocache_ops;
const char *default_pool_ops;
int ret = -1;
@@ -368,6 +371,7 @@ do_all_mempool_perf_tests(unsigned int cores)
printf("cannot allocate mempool (without cache)\n");
goto err;
}
+ mp_nocache_ops = rte_mempool_get_ops(mp_nocache->ops_index)->name;
/* create a mempool (with cache) */
mp_cache = rte_mempool_create("perf_test_cache", MEMPOOL_SIZE,
@@ -380,47 +384,76 @@ do_all_mempool_perf_tests(unsigned int cores)
printf("cannot allocate mempool (with cache)\n");
goto err;
}
+ mp_cache_ops = rte_mempool_get_ops(mp_cache->ops_index)->name;
default_pool_ops = rte_mbuf_best_mempool_ops();
- /* Create a mempool based on Default handler */
- default_pool = rte_mempool_create_empty("default_pool",
- MEMPOOL_SIZE,
- MEMPOOL_ELT_SIZE,
- 0, 0,
- SOCKET_ID_ANY, 0);
-
- if (default_pool == NULL) {
- printf("cannot allocate %s mempool\n", default_pool_ops);
+
+ /* Create a mempool (without cache) based on Default handler */
+ default_pool_nocache = rte_mempool_create_empty("default_pool_nocache",
+ MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE,
+ 0, 0,
+ SOCKET_ID_ANY, 0);
+ if (default_pool_nocache == NULL) {
+ printf("cannot allocate %s mempool (without cache)\n",
default_pool_ops);
goto err;
}
-
- if (rte_mempool_set_ops_byname(default_pool, default_pool_ops, NULL)
- < 0) {
+ if (rte_mempool_set_ops_byname(default_pool_nocache, default_pool_ops,
NULL) < 0) {
printf("cannot set %s handler\n", default_pool_ops);
goto err;
}
-
- if (rte_mempool_populate_default(default_pool) < 0) {
+ if (rte_mempool_populate_default(default_pool_nocache) < 0) {
printf("cannot populate %s mempool\n", default_pool_ops);
goto err;
}
+ rte_mempool_obj_iter(default_pool_nocache, my_obj_init, NULL);
+
+ /* Create a mempool (with cache) based on Default handler */
+ default_pool_cache = rte_mempool_create_empty("default_pool_cache",
+ MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE,
+ RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
+ SOCKET_ID_ANY, 0);
+ if (default_pool_cache == NULL) {
+ printf("cannot allocate %s mempool (with cache)\n",
default_pool_ops);
+ goto err;
+ }
+ if (rte_mempool_set_ops_byname(default_pool_cache, default_pool_ops,
NULL) < 0) {
+ printf("cannot set %s handler\n", default_pool_ops);
+ goto err;
+ }
+ if (rte_mempool_populate_default(default_pool_cache) < 0) {
+ printf("cannot populate %s mempool\n", default_pool_ops);
+ goto err;
+ }
+ rte_mempool_obj_iter(default_pool_cache, my_obj_init, NULL);
- rte_mempool_obj_iter(default_pool, my_obj_init, NULL);
-
- printf("start performance test (without cache)\n");
+ printf("start performance test (using %s, without cache)\n",
+ mp_nocache_ops);
if (do_one_mempool_test(mp_nocache, cores, 0) < 0)
goto err;
- printf("start performance test for %s (without cache)\n",
- default_pool_ops);
- if (do_one_mempool_test(default_pool, cores, 0) < 0)
- goto err;
+ if (strcmp(default_pool_ops, mp_nocache_ops) != 0) {
+ printf("start performance test for %s (without cache)\n",
+ default_pool_ops);
+ if (do_one_mempool_test(default_pool_nocache, cores, 0) < 0)
+ goto err;
+ }
- printf("s
[PATCH v2 1/4] mempool perf test: replace bare unsigned with unsigned int
Updated old code using bare "unsigned" with "unsigned int".
Signed-off-by: Morten Brørup
Acked-by: Andrew Rybchenko
---
app/test/test_mempool_perf.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/test/test_mempool_perf.c b/app/test/test_mempool_perf.c
index 4dd74ef75a..d4271a5ef9 100644
--- a/app/test/test_mempool_perf.c
+++ b/app/test/test_mempool_perf.c
@@ -89,16 +89,16 @@
} while (0)
static int use_external_cache;
-static unsigned external_cache_size = RTE_MEMPOOL_CACHE_MAX_SIZE;
+static unsigned int external_cache_size = RTE_MEMPOOL_CACHE_MAX_SIZE;
static RTE_ATOMIC(uint32_t) synchro;
/* number of objects in one bulk operation (get or put) */
-static unsigned n_get_bulk;
-static unsigned n_put_bulk;
+static unsigned int n_get_bulk;
+static unsigned int n_put_bulk;
/* number of objects retrieved from mempool before putting them back */
-static unsigned n_keep;
+static unsigned int n_keep;
/* true if we want to test with constant n_get_bulk and n_put_bulk */
static int use_constant_values;
@@ -118,7 +118,7 @@ static struct mempool_test_stats stats[RTE_MAX_LCORE];
*/
static void
my_obj_init(struct rte_mempool *mp, __rte_unused void *arg,
- void *obj, unsigned i)
+ void *obj, unsigned int i)
{
uint32_t *objnum = obj;
memset(obj, 0, mp->elt_size);
@@ -163,7 +163,7 @@ static int
per_lcore_mempool_test(void *arg)
{
struct rte_mempool *mp = arg;
- unsigned lcore_id = rte_lcore_id();
+ unsigned int lcore_id = rte_lcore_id();
int ret = 0;
uint64_t start_cycles, end_cycles;
uint64_t time_diff = 0, hz = rte_get_timer_hz();
@@ -246,10 +246,10 @@ per_lcore_mempool_test(void *arg)
static int
launch_cores(struct rte_mempool *mp, unsigned int cores)
{
- unsigned lcore_id;
+ unsigned int lcore_id;
uint64_t rate;
int ret;
- unsigned cores_save = cores;
+ unsigned int cores_save = cores;
double hz = rte_get_timer_hz();
rte_atomic_store_explicit(&synchro, 0, rte_memory_order_relaxed);
@@ -260,7 +260,7 @@ launch_cores(struct rte_mempool *mp, unsigned int cores)
printf("mempool_autotest cache=%u cores=%u n_get_bulk=%u "
"n_put_bulk=%u n_keep=%u constant_n=%u ",
use_external_cache ?
- external_cache_size : (unsigned) mp->cache_size,
+ external_cache_size : (unsigned int) mp->cache_size,
cores, n_get_bulk, n_put_bulk, n_keep, use_constant_values);
if (rte_mempool_avail_count(mp) != MEMPOOL_SIZE) {
@@ -315,9 +315,9 @@ do_one_mempool_test(struct rte_mempool *mp, unsigned int
cores, int external_cac
unsigned int bulk_tab_put[] = { 1, 4, CACHE_LINE_BURST, 32, 64, 128,
256,
RTE_MEMPOOL_CACHE_MAX_SIZE, 0 };
unsigned int keep_tab[] = { 32, 128, 512, 2048, 8192, 32768, 0 };
- unsigned *get_bulk_ptr;
- unsigned *put_bulk_ptr;
- unsigned *keep_ptr;
+ unsigned int *get_bulk_ptr;
+ unsigned int *put_bulk_ptr;
+ unsigned int *keep_ptr;
int ret;
for (get_bulk_ptr = bulk_tab_get; *get_bulk_ptr; get_bulk_ptr++) {
--
2.43.0
[PATCH v2 0/4] mempool perf test: test random bulk sizes
Bulk requests to get or put objects in a mempool often vary in size. A series of tests with pseudo random request sizes, to mitigate the benefits of the CPU's dynamic branch predictor, was added. Also, various other minor changes: - Improved the output formatting for readability. - Added test for the "default" mempool with cache. - Skip the tests for the "default" mempool, if it happens to use the same driver (i.e. operations) as already tested. - Replaced bare use of "unsigned" with "unsigned int", to make checkpatches happy. v2: * Split patch into individual patches. (Andrew Rybchenko) Morten Brørup (4): mempool perf test: replace bare unsigned with unsigned int mempool perf test: test default mempool with cache mempool perf test: improve output readability mempool perf test: test random bulk sizes app/test/test_mempool_perf.c | 222 +++ 1 file changed, 173 insertions(+), 49 deletions(-) -- 2.43.0
Re: [PATCH] dma\ae4dma: added AMD user space DMA driver
On Sun, 9 Mar 2025 14:15:26 +0530
Bhagyada Modali wrote:
> Added a user-space driver with support for the AMD EPYC
> 4th Generation DMA (AE4DMA) offload engine.
>
> Implementation of new user-space driver supporting
> DMA memory copy offload on AMD EYPC 9004 & 8004 systems
> (Genoa and Siena processors).
>
> Signed-off-by: Bhagyada Modali
> ---
> app/test-dma-perf/benchmark.c| 24 +-
> app/test-dma-perf/config.ini | 134 --
> app/test-dma-perf/main.c | 2 -
> app/test/test_dmadev.c | 43 +-
> drivers/dma/ae4dma/ae4dma_dmadev.c | 656 +++
> drivers/dma/ae4dma/ae4dma_hw_defs.h | 225 +
> drivers/dma/ae4dma/ae4dma_internal.h | 125 +
> drivers/dma/ae4dma/meson.build | 7 +
> drivers/dma/meson.build | 1 +
> lib/mempool/rte_mempool.h| 2 +-
> usertools/dpdk-devbind.py| 5 +-
> 11 files changed, 1146 insertions(+), 78 deletions(-)
> create mode 100644 drivers/dma/ae4dma/ae4dma_dmadev.c
> create mode 100644 drivers/dma/ae4dma/ae4dma_hw_defs.h
> create mode 100644 drivers/dma/ae4dma/ae4dma_internal.h
> create mode 100644 drivers/dma/ae4dma/meson.build
>
> diff --git a/app/test-dma-perf/benchmark.c b/app/test-dma-perf/benchmark.c
> index 6d617ea200..a9aff8191b 100644
> --- a/app/test-dma-perf/benchmark.c
> +++ b/app/test-dma-perf/benchmark.c
> @@ -266,17 +266,35 @@ error_exit(int dev_id)
> rte_exit(EXIT_FAILURE, "DMA error\n");
> }
>
> +static void
> +await_hw(int16_t dev_id, uint16_t vchan)
> +{
> + enum rte_dma_vchan_status st;
> +
> + if (rte_dma_vchan_status(dev_id, vchan, &st) < 0) {
> + /* for drivers that don't support this op, just sleep for 1 us
> */
> + rte_delay_us_sleep(1);
> + return;
> + }
> +
> + /* for those that do, *max* end time is one second from now, but all
> should be faster */
> + const uint64_t end_cycles = rte_get_timer_cycles() + rte_get_timer_hz();
> + while (st == RTE_DMA_VCHAN_ACTIVE && rte_get_timer_cycles() <
> end_cycles) {
> + rte_pause();
> + rte_dma_vchan_status(dev_id, vchan, &st);
> + }
> +}
> +
> +
> static inline void
> do_dma_submit_and_poll(uint16_t dev_id, uint64_t *async_cnt,
> volatile struct worker_info *worker_info)
> {
> int ret;
> uint16_t nr_cpl;
> -
> ret = rte_dma_submit(dev_id, 0);
> if (ret < 0)
> error_exit(dev_id);
> -
> nr_cpl = rte_dma_completed(dev_id, 0, MAX_DMA_CPL_NB, NULL, NULL);
> *async_cnt -= nr_cpl;
> worker_info->total_cpl += nr_cpl;
> @@ -311,12 +329,14 @@ do_dma_plain_mem_copy(void *p)
> ret = rte_dma_copy(dev_id, 0,
> rte_mbuf_data_iova(srcs[i]),
> rte_mbuf_data_iova(dsts[i]), buf_size, 0);
> if (unlikely(ret < 0)) {
> + await_hw(dev_id, 0);
> if (ret == -ENOSPC) {
> do_dma_submit_and_poll(dev_id,
> &async_cnt, worker_info);
> goto dma_copy;
> } else
> error_exit(dev_id);
> }
> +
> async_cnt++;
>
> if ((async_cnt % kick_batch) == 0)
> diff --git a/app/test-dma-perf/config.ini b/app/test-dma-perf/config.ini
> index 61e49dbae5..4fa8713e89 100644
> --- a/app/test-dma-perf/config.ini
> +++ b/app/test-dma-perf/config.ini
> @@ -61,57 +61,95 @@
>
> [case1]
> type=DMA_MEM_COPY
> -mem_size=10
> -buf_size=64,8192,2,MUL
> -dma_ring_size=1024
> -kick_batch=32
> +mem_size=64
> +buf_size=32768
> +dma_ring_size=32
> +kick_batch=4
> src_numa_node=0
> dst_numa_node=0
> cache_flush=0
> test_seconds=2
> -lcore_dma0=lcore=10,dev=:00:04.1,dir=mem2mem
> -lcore_dma1=lcore=11,dev=:00:04.2,dir=mem2mem
> +lcore_dma0=lcore=4,dev=:04:00.1-ch0,dir=mem2mem
> +lcore_dma1=lcore=5,dev=:04:00.1-ch1,dir=mem2mem
> +lcore_dma2=lcore=7,dev=:64:00.1-ch0,dir=mem2mem
> +lcore_dma3=lcore=8,dev=:64:00.1-ch1,dir=mem2mem
> +lcore_dma4=lcore=14,dev=:41:00.1-ch0,dir=mem2mem
> +lcore_dma5=lcore=15,dev=:41:00.1-ch1,dir=mem2mem
> +lcore_dma6=lcore=17,dev=:21:00.1-ch0,dir=mem2mem
> +lcore_dma7=lcore=18,dev=:21:00.1-ch1,dir=mem2mem
> +;lcore_dma0=lcore=13,dev=:41:00.1-ch0,dir=mem2mem
> +;lcore_dma1=lcore=14,dev=:41:00.1-ch1,dir=mem2mem
> +;lcore_dma2=lcore=15,dev=:41:00.1-ch2,dir=mem2mem
> +;lcore_dma3=lcore=16,dev=:41:00.1-ch3,dir=mem2mem
> +;lcore_dma4=lcore=17,dev=:41:00.1-ch4,dir=mem2mem
> +;lcore_dma5=lcore=18,dev=:41:00.1-ch5,dir=mem2mem
> +;lcore_dma6=lcore=19,dev=:41:00.1-ch6,dir=mem2mem
> +;lcore_dma7=lcore=20,dev=:41:00.1-ch7,dir=mem2mem
> +;lcore_dma8=lcore=21,dev=:41:00.1-ch8,dir=mem2mem
> +;lcore_dma9=lcore=22,dev=:41:00.1-ch9,dir=
[PATCH 1/2] dts: add packet capture test suite
Add a test suite that tests the packet capture framework
through the use of dpdk-pdump.
Signed-off-by: Thomas Wilks
Reviewed-by: Luca Vizzarro
---
.../dts/tests.TestSuite_packet_capture.rst| 8 +
dts/tests/TestSuite_packet_capture.py | 358 ++
2 files changed, 366 insertions(+)
create mode 100644 doc/api/dts/tests.TestSuite_packet_capture.rst
create mode 100644 dts/tests/TestSuite_packet_capture.py
diff --git a/doc/api/dts/tests.TestSuite_packet_capture.rst
b/doc/api/dts/tests.TestSuite_packet_capture.rst
new file mode 100644
index 00..3d760d3ae4
--- /dev/null
+++ b/doc/api/dts/tests.TestSuite_packet_capture.rst
@@ -0,0 +1,8 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+
+packet_capture Test Suite
+=
+
+.. automodule:: tests.TestSuite_packet_capture
+ :members:
+ :show-inheritance:
diff --git a/dts/tests/TestSuite_packet_capture.py
b/dts/tests/TestSuite_packet_capture.py
new file mode 100644
index 00..bdc3d008a3
--- /dev/null
+++ b/dts/tests/TestSuite_packet_capture.py
@@ -0,0 +1,358 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2025 Arm Limited
+
+"""Packet capture TestSuite.
+
+Tests pdump by sending packets, changing the arguments of pdump
+and verifying the received packets.
+"""
+
+from dataclasses import asdict, dataclass
+from pathlib import Path, PurePath
+from random import randint
+from typing import Union
+
+from scapy.contrib.lldp import (
+LLDPDUChassisID,
+LLDPDUEndOfLLDPDU,
+LLDPDUPortID,
+LLDPDUSystemCapabilities,
+LLDPDUSystemDescription,
+LLDPDUSystemName,
+LLDPDUTimeToLive,
+)
+from scapy.layers.inet import IP, TCP, UDP
+from scapy.layers.inet6 import IPv6
+from scapy.layers.l2 import Dot1Q, Ether
+from scapy.layers.sctp import SCTP
+from scapy.packet import Packet, Raw
+from scapy.utils import rdpcap
+from typing_extensions import Literal
+
+from framework.params.eal import EalParams
+from framework.params.testpmd import PortTopology
+from framework.remote_session.dpdk_app import BlockingDPDKApp
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.settings import SETTINGS
+from framework.test_suite import TestSuite, func_test
+from framework.testbed_model.traffic_generator.capturing_traffic_generator
import (
+PacketFilteringConfig,
+)
+
+
+@dataclass(order=True, kw_only=True)
+class PdumpParameters:
+"""Parameters for --pdump.
+
+Attributes:
+device_id: The PCIE address of the device to capture packets.
+port: The port id of the device to capture packets.
+queue: The ID of the RX and TX queue.
+tx_dev: The path or iface that the TX packets captured on TX will be
outputted at.
+rx_dev: The path or iface that the RX packets captured on RX will be
outputted at.
+ring_size: The size of the ring.
+mbuf_size: The size of the mbuf data.
+total_num_mbufs: Total number of the mbufs in the memory pool.
+"""
+
+device_id: str | None = None
+port: int | None = None
+queue: Union[int, Literal["*"]] = "*"
+tx_dev: PurePath | str | None = None
+rx_dev: PurePath | str | None = None
+ring_size: int | None = None
+mbuf_size: int | None = None
+total_num_mbufs: int | None = None
+
+def __str__(self) -> str:
+"""Parameters as string for --pdump.
+
+Returns:
+String of the pdump commands
+"""
+
+def pair_to_str(field, value):
+if field != "device_id":
+field = field.replace("_", "-")
+return f"{field}={value}"
+
+arg = ",".join(
+[
+pair_to_str(field, value)
+for field, value in asdict(self).items()
+if value is not None
+]
+)
+
+return arg
+
+
+class TestPacketCapture(TestSuite):
+"""Packet Capture TestSuite.
+
+Attributes:
+packets: List of packets to send for testing pdump.
+rx_pcap_path: The remote path where to create the RX packets pcap with
pdump.
+tx_pcap_path: The remote path where to create the TX packets pcap with
pdump.
+pdump_params: The list of pdump parameters.
+"""
+
+packets: list[Packet]
+rx_pcap_path: PurePath
+tx_pcap_path: PurePath
+pdump_params: list[PdumpParameters]
+
+def set_up_suite(self) -> None:
+"""Test suite setup.
+
+Prepare the packets, file paths and queue range to be used in the test
suite.
+"""
+self.packets = [
+Ether() / IP() / Raw(b"\0" * 60),
+Ether() / IP() / TCP() / Raw(b"\0" * 60),
+Ether() / IP() / UDP() / Raw(b"\0" * 60),
+Ether() / IP() / SCTP() / Raw(b"\0" * 40),
+Ether() / IPv6() / TCP() / Raw(b"\0" * 60),
+Ether() / IPv6() / UDP() / Raw(b"\0" * 60),
+Ether() / IP() / IPv6() / SCTP() / Raw(b"\0" * 40),
+Ether() / Dot1Q() / IP
[PATCH 0/2] dts: add packet capture test suite
Hi,
Sending this new test suite that tests the packet capture framework.
Best regards,
Thomas
Depends-on: series-34865 ("dts: shell improvements")
Thomas Wilks (2):
dts: add packet capture test suite
dts: import lldp package in scapy
.../dts/tests.TestSuite_packet_capture.rst| 8 +
.../testbed_model/traffic_generator/scapy.py | 1 +
dts/tests/TestSuite_packet_capture.py | 357 ++
3 files changed, 366 insertions(+)
create mode 100644 doc/api/dts/tests.TestSuite_packet_capture.rst
create mode 100644 dts/tests/TestSuite_packet_capture.py
--
2.43.0
[PATCH 00/10] centralise base code handling for drivers
Many DPDK drivers use the same pattern for base code handling, having
a meson.build file in the base code directory which optionally defines
some custom cflags for the base code build, then builds the code as a
static library and extracts the objects from it. (The reason behind this
is that, in meson, cflags apply per-object, so we need to have a
separate build object for the base code to use custom flags)
This patchset deduplicates this logic by putting it into the
drivers/meson.build file, and allowing individual drivers to then just
specify values for "base_sources" and "base_cflags".
Depends-on: Series-34946 ("net/intel: clean up base code build")
Bruce Richardson (10):
build: add generic support for base code in drivers
common/sfc_efx: use common base code build handling
net/hinic: use common base code build handling
net/intel: use common base code build handling
net/ngbe: use common base code build handling
net/octeontx: use common base code build handling
net/qede: use common base code build handling
net/thunderx: use common base code build handling
net/txgbe: use common base code build handling
raw/ifpga: use common base code build handling
drivers/common/sfc_efx/base/meson.build | 18 +++---
drivers/common/sfc_efx/meson.build | 3 ---
drivers/meson.build | 20
drivers/net/hinic/base/meson.build | 16 +---
drivers/net/hinic/meson.build | 1 -
drivers/net/intel/e1000/meson.build | 3 ---
drivers/net/intel/fm10k/meson.build | 3 ---
drivers/net/intel/i40e/meson.build | 2 --
drivers/net/intel/iavf/meson.build | 1 -
drivers/net/intel/ice/base/meson.build | 22 +++---
drivers/net/intel/ice/meson.build | 2 --
drivers/net/intel/idpf/meson.build | 1 -
drivers/net/intel/ixgbe/meson.build | 3 ---
drivers/net/ngbe/base/meson.build | 12 ++--
drivers/net/ngbe/meson.build| 3 ---
drivers/net/octeontx/base/meson.build | 19 +--
drivers/net/octeontx/meson.build| 3 ---
drivers/net/qede/base/meson.build | 17 +
drivers/net/qede/meson.build| 1 -
drivers/net/thunderx/base/meson.build | 10 +-
drivers/net/thunderx/meson.build| 3 ---
drivers/net/txgbe/base/meson.build | 18 ++
drivers/net/txgbe/meson.build | 3 ---
drivers/raw/ifpga/base/meson.build | 21 ++---
drivers/raw/ifpga/meson.build | 15 ---
25 files changed, 60 insertions(+), 160 deletions(-)
--
2.45.2
Re: [PATCH v2] event/dlb2: consolidate AVX512 and SSE changes
On Fri, Mar 28, 2025 at 06:00:44AM -0500, Tirthendu Sarkar wrote:
> Streamline code for AVX512 and SSE by consolidating the common code and
> adding runtime check for selecting appropriate path based on CPU
> capability.
>
> Signed-off-by: Tirthendu Sarkar
> ---
> v2:
> - Addressed review comments [Bruce Richardson]
Tested that we can still get the function pointer set to the AVX-512 path
in a generic build.
Acked-by: Bruce Richardson
Some additional feedback inline below. Probably want to do a v3 to fix some
of them.
>
> drivers/event/dlb2/dlb2.c| 199 -
> drivers/event/dlb2/dlb2_avx512.c | 298 ---
> drivers/event/dlb2/dlb2_priv.h | 9 +-
> drivers/event/dlb2/dlb2_sse.c| 210 +-
> 4 files changed, 241 insertions(+), 475 deletions(-)
>
> diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
> index 934fcafcfe..4c0b4686a4 100644
> --- a/drivers/event/dlb2/dlb2.c
> +++ b/drivers/event/dlb2/dlb2.c
> @@ -90,6 +90,9 @@ static struct rte_event_dev_info evdev_dlb2_default_info = {
> struct process_local_port_data
> dlb2_port[DLB2_MAX_NUM_PORTS_ALL][DLB2_NUM_PORT_TYPES];
>
> +static void
> +(*dlb2_build_qes)(struct dlb2_enqueue_qe *qe, const struct rte_event ev[],
> __m128i sse_qe[]);
> +
> static void
> dlb2_free_qe_mem(struct dlb2_port *qm_port)
> {
> @@ -2069,9 +2072,9 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev,
>
> if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512VL) &&
> rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_512)
> - ev_port->qm_port.use_avx512 = true;
> + dlb2_build_qes = dlb2_build_qes_avx512;
> else
> - ev_port->qm_port.use_avx512 = false;
> + dlb2_build_qes = dlb2_build_qes_sse;
>
> return 0;
> }
> @@ -2669,6 +2672,21 @@ dlb2_eventdev_start(struct rte_eventdev *dev)
> return 0;
> }
>
> +static uint8_t cmd_byte_map[DLB2_NUM_PORT_TYPES][DLB2_NUM_HW_SCHED_TYPES] = {
> + {
> + /* Load-balanced cmd bytes */
> + [RTE_EVENT_OP_NEW] = DLB2_NEW_CMD_BYTE,
> + [RTE_EVENT_OP_FORWARD] = DLB2_FWD_CMD_BYTE,
> + [RTE_EVENT_OP_RELEASE] = DLB2_COMP_CMD_BYTE,
> + },
> + {
> + /* Directed cmd bytes */
> + [RTE_EVENT_OP_NEW] = DLB2_NEW_CMD_BYTE,
> + [RTE_EVENT_OP_FORWARD] = DLB2_NEW_CMD_BYTE,
> + [RTE_EVENT_OP_RELEASE] = DLB2_NOOP_CMD_BYTE,
> + },
> +};
Minor nit, but this seems in a strange position in the file, being a
global. As far as I can see, it's only used by the one function -
dlb2_event_build_hcws() - so maybe make it a static local variable there.
> +
> static inline uint32_t
> dlb2_port_credits_get(struct dlb2_port *qm_port,
> enum dlb2_hw_queue_types type)
> @@ -2887,6 +2905,183 @@ dlb2_construct_token_pop_qe(struct dlb2_port
> *qm_port, int idx)
> qm_port->owed_tokens = 0;
> }
>
> +static inline void
> +dlb2_event_build_hcws(struct dlb2_port *qm_port,
> + const struct rte_event ev[],
> + int num,
> + uint8_t *sched_type,
> + uint8_t *queue_id)
> +{
> --- a/drivers/event/dlb2/dlb2_sse.c
> +++ b/drivers/event/dlb2/dlb2_sse.c
> @@ -2,172 +2,15 @@
> * Copyright(c) 2022 Intel Corporation
> */
>
> -#include
> -#include
> -
> -#ifndef CC_AVX512_SUPPORT
> -
> #include "dlb2_priv.h"
> -#include "dlb2_iface.h"
> -#include "dlb2_inline_fns.h"
> -
> /*
> * This source file is only used when the compiler on the build machine
> * does not support AVX512VL.
> */
This comment needs updating. It's now used when the runtime platform
doesn't support AVX512.
>
> -static uint8_t cmd_byte_map[DLB2_NUM_PORT_TYPES][DLB2_NUM_HW_SCHED_TYPES] = {
> - {
> - /* Load-balanced cmd bytes */
> - [RTE_EVENT_OP_NEW] = DLB2_NEW_CMD_BYTE,
> - [RTE_EVENT_OP_FORWARD] = DLB2_FWD_CMD_BYTE,
> - [RTE_EVENT_OP_RELEASE] = DLB2_COMP_CMD_BYTE,
> - },
> - {
> - /* Directed cmd bytes */
> - [RTE_EVENT_OP_NEW] = DLB2_NEW_CMD_BYTE,
> - [RTE_EVENT_OP_FORWARD] = DLB2_NEW_CMD_BYTE,
> - [RTE_EVENT_OP_RELEASE] = DLB2_NOOP_CMD_BYTE,
> - },
> -};
> + _mm_storel_epi64((__m128i *)&qe[0].u.opaque_data, sse_qe[0]);
> + _mm_storeh_pd((double *)&qe[1].u.opaque_data,
> (__m128d)sse_qe[0]);
> + _mm_storel_epi64((__m128i *)&qe[2].u.opaque_data, sse_qe[1]);
> + _mm_storeh_pd((double *)&qe[3].u.opaque_data,
> (__m128d)sse_qe[1]);
>
> qe[0].data = ev[0].u64;
> qe[1].data = ev[1].u64;
> qe[2].data = ev[2].u64;
> qe[3].data = ev[3].u64;
While I'm not reviewing in detail the SSE/AVX512 code, since this patch
just seems to be moving the code around rather than writing it new, the
approach for building the
Re: DPDK for rust
On Mon, 31 Mar 2025 at 10:20, Bruce Richardson wrote: > > On Fri, Mar 28, 2025 at 12:25:16PM -0700, Stephen Hemminger wrote: > > On Fri, 28 Mar 2025 21:09:21 +0300 (IDT) > > "Etelson, Gregory" wrote: > > > > > >> Hello Morten, > > > >> > > > >> Thank you for raising these questions ! > > > >> > > > >>> > > > >>> Do we want the DPDK project itself to support rust? > > > >>> Or should parts of this be a DPDK hosted project, like grout? > > > >> > > > >> Rust packages management is different. > > > >> Also DPDK Rust code will eventually provide a different API. > > > >> At this stage, DPDK hosted project looks like a good idea. > > > >> > > > > > > > > For ease of use, that would mean hosting a cargo registry, no? > > > > > > > > > > That's correct - cargo registry is the native way. > > > Also we may consider splitting the code between several crates. > > > That approach can provide more flexible way to arrange files. > > > > Talk to Luca. The current rust cargo registry model is causing > > lots of grief for distro's such as Debian, Redhat, Ubuntu and SUSE. > > > > Packaging is always a pain > > Yes, but cargo is just the way the rust ecosystem works right now. If we > want to have DPDK available for rust developers it needs to be accessible > via cargo. Making DPDK available on it is not an issue - the problems start popping up if it is _used by_ DPDK to pull in dozens of dependencies, as it becomes way, way too hard to manage. If you only use the compiler and the standard library then it's doable
Re: 22.11.8 patches review and test
I tested below 18 scenarios on RHEL 9.2 hosts and didn't find any new dpdk issues. - VM with device assignment(PF) throughput testing(1G hugepage size): PASS - VM with device assignment(PF) throughput testing(2M hugepage size) : PASS - VM with device assignment(VF) throughput testing: PASS - PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS - PVP vhost-user 2Q throughput testing: PASS - PVP vhost-user 1Q - cross numa node throughput testing: PASS - VM with vhost-user 2 queues throughput testing: PASS - vhost-user reconnect with dpdk-client, qemu-server(qemu reconnect): PASS - vhost-user reconnect with dpdk-client, qemu-server(ovs reconnect): PASS - PVP reconnect with dpdk-client, qemu-server: PASS - PVP 1Q live migration testing: PASS - PVP 1Q cross numa node live migration testing: PASS - VM with ovs+dpdk+vhost-user 1Q live migration testing: PASS - VM with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS - VM with ovs+dpdk+vhost-user 2Q live migration testing: PASS - VM with ovs+dpdk+vhost-user 4Q live migration testing: PASS - Host PF + DPDK testing: PASS - Host VF + DPDK testing: PASS Test Versions: - qemu-kvm-7.2.0 - kernel 5.14 - libvirt 9.0 - ovs 3.1 - git log commit 684d996a201182b5335012055df33284e753d832 Author: Luca Boccassi Date: Wed Mar 26 11:26:26 2025 + version: 22.11.8-rc1 Signed-off-by: Luca Boccassi - Test device : X540-AT2 NIC(ixgbe, 10G) Tested-by: Yanghang Liu Best Regards, Yanghang Liu On Wed, Mar 26, 2025 at 7:51 PM wrote: > Hi all, > > Here is a list of patches targeted for stable release 22.11.8. > > The planned date for the final release is 2025/04/10. > > Please help with testing and validation of your use cases and report > any issues/results with reply-all to this mail. For the final release > the fixes and reported validations will be added to the release notes. > > A release candidate tarball can be found at: > > https://dpdk.org/browse/dpdk-stable/tag/?id=v22.11.8-rc1 > > These patches are located at branch 22.11 of dpdk-stable repo: > https://dpdk.org/browse/dpdk-stable/ > > Thanks. > > Luca Boccassi > > --- > Aleksandr Loktionov (2): > net/igc/base: fix MAC address hash bit shift > net/e1000/base: fix MAC address hash bit shift > > Amir Avivi (2): > net/igc/base: fix iterator type > net/e1000/base: fix iterator type > > Anatoly Burakov (3): > net/e1000/base: correct mPHY access logic > net/e1000: fix crashes in secondary processes > net/ixgbe: fix crashes in secondary processes > > Andre Muezerie (5): > eal/x86: fix some intrinsics header include for Windows > net/bnxt: fix indication of allocation > common/idpf: fix void function returning a value > net/intel: fix void functions returning a value > stack: fix pop in C11 implementation > > Andrew Boyer (1): > doc: update ionic driver guide > > Ariel Otilibili (5): > net/sfc: remove unnecessary assignment > net/enetfec: remove useless assignment > use Python raw string notation > eal/linux: remove useless assignments > mempool: fix errno in empty create > > Arkadiusz Kusztal (1): > test/crypto: fix check for OOP header data > > Barbara Skobiej (3): > net/igc/base: fix data type in MAC hash > net/e1000/base: fix data type in MAC hash > net/e1000/base: fix reset for 82580 > > Bruce Richardson (6): > net/iavf: remove reset of Tx prepare function pointer > net/intel: fix build with icx > test/dma: fix pointers in IOVA as PA mode > net/iavf: check interrupt registration failure > net/iavf: fix crash on app exit on FreeBSD > eal: fix undetected NUMA nodes > > Carolyn Wyborny (1): > net/e1000/base: skip management check for 82575 > > Chengwen Feng (2): > app/testpmd: show all DCB priority TC map > app/testpmd: avoid crash in DCB config > > David Marchand (2): > net/mlx5: fix leak in HWS flow counter action > ci: point at GitHub mirror > > Dengdui Huang (3): > net/hns3: fix mbuf freeing in simple Tx path > net/hns3: fix copper port initialization > net/hns3: fix reset timeout > > Dima Ruinskiy (5): > net/igc/base: fix deadlock when writing i225 register > net/igc/base: fix infinite loop > net/igc/base: fix typo in LTR calculation > net/igc/base: fix unused value > net/e1000/base: fix unchecked return > > Ferruh Yigit (1): > ethdev: convert string initialization > > Gavin Hu (1): > net/mlx5: fix polling CQEs > > Gowrishankar Muthukrishnan (3): > crypto/virtio: fix data queues iteration > examples/vhost_crypto: fix user callbacks > crypto/openssl: validate incorrect RSA signature > > Gregory Etelson (1): > net/mlx5: fix IPIP tunnel verification > > Huisong Li (1): > ethdev: fix functions available in new device eve
Re: Migrate DPDK 18.05.1 -> DPDK 24.11.1 LTS
On Fri, Mar 28, 2025 at 07:18:18PM +0530, Eldho Paul Mathew wrote: >Hi, >In the 24.11.1 build, I have specific questions >1) I need the DPDK output in static lib format. How can I switch off >the shared lib build? Hi, Both static and shared libraries are built, you do not need to disable shared libraries in order to use the static libs. To get the appropriate linker flags you can use the pkgconfig .pc files output from the DPDK build, or installed when you do a "ninja install". For static linkage: "pkg-config --libs --static libdpdk" For a not-installed build, you can use the same command, just set PKG_CONFIG_PATH to "/meson-private" so the .pc files can be found. >2) I need to build librte_kni. a - Is this module deprecated in DPDK >24.11.1 yes. Recommend to use an in-kernel alternative, such as TAP or virtio-vhost. >3) How can I enable librte_pmd_* modules? In the driver/net folder, >many pmd are available, but none of them are built in the default ninja >build.? >How to enable this? All buildable drivers are built by default. You will find them in the /drivers folder. NOTE: the names may have changed in some cases, e.g. network drivers are now named with "librte_net_*" rather than "librte_pmd_*", since all drivers in DPDK are of "pmd" type. >I used the build steps listed below >cd dpdk > meson build > ninja -C build >Will you please help? /Bruce
Re: DPDK for rust
On Fri, Mar 28, 2025 at 12:25:16PM -0700, Stephen Hemminger wrote: > On Fri, 28 Mar 2025 21:09:21 +0300 (IDT) > "Etelson, Gregory" wrote: > > > >> Hello Morten, > > >> > > >> Thank you for raising these questions ! > > >> > > >>> > > >>> Do we want the DPDK project itself to support rust? > > >>> Or should parts of this be a DPDK hosted project, like grout? > > >> > > >> Rust packages management is different. > > >> Also DPDK Rust code will eventually provide a different API. > > >> At this stage, DPDK hosted project looks like a good idea. > > >> > > > > > > For ease of use, that would mean hosting a cargo registry, no? > > > > > > > That's correct - cargo registry is the native way. > > Also we may consider splitting the code between several crates. > > That approach can provide more flexible way to arrange files. > > Talk to Luca. The current rust cargo registry model is causing > lots of grief for distro's such as Debian, Redhat, Ubuntu and SUSE. > > Packaging is always a pain Yes, but cargo is just the way the rust ecosystem works right now. If we want to have DPDK available for rust developers it needs to be accessible via cargo. /Bruce
[PATCH 02/10] common/sfc_efx: use common base code build handling
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson
---
drivers/common/sfc_efx/base/meson.build | 18 +++---
drivers/common/sfc_efx/meson.build | 3 ---
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/common/sfc_efx/base/meson.build
b/drivers/common/sfc_efx/base/meson.build
index c8deb4555e..58bb5f7b4a 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -5,7 +5,7 @@
# This software was jointly developed between OKTET Labs (under contract
# for Solarflare) and Solarflare Communications, Inc.
-sources = [
+base_sources = files(
'efx_bootcfg.c',
'efx_crc32.c',
'efx_ev.c',
@@ -64,7 +64,7 @@ sources = [
'rhead_tunnel.c',
'rhead_tx.c',
'rhead_virtio.c',
-]
+)
if is_ms_compiler
extra_flags = [
@@ -80,20 +80,8 @@ else
]
endif
-c_args = cflags
foreach flag: extra_flags
if cc.has_argument(flag)
-c_args += flag
+base_cflags += flag
endif
endforeach
-
-if build
-base_lib = static_library('sfc_base', sources,
-include_directories: includes,
-dependencies: static_rte_eal,
-c_args: c_args)
-
-base_objs = base_lib.extract_all_objects(recursive: true)
-else
-base_objs = []
-endif
diff --git a/drivers/common/sfc_efx/meson.build
b/drivers/common/sfc_efx/meson.build
index 0cf0a23bf8..d8cb6d7b96 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -35,12 +35,9 @@ foreach flag: extra_flags
endforeach
subdir('base')
-objs = [base_objs]
deps += ['bus_pci']
sources = files(
'sfc_efx.c',
'sfc_efx_mcdi.c',
)
-
-includes += include_directories('base')
--
2.45.2
[PATCH 01/10] build: add generic support for base code in drivers
Add support to the drivers meson.build file for base code files with
extra cflags for compilation. This should remove the need for custom
logic in each driver.
In future, we may want to move the base code handling down the file a
little in order to get lock checking. However, this lock checking is not
done currently on base code builds, so not all drivers can safely pass
these checks. Therefore, we handle the base code files before we add on
the extra lock annotation flags.
Signed-off-by: Bruce Richardson
---
drivers/meson.build | 20
1 file changed, 20 insertions(+)
diff --git a/drivers/meson.build b/drivers/meson.build
index c15319dc24..b2d2537dc8 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -145,7 +145,13 @@ foreach subpath:subdirs
pkgconfig_extra_libs = []
testpmd_sources = []
require_iova_in_mbuf = true
+# for handling base code files which may need extra cflags
+base_sources = []
+base_cflags = []
+if fs.is_dir(drv_path / 'base')
+includes += include_directories(drv_path / 'base')
+endif
if name.contains('/')
name = name.split('/')[1]
endif
@@ -216,6 +222,20 @@ foreach subpath:subdirs
continue
endif
+# not all drivers base code is lock annotation safe, so do base code
builds before
+# adding on the lock annotation flags. NOTE: If no custom cflags, the
lock annotation
+# checks will be done though.
+if base_cflags != []
+base_lib = static_library(lib_name + '_base_lib',
+base_sources,
+dependencies: static_deps,
+include_directories: includes,
+c_args: cflags + base_cflags)
+objs += base_lib.extract_objects(base_sources)
+else
+sources += base_sources
+endif
+
enabled_drivers += name
lib_name = '_'.join(['rte', class, name])
cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=' + '.'.join([log_prefix, name])
--
2.45.2
[PATCH 04/10] net/intel: use common base code build handling
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the drivers.
Signed-off-by: Bruce Richardson
---
drivers/net/intel/e1000/meson.build| 3 ---
drivers/net/intel/fm10k/meson.build| 3 ---
drivers/net/intel/i40e/meson.build | 2 --
drivers/net/intel/iavf/meson.build | 1 -
drivers/net/intel/ice/base/meson.build | 22 +++---
drivers/net/intel/ice/meson.build | 2 --
drivers/net/intel/idpf/meson.build | 1 -
drivers/net/intel/ixgbe/meson.build| 3 ---
8 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/drivers/net/intel/e1000/meson.build
b/drivers/net/intel/e1000/meson.build
index b52a843228..924fe4ecae 100644
--- a/drivers/net/intel/e1000/meson.build
+++ b/drivers/net/intel/e1000/meson.build
@@ -3,7 +3,6 @@
subdir('base')
-sources += base_sources
sources += files(
'e1000_logs.c',
'em_ethdev.c',
@@ -24,5 +23,3 @@ if not is_windows
'igc_txrx.c',
)
endif
-
-includes += include_directories('base')
diff --git a/drivers/net/intel/fm10k/meson.build
b/drivers/net/intel/fm10k/meson.build
index e08a00cb49..fac4750f8d 100644
--- a/drivers/net/intel/fm10k/meson.build
+++ b/drivers/net/intel/fm10k/meson.build
@@ -9,7 +9,6 @@ endif
subdir('base')
-sources += base_sources
sources += files(
'fm10k_ethdev.c',
'fm10k_rxtx.c',
@@ -17,5 +16,3 @@ sources += files(
if arch_subdir == 'x86'
sources += files('fm10k_rxtx_vec.c')
endif
-
-includes += include_directories('base')
diff --git a/drivers/net/intel/i40e/meson.build
b/drivers/net/intel/i40e/meson.build
index 720706ff1e..49e7f899e6 100644
--- a/drivers/net/intel/i40e/meson.build
+++ b/drivers/net/intel/i40e/meson.build
@@ -19,7 +19,6 @@ endif
subdir('base')
-sources += base_sources
sources += files(
'i40e_ethdev.c',
'i40e_rxtx.c',
@@ -36,7 +35,6 @@ sources += files(
testpmd_sources = files('i40e_testpmd.c')
deps += ['hash']
-includes += include_directories('base')
if arch_subdir == 'x86'
sources += files('i40e_rxtx_vec_sse.c')
diff --git a/drivers/net/intel/iavf/meson.build
b/drivers/net/intel/iavf/meson.build
index 7e03881529..3b1da8a796 100644
--- a/drivers/net/intel/iavf/meson.build
+++ b/drivers/net/intel/iavf/meson.build
@@ -24,7 +24,6 @@ sources = files(
'iavf_ipsec_crypto.c',
'iavf_fsub.c',
)
-includes += include_directories('base')
if arch_subdir == 'x86'
sources += files('iavf_rxtx_vec_sse.c')
diff --git a/drivers/net/intel/ice/base/meson.build
b/drivers/net/intel/ice/base/meson.build
index e7ba9c34bc..f453005a1d 100644
--- a/drivers/net/intel/ice/base/meson.build
+++ b/drivers/net/intel/ice/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018-2021 Intel Corporation
-sources = [
+base_sources = files(
'ice_controlq.c',
'ice_common.c',
'ice_sched.c',
@@ -29,7 +29,7 @@ sources = [
'ice_ddp.c',
'ice_fwlog.c',
'ice_vf_mbx.c',
-]
+)
if is_ms_compiler
error_cflags = [
@@ -41,22 +41,14 @@ else
'-Wno-unused-but-set-variable',
'-Wno-unused-parameter',
]
+# Bugzilla ID: 678
+#if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
+#error_cflags += ['-Wno-array-bounds']
+#endif
endif
-# Bugzilla ID: 678
-if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0'))
-error_cflags += ['-Wno-array-bounds']
-endif
-
-c_args = cflags
-
foreach flag: error_cflags
if cc.has_argument(flag)
-c_args += flag
+base_cflags += flag
endif
endforeach
-
-base_lib = static_library('ice_base', sources,
-dependencies: static_rte_eal,
-c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/intel/ice/meson.build
b/drivers/net/intel/ice/meson.build
index 70ec746e50..8a20d0f297 100644
--- a/drivers/net/intel/ice/meson.build
+++ b/drivers/net/intel/ice/meson.build
@@ -2,7 +2,6 @@
# Copyright(c) 2018 Intel Corporation
subdir('base')
-objs = [base_objs]
sources = files(
'ice_acl_filter.c',
@@ -19,7 +18,6 @@ sources = files(
testpmd_sources = files('ice_testpmd.c')
deps += ['hash', 'net']
-includes += include_directories('base')
if dpdk_conf.has('RTE_NET_IAVF')
deps += 'net_iavf'
diff --git a/drivers/net/intel/idpf/meson.build
b/drivers/net/intel/idpf/meson.build
index 44e59c6910..a805d02ea2 100644
--- a/drivers/net/intel/idpf/meson.build
+++ b/drivers/net/intel/idpf/meson.build
@@ -11,7 +11,6 @@ subdir('base')
includes += include_directories('../iavf/base')
-sources += base_sources
sources += files(
'idpf_common_device.c',
'idpf_common_rxtx.c',
diff --git a/drivers/net/intel/ixgbe/meson.build
b/drivers/net/intel/ixgbe/meson.build
index 23f5a6cb3e..d1122bb9cd 100644
--- a/drivers/net/intel/ixgbe/meson.build
+++ b/dri
[PATCH 03/10] net/hinic: use common base code build handling
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson
---
Minor note: while working on this driver, I noticed that the
dependencies of it, and the overall C flags, not the base code C flags,
are set in the "base/meson.build" file. Most drivers in DPDK have those
set in the top-level driver file, and only to have the base-code
specific changes in the base directory.
---
drivers/net/hinic/base/meson.build | 16 +---
drivers/net/hinic/meson.build | 1 -
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/net/hinic/base/meson.build
b/drivers/net/hinic/base/meson.build
index 3aa53df881..9028acdf4d 100644
--- a/drivers/net/hinic/base/meson.build
+++ b/drivers/net/hinic/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Huawei Technologies Co., Ltd
-sources = [
+base_sources = files(
'hinic_pmd_api_cmd.c',
'hinic_pmd_cfg.c',
'hinic_pmd_cmdq.c',
@@ -13,7 +13,7 @@ sources = [
'hinic_pmd_nicio.c',
'hinic_pmd_wq.c',
'hinic_pmd_mbox.c',
-]
+)
extra_flags = []
# The driver runs only on arch64 machine, remove 32bit warnings
@@ -22,16 +22,10 @@ if not dpdk_conf.get('RTE_ARCH_64')
endif
foreach flag: extra_flags
-if cc.has_argument(flag)
-cflags += flag
-endif
+if cc.has_argument(flag)
+cflags += flag
+endif
endforeach
deps += ['hash']
-c_args = cflags
-
-base_lib = static_library('hinic_base', sources,
-dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci,
static_rte_hash],
-c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index 8242e0052e..36cc9431a6 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -8,7 +8,6 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
sources = files(
'hinic_pmd_ethdev.c',
--
2.45.2
[PATCH 06/10] net/octeontx: use common base code build handling
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson
---
drivers/net/octeontx/base/meson.build | 19 +--
drivers/net/octeontx/meson.build | 3 ---
2 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/net/octeontx/base/meson.build
b/drivers/net/octeontx/base/meson.build
index 8e5e8c1b55..244466bd36 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -1,25 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
-sources = [
+base_sources = files(
'octeontx_pkovf.c',
'octeontx_pkivf.c',
'octeontx_bgx.c',
-]
-
-depends = ['ethdev', 'mempool_octeontx']
-static_objs = []
-foreach d: depends
-if not is_variable('shared_rte_' + d)
-subdir_done()
-endif
-static_objs += get_variable('static_rte_' + d)
-endforeach
-
-c_args = cflags
-base_lib = static_library('octeontx_base', sources,
-c_args: c_args,
-dependencies: static_objs,
)
-
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 541d2d9d0b..fc8a5a73f2 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -8,7 +8,6 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
endif
subdir('base')
-objs = [base_objs]
sources = files(
'octeontx_ethdev.c',
@@ -18,6 +17,4 @@ sources = files(
deps += ['mempool_octeontx', 'eventdev']
-includes += include_directories('base')
-
cflags += no_wvla_cflag
--
2.45.2
[PATCH 08/10] net/thunderx: use common base code build handling
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson
---
drivers/net/thunderx/base/meson.build | 10 +-
drivers/net/thunderx/meson.build | 3 ---
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/net/thunderx/base/meson.build
b/drivers/net/thunderx/base/meson.build
index cec45d0ae1..abf0b64e79 100644
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -1,16 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
-sources = [
+base_sources = files(
'nicvf_hw.c',
'nicvf_mbox.c',
'nicvf_bsvf.c',
-]
-
-c_args = cflags
-base_lib = static_library('nicvf_base', sources,
-c_args: c_args,
-dependencies: static_rte_ethdev
)
-
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index da665bd76f..03262af8ca 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -8,7 +8,6 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
endif
subdir('base')
-objs = [base_objs]
sources = files(
'nicvf_ethdev.c',
@@ -23,5 +22,3 @@ endif
if cc.has_argument('-Wno-maybe-uninitialized')
cflags += '-Wno-maybe-uninitialized'
endif
-
-includes += include_directories('base')
--
2.45.2
[PATCH 07/10] net/qede: use common base code build handling
Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson
---
drivers/net/qede/base/meson.build | 17 +
drivers/net/qede/meson.build | 1 -
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/net/qede/base/meson.build
b/drivers/net/qede/base/meson.build
index 66251360bf..a6dad3ec7b 100644
--- a/drivers/net/qede/base/meson.build
+++ b/drivers/net/qede/base/meson.build
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi
-sources = [
+base_sources = files(
'bcm_osal.c',
'ecore_cxt.c',
'ecore_dcbx.c',
@@ -16,8 +16,7 @@ sources = [
'ecore_spq.c',
'ecore_sriov.c',
'ecore_vf.c',
-]
-
+)
if is_ms_compiler
error_cflags = [
@@ -51,14 +50,8 @@ else
]
endif
-c_args = cflags
foreach flag: error_cflags
-if cc.has_argument(flag)
-c_args += flag
-endif
+if cc.has_argument(flag)
+base_cflags += flag
+endif
endforeach
-
-base_lib = static_library('qede_base', sources,
-dependencies: [static_rte_net, static_rte_bus_pci],
-c_args: c_args)
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 3783e24db7..e1b21d6ff5 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -8,7 +8,6 @@ if is_windows
endif
subdir('base')
-objs = [base_objs]
sources = files(
'qede_debug.c',
--
2.45.2
[PATCH 2/2] dts: import lldp package in scapy
Add import for lldp scapy package to enable lldp packet
creation and handling.
Signed-off-by: Thomas Wilks
Reviewed-by: Luca Vizzarro
---
dts/framework/testbed_model/traffic_generator/scapy.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py
b/dts/framework/testbed_model/traffic_generator/scapy.py
index 78a6ded74c..c7e8fc42e9 100644
--- a/dts/framework/testbed_model/traffic_generator/scapy.py
+++ b/dts/framework/testbed_model/traffic_generator/scapy.py
@@ -95,6 +95,7 @@ def setup(self, ports: Iterable[Port]):
self._tg_node.main_session.bring_up_link(ports)
self._shell.start_application()
self._shell.send_command("from scapy.all import *")
+self._shell.send_command("from scapy.contrib.lldp import *")
def close(self):
"""Close traffic generator."""
--
2.43.0
