From patchwork Thu Feb 7 12:17:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 50174 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 9D9571B4FF; Thu, 7 Feb 2019 13:18:32 +0100 (CET) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id A03C91B4BC for ; Thu, 7 Feb 2019 13:18:15 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 61E42600067 for ; Thu, 7 Feb 2019 12:18:14 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 7 Feb 2019 04:18:10 -0800 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Thu, 7 Feb 2019 04:18:09 -0800 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id x17CI8Ie013231 for ; Thu, 7 Feb 2019 12:18:08 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 7DD601613E4 for ; Thu, 7 Feb 2019 12:18:08 +0000 (GMT) From: Andrew Rybchenko To: Date: Thu, 7 Feb 2019 12:17:32 +0000 Message-ID: <1549541873-17403-10-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 X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24412.006 X-TM-AS-Result: No-1.879800-4.000000-10 X-TMASE-MatchedRID: 4TjxhQTf5XhJ0YyoO3S+Ix+WEMjoO9WWI9yVcHNDU7are7bPW6Vx7qip 18v0DWYVhw91EYo9qbfr8OtoMyGhhTeE3zHLyrsyNs3S39zaoXbljSRvSGpq3M7EPIkVcg+O+4D mGDa9rNy9Yfxjf48xHrO9i5FesTRZGAdnzrnkM48URSScn+QSXt0H8LFZNFG76sBnwpOylLNzDP LEyMVz7YQvqvA+3pq86zoTQssakAvhoSW3D2FaK4Wwfkily/J5ybv0UzsouSRtkC08tcRcyMp8N OZM6RM9lZLmC6R7frwA5SS2XRjKFM+aZOIheolUvvUo0hZPhlzM/43UL1MJR37cGd19dSFd X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--1.879800-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549541895-SYusbIa5MiCz Subject: [dpdk-dev] [PATCH 09/30] net/sfc: move main log type to process private data 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" Dynamic log type value may differ in primary and secondary processes. Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.h | 2 +- drivers/net/sfc/sfc_ethdev.c | 4 +++- drivers/net/sfc/sfc_log.h | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index 5c836b1c3..f04127bbc 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -175,6 +175,7 @@ struct sfc_rss { struct sfc_adapter_priv { const struct sfc_dp_rx *dp_rx; const struct sfc_dp_tx *dp_tx; + uint32_t logtype_main; }; static inline struct sfc_adapter_priv * @@ -207,7 +208,6 @@ struct sfc_adapter { uint16_t port_id; struct rte_eth_dev *eth_dev; struct rte_kvargs *kvargs; - uint32_t logtype_main; int socket_id; efsys_bar_t mem_bar; efx_family_t family; diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 46cd36fa5..bb53c7d53 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1905,6 +1905,8 @@ sfc_eth_dev_secondary_init(struct rte_eth_dev *dev, uint32_t logtype_main) goto fail_alloc_priv; } + sap->logtype_main = logtype_main; + dp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, sa->dp_rx_name); if (dp_rx == NULL) { SFC_LOG(sa, RTE_LOG_ERR, logtype_main, @@ -2011,7 +2013,7 @@ sfc_eth_dev_init(struct rte_eth_dev *dev) /* Required for logging */ sa->pci_addr = pci_dev->addr; sa->port_id = dev->data->port_id; - sa->logtype_main = logtype_main; + sa->priv.logtype_main = logtype_main; sa->eth_dev = dev; diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h index b11fbfb0a..405cc2a26 100644 --- a/drivers/net/sfc/sfc_log.h +++ b/drivers/net/sfc/sfc_log.h @@ -52,7 +52,7 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_ERR, _sa->logtype_main, \ + SFC_LOG(_sa, RTE_LOG_ERR, _sa->priv.logtype_main, \ __VA_ARGS__); \ } while (0) @@ -60,7 +60,7 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_WARNING, _sa->logtype_main, \ + SFC_LOG(_sa, RTE_LOG_WARNING, _sa->priv.logtype_main, \ __VA_ARGS__); \ } while (0) @@ -68,7 +68,7 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_NOTICE, _sa->logtype_main, \ + SFC_LOG(_sa, RTE_LOG_NOTICE, _sa->priv.logtype_main, \ __VA_ARGS__); \ } while (0) @@ -76,7 +76,7 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main, \ + SFC_LOG(_sa, RTE_LOG_INFO, _sa->priv.logtype_main, \ __VA_ARGS__); \ } while (0) @@ -84,7 +84,7 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main, \ + SFC_LOG(_sa, RTE_LOG_INFO, _sa->priv.logtype_main, \ RTE_FMT("%s(): " \ RTE_FMT_HEAD(__VA_ARGS__ ,), \ __func__, \