From patchwork Thu Feb 7 12:17:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 50181 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 D667F1B535; Thu, 7 Feb 2019 13:18:39 +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 A3D831B4B6 for ; Thu, 7 Feb 2019 13:18:16 +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 BBD2860005B for ; Thu, 7 Feb 2019 12:18:15 +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:10 -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 x17CI9I5013293 for ; Thu, 7 Feb 2019 12:18:09 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 4B0651613EB for ; Thu, 7 Feb 2019 12:18:09 +0000 (GMT) From: Andrew Rybchenko To: Date: Thu, 7 Feb 2019 12:17:46 +0000 Message-ID: <1549541873-17403-24-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-6.139800-4.000000-10 X-TMASE-MatchedRID: kdClzEoqFPdgNTke+eoi16b8GfRpncAzlSphlGf1p5HfTFKBkQVCslzm bZmEF1O409NQNrxIpFYBtjkcfRMmqSnPugGsN3p5fuyIS1Zjfrtzd7C7BtJobvgnJH5vm2+g584 AXn/P/n2DZO9Xbndg3h2a9WLoHBurxpw//AHNLCfhG1IOMb7PsIB84MMvKlea8JGeRYYBDDrY92 Zl64JjICuvI3j+W1HBXBw41v12Ht2PaFHMfVTC4BRFJJyf5BJe3QfwsVk0UbtuRXh7bFKB7ojLw F4bPHgHBwCCt2qcoHpffZztqnsXurwBcehf5XzEH8FerAT0dJY= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--6.139800-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549541896-hn2UcaOqBnxl Subject: [dpdk-dev] [PATCH 23/30] net/sfc: make main logging macro reusable in secondary 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" Logging should be supported in secondary process and now we have everything required to share at least main logging macro. sfc_adapter is going to become primary process only. Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 14 ++++---------- drivers/net/sfc/sfc_log.h | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 9f0036375..e30217cf1 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1922,12 +1922,6 @@ static const struct eth_dev_ops sfc_eth_dev_secondary_ops = { static int sfc_eth_dev_secondary_init(struct rte_eth_dev *dev, uint32_t logtype_main) { - /* - * Device private data has really many process-local pointers. - * Below code should be extremely careful to use data located - * in shared memory only. - */ - struct sfc_adapter *sa = dev->data->dev_private; struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev); struct sfc_adapter_priv *sap; const struct sfc_dp_rx *dp_rx; @@ -1948,13 +1942,13 @@ sfc_eth_dev_secondary_init(struct rte_eth_dev *dev, uint32_t logtype_main) dp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, sas->dp_rx_name); if (dp_rx == NULL) { - SFC_LOG(sa, RTE_LOG_ERR, logtype_main, + SFC_LOG(sas, RTE_LOG_ERR, logtype_main, "cannot find %s Rx datapath", sas->dp_rx_name); rc = ENOENT; goto fail_dp_rx; } if (~dp_rx->features & SFC_DP_RX_FEAT_MULTI_PROCESS) { - SFC_LOG(sa, RTE_LOG_ERR, logtype_main, + SFC_LOG(sas, RTE_LOG_ERR, logtype_main, "%s Rx datapath does not support multi-process", sas->dp_rx_name); rc = EINVAL; @@ -1963,13 +1957,13 @@ sfc_eth_dev_secondary_init(struct rte_eth_dev *dev, uint32_t logtype_main) dp_tx = sfc_dp_find_tx_by_name(&sfc_dp_head, sas->dp_tx_name); if (dp_tx == NULL) { - SFC_LOG(sa, RTE_LOG_ERR, logtype_main, + SFC_LOG(sas, RTE_LOG_ERR, logtype_main, "cannot find %s Tx datapath", sas->dp_tx_name); rc = ENOENT; goto fail_dp_tx; } if (~dp_tx->features & SFC_DP_TX_FEAT_MULTI_PROCESS) { - SFC_LOG(sa, RTE_LOG_ERR, logtype_main, + SFC_LOG(sas, RTE_LOG_ERR, logtype_main, "%s Tx datapath does not support multi-process", sas->dp_tx_name); rc = EINVAL; diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h index 97de9ae53..62c4f4dd1 100644 --- a/drivers/net/sfc/sfc_log.h +++ b/drivers/net/sfc/sfc_log.h @@ -32,11 +32,10 @@ extern uint32_t sfc_logtype_driver; #define SFC_LOG_LEVEL_MCDI RTE_LOG_INFO /* Log PMD message, automatically add prefix and \n */ -#define SFC_LOG(sa, level, type, ...) \ +#define SFC_LOG(sas, level, type, ...) \ do { \ - const struct sfc_adapter_shared *_sas; \ + const struct sfc_adapter_shared *_sas = (sas); \ \ - _sas = (sa)->priv.shared; \ rte_log(level, type, \ RTE_FMT("PMD: sfc_efx " \ PCI_PRI_FMT " #%" PRIu16 \ @@ -53,39 +52,40 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_ERR, _sa->priv.logtype_main, \ - __VA_ARGS__); \ + SFC_LOG(_sa->priv.shared, RTE_LOG_ERR, \ + _sa->priv.logtype_main, __VA_ARGS__); \ } while (0) #define sfc_warn(sa, ...) \ do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_WARNING, _sa->priv.logtype_main, \ - __VA_ARGS__); \ + SFC_LOG(_sa->priv.shared, RTE_LOG_WARNING, \ + _sa->priv.logtype_main, __VA_ARGS__); \ } while (0) #define sfc_notice(sa, ...) \ do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_NOTICE, _sa->priv.logtype_main, \ - __VA_ARGS__); \ + SFC_LOG(_sa->priv.shared, RTE_LOG_NOTICE, \ + _sa->priv.logtype_main, __VA_ARGS__); \ } while (0) #define sfc_info(sa, ...) \ do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_INFO, _sa->priv.logtype_main, \ - __VA_ARGS__); \ + SFC_LOG(_sa->priv.shared, RTE_LOG_INFO, \ + _sa->priv.logtype_main, __VA_ARGS__); \ } while (0) #define sfc_log_init(sa, ...) \ do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, RTE_LOG_INFO, _sa->priv.logtype_main, \ + SFC_LOG(_sa->priv.shared, RTE_LOG_INFO, \ + _sa->priv.logtype_main, \ RTE_FMT("%s(): " \ RTE_FMT_HEAD(__VA_ARGS__ ,), \ __func__, \ @@ -96,8 +96,8 @@ extern uint32_t sfc_logtype_driver; do { \ const struct sfc_adapter *_sa = (sa); \ \ - SFC_LOG(_sa, SFC_LOG_LEVEL_MCDI, _sa->mcdi.logtype, \ - __VA_ARGS__); \ + SFC_LOG(_sa->priv.shared, SFC_LOG_LEVEL_MCDI, \ + _sa->mcdi.logtype, __VA_ARGS__); \ } while (0)