mirror of
https://github.com/openvswitch/ovs
synced 2025-10-27 15:18:06 +00:00
The DPDK EAL library intents that all argc/argv arguments passed on the
command line will be in the form:
progname dpdk arguments program arguments
This means the argv array will look something like:
argv[0] = progname
argv[1..x] = dpdk arguments
argv[x..y] = program arguments
When the eal initialization routine completes, it will modify the argv array
to set argv[ret] = progname, such that the arguments can then be passed to
something like getopts for further processing.
When the dpdk arguments rework was initially added, the assignment mentioned
above was not considered. This means two errors were introduced:
1. Leak of the element at argv[ret]
2. Double-free of the element at argv[0]
Reported-by: Ilya Maximets <i.maximets@samsung.com>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2016-November/325442.html
Fixes: bab6940971 ("netdev-dpdk: Convert initialization from cmdline to db")
Signed-off-by: Aaron Conole <aconole@redhat.com>
444 lines
13 KiB
C
444 lines
13 KiB
C
/*
|
|
* Copyright (c) 2014, 2015, 2016 Nicira, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "dpdk.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <getopt.h>
|
|
|
|
#include <rte_memzone.h>
|
|
#ifdef DPDK_PDUMP
|
|
#include <rte_mempool.h>
|
|
#include <rte_pdump.h>
|
|
#endif
|
|
|
|
#include "dirs.h"
|
|
#include "fatal-signal.h"
|
|
#include "netdev-dpdk.h"
|
|
#include "openvswitch/dynamic-string.h"
|
|
#include "openvswitch/vlog.h"
|
|
#include "smap.h"
|
|
|
|
VLOG_DEFINE_THIS_MODULE(dpdk);
|
|
|
|
static char *vhost_sock_dir = NULL; /* Location of vhost-user sockets */
|
|
|
|
static int
|
|
process_vhost_flags(char *flag, char *default_val, int size,
|
|
const struct smap *ovs_other_config,
|
|
char **new_val)
|
|
{
|
|
const char *val;
|
|
int changed = 0;
|
|
|
|
val = smap_get(ovs_other_config, flag);
|
|
|
|
/* Process the vhost-sock-dir flag if it is provided, otherwise resort to
|
|
* default value.
|
|
*/
|
|
if (val && (strlen(val) <= size)) {
|
|
changed = 1;
|
|
*new_val = xstrdup(val);
|
|
VLOG_INFO("User-provided %s in use: %s", flag, *new_val);
|
|
} else {
|
|
VLOG_INFO("No %s provided - defaulting to %s", flag, default_val);
|
|
*new_val = default_val;
|
|
}
|
|
|
|
return changed;
|
|
}
|
|
|
|
static char **
|
|
grow_argv(char ***argv, size_t cur_siz, size_t grow_by)
|
|
{
|
|
return xrealloc(*argv, sizeof(char *) * (cur_siz + grow_by));
|
|
}
|
|
|
|
static void
|
|
dpdk_option_extend(char ***argv, int argc, const char *option,
|
|
const char *value)
|
|
{
|
|
char **newargv = grow_argv(argv, argc, 2);
|
|
*argv = newargv;
|
|
newargv[argc] = xstrdup(option);
|
|
newargv[argc+1] = xstrdup(value);
|
|
}
|
|
|
|
static char **
|
|
move_argv(char ***argv, size_t cur_size, char **src_argv, size_t src_argc)
|
|
{
|
|
char **newargv = grow_argv(argv, cur_size, src_argc);
|
|
while (src_argc--) {
|
|
newargv[cur_size+src_argc] = src_argv[src_argc];
|
|
src_argv[src_argc] = NULL;
|
|
}
|
|
return newargv;
|
|
}
|
|
|
|
static int
|
|
extra_dpdk_args(const char *ovs_extra_config, char ***argv, int argc)
|
|
{
|
|
int ret = argc;
|
|
char *release_tok = xstrdup(ovs_extra_config);
|
|
char *tok, *endptr = NULL;
|
|
|
|
for (tok = strtok_r(release_tok, " ", &endptr); tok != NULL;
|
|
tok = strtok_r(NULL, " ", &endptr)) {
|
|
char **newarg = grow_argv(argv, ret, 1);
|
|
*argv = newarg;
|
|
newarg[ret++] = xstrdup(tok);
|
|
}
|
|
free(release_tok);
|
|
return ret;
|
|
}
|
|
|
|
static bool
|
|
argv_contains(char **argv_haystack, const size_t argc_haystack,
|
|
const char *needle)
|
|
{
|
|
for (size_t i = 0; i < argc_haystack; ++i) {
|
|
if (!strcmp(argv_haystack[i], needle))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static int
|
|
construct_dpdk_options(const struct smap *ovs_other_config,
|
|
char ***argv, const int initial_size,
|
|
char **extra_args, const size_t extra_argc)
|
|
{
|
|
struct dpdk_options_map {
|
|
const char *ovs_configuration;
|
|
const char *dpdk_option;
|
|
bool default_enabled;
|
|
const char *default_value;
|
|
} opts[] = {
|
|
{"dpdk-lcore-mask", "-c", false, NULL},
|
|
{"dpdk-hugepage-dir", "--huge-dir", false, NULL},
|
|
};
|
|
|
|
int i, ret = initial_size;
|
|
|
|
/*First, construct from the flat-options (non-mutex)*/
|
|
for (i = 0; i < ARRAY_SIZE(opts); ++i) {
|
|
const char *lookup = smap_get(ovs_other_config,
|
|
opts[i].ovs_configuration);
|
|
if (!lookup && opts[i].default_enabled) {
|
|
lookup = opts[i].default_value;
|
|
}
|
|
|
|
if (lookup) {
|
|
if (!argv_contains(extra_args, extra_argc, opts[i].dpdk_option)) {
|
|
dpdk_option_extend(argv, ret, opts[i].dpdk_option, lookup);
|
|
ret += 2;
|
|
} else {
|
|
VLOG_WARN("Ignoring database defined option '%s' due to "
|
|
"dpdk_extras config", opts[i].dpdk_option);
|
|
}
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#define MAX_DPDK_EXCL_OPTS 10
|
|
|
|
static int
|
|
construct_dpdk_mutex_options(const struct smap *ovs_other_config,
|
|
char ***argv, const int initial_size,
|
|
char **extra_args, const size_t extra_argc)
|
|
{
|
|
struct dpdk_exclusive_options_map {
|
|
const char *category;
|
|
const char *ovs_dpdk_options[MAX_DPDK_EXCL_OPTS];
|
|
const char *eal_dpdk_options[MAX_DPDK_EXCL_OPTS];
|
|
const char *default_value;
|
|
int default_option;
|
|
} excl_opts[] = {
|
|
{"memory type",
|
|
{"dpdk-alloc-mem", "dpdk-socket-mem", NULL,},
|
|
{"-m", "--socket-mem", NULL,},
|
|
"1024,0", 1
|
|
},
|
|
};
|
|
|
|
int i, ret = initial_size;
|
|
for (i = 0; i < ARRAY_SIZE(excl_opts); ++i) {
|
|
int found_opts = 0, scan, found_pos = -1;
|
|
const char *found_value;
|
|
struct dpdk_exclusive_options_map *popt = &excl_opts[i];
|
|
|
|
for (scan = 0; scan < MAX_DPDK_EXCL_OPTS
|
|
&& popt->ovs_dpdk_options[scan]; ++scan) {
|
|
const char *lookup = smap_get(ovs_other_config,
|
|
popt->ovs_dpdk_options[scan]);
|
|
if (lookup && strlen(lookup)) {
|
|
found_opts++;
|
|
found_pos = scan;
|
|
found_value = lookup;
|
|
}
|
|
}
|
|
|
|
if (!found_opts) {
|
|
if (popt->default_option) {
|
|
found_pos = popt->default_option;
|
|
found_value = popt->default_value;
|
|
} else {
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (found_opts > 1) {
|
|
VLOG_ERR("Multiple defined options for %s. Please check your"
|
|
" database settings and reconfigure if necessary.",
|
|
popt->category);
|
|
}
|
|
|
|
if (!argv_contains(extra_args, extra_argc,
|
|
popt->eal_dpdk_options[found_pos])) {
|
|
dpdk_option_extend(argv, ret, popt->eal_dpdk_options[found_pos],
|
|
found_value);
|
|
ret += 2;
|
|
} else {
|
|
VLOG_WARN("Ignoring database defined option '%s' due to "
|
|
"dpdk_extras config", popt->eal_dpdk_options[found_pos]);
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
get_dpdk_args(const struct smap *ovs_other_config, char ***argv,
|
|
int argc)
|
|
{
|
|
const char *extra_configuration;
|
|
char **extra_args = NULL;
|
|
int i;
|
|
size_t extra_argc = 0;
|
|
|
|
extra_configuration = smap_get(ovs_other_config, "dpdk-extra");
|
|
if (extra_configuration) {
|
|
extra_argc = extra_dpdk_args(extra_configuration, &extra_args, 0);
|
|
}
|
|
|
|
i = construct_dpdk_options(ovs_other_config, argv, argc, extra_args,
|
|
extra_argc);
|
|
i = construct_dpdk_mutex_options(ovs_other_config, argv, i, extra_args,
|
|
extra_argc);
|
|
|
|
if (extra_configuration) {
|
|
*argv = move_argv(argv, i, extra_args, extra_argc);
|
|
}
|
|
|
|
return i + extra_argc;
|
|
}
|
|
|
|
static char **dpdk_argv, **dpdk_argv_release;
|
|
static int dpdk_argc;
|
|
|
|
static void
|
|
deferred_argv_release(void)
|
|
{
|
|
int result;
|
|
for (result = 0; result < dpdk_argc; ++result) {
|
|
free(dpdk_argv_release[result]);
|
|
}
|
|
|
|
free(dpdk_argv_release);
|
|
free(dpdk_argv);
|
|
}
|
|
|
|
static void
|
|
dpdk_init__(const struct smap *ovs_other_config)
|
|
{
|
|
char **argv = NULL;
|
|
int result;
|
|
int argc, argc_tmp;
|
|
bool auto_determine = true;
|
|
int err = 0;
|
|
cpu_set_t cpuset;
|
|
char *sock_dir_subcomponent;
|
|
|
|
if (!smap_get_bool(ovs_other_config, "dpdk-init", false)) {
|
|
VLOG_INFO("DPDK Disabled - to change this requires a restart.\n");
|
|
return;
|
|
}
|
|
|
|
VLOG_INFO("DPDK Enabled, initializing");
|
|
if (process_vhost_flags("vhost-sock-dir", xstrdup(ovs_rundir()),
|
|
NAME_MAX, ovs_other_config,
|
|
&sock_dir_subcomponent)) {
|
|
struct stat s;
|
|
if (!strstr(sock_dir_subcomponent, "..")) {
|
|
vhost_sock_dir = xasprintf("%s/%s", ovs_rundir(),
|
|
sock_dir_subcomponent);
|
|
|
|
err = stat(vhost_sock_dir, &s);
|
|
if (err) {
|
|
VLOG_ERR("vhost-user sock directory '%s' does not exist.",
|
|
vhost_sock_dir);
|
|
}
|
|
} else {
|
|
vhost_sock_dir = xstrdup(ovs_rundir());
|
|
VLOG_ERR("vhost-user sock directory request '%s/%s' has invalid"
|
|
"characters '..' - using %s instead.",
|
|
ovs_rundir(), sock_dir_subcomponent, ovs_rundir());
|
|
}
|
|
free(sock_dir_subcomponent);
|
|
} else {
|
|
vhost_sock_dir = sock_dir_subcomponent;
|
|
}
|
|
|
|
argv = grow_argv(&argv, 0, 1);
|
|
argc = 1;
|
|
argv[0] = xstrdup(ovs_get_program_name());
|
|
argc_tmp = get_dpdk_args(ovs_other_config, &argv, argc);
|
|
|
|
while (argc_tmp != argc) {
|
|
if (!strcmp("-c", argv[argc]) || !strcmp("-l", argv[argc])) {
|
|
auto_determine = false;
|
|
break;
|
|
}
|
|
argc++;
|
|
}
|
|
argc = argc_tmp;
|
|
|
|
/**
|
|
* NOTE: This is an unsophisticated mechanism for determining the DPDK
|
|
* lcore for the DPDK Master.
|
|
*/
|
|
if (auto_determine) {
|
|
int i;
|
|
/* Get the main thread affinity */
|
|
CPU_ZERO(&cpuset);
|
|
err = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t),
|
|
&cpuset);
|
|
if (!err) {
|
|
for (i = 0; i < CPU_SETSIZE; i++) {
|
|
if (CPU_ISSET(i, &cpuset)) {
|
|
argv = grow_argv(&argv, argc, 2);
|
|
argv[argc++] = xstrdup("-c");
|
|
argv[argc++] = xasprintf("0x%08llX", (1ULL<<i));
|
|
i = CPU_SETSIZE;
|
|
}
|
|
}
|
|
} else {
|
|
VLOG_ERR("Thread getaffinity error %d. Using core 0x1", err);
|
|
/* User did not set dpdk-lcore-mask and unable to get current
|
|
* thread affintity - default to core 0x1 */
|
|
argv = grow_argv(&argv, argc, 2);
|
|
argv[argc++] = xstrdup("-c");
|
|
argv[argc++] = xasprintf("0x%X", 1);
|
|
}
|
|
}
|
|
|
|
argv = grow_argv(&argv, argc, 1);
|
|
argv[argc] = NULL;
|
|
|
|
optind = 1;
|
|
|
|
if (VLOG_IS_INFO_ENABLED()) {
|
|
struct ds eal_args;
|
|
int opt;
|
|
ds_init(&eal_args);
|
|
ds_put_cstr(&eal_args, "EAL ARGS:");
|
|
for (opt = 0; opt < argc; ++opt) {
|
|
ds_put_cstr(&eal_args, " ");
|
|
ds_put_cstr(&eal_args, argv[opt]);
|
|
}
|
|
VLOG_INFO("%s", ds_cstr_ro(&eal_args));
|
|
ds_destroy(&eal_args);
|
|
}
|
|
|
|
dpdk_argv_release = grow_argv(&dpdk_argv_release, 0, argc);
|
|
for (argc_tmp = 0; argc_tmp < argc; ++argc_tmp) {
|
|
dpdk_argv_release[argc_tmp] = argv[argc_tmp];
|
|
}
|
|
|
|
/* Make sure things are initialized ... */
|
|
result = rte_eal_init(argc, argv);
|
|
if (result < 0) {
|
|
ovs_abort(result, "Cannot init EAL");
|
|
}
|
|
|
|
/* Set the main thread affinity back to pre rte_eal_init() value */
|
|
if (auto_determine && !err) {
|
|
err = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t),
|
|
&cpuset);
|
|
if (err) {
|
|
VLOG_ERR("Thread setaffinity error %d", err);
|
|
}
|
|
}
|
|
|
|
dpdk_argv = argv;
|
|
dpdk_argc = argc;
|
|
|
|
atexit(deferred_argv_release);
|
|
|
|
rte_memzone_dump(stdout);
|
|
|
|
/* We are called from the main thread here */
|
|
RTE_PER_LCORE(_lcore_id) = NON_PMD_CORE_ID;
|
|
|
|
#ifdef DPDK_PDUMP
|
|
VLOG_INFO("DPDK pdump packet capture enabled");
|
|
err = rte_pdump_init(ovs_rundir());
|
|
if (err) {
|
|
VLOG_INFO("Error initialising DPDK pdump");
|
|
rte_pdump_uninit();
|
|
} else {
|
|
char *server_socket_path;
|
|
|
|
server_socket_path = xasprintf("%s/%s", ovs_rundir(),
|
|
"pdump_server_socket");
|
|
fatal_signal_add_file_to_unlink(server_socket_path);
|
|
free(server_socket_path);
|
|
}
|
|
#endif
|
|
|
|
/* Finally, register the dpdk classes */
|
|
netdev_dpdk_register();
|
|
}
|
|
|
|
void
|
|
dpdk_init(const struct smap *ovs_other_config)
|
|
{
|
|
static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
|
|
|
|
if (ovs_other_config && ovsthread_once_start(&once)) {
|
|
dpdk_init__(ovs_other_config);
|
|
ovsthread_once_done(&once);
|
|
}
|
|
}
|
|
|
|
const char *
|
|
dpdk_get_vhost_sock_dir(void)
|
|
{
|
|
return vhost_sock_dir;
|
|
}
|
|
|
|
void
|
|
dpdk_set_lcore_id(unsigned cpu)
|
|
{
|
|
/* NON_PMD_CORE_ID is reserved for use by non pmd threads. */
|
|
ovs_assert(cpu != NON_PMD_CORE_ID);
|
|
RTE_PER_LCORE(_lcore_id) = cpu;
|
|
}
|