From patchwork Thu Feb 7 12:17:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 50167 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 95BC81B4D6; Thu, 7 Feb 2019 13:18:24 +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 56D9A1B4AF for ; Thu, 7 Feb 2019 13:18:14 +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 31F82600057 for ; Thu, 7 Feb 2019 12:18:13 +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:09 -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 x17CI8L7013221 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 628011613E4 for ; Thu, 7 Feb 2019 12:18:08 +0000 (GMT) From: Andrew Rybchenko To: Date: Thu, 7 Feb 2019 12:17:30 +0000 Message-ID: <1549541873-17403-8-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.220400-4.000000-10 X-TMASE-MatchedRID: UFAELJy4t92Ic+vz4Wow0yYRREGYqtmUTJDl9FKHbrm82TV3yRt/mqYm f3n26fzqAwade5BKaDhZ8dIoq+XBRYh1eqwd24JQYwaJXrf2IXTGYnoF/CTeZZsoi2XrUn/Jn6K dMrRsL14qtq5d3cxkNUrJnk8Tj/KR2T0Vj7hHXlFK9H5ESthoOzLBzTU+2otENxztDcXp3qMbqi 4bv1WErwOWGkF9QNFXvZi/zRe1L0IjCELN0+ElYJcKmKwj4x3aI6KkAL2A5kcMtYrw9BuTwqSmS PRgKSZMuowvJdIWQm5DDKa3G4nrLQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--1.220400-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549541893-dY7njkWGwj4u Subject: [dpdk-dev] [PATCH 07/30] net/sfc: make it simpler to change datapath ops location 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" Rx and Tx datapath ops should be stored in process private data since these structures are located in the data section (not allocated from shared memory). Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 36dc580ae..f49a1073a 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1735,6 +1735,8 @@ static int sfc_eth_dev_set_ops(struct rte_eth_dev *dev) { struct sfc_adapter *sa = dev->data->dev_private; + const struct sfc_dp_rx *dp_rx; + const struct sfc_dp_tx *dp_tx; const efx_nic_cfg_t *encp; unsigned int avail_caps = 0; const char *rx_name = NULL; @@ -1761,13 +1763,13 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) goto fail_kvarg_rx_datapath; if (rx_name != NULL) { - sa->dp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, rx_name); - if (sa->dp_rx == NULL) { + dp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, rx_name); + if (dp_rx == NULL) { sfc_err(sa, "Rx datapath %s not found", rx_name); rc = ENOENT; goto fail_dp_rx; } - if (!sfc_dp_match_hw_fw_caps(&sa->dp_rx->dp, avail_caps)) { + if (!sfc_dp_match_hw_fw_caps(&dp_rx->dp, avail_caps)) { sfc_err(sa, "Insufficient Hw/FW capabilities to use Rx datapath %s", rx_name); @@ -1775,8 +1777,8 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) goto fail_dp_rx_caps; } } else { - sa->dp_rx = sfc_dp_find_rx_by_caps(&sfc_dp_head, avail_caps); - if (sa->dp_rx == NULL) { + dp_rx = sfc_dp_find_rx_by_caps(&sfc_dp_head, avail_caps); + if (dp_rx == NULL) { sfc_err(sa, "Rx datapath by caps %#x not found", avail_caps); rc = ENOENT; @@ -1784,7 +1786,7 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) } } - sa->dp_rx_name = sfc_strdup(sa->dp_rx->dp.name); + sa->dp_rx_name = sfc_strdup(dp_rx->dp.name); if (sa->dp_rx_name == NULL) { rc = ENOMEM; goto fail_dp_rx_name; @@ -1792,21 +1794,19 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) sfc_notice(sa, "use %s Rx datapath", sa->dp_rx_name); - dev->rx_pkt_burst = sa->dp_rx->pkt_burst; - rc = sfc_kvargs_process(sa, SFC_KVARG_TX_DATAPATH, sfc_kvarg_string_handler, &tx_name); if (rc != 0) goto fail_kvarg_tx_datapath; if (tx_name != NULL) { - sa->dp_tx = sfc_dp_find_tx_by_name(&sfc_dp_head, tx_name); - if (sa->dp_tx == NULL) { + dp_tx = sfc_dp_find_tx_by_name(&sfc_dp_head, tx_name); + if (dp_tx == NULL) { sfc_err(sa, "Tx datapath %s not found", tx_name); rc = ENOENT; goto fail_dp_tx; } - if (!sfc_dp_match_hw_fw_caps(&sa->dp_tx->dp, avail_caps)) { + if (!sfc_dp_match_hw_fw_caps(&dp_tx->dp, avail_caps)) { sfc_err(sa, "Insufficient Hw/FW capabilities to use Tx datapath %s", tx_name); @@ -1814,8 +1814,8 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) goto fail_dp_tx_caps; } } else { - sa->dp_tx = sfc_dp_find_tx_by_caps(&sfc_dp_head, avail_caps); - if (sa->dp_tx == NULL) { + dp_tx = sfc_dp_find_tx_by_caps(&sfc_dp_head, avail_caps); + if (dp_tx == NULL) { sfc_err(sa, "Tx datapath by caps %#x not found", avail_caps); rc = ENOENT; @@ -1823,7 +1823,7 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) } } - sa->dp_tx_name = sfc_strdup(sa->dp_tx->dp.name); + sa->dp_tx_name = sfc_strdup(dp_tx->dp.name); if (sa->dp_tx_name == NULL) { rc = ENOMEM; goto fail_dp_tx_name; @@ -1831,7 +1831,11 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) sfc_notice(sa, "use %s Tx datapath", sa->dp_tx_name); - dev->tx_pkt_burst = sa->dp_tx->pkt_burst; + sa->dp_rx = dp_rx; + sa->dp_tx = dp_tx; + + dev->rx_pkt_burst = dp_rx->pkt_burst; + dev->tx_pkt_burst = dp_tx->pkt_burst; dev->dev_ops = &sfc_eth_dev_ops; @@ -1839,8 +1843,6 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) fail_dp_tx_name: fail_dp_tx_caps: - sa->dp_tx = NULL; - fail_dp_tx: fail_kvarg_tx_datapath: rte_free(sa->dp_rx_name); @@ -1848,8 +1850,6 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) fail_dp_rx_name: fail_dp_rx_caps: - sa->dp_rx = NULL; - fail_dp_rx: fail_kvarg_rx_datapath: return rc;