Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/34491/?format=api
{ "id": 34491, "url": "http://patches.dpdk.org/api/patches/34491/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1516899647-8541-4-git-send-email-arybchenko@solarflare.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": "<1516899647-8541-4-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1516899647-8541-4-git-send-email-arybchenko@solarflare.com", "date": "2018-01-25T17:00:44", "name": "[dpdk-dev,3/6] net/sfc: add support for per-port dynamic logging", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "daeffa88c96a8150c7cc95afef1cd32d3beb1f8e", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1516899647-8541-4-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/34491/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/34491/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 2C8771B28E;\n\tThu, 25 Jan 2018 18:01:09 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id E8FAD1B1D0\n\tfor <dev@dpdk.org>; Thu, 25 Jan 2018 18:01:01 +0100 (CET)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id 4856294006E; Thu, 25 Jan 2018 17:01:00 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1044.25; Thu, 25 Jan 2018 09:00:57 -0800", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1044.25 via Frontend Transport; Thu, 25 Jan 2018 09:00:57 -0800", "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tw0PH0uSP024566; Thu, 25 Jan 2018 17:00:56 GMT", "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tw0PH0uQN008590; Thu, 25 Jan 2018 17:00:56 GMT" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Thu, 25 Jan 2018 17:00:44 +0000", "Message-ID": "<1516899647-8541-4-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1516899647-8541-1-git-send-email-arybchenko@solarflare.com>", "References": "<1516899647-8541-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-MDID": "1516899660-AzxO18BggtKO", "Subject": "[dpdk-dev] [PATCH 3/6] net/sfc: add support for per-port dynamic\n\tlogging", "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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Ivan Malov <ivan.malov@oktetlabs.ru>\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@solarflare.com>\n---\n doc/guides/nics/sfc_efx.rst | 6 ++++++\n drivers/net/sfc/sfc.c | 32 ++++++++++++++++++++++++++++++++\n drivers/net/sfc/sfc.h | 5 +++++\n drivers/net/sfc/sfc_ethdev.c | 3 +++\n drivers/net/sfc/sfc_log.h | 41 ++++++++++++++++++++++++++++++++---------\n 5 files changed, 78 insertions(+), 9 deletions(-)", "diff": "diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst\nindex 4d89cfd..8d5eb30 100644\n--- a/doc/guides/nics/sfc_efx.rst\n+++ b/doc/guides/nics/sfc_efx.rst\n@@ -324,3 +324,9 @@ SFC EFX PMD provides the following log types available for control:\n - ``pmd.net.sfc.driver`` (default level is **6** - ``RTE_LOG_NOTICE``)\n \n Affects driver-wide messages unrelated to any particular devices.\n+\n+- ``pmd.net.sfc.main`` (default level is **6** - ``RTE_LOG_NOTICE``)\n+\n+ Matches a subset of per-port log types registered during runtime.\n+ A full name for a particular type may be obtained by appending a\n+ dot and a PCI device identifier (``XXXX:XX:XX.X``) to the prefix.\ndiff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex ac5fdca..d31b0b1 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -843,3 +843,35 @@ sfc_unprobe(struct sfc_adapter *sa)\n \tsfc_flow_fini(sa);\n \tsa->state = SFC_ADAPTER_UNINITIALIZED;\n }\n+\n+uint32_t\n+sfc_register_logtype(struct sfc_adapter *sa, const char *lt_prefix_str,\n+\t\t uint32_t ll_default)\n+{\n+\tsize_t lt_prefix_str_size = strlen(lt_prefix_str);\n+\tsize_t lt_str_size_max;\n+\tchar *lt_str = NULL;\n+\tint ret;\n+\n+\tif (SIZE_MAX - PCI_PRI_STR_SIZE - 1 > lt_prefix_str_size) {\n+\t\t++lt_prefix_str_size; /* Reserve space for prefix separator */\n+\t\tlt_str_size_max = lt_prefix_str_size + PCI_PRI_STR_SIZE + 1;\n+\t} else {\n+\t\treturn RTE_LOGTYPE_PMD;\n+\t}\n+\n+\tlt_str = rte_zmalloc(\"logtype_str\", lt_str_size_max, 0);\n+\tif (lt_str == NULL)\n+\t\treturn RTE_LOGTYPE_PMD;\n+\n+\tstrncpy(lt_str, lt_prefix_str, lt_prefix_str_size);\n+\tlt_str[lt_prefix_str_size - 1] = '.';\n+\trte_pci_device_name(&sa->pci_addr, lt_str + lt_prefix_str_size,\n+\t\t\t lt_str_size_max - lt_prefix_str_size);\n+\tlt_str[lt_str_size_max - 1] = '\\0';\n+\n+\tret = rte_log_register_type_and_pick_level(lt_str, ll_default);\n+\trte_free(lt_str);\n+\n+\treturn (ret < 0) ? RTE_LOGTYPE_PMD : ret;\n+}\ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 7557534..768578e 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -170,6 +170,7 @@ struct sfc_adapter {\n \tuint16_t\t\t\tport_id;\n \tstruct rte_eth_dev\t\t*eth_dev;\n \tstruct rte_kvargs\t\t*kvargs;\n+\tuint32_t\t\t\tlogtype_main;\n \tbool\t\t\t\tdebug_init;\n \tint\t\t\t\tsocket_id;\n \tefsys_bar_t\t\t\tmem_bar;\n@@ -302,6 +303,10 @@ int sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,\n \t\t size_t len, int socket_id, efsys_mem_t *esmp);\n void sfc_dma_free(const struct sfc_adapter *sa, efsys_mem_t *esmp);\n \n+uint32_t sfc_register_logtype(struct sfc_adapter *sa,\n+\t\t\t const char *lt_prefix_str,\n+\t\t\t uint32_t ll_default);\n+\n int sfc_probe(struct sfc_adapter *sa);\n void sfc_unprobe(struct sfc_adapter *sa);\n int sfc_attach(struct sfc_adapter *sa);\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex f167120..a244d27 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -1937,6 +1937,9 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)\n \t/* Copy PCI device info to the dev->data */\n \trte_eth_copy_pci_info(dev, pci_dev);\n \n+\tsa->logtype_main = sfc_register_logtype(sa, SFC_LOGTYPE_MAIN_STR,\n+\t\t\t\t\t\tRTE_LOG_NOTICE);\n+\n \trc = sfc_kvargs_parse(sa);\n \tif (rc != 0)\n \t\tgoto fail_kvargs_parse;\ndiff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h\nindex ecafffc..ec903db 100644\n--- a/drivers/net/sfc/sfc_log.h\n+++ b/drivers/net/sfc/sfc_log.h\n@@ -22,14 +22,17 @@ extern uint32_t sfc_logtype_driver;\n \t\tRTE_FMT(\"PMD: \" RTE_FMT_HEAD(__VA_ARGS__ ,) \"\\n\",\t\\\n \t\t\tRTE_FMT_TAIL(__VA_ARGS__ ,)))\n \n+/** Name prefix for the per-device log type used to report basic information */\n+#define SFC_LOGTYPE_MAIN_STR\tSFC_LOGTYPE_PREFIX \"main\"\n+\n /* Log PMD message, automatically add prefix and \\n */\n-#define SFC_LOG(sa, level, ...) \\\n+#define SFC_LOG(sa, level, type, ...) \\\n \tdo {\t\t\t\t\t\t\t\t\\\n \t\tconst struct sfc_adapter *__sa = (sa);\t\t\t\\\n \t\t\t\t\t\t\t\t\t\\\n-\t\tRTE_LOG(level, PMD,\t\t\t\t\t\\\n-\t\t\tRTE_FMT(\"sfc_efx \" PCI_PRI_FMT \" #%\" PRIu8 \": \"\t\\\n-\t\t\t\tRTE_FMT_HEAD(__VA_ARGS__,) \"\\n\",\t\\\n+\t\trte_log(level, type,\t\t\t\t\t\\\n+\t\t\tRTE_FMT(\"PMD: sfc_efx \" PCI_PRI_FMT \" #%\" PRIu8\t\\\n+\t\t\t\t\": \" RTE_FMT_HEAD(__VA_ARGS__ ,) \"\\n\",\t\\\n \t\t\t\t__sa->pci_addr.domain,\t\t\t\\\n \t\t\t\t__sa->pci_addr.bus,\t\t\t\\\n \t\t\t\t__sa->pci_addr.devid,\t\t\t\\\n@@ -39,23 +42,43 @@ extern uint32_t sfc_logtype_driver;\n \t} while (0)\n \n #define sfc_err(sa, ...) \\\n-\tSFC_LOG(sa, ERR, __VA_ARGS__)\n+\tdo {\t\t\t\t\t\t\t\t\\\n+\t\tconst struct sfc_adapter *_sa = (sa);\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\\\n+\t\tSFC_LOG(_sa, RTE_LOG_ERR, _sa->logtype_main,\t\t\\\n+\t\t\t__VA_ARGS__);\t\t\t\t\t\\\n+\t} while (0)\n \n #define sfc_warn(sa, ...) \\\n-\tSFC_LOG(sa, WARNING, __VA_ARGS__)\n+\tdo {\t\t\t\t\t\t\t\t\\\n+\t\tconst struct sfc_adapter *_sa = (sa);\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\\\n+\t\tSFC_LOG(_sa, RTE_LOG_WARNING, _sa->logtype_main,\t\\\n+\t\t\t__VA_ARGS__);\t\t\t\t\t\\\n+\t} while (0)\n \n #define sfc_notice(sa, ...) \\\n-\tSFC_LOG(sa, NOTICE, __VA_ARGS__)\n+\tdo {\t\t\t\t\t\t\t\t\\\n+\t\tconst struct sfc_adapter *_sa = (sa);\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\\\n+\t\tSFC_LOG(_sa, RTE_LOG_NOTICE, _sa->logtype_main,\t\t\\\n+\t\t\t__VA_ARGS__);\t\t\t\t\t\\\n+\t} while (0)\n \n #define sfc_info(sa, ...) \\\n-\tSFC_LOG(sa, INFO, __VA_ARGS__)\n+\tdo {\t\t\t\t\t\t\t\t\\\n+\t\tconst struct sfc_adapter *_sa = (sa);\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\\\n+\t\tSFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main,\t\t\\\n+\t\t\t__VA_ARGS__);\t\t\t\t\t\\\n+\t} while (0)\n \n #define sfc_log_init(sa, ...) \\\n \tdo {\t\t\t\t\t\t\t\t\\\n \t\tconst struct sfc_adapter *_sa = (sa);\t\t\t\\\n \t\t\t\t\t\t\t\t\t\\\n \t\tif (_sa->debug_init)\t\t\t\t\t\\\n-\t\t\tSFC_LOG(_sa, INFO,\t\t\t\t\\\n+\t\t\tSFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main,\t\\\n \t\t\t\tRTE_FMT(\"%s(): \"\t\t\t\\\n \t\t\t\t\tRTE_FMT_HEAD(__VA_ARGS__,),\t\\\n \t\t\t\t\t__func__,\t\t\t\\\n", "prefixes": [ "dpdk-dev", "3/6" ] }