From patchwork Wed May 24 16:16:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 24572 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 92B569998; Wed, 24 May 2017 18:17:55 +0200 (CEST) Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by dpdk.org (Postfix) with ESMTP id 2AEE59177 for ; Wed, 24 May 2017 18:17:16 +0200 (CEST) Received: by mail-wr0-f170.google.com with SMTP id j27so4272704wre.1 for ; Wed, 24 May 2017 09:17:16 -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 :in-reply-to:references; bh=SCezPnAHRY3PUDDcmOtRiSG+AZcN8/l8GGmvvKBRENE=; b=Xdx1Xv2fS3BuC+YfrhaVpTeCPlc/aYq6yFYvyqNfEOdDQrSRuZsrB7nkmgcVu+VXkh X38fEj0fuBCWEcT1x2v5qYOivdhgrwcyZky+zcLwVEksJdGTpuf2YsmKeL5lskA6SvGw aHmlPvG6LzmYg6q7lSV+wz4lE4PXwkUt5cZKy+ReBJnPucIFQy8q2uiHSsKzv4mffq4O Uko8/uISpeRcO3Ab/vUStwJERtwNHIMyObEeW6e+UjAUv6GcC8FC7679VFuOTYSPdPBr tqrehjOHCDOQpiFMNG2/c0o1aLGno+7Jr+Fxk73u0Cr2RW9Gdm6iDl13SiqLN4QOVk0K A1gA== 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:in-reply-to:references; bh=SCezPnAHRY3PUDDcmOtRiSG+AZcN8/l8GGmvvKBRENE=; b=XJEbzuArrrcfp7I/rSghWgKKD/wiv6ZnWzXI3KBP6PqVRSODM8CU1Awzrg4Xrm1cHL AG3JLz9UzIFRNQBDqO/iRiUyhMnqd84pMv3GoZEh5wJ4loFWy66sHuKSUCD7S7Nkjo6v R/c8cSUFAXCUGaBz8Z3d97FWrNHie4rcdFkVZid/AtiHL4QML6M8IsZf4wtpI1fhpgvi if5F4ZPa0OWUxeHySeyG/xtqYxtdxwtqBP9YZgiFiV2mPH/W6+fA2OnDYWwMkgFu2hjz JP/whB7dMc1cn0DiE9UwpiqXWGDfG1bYLJUfGqQir1Sxck8SbarPMtZ6t1tTDMHh7Q3B hIRw== X-Gm-Message-State: AODbwcC3FcTP4ig+W38gKdWPIW9d0OhCncrBoliTAburOGkd3VpVhhsE ZTGFM8s076GaTKxl X-Received: by 10.223.175.17 with SMTP id z17mr19549226wrc.11.1495642634800; Wed, 24 May 2017 09:17:14 -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 17sm5816909wml.32.2017.05.24.09.17.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 May 2017 09:17:13 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 24 May 2017 18:16:49 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 14/14] devargs: introduce cleaner parsing helper 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Introduce a more versatile helper to parse device strings. This helper expects a generic rte_devargs structure as storage in order not to require any API changes in the future, should this structure be updated. The old equivalent function is thus being deprecated, as its API does not allow to accompany current rte_devargs evolutions. A deprecation notice is issued. This new helper will parse bus information as well as device name and device parameters. It does not allocate an rte_devargs structure and expects one to be given as input. Signed-off-by: Gaetan Rivet --- doc/guides/rel_notes/deprecation.rst | 5 ++ lib/librte_eal/common/eal_common_devargs.c | 86 ++++++++++++++++++++--------- lib/librte_eal/common/include/rte_devargs.h | 20 +++++++ 3 files changed, 85 insertions(+), 26 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index ba9b5a2..f90cd87 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -128,3 +128,8 @@ Deprecation Notices The non-"do-sig" versions of the hash tables will be removed (including the ``signature_offset`` parameter) and the "do-sig" versions renamed accordingly. + +* eal: the following function is deprecated starting from 17.08 and will + be removed in 17.11: + + - ``rte_eal_parse_devargs_str``, replaced by ``rte_eal_devargs_parse`` diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index d423125..7bca015 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -77,44 +77,80 @@ rte_eal_parse_devargs_str(const char *devargs_str, return 0; } -/* store a whitelist parameter for later parsing */ int -rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) +rte_eal_devargs_parse(const char *dev, + struct rte_devargs *da) { - struct rte_devargs *devargs = NULL; - const char *dev = devargs_str; struct rte_bus *bus; - char *buf = NULL; + const char *c; + const size_t maxlen = sizeof(da->name); size_t i; - int ret; - - /* use malloc instead of rte_malloc as it's called early at init */ - devargs = malloc(sizeof(*devargs)); - if (devargs == NULL) - goto fail; - - memset(devargs, 0, sizeof(*devargs)); - devargs->type = devtype; + if ((dev) == NULL || (da) == NULL) + return -EINVAL; + c = dev; + /* Retrieve eventual bus info */ bus = rte_bus_from_name(dev); if (bus) { i = rte_bus_name_valid(dev); - dev += i + 1; - } else { - bus = rte_bus_from_dev(dev); + if (dev[i] == '\0') { + fprintf(stderr, "WARNING: device name matches a bus name.\n"); + bus = NULL; + } else { + c = &dev[i+1]; + } + } + /* Store device name */ + i = 0; + while (c[i] != '\0' && c[i] != ',') { + da->name[i] = c[i]; + i++; + if (i == maxlen) { + fprintf(stderr, "WARNING: Parsing \"%s\": device name should be shorter than %zu\n", + dev, maxlen); + da->name[i-1] = '\0'; + return -EINVAL; + } + } + da->name[i] = '\0'; + if (!bus) { + bus = rte_bus_from_dev(da->name); if (!bus) { - fprintf(stderr, "ERROR: failed to parse bus info from device declaration\n"); - goto fail; + fprintf(stderr, "ERROR: failed to parse bus info from device \"%s\"\n", + da->name); + return -EFAULT; } } - devargs->bus = bus; - if (rte_eal_parse_devargs_str(dev, &buf, &devargs->args)) + da->bus = bus; + /* Parse eventual device arguments */ + if (c[i] == ',') + da->args = strdup(&c[i+1]); + else + da->args = strdup(""); + if (da->args == NULL) { + fprintf(stderr, "ERROR: not enough memory to parse arguments\n"); + return -ENOMEM; + } + return 0; +} + +/* store a whitelist parameter for later parsing */ +int +rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) +{ + struct rte_devargs *devargs = NULL; + const char *dev = devargs_str; + struct rte_bus *bus; + + /* use calloc instead of rte_zmalloc as it's called early at init */ + devargs = calloc(1, sizeof(*devargs)); + if (devargs == NULL) goto fail; - /* save device name. */ - ret = snprintf(devargs->name, sizeof(devargs->name), "%s", buf); - if (ret < 0 || ret >= (int)sizeof(devargs->name)) + if (rte_eal_devargs_parse(dev, devargs)) goto fail; + devargs->type = devtype; + bus = devargs->bus; if (devargs->type == RTE_DEVTYPE_WHITELISTED) { if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) { bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST; @@ -131,12 +167,10 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) } } - free(buf); TAILQ_INSERT_TAIL(&devargs_list, devargs, next); return 0; fail: - free(buf); if (devargs) { free(devargs->args); free(devargs); diff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h index 6e9e134..2ab8864 100644 --- a/lib/librte_eal/common/include/rte_devargs.h +++ b/lib/librte_eal/common/include/rte_devargs.h @@ -119,6 +119,26 @@ int rte_eal_parse_devargs_str(const char *devargs_str, char **drvname, char **drvargs); /** + * Parse a device string. + * + * Verify that a bus is capable of handling the device passed + * in argument. Store which bus will handle the device, its name + * and the eventual device parameters. + * + * @param dev + * The device declaration string. + * @param da + * The devargs structure holding the device information. + * + * @return + * - 0 on success. + * - Negative errno on error. + */ +int +rte_eal_devargs_parse(const char *dev, + struct rte_devargs *da); + +/** * Add a device to the user device list * * For PCI devices, the format of arguments string is "PCI_ADDR" or