Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50165/?format=api
{ "id": 50165, "url": "http://patchwork.dpdk.org/api/patches/50165/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1549541873-17403-4-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1549541873-17403-4-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549541873-17403-4-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T12:17:26", "name": "[03/30] net/sfc: fix logging from secondary process", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1caa9a4070de49da151c7bd8e04ccef94b86c291", "submitter": { "id": 607, "url": "http://patchwork.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1549541873-17403-4-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 3407, "url": "http://patchwork.dpdk.org/api/series/3407/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=3407", "date": "2019-02-07T12:17:25", "name": "net/sfc: improve multi-process support", "version": 1, "mbox": "http://patchwork.dpdk.org/series/3407/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/50165/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/50165/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 6AFB51B4CF;\n\tThu, 7 Feb 2019 13:18:20 +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 1834B1B4B5;\n\tThu, 7 Feb 2019 13:18:14 +0100 (CET)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id D30EB60005B; Thu, 7 Feb 2019 12:18:12 +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.1395.4; Thu, 7 Feb 2019 04:18:09 -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.1395.4 via Frontend Transport; Thu, 7 Feb 2019 04:18:09 -0800", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx17CI8UV013203; Thu, 7 Feb 2019 12:18:08 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t2E2971613E4; Thu, 7 Feb 2019 12:18:08 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "<stable@dpdk.org>", "Date": "Thu, 7 Feb 2019 12:17:26 +0000", "Message-ID": "<1549541873-17403-4-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1549541873-17403-1-git-send-email-arybchenko@solarflare.com>", "References": "<1549541873-17403-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-TM-AS-Result": "No-1.268300-4.000000-10", "X-TMASE-MatchedRID": "uXzBxCMCukwQDGFU4qALfh+WEMjoO9WWI9yVcHNDU7bHeIFnKQ51HO73\n\t4x6nzMNiNA1KKQWShzTKh/M5R6nRphF4l1oN/bmOogGd8wIUGIKkWoMjFfK3Xrqln+jYe7ZhPJ0\n\t5UREtjOWnQtykVg1isDu9e59msPtHBeXvD66vx6WJLx4p0P/u5IzjknOM+UJozsQ8iRVyD4486a\n\ty9NNiI8eLzNWBegCW2wgn7iDBesS0nRE+fI6etkg6/k+SM6LvygTxnULpEGaO6BSjFT1IR+3SPS\n\todijB6mmkXKOcEfx3tIowWbyLJjJGgxL/bTORVlYlijIv34t+TR8CKm71x1Kr1NuKS30BZnQIFI\n\tZLtsgG0DUH+nVLNyiCsqIP9TxvtJMb6p570ilnc=", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--1.268300-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549541893-6vEMNnS3P2IM", "Subject": "[dpdk-dev] [PATCH 03/30] net/sfc: fix logging from secondary process", "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": "Dynamic log type value may differ in different processes.\n\nFixes: f28ede500c2e (\"net/sfc: support multi-process\")\nCc: stable@dpdk.org\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc.c | 6 +++---\n drivers/net/sfc/sfc.h | 2 +-\n drivers/net/sfc/sfc_ethdev.c | 25 ++++++++++++++++---------\n drivers/net/sfc/sfc_mcdi.c | 3 ++-\n 4 files changed, 22 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex 6690053f2..0d7311d68 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -1071,8 +1071,8 @@ sfc_unprobe(struct sfc_adapter *sa)\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+sfc_register_logtype(const struct rte_pci_addr *pci_addr,\n+\t\t const char *lt_prefix_str, uint32_t ll_default)\n {\n \tsize_t lt_prefix_str_size = strlen(lt_prefix_str);\n \tsize_t lt_str_size_max;\n@@ -1092,7 +1092,7 @@ sfc_register_logtype(struct sfc_adapter *sa, const char *lt_prefix_str,\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+\trte_pci_device_name(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 \ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex a94ca8e75..f1cb83002 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -311,7 +311,7 @@ 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+uint32_t sfc_register_logtype(const struct rte_pci_addr *pci_addr,\n \t\t\t const char *lt_prefix_str,\n \t\t\t uint32_t ll_default);\n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 67ce5a22f..10e032400 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -1875,7 +1875,7 @@ static const struct eth_dev_ops sfc_eth_dev_secondary_ops = {\n };\n \n static int\n-sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev)\n+sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev, uint32_t logtype_main)\n {\n \t/*\n \t * Device private data has really many process-local pointers.\n@@ -1889,12 +1889,14 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev)\n \n \tdp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, sa->dp_rx_name);\n \tif (dp_rx == NULL) {\n-\t\tsfc_err(sa, \"cannot find %s Rx datapath\", sa->dp_rx_name);\n+\t\tSFC_LOG(sa, RTE_LOG_ERR, logtype_main,\n+\t\t\t\"cannot find %s Rx datapath\", sa->dp_rx_name);\n \t\trc = ENOENT;\n \t\tgoto fail_dp_rx;\n \t}\n \tif (~dp_rx->features & SFC_DP_RX_FEAT_MULTI_PROCESS) {\n-\t\tsfc_err(sa, \"%s Rx datapath does not support multi-process\",\n+\t\tSFC_LOG(sa, RTE_LOG_ERR, logtype_main,\n+\t\t\t\"%s Rx datapath does not support multi-process\",\n \t\t\tsa->dp_rx_name);\n \t\trc = EINVAL;\n \t\tgoto fail_dp_rx_multi_process;\n@@ -1902,12 +1904,14 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev)\n \n \tdp_tx = sfc_dp_find_tx_by_name(&sfc_dp_head, sa->dp_tx_name);\n \tif (dp_tx == NULL) {\n-\t\tsfc_err(sa, \"cannot find %s Tx datapath\", sa->dp_tx_name);\n+\t\tSFC_LOG(sa, RTE_LOG_ERR, logtype_main,\n+\t\t\t\"cannot find %s Tx datapath\", sa->dp_tx_name);\n \t\trc = ENOENT;\n \t\tgoto fail_dp_tx;\n \t}\n \tif (~dp_tx->features & SFC_DP_TX_FEAT_MULTI_PROCESS) {\n-\t\tsfc_err(sa, \"%s Tx datapath does not support multi-process\",\n+\t\tSFC_LOG(sa, RTE_LOG_ERR, logtype_main,\n+\t\t\t\"%s Tx datapath does not support multi-process\",\n \t\t\tsa->dp_tx_name);\n \t\trc = EINVAL;\n \t\tgoto fail_dp_tx_multi_process;\n@@ -1955,27 +1959,30 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)\n {\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tuint32_t logtype_main;\n \tint rc;\n \tconst efx_nic_cfg_t *encp;\n \tconst struct ether_addr *from;\n \n \tsfc_register_dp();\n \n+\tlogtype_main = sfc_register_logtype(&pci_dev->addr,\n+\t\t\t\t\t SFC_LOGTYPE_MAIN_STR,\n+\t\t\t\t\t RTE_LOG_NOTICE);\n+\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n-\t\treturn -sfc_eth_dev_secondary_set_ops(dev);\n+\t\treturn -sfc_eth_dev_secondary_set_ops(dev, logtype_main);\n \n \t/* Required for logging */\n \tsa->pci_addr = pci_dev->addr;\n \tsa->port_id = dev->data->port_id;\n+\tsa->logtype_main = logtype_main;\n \n \tsa->eth_dev = dev;\n \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_mcdi.c b/drivers/net/sfc/sfc_mcdi.c\nindex 007506b4e..e485e07d6 100644\n--- a/drivers/net/sfc/sfc_mcdi.c\n+++ b/drivers/net/sfc/sfc_mcdi.c\n@@ -256,7 +256,8 @@ sfc_mcdi_init(struct sfc_adapter *sa)\n \tif (rc != 0)\n \t\tgoto fail_dma_alloc;\n \n-\tmcdi->logtype = sfc_register_logtype(sa, SFC_LOGTYPE_MCDI_STR,\n+\tmcdi->logtype = sfc_register_logtype(&sa->pci_addr,\n+\t\t\t\t\t SFC_LOGTYPE_MCDI_STR,\n \t\t\t\t\t RTE_LOG_NOTICE);\n \n \temtp = &mcdi->transport;\n", "prefixes": [ "03/30" ] }