From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 28B881B4B5 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 84E99600067 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: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 x17CI8n8013226 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 6FD281613EB for ; Thu, 7 Feb 2019 12:18:08 +0000 (GMT) From: Andrew Rybchenko To: Date: Thu, 7 Feb 2019 12:17:31 +0000 Message-ID: <1549541873-17403-9-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-9.126600-4.000000-10 X-TMASE-MatchedRID: 9DtNOpOaDR8o64784+PXYhWCVBr+Ay98SoCG4sefl8Qs/uUAk6xP7NYI JSW5nrITjTAgo9OJRgVIcaw79h4a2EILcl5xUj1WDB+ErBr0bAPt/okBLaEo+E1KG1YrOQW/RDL xu3JRGrTNH2aBPej3yfOubpws5cPpAgPLSTo3umccsSroYI5AVmeCuKOf7fb1CgNjqBgJU5P5r/ N0c4ndaR3/06bOxIpgUDzJkjdTduADOqKd7r6zB7dQIb8hCnY+kZs6eeBnIM3pPECXwkmdkYNWk 9nhbJx/uloKsxl1w7TE0KAN7cl+5I0GdWKgGbBhpvwZ9GmdwDPwZGE/+dMc1qMP1fF+gQ2Oymn7 YQ8v1Om3iatEqGkBbAt1FbTRkWhlFII+ATBNwhKO0rt0LpQGeVPgO2JKQydY/NpLPdn/hpr5hKl gHqir+tp9a0LxKCm8aq5WvEbO0CUfdZs7fJ18wgs9VkfCh3uAD6C/6wX1l2K5vQ50gIH+iuGZhE v9wwOJGzCRAO5zGPXzNThJ4wFK7fL1YiTdLz7jM5vhCMb51Y9/r8x3wtvaX/lQZt0pYkhro8WMk QWv6iXBcIE78YqRWo6HM5rqDwqtFEtvPAaC1idpMD1EgzpXZNQySOyfsSgtX2Jq4goed9aNITIM nC4r1UMMprcbiest X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.126600-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549541894-QY--BdTCTbhW Subject: [dpdk-dev] [PATCH 08/30] net/sfc: move datapath ops pointers 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: , X-List-Received-Date: Thu, 07 Feb 2019 12:18:15 -0000 The change is required to support datapath-dependent device operations for secondary process. It is just a step in the direction. Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 2 +- drivers/net/sfc/sfc.h | 24 +++++++++++-- drivers/net/sfc/sfc_ethdev.c | 68 ++++++++++++++++++++++++++---------- drivers/net/sfc/sfc_ev.c | 18 +++++----- drivers/net/sfc/sfc_flow.c | 2 +- drivers/net/sfc/sfc_rx.c | 30 ++++++++-------- drivers/net/sfc/sfc_tx.c | 26 +++++++------- 7 files changed, 112 insertions(+), 58 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index bead373ea..63bc0a568 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -727,7 +727,7 @@ sfc_attach(struct sfc_adapter *sa) encp = efx_nic_cfg_get(sa->nic); - if (sa->dp_tx->features & SFC_DP_TX_FEAT_TSO) { + if (sa->priv.dp_tx->features & SFC_DP_TX_FEAT_TSO) { sa->tso = encp->enc_fw_assisted_tso_v2_enabled; if (!sa->tso) sfc_warn(sa, diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index f1cb83002..5c836b1c3 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -171,8 +171,30 @@ struct sfc_rss { uint8_t key[EFX_RSS_KEY_SIZE]; }; +/* Adapter process private data */ +struct sfc_adapter_priv { + const struct sfc_dp_rx *dp_rx; + const struct sfc_dp_tx *dp_tx; +}; + +static inline struct sfc_adapter_priv * +sfc_adapter_priv_by_eth_dev(struct rte_eth_dev *eth_dev) +{ + struct sfc_adapter_priv *sap = eth_dev->process_private; + + SFC_ASSERT(sap != NULL); + return sap; +} + /* Adapter private data */ struct sfc_adapter { + /* + * It must be the first field of the sfc_adapter structure since + * sfc_adapter is the primary process private data (i.e. process + * private data plus additional primary process specific data). + */ + struct sfc_adapter_priv priv; + /* * PMD setup and configuration is not thread safe. Since it is not * performance sensitive, it is better to guarantee thread-safety @@ -249,14 +271,12 @@ struct sfc_adapter { * the secondary process to find Rx datapath to be used. */ char *dp_rx_name; - const struct sfc_dp_rx *dp_rx; /* * Shared memory copy of the Tx datapath name to be used by * the secondary process to find Tx datapath to be used. */ char *dp_tx_name; - const struct sfc_dp_tx *dp_tx; }; /* diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index f49a1073a..46cd36fa5 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -84,6 +84,7 @@ sfc_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) static void sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { + const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev); struct sfc_adapter *sa = dev->data->dev_private; struct sfc_rss *rss = &sa->rss; uint64_t txq_offloads_def = 0; @@ -167,10 +168,10 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) */ dev_info->tx_desc_lim.nb_align = EFX_TXQ_MINNDESCS; - if (sa->dp_rx->get_dev_info != NULL) - sa->dp_rx->get_dev_info(dev_info); - if (sa->dp_tx->get_dev_info != NULL) - sa->dp_tx->get_dev_info(dev_info); + if (sap->dp_rx->get_dev_info != NULL) + sap->dp_rx->get_dev_info(dev_info); + if (sap->dp_tx->get_dev_info != NULL) + sap->dp_tx->get_dev_info(dev_info); dev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP | RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP; @@ -179,11 +180,12 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) static const uint32_t * sfc_dev_supported_ptypes_get(struct rte_eth_dev *dev) { + const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev); struct sfc_adapter *sa = dev->data->dev_private; const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); uint32_t tunnel_encaps = encp->enc_tunnel_encapsulations_supported; - return sa->dp_rx->supported_ptypes_get(tunnel_encaps); + return sap->dp_rx->supported_ptypes_get(tunnel_encaps); } static int @@ -1118,6 +1120,7 @@ sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id, static uint32_t sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) { + const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev); struct sfc_adapter *sa = dev->data->dev_private; struct sfc_rxq *rxq; @@ -1127,7 +1130,7 @@ sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) if (rxq == NULL || (rxq->state & SFC_RXQ_STARTED) == 0) return 0; - return sa->dp_rx->qdesc_npending(rxq->dp); + return sap->dp_rx->qdesc_npending(rxq->dp); } static int @@ -1136,7 +1139,7 @@ sfc_rx_descriptor_done(void *queue, uint16_t offset) struct sfc_dp_rxq *dp_rxq = queue; struct sfc_rxq *rxq = sfc_rxq_by_dp_rxq(dp_rxq); - return offset < rxq->evq->sa->dp_rx->qdesc_npending(dp_rxq); + return offset < rxq->evq->sa->priv.dp_rx->qdesc_npending(dp_rxq); } static int @@ -1145,7 +1148,7 @@ sfc_rx_descriptor_status(void *queue, uint16_t offset) struct sfc_dp_rxq *dp_rxq = queue; struct sfc_rxq *rxq = sfc_rxq_by_dp_rxq(dp_rxq); - return rxq->evq->sa->dp_rx->qdesc_status(dp_rxq, offset); + return rxq->evq->sa->priv.dp_rx->qdesc_status(dp_rxq, offset); } static int @@ -1154,7 +1157,7 @@ sfc_tx_descriptor_status(void *queue, uint16_t offset) struct sfc_dp_txq *dp_txq = queue; struct sfc_txq *txq = sfc_txq_by_dp_txq(dp_txq); - return txq->evq->sa->dp_tx->qdesc_status(dp_txq, offset); + return txq->evq->sa->priv.dp_tx->qdesc_status(dp_txq, offset); } static int @@ -1645,16 +1648,16 @@ sfc_dev_filter_ctrl(struct rte_eth_dev *dev, enum rte_filter_type filter_type, static int sfc_pool_ops_supported(struct rte_eth_dev *dev, const char *pool) { - struct sfc_adapter *sa = dev->data->dev_private; + const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev); /* * If Rx datapath does not provide callback to check mempool, * all pools are supported. */ - if (sa->dp_rx->pool_ops_supported == NULL) + if (sap->dp_rx->pool_ops_supported == NULL) return 1; - return sa->dp_rx->pool_ops_supported(pool); + return sap->dp_rx->pool_ops_supported(pool); } static const struct eth_dev_ops sfc_eth_dev_ops = { @@ -1831,8 +1834,8 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev) sfc_notice(sa, "use %s Tx datapath", sa->dp_tx_name); - sa->dp_rx = dp_rx; - sa->dp_tx = dp_tx; + sa->priv.dp_rx = dp_rx; + sa->priv.dp_tx = dp_tx; dev->rx_pkt_burst = dp_rx->pkt_burst; dev->tx_pkt_burst = dp_tx->pkt_burst; @@ -1866,11 +1869,11 @@ sfc_eth_dev_clear_ops(struct rte_eth_dev *dev) rte_free(sa->dp_tx_name); sa->dp_tx_name = NULL; - sa->dp_tx = NULL; + sa->priv.dp_tx = NULL; rte_free(sa->dp_rx_name); sa->dp_rx_name = NULL; - sa->dp_rx = NULL; + sa->priv.dp_rx = NULL; } static const struct eth_dev_ops sfc_eth_dev_secondary_ops = { @@ -1879,7 +1882,7 @@ static const struct eth_dev_ops sfc_eth_dev_secondary_ops = { }; static int -sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev, uint32_t logtype_main) +sfc_eth_dev_secondary_init(struct rte_eth_dev *dev, uint32_t logtype_main) { /* * Device private data has really many process-local pointers. @@ -1887,10 +1890,21 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev, uint32_t logtype_main) * in shared memory only. */ struct sfc_adapter *sa = dev->data->dev_private; + struct sfc_adapter_priv *sap; const struct sfc_dp_rx *dp_rx; const struct sfc_dp_tx *dp_tx; int rc; + /* + * Allocate process private data from heap, since it should not + * be located in shared memory allocated using rte_malloc() API. + */ + sap = calloc(1, sizeof(*sap)); + if (sap == NULL) { + rc = ENOMEM; + goto fail_alloc_priv; + } + 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, @@ -1921,6 +1935,10 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev, uint32_t logtype_main) goto fail_dp_tx_multi_process; } + sap->dp_rx = dp_rx; + sap->dp_tx = dp_tx; + + dev->process_private = sap; dev->rx_pkt_burst = dp_rx->pkt_burst; dev->tx_pkt_burst = dp_tx->pkt_burst; dev->dev_ops = &sfc_eth_dev_secondary_ops; @@ -1931,12 +1949,17 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev, uint32_t logtype_main) fail_dp_tx: fail_dp_rx_multi_process: fail_dp_rx: + free(sap); + +fail_alloc_priv: return rc; } static void sfc_eth_dev_secondary_clear_ops(struct rte_eth_dev *dev) { + free(dev->process_private); + dev->process_private = NULL; dev->dev_ops = NULL; dev->tx_pkt_burst = NULL; dev->rx_pkt_burst = NULL; @@ -1975,7 +1998,15 @@ sfc_eth_dev_init(struct rte_eth_dev *dev) RTE_LOG_NOTICE); if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return -sfc_eth_dev_secondary_set_ops(dev, logtype_main); + return -sfc_eth_dev_secondary_init(dev, logtype_main); + + /* + * sfc_adapter is a mixture of shared and process private data. + * During transition period use it in both kinds. When the + * driver becomes ready to separate it, sfc_adapter will become + * primary process private only. + */ + dev->process_private = sa; /* Required for logging */ sa->pci_addr = pci_dev->addr; @@ -2048,6 +2079,7 @@ sfc_eth_dev_init(struct rte_eth_dev *dev) fail_kvargs_parse: sfc_log_init(sa, "failed %d", rc); + dev->process_private = NULL; SFC_ASSERT(rc > 0); return -rc; } diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c index f93d30e5c..717835cab 100644 --- a/drivers/net/sfc/sfc_ev.c +++ b/drivers/net/sfc/sfc_ev.c @@ -158,8 +158,8 @@ sfc_ev_dp_rx(void *arg, __rte_unused uint32_t label, uint32_t id, dp_rxq = evq->dp_rxq; SFC_ASSERT(dp_rxq != NULL); - SFC_ASSERT(evq->sa->dp_rx->qrx_ev != NULL); - return evq->sa->dp_rx->qrx_ev(dp_rxq, id); + SFC_ASSERT(evq->sa->priv.dp_rx->qrx_ev != NULL); + return evq->sa->priv.dp_rx->qrx_ev(dp_rxq, id); } static boolean_t @@ -185,8 +185,8 @@ sfc_ev_dp_rx_ps(void *arg, __rte_unused uint32_t label, uint32_t id, dp_rxq = evq->dp_rxq; SFC_ASSERT(dp_rxq != NULL); - if (evq->sa->dp_rx->qrx_ps_ev != NULL) - return evq->sa->dp_rx->qrx_ps_ev(dp_rxq, id); + if (evq->sa->priv.dp_rx->qrx_ps_ev != NULL) + return evq->sa->priv.dp_rx->qrx_ps_ev(dp_rxq, id); else return B_FALSE; } @@ -239,8 +239,8 @@ sfc_ev_dp_tx(void *arg, __rte_unused uint32_t label, uint32_t id) dp_txq = evq->dp_txq; SFC_ASSERT(dp_txq != NULL); - SFC_ASSERT(evq->sa->dp_tx->qtx_ev != NULL); - return evq->sa->dp_tx->qtx_ev(dp_txq, id); + SFC_ASSERT(evq->sa->priv.dp_tx->qtx_ev != NULL); + return evq->sa->priv.dp_tx->qtx_ev(dp_txq, id); } static boolean_t @@ -609,12 +609,14 @@ sfc_ev_qstart(struct sfc_evq *evq, unsigned int hw_index) SFC_ASSERT(evq->dp_rxq == NULL || evq->dp_txq == NULL); if (evq->dp_rxq != 0) { - if (strcmp(sa->dp_rx->dp.name, SFC_KVARG_DATAPATH_EFX) == 0) + if (strcmp(sa->priv.dp_rx->dp.name, + SFC_KVARG_DATAPATH_EFX) == 0) evq->callbacks = &sfc_ev_callbacks_efx_rx; else evq->callbacks = &sfc_ev_callbacks_dp_rx; } else if (evq->dp_txq != 0) { - if (strcmp(sa->dp_tx->dp.name, SFC_KVARG_DATAPATH_EFX) == 0) + if (strcmp(sa->priv.dp_tx->dp.name, + SFC_KVARG_DATAPATH_EFX) == 0) evq->callbacks = &sfc_ev_callbacks_efx_tx; else evq->callbacks = &sfc_ev_callbacks_dp_tx; diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index 371648b0e..41d388735 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -1527,7 +1527,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa, struct rte_flow_error *error) { int rc; - const unsigned int dp_rx_features = sa->dp_rx->features; + const unsigned int dp_rx_features = sa->priv.dp_rx->features; uint32_t actions_set = 0; const uint32_t fate_actions_mask = (1UL << RTE_FLOW_ACTION_TYPE_QUEUE) | (1UL << RTE_FLOW_ACTION_TYPE_RSS) | diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 44aee29e9..0ee3cfdcd 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -581,7 +581,7 @@ sfc_rx_qflush(struct sfc_adapter *sa, unsigned int sw_index) sfc_notice(sa, "RxQ %u flushed", sw_index); } - sa->dp_rx->qpurge(rxq->dp); + sa->priv.dp_rx->qpurge(rxq->dp); } static int @@ -695,7 +695,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) efx_rx_qenable(rxq->common); - rc = sa->dp_rx->qstart(rxq->dp, evq->read_ptr); + rc = sa->priv.dp_rx->qstart(rxq->dp, evq->read_ptr); if (rc != 0) goto fail_dp_qstart; @@ -714,7 +714,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index) return 0; fail_mac_filter_default_rxq_set: - sa->dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr); + sa->priv.dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr); fail_dp_qstart: sfc_rx_qflush(sa, sw_index); @@ -749,7 +749,7 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index) sa->eth_dev->data->rx_queue_state[sw_index] = RTE_ETH_QUEUE_STATE_STOPPED; - sa->dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr); + sa->priv.dp_rx->qstop(rxq->dp, &rxq->evq->read_ptr); if (sw_index == 0) efx_mac_filter_default_rxq_clear(sa->nic); @@ -771,14 +771,14 @@ sfc_rx_get_dev_offload_caps(struct sfc_adapter *sa) caps |= DEV_RX_OFFLOAD_JUMBO_FRAME; - if (sa->dp_rx->features & SFC_DP_RX_FEAT_CHECKSUM) { + if (sa->priv.dp_rx->features & SFC_DP_RX_FEAT_CHECKSUM) { caps |= DEV_RX_OFFLOAD_IPV4_CKSUM; caps |= DEV_RX_OFFLOAD_UDP_CKSUM; caps |= DEV_RX_OFFLOAD_TCP_CKSUM; } if (encp->enc_tunnel_encapsulations_supported && - (sa->dp_rx->features & SFC_DP_RX_FEAT_TUNNELS)) + (sa->priv.dp_rx->features & SFC_DP_RX_FEAT_TUNNELS)) caps |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM; return caps; @@ -789,7 +789,7 @@ sfc_rx_get_queue_offload_caps(struct sfc_adapter *sa) { uint64_t caps = 0; - if (sa->dp_rx->features & SFC_DP_RX_FEAT_SCATTER) + if (sa->priv.dp_rx->features & SFC_DP_RX_FEAT_SCATTER) caps |= DEV_RX_OFFLOAD_SCATTER; return caps; @@ -943,8 +943,8 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, struct sfc_rxq *rxq; struct sfc_dp_rx_qcreate_info info; - rc = sa->dp_rx->qsize_up_rings(nb_rx_desc, mb_pool, &rxq_entries, - &evq_entries, &rxq_max_fill_level); + rc = sa->priv.dp_rx->qsize_up_rings(nb_rx_desc, mb_pool, &rxq_entries, + &evq_entries, &rxq_max_fill_level); if (rc != 0) goto fail_size_up_rings; SFC_ASSERT(rxq_entries >= EFX_RXQ_MINNDESCS); @@ -983,7 +983,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, SFC_ASSERT(rxq_entries <= rxq_info->max_entries); rxq_info->entries = rxq_entries; - if (sa->dp_rx->dp.hw_fw_caps & SFC_DP_HW_FW_CAP_RX_ES_SUPER_BUFFER) + if (sa->priv.dp_rx->dp.hw_fw_caps & SFC_DP_HW_FW_CAP_RX_ES_SUPER_BUFFER) rxq_info->type = EFX_RXQ_TYPE_ES_SUPER_BUFFER; else rxq_info->type = EFX_RXQ_TYPE_DEFAULT; @@ -993,7 +993,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, EFX_RXQ_FLAG_SCATTER : EFX_RXQ_FLAG_NONE; if ((encp->enc_tunnel_encapsulations_supported != 0) && - (sa->dp_rx->features & SFC_DP_RX_FEAT_TUNNELS)) + (sa->priv.dp_rx->features & SFC_DP_RX_FEAT_TUNNELS)) rxq_info->type_flags |= EFX_RXQ_FLAG_INNER_CLASSES; rc = sfc_ev_qinit(sa, SFC_EVQ_TYPE_RX, sw_index, @@ -1040,9 +1040,9 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, info.mem_bar = sa->mem_bar.esb_base; info.vi_window_shift = encp->enc_vi_window_shift; - rc = sa->dp_rx->qcreate(sa->eth_dev->data->port_id, sw_index, - &RTE_ETH_DEV_TO_PCI(sa->eth_dev)->addr, - socket_id, &info, &rxq->dp); + rc = sa->priv.dp_rx->qcreate(sa->eth_dev->data->port_id, sw_index, + &RTE_ETH_DEV_TO_PCI(sa->eth_dev)->addr, + socket_id, &info, &rxq->dp); if (rc != 0) goto fail_dp_rx_qcreate; @@ -1087,7 +1087,7 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index) rxq = rxq_info->rxq; SFC_ASSERT(rxq->state == SFC_RXQ_INITIALIZED); - sa->dp_rx->qdestroy(rxq->dp); + sa->priv.dp_rx->qdestroy(rxq->dp); rxq->dp = NULL; rxq_info->rxq = NULL; diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c index c3b089fd8..5d31fedbb 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -40,15 +40,15 @@ sfc_tx_get_dev_offload_caps(struct sfc_adapter *sa) const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); uint64_t caps = 0; - if ((sa->dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) && + if ((sa->priv.dp_tx->features & SFC_DP_TX_FEAT_VLAN_INSERT) && encp->enc_hw_tx_insert_vlan_enabled) caps |= DEV_TX_OFFLOAD_VLAN_INSERT; - if (sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG) + if (sa->priv.dp_tx->features & SFC_DP_TX_FEAT_MULTI_SEG) caps |= DEV_TX_OFFLOAD_MULTI_SEGS; - if ((~sa->dp_tx->features & SFC_DP_TX_FEAT_MULTI_POOL) && - (~sa->dp_tx->features & SFC_DP_TX_FEAT_REFCNT)) + if ((~sa->priv.dp_tx->features & SFC_DP_TX_FEAT_MULTI_POOL) && + (~sa->priv.dp_tx->features & SFC_DP_TX_FEAT_REFCNT)) caps |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; return caps; @@ -134,8 +134,8 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index, sfc_log_init(sa, "TxQ = %u", sw_index); - rc = sa->dp_tx->qsize_up_rings(nb_tx_desc, &txq_entries, &evq_entries, - &txq_max_fill_level); + rc = sa->priv.dp_tx->qsize_up_rings(nb_tx_desc, &txq_entries, + &evq_entries, &txq_max_fill_level); if (rc != 0) goto fail_size_up_rings; SFC_ASSERT(txq_entries >= EFX_TXQ_MINNDESCS); @@ -193,9 +193,9 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index, info.tso_tcp_header_offset_limit = encp->enc_tx_tso_tcp_header_offset_limit; - rc = sa->dp_tx->qcreate(sa->eth_dev->data->port_id, sw_index, - &RTE_ETH_DEV_TO_PCI(sa->eth_dev)->addr, - socket_id, &info, &txq->dp); + rc = sa->priv.dp_tx->qcreate(sa->eth_dev->data->port_id, sw_index, + &RTE_ETH_DEV_TO_PCI(sa->eth_dev)->addr, + socket_id, &info, &txq->dp); if (rc != 0) goto fail_dp_tx_qinit; @@ -243,7 +243,7 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index) SFC_ASSERT(txq != NULL); SFC_ASSERT(txq->state == SFC_TXQ_INITIALIZED); - sa->dp_tx->qdestroy(txq->dp); + sa->priv.dp_tx->qdestroy(txq->dp); txq->dp = NULL; txq_info->txq = NULL; @@ -466,7 +466,7 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index) txq->state |= SFC_TXQ_STARTED; - rc = sa->dp_tx->qstart(txq->dp, evq->read_ptr, desc_index); + rc = sa->priv.dp_tx->qstart(txq->dp, evq->read_ptr, desc_index); if (rc != 0) goto fail_dp_qstart; @@ -511,7 +511,7 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index) SFC_ASSERT(txq->state & SFC_TXQ_STARTED); - sa->dp_tx->qstop(txq->dp, &txq->evq->read_ptr); + sa->priv.dp_tx->qstop(txq->dp, &txq->evq->read_ptr); /* * Retry TX queue flushing in case of flush failed or @@ -548,7 +548,7 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index) sfc_notice(sa, "TxQ %u flushed", sw_index); } - sa->dp_tx->qreap(txq->dp); + sa->priv.dp_tx->qreap(txq->dp); txq->state = SFC_TXQ_INITIALIZED; -- 2.17.1