From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 521BD5B3A for ; Wed, 19 Sep 2018 18:04:18 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id g33-v6so6403245wrd.1 for ; Wed, 19 Sep 2018 09:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9n/liH3PJLh2eeKwIDG92wTMMNTl7wZomtkWeSppUWY=; b=gbHyEXITxWxJdhKq2zUPPSnWkbLT6BIse0uctBK3U/22lK5WCKwAkZ27qP9Mu+jFtQ c7y81wA9C1UPBP0r817t8ACShg6vZ+lgYKDdVOz73qENv4KuSwnIyYiE6loW3rHkKZ81 Q+BygxlsZTtRoJuKxZd9tkQF4uLN221aO8UCg+Bqrwsrl5rqbLm3Quz6ib+w/61QIK9w hMdJUR84/xhqP1J2CdkSWcGRvaj43sMzu2V/nGDOMVHTOLY3TGlqjfqdZbu+oUnrH8Z1 AQMBeN9yj7hJggktnRuPnFWyYi4uNVlHCgfLj2eHEIxd61ydEIm1TIxYq3Qx8zKgYglj OpaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9n/liH3PJLh2eeKwIDG92wTMMNTl7wZomtkWeSppUWY=; b=iMdr+kazzTxQeeMm9vGgErW8SnIY/H/Fmb8zImoEn8uWq1hmk/hSx5Ofo3mAT6talk pu+mmXr1pOEEOqJND+FqEnMBUI3wziEOL0GM7ePONK/5700UGP+lVXUPmYLEk4Z4AD2L TJXArsTh7IH5SgKj0NOnYEyYbrVnrJpE0pa7yrjx+nh4NtpygkhMsbuyxVKzlZ4xMAmY V1zQSniLMlREEJBDq+Fma71r3uLCtavaymi7thi1sYDbG8ZFKv85C9yT2EZjtQlMjUnw VQwuLhTG2roQ2a07l/5BjtPxABNM2xeaYFAgvynhIvDy3HtVQnEND8b2T4wNfodWmin2 Y+/w== X-Gm-Message-State: APzg51A0wahoZuzK3or/t0jQAqp1c37ON6VL4bg39zvRwp16d9SKHQS1 fKQstaZpHcAuqSE/WNdCAf3h6qV6znI= X-Google-Smtp-Source: ANB0VdaIkRkkLW5i64IvPF6B6FH8uXiutL9WWQailRJSSjfZkXDR1JYlN2/BSgq8CQ3dfRgK/QaRyg== X-Received: by 2002:adf:8445:: with SMTP id 63-v6mr29875618wrf.41.1537373057539; Wed, 19 Sep 2018 09:04:17 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id x24-v6sm34983671wrd.13.2018.09.19.09.04.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 09:04:16 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 19 Sep 2018 18:03:43 +0200 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 13/13] eal: add generic dev parameter X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2018 16:04:18 -0000 Add the --dev parameter to the EAL. This new parameter takes a generic device declaration as argument. It uses the new devargs parsing API. Signed-off-by: Gaetan Rivet --- lib/librte_eal/common/eal_common_devargs.c | 4 +++ lib/librte_eal/common/eal_common_options.c | 36 +++++++++++++++++++--- lib/librte_eal/common/eal_options.h | 2 ++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index dac2402a4..f1f4628db 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -219,6 +219,10 @@ rte_devargs_parse(struct rte_devargs *da, const char *dev) if (da == NULL) return -EINVAL; + if (strncmp(dev, "bus=", 4) == 0 || + strncmp(dev, "class=", 6) == 0) + return rte_devargs_layers_parse(da, dev); + /* Retrieve eventual bus info */ do { devname = dev; diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index ddd624110..703932a30 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -54,6 +54,7 @@ const struct option eal_long_options[] = { {OPT_BASE_VIRTADDR, 1, NULL, OPT_BASE_VIRTADDR_NUM }, {OPT_CREATE_UIO_DEV, 0, NULL, OPT_CREATE_UIO_DEV_NUM }, + {OPT_DEV, 1, NULL, OPT_DEV_NUM }, {OPT_FILE_PREFIX, 1, NULL, OPT_FILE_PREFIX_NUM }, {OPT_HELP, 0, NULL, OPT_HELP_NUM }, {OPT_HUGE_DIR, 1, NULL, OPT_HUGE_DIR_NUM }, @@ -111,6 +112,7 @@ TAILQ_HEAD(device_option_list, device_option); struct device_option { TAILQ_ENTRY(device_option) next; + int new; enum rte_devtype type; char arg[]; }; @@ -123,7 +125,8 @@ static int mem_parsed; static int core_parsed; static int -eal_option_device_add(enum rte_devtype type, const char *optarg) +eal_option_device_add(enum rte_devtype type, const char *optarg, + int new) { struct device_option *devopt; size_t optlen; @@ -137,6 +140,7 @@ eal_option_device_add(enum rte_devtype type, const char *optarg) } devopt->type = type; + devopt->new = new; ret = snprintf(devopt->arg, optlen, "%s", optarg); if (ret < 0) { RTE_LOG(ERR, EAL, "Unable to copy device option\n"); @@ -156,7 +160,22 @@ eal_option_device_parse(void) TAILQ_FOREACH_SAFE(devopt, &devopt_list, next, tmp) { if (ret == 0) { - ret = rte_devargs_add(devopt->type, devopt->arg); + if (devopt->new) { + struct rte_devargs *da; + + da = calloc(1, sizeof(*da)); + ret = rte_devargs_parse(da, devopt->arg); + if (ret) { + free(da); + } else { + ret = rte_devargs_insert(da); + if (ret) + free(da); + } + } else { + ret = rte_devargs_add(devopt->type, + devopt->arg); + } if (ret) RTE_LOG(ERR, EAL, "Unable to parse device '%s'\n", devopt->arg); @@ -1088,7 +1107,7 @@ eal_parse_common_option(int opt, const char *optarg, if (w_used) goto bw_used; if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI, - optarg) < 0) { + optarg, 0) < 0) { return -1; } b_used = 1; @@ -1098,7 +1117,7 @@ eal_parse_common_option(int opt, const char *optarg, if (b_used) goto bw_used; if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI, - optarg) < 0) { + optarg, 0) < 0) { return -1; } w_used = 1; @@ -1234,9 +1253,16 @@ eal_parse_common_option(int opt, const char *optarg, } break; + case OPT_DEV_NUM: + /* devtype is meaningless in the new format. */ + if (eal_option_device_add(0, optarg, 1) < 0) { + return -1; + } + break; + case OPT_VDEV_NUM: if (eal_option_device_add(RTE_DEVTYPE_VIRTUAL, - optarg) < 0) { + optarg, 0) < 0) { return -1; } break; diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h index 96e166787..8a17eb22c 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -21,6 +21,8 @@ enum { OPT_BASE_VIRTADDR_NUM, #define OPT_CREATE_UIO_DEV "create-uio-dev" OPT_CREATE_UIO_DEV_NUM, +#define OPT_DEV "dev" + OPT_DEV_NUM, #define OPT_FILE_PREFIX "file-prefix" OPT_FILE_PREFIX_NUM, #define OPT_HUGE_DIR "huge-dir" -- 2.18.0