From patchwork Thu Jul 5 11:48:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 42358 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D91F54CA6; Thu, 5 Jul 2018 13:49:49 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 261911BF01 for ; Thu, 5 Jul 2018 13:49:27 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id t6-v6so1015857wrn.7 for ; Thu, 05 Jul 2018 04:49:27 -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 :mime-version:content-transfer-encoding; bh=yayVlu6odT1kDogaWf+RhvMWJ8dgHDD8ic8zx8Qvt1c=; b=HuHxJ8muAeuY+yPkEsPoDv6oQKXEoVlQ/XkWi1JeDjZweZMLJ0+sVAflm8P/q16VI8 AeoIZjkD+BDzEJ86iz4ljiCAq3Q5sdg09vDArPLI7pBaS1dc9gTKWX59gYM3pnJZSKyK Xay/4IsvcxH7hUJ5gDd8MZmVC4cfmxG9uP8CwJYbRhXc7mY/TEaYN6iFaDTItr2xljAE EmpaPlw8x1MHD5TS2W7rlAr/8N70xWwsdBsBOhK+zVY7693ohKzV9bIBMBTJEqy4dJB6 dIEO7APuoKuSn1uE5Op8WJvZm8Yq1eBoSf4mRNQh9erLVmSBwPL7TkNsn549ZgfGOUrl inHA== 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:mime-version:content-transfer-encoding; bh=yayVlu6odT1kDogaWf+RhvMWJ8dgHDD8ic8zx8Qvt1c=; b=RR01+8n1UxQivdIaH+Mhe8YMAumAWpguovC59NlCL1waM11lxHajaZ7/dUVD2mQiO7 bq6V7zoIPiQZ8bDslHzmj5/l1F4PXlkDJmsR07U/ORPghKZ94PMcZsdMKZft+kHwrpUl YZT8VFN4keZF2v6MzPP5Hwtlup4a/xlNSchzjqf1U1ZXbUgNAy49RDgW+u2PQ+obLZKl iirzRu71a7qhGs5S1IvWlmDuIq+mOn/s+JmGU8p1dIBfDi/R+4npqXifOI+VNg/ggr/W Ts/eOfN4yQRjhAkiyVB34DbFFW0U+TldX1oughDyR5JQvdHl2ouv9yknjWhC8A1f3Oe0 iHYA== X-Gm-Message-State: APt69E1y1+8a0H4JwgSKKPXZnpoxmMedNO/vSpZ6ZVTiRmBUgElN+/XF Lz1mCI4gRiHTl68k6fhteBo+II+G X-Google-Smtp-Source: AAOMgpe+OdW5o6ATtYiL9NE58OJtPd81oUnbHMsiUUBMr+aEPz6Gs4o7oIoiezRmjGouSS0H3zFhLA== X-Received: by 2002:adf:81c5:: with SMTP id 63-v6mr4576486wra.88.1530791366465; Thu, 05 Jul 2018 04:49:26 -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 o42-v6sm15809183wrc.50.2018.07.05.04.49.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 04:49:25 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 5 Jul 2018 13:48:30 +0200 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v10 23/27] bus/pci: pre-process declarative PCI devargs 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" The new devargs format does not recognize a particular device name. Each bus uses its specific format. Instead of introducing a new bus API, process those devargs privately for the moment. Prepare them for matching during scan against the bus devices. Signed-off-by: Gaetan Rivet --- drivers/bus/pci/bsd/pci.c | 5 ++++ drivers/bus/pci/linux/pci.c | 5 ++++ drivers/bus/pci/pci_params.c | 51 ++++++++++++++++++++++++++++++++++++ drivers/bus/pci/private.h | 16 +++++++++++ 4 files changed, 77 insertions(+) diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c index 655b34b7e..046cd11d5 100644 --- a/drivers/bus/pci/bsd/pci.c +++ b/drivers/bus/pci/bsd/pci.c @@ -327,6 +327,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf) int rte_pci_scan(void) { + struct rte_devargs *devargs; int fd; unsigned dev_count = 0; struct pci_conf matches[16]; @@ -342,6 +343,10 @@ rte_pci_scan(void) if (!rte_eal_has_pci()) return 0; + RTE_EAL_DEVARGS_FOREACH("pci", devargs) + if (rte_pci_devargs_prepare(devargs)) + continue; + fd = open("/dev/pci", O_RDONLY); if (fd < 0) { RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__); diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index 004600f1c..0c20a4337 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -430,6 +430,7 @@ parse_pci_addr_format(const char *buf, int bufsize, struct rte_pci_addr *addr) int rte_pci_scan(void) { + struct rte_devargs *devargs; struct dirent *e; DIR *dir; char dirname[PATH_MAX]; @@ -439,6 +440,10 @@ rte_pci_scan(void) if (!rte_eal_has_pci()) return 0; + RTE_EAL_DEVARGS_FOREACH("pci", devargs) + if (rte_pci_devargs_prepare(devargs)) + continue; + #ifdef VFIO_PRESENT if (!pci_vfio_is_enabled()) RTE_LOG(DEBUG, EAL, "VFIO PCI modules not loaded\n"); diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 7630d4845..56bb653fc 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -2,9 +2,12 @@ * Copyright 2018 Gaëtan Rivet */ +#include + #include #include #include +#include #include #include #include @@ -76,3 +79,51 @@ rte_pci_dev_iterate(const void *start, rte_kvargs_free(kvargs); return dev; } + +static int +pci_addr_kv_parse(const char *key __rte_unused, + const char *value, + void *_da) +{ + struct rte_devargs *da = _da; + struct rte_pci_addr addr; + + /* Verify address is valid. */ + if (rte_pci_addr_parse(value, &addr)) { + rte_errno = ENODEV; + return -1; + } + /* Write down the address as the devargs name. */ + rte_pci_device_name(&addr, da->name, sizeof(da->name)); + return 0; +} + +int +rte_pci_devargs_prepare(struct rte_devargs *da) +{ + struct rte_kvargs *kvargs = NULL; + char *args; + int ret; + + if (da->busstr == NULL) + return 0; + + args = strchr(da->busstr, ','); + if (args == NULL) + return 0; + args++; + + kvargs = rte_kvargs_parse(args, pci_params_keys); + if (kvargs == NULL) { + RTE_LOG(ERR, EAL, "unable to parse parameter list: %s\n", + da->busstr); + rte_errno = EINVAL; + return -1; + } + + ret = rte_kvargs_process(kvargs, "id", + &pci_addr_kv_parse, da); + + rte_kvargs_free(kvargs); + return ret; +} diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h index 0e689fa74..9beb24c6a 100644 --- a/drivers/bus/pci/private.h +++ b/drivers/bus/pci/private.h @@ -191,4 +191,20 @@ rte_pci_dev_iterate(const void *start, const char *str, const struct rte_dev_iterator *it); +/* + * Prepare a devargs meant for this bus. + * This function is only used for a transitory period, + * to translate the new devargs format in one + * compatible with the old form. + * + * @param da + * Devargs to process. + * + * @return + * 0 on success. + * <0 on error. + */ +int +rte_pci_devargs_prepare(struct rte_devargs *da); + #endif /* _PCI_PRIVATE_H_ */