On 5/21/26 10:42 AM, David Marchand wrote: > Since v26.07, device probing can be disabled with a single knob. > > Signed-off-by: David Marchand <[email protected]> > --- > lib/dpdk.c | 30 ++++-------------------------- > tests/system-dpdk-macros.at | 3 ++- > 2 files changed, 6 insertions(+), 27 deletions(-) > > diff --git a/lib/dpdk.c b/lib/dpdk.c > index 3685baf00c..40fe09661e 100644 > --- a/lib/dpdk.c > +++ b/lib/dpdk.c > @@ -432,33 +432,11 @@ dpdk_init__(const struct smap *ovs_other_config) > > if (!args_contains(&args, "-a") && !args_contains(&args, "--allow") > && !args_contains(&args, "-b") && !args_contains(&args, "--block") > + && !args_contains(&args, "--auto-probing") > + && !args_contains(&args, "-A") > + && !args_contains(&args, "--no-auto-probing") > && !smap_get_bool(ovs_other_config, "dpdk-probe-at-init", false)) { > -#ifdef RTE_BUS_AUXILIARY > - svec_add(&args, "-a"); > - svec_add(&args, "auxiliary:"); > -#endif > -#ifdef RTE_BUS_CDX > - svec_add(&args, "-a"); > - svec_add(&args, "cdx:cdx-"); > -#endif > -#ifdef RTE_BUS_FSLMC > - svec_add(&args, "-a"); > - svec_add(&args, "fslmc:dpni.65535"); > -#endif > -#ifdef RTE_BUS_PCI > - if (!args_contains(&args, "--no-pci")) { > - svec_add(&args, "-a"); > - svec_add(&args, "pci:0000:00:00.0"); > - } > -#endif > -#ifdef RTE_BUS_UACCE > - svec_add(&args, "-a"); > - svec_add(&args, "uacce:"); > -#endif > -#ifdef RTE_BUS_VMBUS > - svec_add(&args, "-a"); > - svec_add(&args, "vmbus:00000000-0000-0000-0000-000000000000"); > -#endif > + svec_add(&args, "--no-auto-probing"); > } > > svec_terminate(&args); > diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at > index 716d8a357d..3665a3d3cd 100644 > --- a/tests/system-dpdk-macros.at > +++ b/tests/system-dpdk-macros.at > @@ -102,7 +102,8 @@ m4_define([OVS_DPDK_CHECK_TESTPMD], > m4_define([OVS_DPDK_START_TESTPMD], > [AT_CHECK([lscpu], [], [stdout]) > AT_CHECK([cat stdout | grep "NUMA node(s)" | awk '{c=1; while (c++<$(3)) > {printf "512,"}; print "512"}' > NUMA_NODE]) > - eal_options="$DPDK_EAL_OPTIONS --in-memory --socket-mem="$(cat > NUMA_NODE)" --single-file-segments --no-pci --file-prefix testpmd" > + eal_options="$DPDK_EAL_OPTIONS --in-memory --socket-mem="$(cat NUMA_NODE) > + eal_options="$eal_options --single-file-segments --no-auto-probing > --file-prefix testpmd" > options="$1" > test "$options" != "${options%% -- *}" || options="$options -- " > eal_options="$eal_options ${options%% -- *}"
LGTM Acked-by: Kevin Traynor <[email protected]> _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
