From patchwork Wed Jun 7 23:57:02 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: 25159 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 5912B7CFD; Thu, 8 Jun 2017 01:58:08 +0200 (CEST) Received: from mail-wr0-f175.google.com (mail-wr0-f175.google.com [209.85.128.175]) by dpdk.org (Postfix) with ESMTP id A95447CD0 for ; Thu, 8 Jun 2017 01:57:38 +0200 (CEST) Received: by mail-wr0-f175.google.com with SMTP id g76so11985667wrd.1 for ; Wed, 07 Jun 2017 16:57:38 -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=ab0gyWaeRTXcPB1ehqagIgPwUd1Ov0Vm1hk3OhjuUVk=; b=sexeoe2j1K+rYEI4LFZbeUbWchhGZSygiZ7MJC+cvDHrXbUJH+BgR4OHyQgj4lC6pq 88Twyc+prs+1aUmBK8PAM9WYN2gWK3iI2ToxpgZllLQn2VLKVJD557xzCmYr31E5yx1k qRvpEiHli8/MhU697t2rrpoJfbg3Do7ffbab9EP3hzi+nU29Ku2TfX4fqKxqAoOR4cbt j/TqmbDAtnv4XVUy/dC0iTBIJiScpVUb8yjUVxOMZHcLPV5NdyO3FcTrrpr8k0HbbijY msNvduFGbFeGTC6phdPF9EE/LBKa3zdCpe6pF75eNTORuRs/x4Vpf18LiK+gA9OZt9xG 1sQw== 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=ab0gyWaeRTXcPB1ehqagIgPwUd1Ov0Vm1hk3OhjuUVk=; b=nHL23099q9805NVRz2f5oUmTu2GUpJYsZX4F3hGV0szZQwRTZHfYNy5tHxy4KX7a4d AZrz8LTIOzpVdvWzWzEmmhgtC50xUFWm5QN655nqbzUtSwx4ndGaGK1SQ/9tsVIuCZ9m H/84hpY61At3v5f3upOQjouUmt6Ftmqgl3sGEWgRr5vDV4pxv2Wa78MAaQpxe61Iqw+Z 3wmiCPf13DgI/Szucvaol0lcUXpQ1qYF4BAv7DDDIhxWOceMJcJLh8g+Y/TCMOVgvEC2 hQ/9YHYjQ55hcH3qoS4TnVMjIs6I64F7z181vPqxe9H+PdUQQcifQ3XxiS34C13IMMOB R2GA== X-Gm-Message-State: AODbwcB4RNL53Qx1fdLG0kEMxNOGrq3Y0FdoGPr0fx2ZGg9Hg1SQ4124 xQw+ZnbUWrHkQ4yDi0U= X-Received: by 10.223.164.154 with SMTP id g26mr25290314wrb.75.1496879858100; Wed, 07 Jun 2017 16:57:38 -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 185sm22397056wmp.1.2017.06.07.16.57.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jun 2017 16:57:37 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 8 Jun 2017 01:57:02 +0200 Message-Id: <7ee066b0f4020945659b596be0a095a60e1cd9f0.1496876859.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 16/19] 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 | 89 ++++++++++++++++++++--------- lib/librte_eal/common/include/rte_devargs.h | 20 +++++++ 3 files changed, 88 insertions(+), 26 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 1786a59..fb95ced 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -105,3 +105,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..b69a2b2 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -77,44 +77,83 @@ 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 if (rte_bus_from_dev(dev)) { + /* false positive on bus name. */ + 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 +170,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