From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id F41461BEC1 for ; Wed, 4 Jul 2018 00:16:06 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id u7-v6so3369411wrn.12 for ; Tue, 03 Jul 2018 15:16:06 -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:in-reply-to:references:content-transfer-encoding; bh=kNSu5jGTr4hWtkkgP21roR7INfsKTWJDt0wrGRnfwO8=; b=RiIWKK/5iZjaf/kw9OaPbQkk757B/3lUIQ844A3Q2C75l48i4oiLjUttNek2+AbL5l A2/ieYjkpKtorrthZc0kYptKiUyXDsM2t8g3YtCfr19lmoyWAePhNl0DNEqq91hopaM/ lxkr0MEBvN88qOJlJIIZEbzV8vWIGSsXOAfdxgr8xAVNbhwLqV0NGAIQiLagQ3FaJQ5n 2V0yeODPiVIZSNDc31oefLLRMXZeSI9CyRhFhPvI4P+g7+s1Grg5djONFiOIA6wKP9MH QEDGePHS4Sw3jF93NDf0sojRW9OpsFw2vdgmwWGCP25rSEQFoWhjT8tqUf8zKxIXRUQ5 wjlg== 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:in-reply-to:references :content-transfer-encoding; bh=kNSu5jGTr4hWtkkgP21roR7INfsKTWJDt0wrGRnfwO8=; b=KEL8MEFcXwlFFUAn6vNMzsKse50IzQKlnznQeXCpr0Asb5uycS70ZdWrYANprmWl7U fduPsJjUdDxI5Ch5Lg0EO62TAT+dPhqbVuCAKxWNTXmEa35tL2TOcYxrmQT1BBUBCbe1 UI+mpqxyR5823VfcU2WVJncu/N+sULE5a1Ls+DQK10ZL0rHhJbwxeJf1quZOF8Xq+UOs LC9hWanPN30LCK+WoJog4Q94GuLBabR6o9FBQB/NMW94X+00nm+pjVvgqY4PFMOm9S05 KhUzXNG2wXR/dCEBDkTqGoOsEla3Vp0NROJqVMGr8R0xyUnF5JUcN4MyDPmNQU6bycg2 5czQ== X-Gm-Message-State: APt69E3wZyTCfzGkCqPdHSM9GsbtzZl0F26+TkYMGFVp0r+rPe7/89si TJgh4V//60XQ4dyPAdjlsMzpXi7Z X-Google-Smtp-Source: AAOMgpcXpCFwQUU9FnpwbMPgcaLO4ICitPKPOPgU5Rp04BkW9kTKplqJ3ZbprsEhnhPyPbzSfk8ROA== X-Received: by 2002:adf:8b01:: with SMTP id n1-v6mr24691132wra.282.1530656166295; Tue, 03 Jul 2018 15:16:06 -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 i190-v6sm3771084wmd.33.2018.07.03.15.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jul 2018 15:16:04 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 4 Jul 2018 00:15:06 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v9 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: , X-List-Received-Date: Tue, 03 Jul 2018 22:16:07 -0000 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 | 55 ++++++++++++++++++++++++++++++++++++++++++++ drivers/bus/pci/private.h | 16 +++++++++++++ 4 files changed, 81 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..bb62bcb80 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,55 @@ 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; + } + + if (rte_kvargs_process(kvargs, "id", + &pci_addr_kv_parse, da)) { + ret = -1; + goto free_kvargs; + } + +free_kvargs: + 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_ */ -- 2.11.0