Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42192/?format=api
{ "id": 42192, "url": "http://patches.dpdk.org/api/patches/42192/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/ce4046815763b1b1bda6eeec3684f2fff38133be.1530655929.git.gaetan.rivet@6wind.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<ce4046815763b1b1bda6eeec3684f2fff38133be.1530655929.git.gaetan.rivet@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/ce4046815763b1b1bda6eeec3684f2fff38133be.1530655929.git.gaetan.rivet@6wind.com", "date": "2018-07-03T22:15:06", "name": "[v9,23/27] bus/pci: pre-process declarative PCI devargs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2cee132a21a1c205fe6201ded08b19953ccc704d", "submitter": { "id": 269, "url": "http://patches.dpdk.org/api/people/269/?format=api", "name": "Gaëtan Rivet", "email": "gaetan.rivet@6wind.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/ce4046815763b1b1bda6eeec3684f2fff38133be.1530655929.git.gaetan.rivet@6wind.com/mbox/", "series": [ { "id": 383, "url": "http://patches.dpdk.org/api/series/383/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=383", "date": "2018-07-03T22:14:43", "name": "Device querying", "version": 9, "mbox": "http://patches.dpdk.org/series/383/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42192/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/42192/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0BC131BEE0;\n\tWed, 4 Jul 2018 00:16:15 +0200 (CEST)", "from mail-wr0-f195.google.com (mail-wr0-f195.google.com\n\t[209.85.128.195]) by dpdk.org (Postfix) with ESMTP id F41461BEC1\n\tfor <dev@dpdk.org>; Wed, 4 Jul 2018 00:16:06 +0200 (CEST)", "by mail-wr0-f195.google.com with SMTP id u7-v6so3369411wrn.12\n\tfor <dev@dpdk.org>; Tue, 03 Jul 2018 15:16:06 -0700 (PDT)", "from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\ti190-v6sm3771084wmd.33.2018.07.03.15.16.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 03 Jul 2018 15:16:04 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:in-reply-to:references:content-transfer-encoding;\n\tbh=kNSu5jGTr4hWtkkgP21roR7INfsKTWJDt0wrGRnfwO8=;\n\tb=RiIWKK/5iZjaf/kw9OaPbQkk757B/3lUIQ844A3Q2C75l48i4oiLjUttNek2+AbL5l\n\tA2/ieYjkpKtorrthZc0kYptKiUyXDsM2t8g3YtCfr19lmoyWAePhNl0DNEqq91hopaM/\n\tlxkr0MEBvN88qOJlJIIZEbzV8vWIGSsXOAfdxgr8xAVNbhwLqV0NGAIQiLagQ3FaJQ5n\n\t2V0yeODPiVIZSNDc31oefLLRMXZeSI9CyRhFhPvI4P+g7+s1Grg5djONFiOIA6wKP9MH\n\tQEDGePHS4Sw3jF93NDf0sojRW9OpsFw2vdgmwWGCP25rSEQFoWhjT8tqUf8zKxIXRUQ5\n\twjlg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:in-reply-to:references\n\t:content-transfer-encoding;\n\tbh=kNSu5jGTr4hWtkkgP21roR7INfsKTWJDt0wrGRnfwO8=;\n\tb=KEL8MEFcXwlFFUAn6vNMzsKse50IzQKlnznQeXCpr0Asb5uycS70ZdWrYANprmWl7U\n\tfduPsJjUdDxI5Ch5Lg0EO62TAT+dPhqbVuCAKxWNTXmEa35tL2TOcYxrmQT1BBUBCbe1\n\tUI+mpqxyR5823VfcU2WVJncu/N+sULE5a1Ls+DQK10ZL0rHhJbwxeJf1quZOF8Xq+UOs\n\tLC9hWanPN30LCK+WoJog4Q94GuLBabR6o9FBQB/NMW94X+00nm+pjVvgqY4PFMOm9S05\n\tKhUzXNG2wXR/dCEBDkTqGoOsEla3Vp0NROJqVMGr8R0xyUnF5JUcN4MyDPmNQU6bycg2\n\t5czQ==", "X-Gm-Message-State": "APt69E3wZyTCfzGkCqPdHSM9GsbtzZl0F26+TkYMGFVp0r+rPe7/89si\n\tTJgh4V//60XQ4dyPAdjlsMzpXi7Z", "X-Google-Smtp-Source": "AAOMgpcXpCFwQUU9FnpwbMPgcaLO4ICitPKPOPgU5Rp04BkW9kTKplqJ3ZbprsEhnhPyPbzSfk8ROA==", "X-Received": "by 2002:adf:8b01:: with SMTP id\n\tn1-v6mr24691132wra.282.1530656166295; \n\tTue, 03 Jul 2018 15:16:06 -0700 (PDT)", "From": "Gaetan Rivet <gaetan.rivet@6wind.com>", "To": "dev@dpdk.org", "Cc": "Gaetan Rivet <gaetan.rivet@6wind.com>", "Date": "Wed, 4 Jul 2018 00:15:06 +0200", "Message-Id": "<ce4046815763b1b1bda6eeec3684f2fff38133be.1530655929.git.gaetan.rivet@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": [ "<cover.1530655929.git.gaetan.rivet@6wind.com>", "<cover.1530655929.git.gaetan.rivet@6wind.com>" ], "References": [ "<cover.1521124599.git.gaetan.rivet@6wind.com>\n\t<cover.1530655929.git.gaetan.rivet@6wind.com>", "<cover.1530655929.git.gaetan.rivet@6wind.com>" ], "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v9 23/27] bus/pci: pre-process declarative PCI\n\tdevargs", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The new devargs format does not recognize a particular device name.\nEach bus uses its specific format.\n\nInstead of introducing a new bus API, process those devargs privately\nfor the moment. Prepare them for matching during scan against the\nbus devices.\n\nSigned-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\n---\n drivers/bus/pci/bsd/pci.c | 5 ++++\n drivers/bus/pci/linux/pci.c | 5 ++++\n drivers/bus/pci/pci_params.c | 55 ++++++++++++++++++++++++++++++++++++++++++++\n drivers/bus/pci/private.h | 16 +++++++++++++\n 4 files changed, 81 insertions(+)", "diff": "diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c\nindex 655b34b7e..046cd11d5 100644\n--- a/drivers/bus/pci/bsd/pci.c\n+++ b/drivers/bus/pci/bsd/pci.c\n@@ -327,6 +327,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)\n int\n rte_pci_scan(void)\n {\n+\tstruct rte_devargs *devargs;\n \tint fd;\n \tunsigned dev_count = 0;\n \tstruct pci_conf matches[16];\n@@ -342,6 +343,10 @@ rte_pci_scan(void)\n \tif (!rte_eal_has_pci())\n \t\treturn 0;\n \n+\tRTE_EAL_DEVARGS_FOREACH(\"pci\", devargs)\n+\t\tif (rte_pci_devargs_prepare(devargs))\n+\t\t\tcontinue;\n+\n \tfd = open(\"/dev/pci\", O_RDONLY);\n \tif (fd < 0) {\n \t\tRTE_LOG(ERR, EAL, \"%s(): error opening /dev/pci\\n\", __func__);\ndiff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c\nindex 004600f1c..0c20a4337 100644\n--- a/drivers/bus/pci/linux/pci.c\n+++ b/drivers/bus/pci/linux/pci.c\n@@ -430,6 +430,7 @@ parse_pci_addr_format(const char *buf, int bufsize, struct rte_pci_addr *addr)\n int\n rte_pci_scan(void)\n {\n+\tstruct rte_devargs *devargs;\n \tstruct dirent *e;\n \tDIR *dir;\n \tchar dirname[PATH_MAX];\n@@ -439,6 +440,10 @@ rte_pci_scan(void)\n \tif (!rte_eal_has_pci())\n \t\treturn 0;\n \n+\tRTE_EAL_DEVARGS_FOREACH(\"pci\", devargs)\n+\t\tif (rte_pci_devargs_prepare(devargs))\n+\t\t\tcontinue;\n+\n #ifdef VFIO_PRESENT\n \tif (!pci_vfio_is_enabled())\n \t\tRTE_LOG(DEBUG, EAL, \"VFIO PCI modules not loaded\\n\");\ndiff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c\nindex 7630d4845..bb62bcb80 100644\n--- a/drivers/bus/pci/pci_params.c\n+++ b/drivers/bus/pci/pci_params.c\n@@ -2,9 +2,12 @@\n * Copyright 2018 Gaëtan Rivet\n */\n \n+#include <string.h>\n+\n #include <rte_bus.h>\n #include <rte_bus_pci.h>\n #include <rte_dev.h>\n+#include <rte_devargs.h>\n #include <rte_errno.h>\n #include <rte_kvargs.h>\n #include <rte_pci.h>\n@@ -76,3 +79,55 @@ rte_pci_dev_iterate(const void *start,\n \trte_kvargs_free(kvargs);\n \treturn dev;\n }\n+\n+static int\n+pci_addr_kv_parse(const char *key __rte_unused,\n+\t\t const char *value,\n+\t\t void *_da)\n+{\n+\tstruct rte_devargs *da = _da;\n+\tstruct rte_pci_addr addr;\n+\n+\t/* Verify address is valid. */\n+\tif (rte_pci_addr_parse(value, &addr)) {\n+\t\trte_errno = ENODEV;\n+\t\treturn -1;\n+\t}\n+\t/* Write down the address as the devargs name. */\n+\trte_pci_device_name(&addr, da->name, sizeof(da->name));\n+\treturn 0;\n+}\n+\n+int\n+rte_pci_devargs_prepare(struct rte_devargs *da)\n+{\n+\tstruct rte_kvargs *kvargs = NULL;\n+\tchar *args;\n+\tint ret;\n+\n+\tif (da->busstr == NULL)\n+\t\treturn 0;\n+\n+\targs = strchr(da->busstr, ',');\n+\tif (args == NULL)\n+\t\treturn 0;\n+\targs++;\n+\n+\tkvargs = rte_kvargs_parse(args, pci_params_keys);\n+\tif (kvargs == NULL) {\n+\t\tRTE_LOG(ERR, EAL, \"unable to parse parameter list: %s\\n\",\n+\t\t\tda->busstr);\n+\t\trte_errno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\n+\tif (rte_kvargs_process(kvargs, \"id\",\n+\t\t\t &pci_addr_kv_parse, da)) {\n+\t\tret = -1;\n+\t\tgoto free_kvargs;\n+\t}\n+\n+free_kvargs:\n+\trte_kvargs_free(kvargs);\n+\treturn ret;\n+}\ndiff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h\nindex 0e689fa74..9beb24c6a 100644\n--- a/drivers/bus/pci/private.h\n+++ b/drivers/bus/pci/private.h\n@@ -191,4 +191,20 @@ rte_pci_dev_iterate(const void *start,\n \t\t const char *str,\n \t\t const struct rte_dev_iterator *it);\n \n+/*\n+ * Prepare a devargs meant for this bus.\n+ * This function is only used for a transitory period,\n+ * to translate the new devargs format in one\n+ * compatible with the old form.\n+ *\n+ * @param da\n+ * Devargs to process.\n+ *\n+ * @return\n+ * 0 on success.\n+ * <0 on error.\n+ */\n+int\n+rte_pci_devargs_prepare(struct rte_devargs *da);\n+\n #endif /* _PCI_PRIVATE_H_ */\n", "prefixes": [ "v9", "23/27" ] }