diff options
Diffstat (limited to 'src/plugins/dpdk/device')
| -rw-r--r-- | src/plugins/dpdk/device/cli.c | 3 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/dpdk.h | 24 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/dpdk_priv.h | 4 | ||||
| -rw-r--r-- | src/plugins/dpdk/device/init.c | 75 |
4 files changed, 13 insertions, 93 deletions
diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c index 0f771c6ba77..ba922e29a54 100644 --- a/src/plugins/dpdk/device/cli.c +++ b/src/plugins/dpdk/device/cli.c @@ -373,7 +373,8 @@ show_dpdk_version_command_fn (vlib_main_t * vm, * Example of how to display how many DPDK buffer test command has allocated: * @cliexstart{show dpdk version} * DPDK Version: DPDK 16.11.0 - * DPDK EAL init args: -c 1 -n 4 --huge-dir /run/vpp/hugepages --file-prefix vpp -w 0000:00:08.0 -w 0000:00:09.0 --master-lcore 0 --socket-mem 256 + * DPDK EAL init args: --in-memory --no-telemetry --file-prefix vpp + * -w 0000:00:08.0 -w 0000:00:09.0 * @cliexend ?*/ /* *INDENT-OFF* */ diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 51f80a80462..cc7305dbdc4 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -22,27 +22,12 @@ #include <rte_config.h> -#include <rte_common.h> -#include <rte_dev.h> -#include <rte_memory.h> #include <rte_eal.h> -#include <rte_per_lcore.h> -#include <rte_cycles.h> -#include <rte_lcore.h> -#include <rte_per_lcore.h> -#include <rte_interrupts.h> -#include <rte_pci.h> +#include <rte_bus_pci.h> #include <rte_bus_vmbus.h> -#include <rte_ether.h> #include <rte_ethdev.h> -#include <rte_ring.h> -#include <rte_mempool.h> -#include <rte_mbuf.h> #include <rte_version.h> -#include <rte_sched.h> #include <rte_net.h> -#include <rte_bus_pci.h> -#include <rte_flow.h> #include <vnet/devices/devices.h> @@ -313,13 +298,6 @@ typedef struct #define DPDK_MAX_SIMD_BITWIDTH_256 256 #define DPDK_MAX_SIMD_BITWIDTH_512 512 - /* Required config parameters */ - u8 coremask_set_manually; - u8 nchannels_set_manually; - u32 coremask; - u32 nchannels; - u32 num_crypto_mbufs; - /* * format interface names ala xxxEthernet%d/%d/%d instead of * xxxEthernet%x/%x/%x. diff --git a/src/plugins/dpdk/device/dpdk_priv.h b/src/plugins/dpdk/device/dpdk_priv.h index 7f595ae8e19..267c0b55aa3 100644 --- a/src/plugins/dpdk/device/dpdk_priv.h +++ b/src/plugins/dpdk/device/dpdk_priv.h @@ -33,10 +33,6 @@ _(no-hpet) \ _(no-huge) \ _(vmware-tsc-map) -#define foreach_eal_single_hyphen_mandatory_arg \ -_(coremask, c) \ -_(nchannels, n) \ - #define foreach_eal_single_hyphen_arg \ _(mem-alloc-request, m) \ _(force-ranks, r) diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 3808a5b1e4d..04d6f89ac7b 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1504,11 +1504,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) num_whitelisted++; } - else if (unformat (input, "num-mem-channels %d", &conf->nchannels)) - conf->nchannels_set_manually = 0; - else if (unformat (input, "num-crypto-mbufs %d", - &conf->num_crypto_mbufs)) - ; else if (unformat (input, "uio-driver %s", &conf->uio_driver_name)) ; else if (unformat (input, "socket-mem %s", &socket_mem)) @@ -1585,17 +1580,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } foreach_eal_single_hyphen_arg #undef _ -#define _(a,b) \ - else if (unformat(input, #a " %s", &s)) \ - { \ - tmp = format (0, "-%s%c", #b, 0); \ - vec_add1 (conf->eal_init_args, tmp); \ - vec_add1 (s, 0); \ - vec_add1 (conf->eal_init_args, s); \ - conf->a##_set_manually = 1; \ - } - foreach_eal_single_hyphen_mandatory_arg -#undef _ else if (unformat (input, "default")) ; @@ -1651,38 +1635,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (error) return error; - /* I'll bet that -c and -n must be the first and second args... */ - if (!conf->coremask_set_manually) - { - vlib_thread_registration_t *tr; - uword *coremask = 0; - int i; - - /* main thread core */ - coremask = clib_bitmap_set (coremask, tm->main_lcore, 1); - - for (i = 0; i < vec_len (tm->registrations); i++) - { - tr = tm->registrations[i]; - coremask = clib_bitmap_or (coremask, tr->coremask); - } - - vec_insert (conf->eal_init_args, 2, 1); - conf->eal_init_args[1] = (u8 *) "-c"; - tmp = format (0, "%U%c", format_bitmap_hex, coremask, 0); - conf->eal_init_args[2] = tmp; - clib_bitmap_free (coremask); - } - - if (!conf->nchannels_set_manually) - { - vec_insert (conf->eal_init_args, 2, 3); - conf->eal_init_args[3] = (u8 *) "-n"; - tmp = format (0, "%d", conf->nchannels); - vec_terminate_c_string (tmp); - conf->eal_init_args[4] = tmp; - } - if (no_pci == 0 && geteuid () == 0) dpdk_bind_devices_to_uio (conf); @@ -1693,7 +1645,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) if (devconf->x == 0 && conf->default_devconf.x > 0) \ devconf->x = conf->default_devconf.x ; - /* *INDENT-OFF* */ pool_foreach (devconf, conf->dev_confs) { /* default per-device config items */ @@ -1737,17 +1688,9 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) vec_add1 (conf->eal_init_args, tmp); } } - /* *INDENT-ON* */ #undef _ - /* set master-lcore */ - tmp = format (0, "--main-lcore%c", 0); - vec_add1 (conf->eal_init_args, tmp); - tmp = format (0, "%u%c", tm->main_lcore, 0); - vec_add1 (conf->eal_init_args, tmp); - - if (socket_mem) clib_warning ("socket-mem argument is deprecated"); @@ -1999,7 +1942,6 @@ dpdk_init (vlib_main_t * vm) dm->vnet_main = vnet_get_main (); dm->conf = &dpdk_config_main; - dm->conf->nchannels = 4; vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet"); /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ @@ -2020,10 +1962,13 @@ dpdk_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (dpdk_init); -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ +static clib_error_t * +dpdk_worker_thread_init (vlib_main_t *vm) +{ + if (rte_thread_register () < 0) + clib_panic ("dpdk: cannot register thread %u - %s", vm->thread_index, + rte_strerror (rte_errno)); + return 0; +} + +VLIB_WORKER_INIT_FUNCTION (dpdk_worker_thread_init); |