From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 975E78E5D for ; Tue, 10 Nov 2015 15:28:26 +0100 (CET) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E5EF0AEF38; Tue, 10 Nov 2015 14:28:25 +0000 (UTC) Received: from dhcp195.koti.laiskiainen.org.com (vpn1-5-63.ams2.redhat.com [10.36.5.63]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAAESLCr021809; Tue, 10 Nov 2015 09:28:24 -0500 From: Panu Matilainen To: dev@dpdk.org Date: Tue, 10 Nov 2015 16:28:15 +0200 Message-Id: <2d60fbe972f7e06bb41057bf5829f9bc7cd10f60.1447165615.git.pmatilai@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Subject: [dpdk-dev] [PATCH v4 2/2] eal: add support for driver directory concept X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2015 14:28:27 -0000 Add support for directories as arguments to -d for loading all drivers from a given directory. Additionally a default driver directory can be set in build-time configuration, in which case it will be always be used when EAL is initialized. This simplifies usage in shared library configuration significantly over manually loading individual drivers with -d, and allows distros to establish a drop-in driver directory for seamless integration with 3rd party drivers etc. Suggested-by: Thomas Monjalon Suggested-by: David Marchand Signed-off-by: Panu Matilainen --- config/common_bsdapp | 3 ++ config/common_linuxapp | 3 ++ lib/librte_eal/common/eal_common_options.c | 74 ++++++++++++++++++++++++++++-- 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index fba29e5..7df0763 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -108,6 +108,9 @@ CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n CONFIG_RTE_MALLOC_DEBUG=n +# Default driver path (or "" to disable) +CONFIG_RTE_EAL_PMD_PATH="" + # # FreeBSD contiguous memory driver settings # diff --git a/config/common_linuxapp b/config/common_linuxapp index 7248262..52173d5 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -111,6 +111,9 @@ CONFIG_RTE_EAL_IGB_UIO=y CONFIG_RTE_EAL_VFIO=y CONFIG_RTE_MALLOC_DEBUG=n +# Default driver path (or "" to disable) +CONFIG_RTE_EAL_PMD_PATH="" + # # Special configurations in PCI Config Space for high performance # diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index ae0187a..a2c3d91 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -40,6 +40,9 @@ #include #include #include +#include +#include +#include #include #include @@ -109,6 +112,9 @@ struct shared_driver { static struct shared_driver_list solib_list = TAILQ_HEAD_INITIALIZER(solib_list); +/* Default path of external loadable drivers */ +static const char *default_solib_dir = RTE_EAL_PMD_PATH; + static int master_lcore_parsed; static int mem_parsed; @@ -167,18 +173,75 @@ eal_plugin_add(const char *path) return 0; } +static int +eal_plugindir_init(const char *path) +{ + DIR *d = NULL; + struct dirent *dent = NULL; + char sopath[PATH_MAX]; + + if (path == NULL || *path == '\0') + return 0; + + d = opendir(path); + if (d == NULL) { + RTE_LOG(ERR, EAL, "failed to open directory %s: %s\n", + path, strerror(errno)); + return -1; + } + + while ((dent = readdir(d)) != NULL) { + if (dent->d_type != DT_REG && dent->d_type != DT_LNK) + continue; + + snprintf(sopath, PATH_MAX-1, "%s/%s", path, dent->d_name); + sopath[PATH_MAX-1] = 0; + + if (eal_plugin_add(sopath) == -1) + break; + } + + closedir(d); + /* XXX this ignores failures from readdir() itself */ + return (dent == NULL) ? 0 : -1; +} + int eal_plugins_init(void) { struct shared_driver *solib = NULL; + if (*default_solib_dir != '\0') + eal_plugin_add(default_solib_dir); + TAILQ_FOREACH(solib, &solib_list, next) { - RTE_LOG(DEBUG, EAL, "open shared lib %s\n", solib->name); - solib->lib_handle = dlopen(solib->name, RTLD_NOW); - if (solib->lib_handle == NULL) { - RTE_LOG(ERR, EAL, "%s\n", dlerror()); + struct stat sb; + if (stat(solib->name, &sb) == -1) { + RTE_LOG(ERR, EAL, "Invalid plugin specified: %s: %s\n", + solib->name, strerror(errno)); return -1; } + + switch (sb.st_mode & S_IFMT) { + case S_IFDIR: + if (eal_plugindir_init(solib->name) == -1) { + RTE_LOG(ERR, EAL, + "Cannot init plugin directory %s\n", + solib->name); + return -1; + } + break; + case S_IFREG: + RTE_LOG(DEBUG, EAL, "open shared lib %s\n", + solib->name); + solib->lib_handle = dlopen(solib->name, RTLD_NOW); + if (solib->lib_handle == NULL) { + RTE_LOG(ERR, EAL, "%s\n", dlerror()); + return -1; + } + break; + } + } return 0; } @@ -952,7 +1015,8 @@ eal_common_usage(void) " --"OPT_PROC_TYPE" Type of this process (primary|secondary|auto)\n" " --"OPT_SYSLOG" Set syslog facility\n" " --"OPT_LOG_LEVEL" Set default log level\n" - " -d LIB.so Add driver (can be used multiple times)\n" + " -d LIB.so|DIR Add a driver or driver directory\n" + " (can be used multiple times)\n" " -v Display version information on startup\n" " -h, --help This help\n" "\nEAL options for DEBUG use only:\n" -- 2.5.0