From patchwork Fri Jan 20 15:22:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 19842 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 [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id E0934F60E; Fri, 20 Jan 2017 16:23:15 +0100 (CET) Received: from nbfkord-smmo03.seg.att.com (nbfkord-smmo03.seg.att.com [209.65.160.84]) by dpdk.org (Postfix) with ESMTP id 84E7BF60C for ; Fri, 20 Jan 2017 16:23:13 +0100 (CET) Received: from unknown [12.187.104.26] (EHLO webmail.solarflare.com) by nbfkord-smmo03.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id 16b22885.2b6341274940.3025532.00-2484.6207630.nbfkord-smmo03.seg.att.com (envelope-from ); Fri, 20 Jan 2017 15:23:13 +0000 (UTC) X-MXL-Hash: 58822b610b8f731f-31e301be62b9a067f182db9902ac59e9804a58ea Received: from unknown [12.187.104.26] (EHLO webmail.solarflare.com) by nbfkord-smmo03.seg.att.com(mxl_mta-7.2.4-7) over TLS secured channel with ESMTP id f5b22885.0.3025530.00-2259.6207624.nbfkord-smmo03.seg.att.com (envelope-from ); Fri, 20 Jan 2017 15:23:12 +0000 (UTC) X-MXL-Hash: 58822b60787234d4-50fb3ce2955290acc7ebdf4eb38d269d072c1293 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.1044.25; Fri, 20 Jan 2017 07:23:08 -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.1044.25 via Frontend Transport; Fri, 20 Jan 2017 07:23:08 -0800 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v0KFN6jo012723; Fri, 20 Jan 2017 15:23:07 GMT Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v0KFN651014567; Fri, 20 Jan 2017 15:23:06 GMT From: Andrew Rybchenko To: CC: Thomas Monjalon , Ferruh Yigit Date: Fri, 20 Jan 2017 15:22:56 +0000 Message-ID: <1484925776-14530-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1484841140-24117-1-git-send-email-arybchenko@solarflare.com> References: <1484841140-24117-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=HuVwbhnS c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=IgFoBzBjUZAA:10 a=zRKbQ67AAAAA:8 a=hDDH4Qfy0PK_0mTnh] X-AnalysisOut: [FoA:9 a=pewrH-8fzHG_v3-5:21 a=zkMcjJQUXfLFsW2N:21 a=PA03WX] X-AnalysisOut: [8tBzeizutn5_OT:22] X-Spam: [F=0.2452250987; CM=0.500; S=0.245(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH v3] net/sfc: enable TSO by default 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" Remove RTE_LIBRTE_SFC_EFX_TSO config option since it is not required any more: - unreasonable limit on number of Tx queues when TSO is not actually required should be solved using per-device parameter - performance difference with and without TSO compiled in is small Signed-off-by: Andrew Rybchenko --- config/common_base | 1 - doc/guides/nics/sfc_efx.rst | 6 ------ drivers/net/sfc/Makefile | 6 ++---- drivers/net/sfc/sfc.c | 4 ---- drivers/net/sfc/sfc_tx.c | 2 -- drivers/net/sfc/sfc_tx.h | 18 ------------------ 6 files changed, 2 insertions(+), 35 deletions(-) diff --git a/config/common_base b/config/common_base index b9fb8e2..c33179b 100644 --- a/config/common_base +++ b/config/common_base @@ -261,7 +261,6 @@ CONFIG_RTE_LIBRTE_BNXT_PMD=y # CONFIG_RTE_LIBRTE_SFC_EFX_PMD=y CONFIG_RTE_LIBRTE_SFC_EFX_DEBUG=n -CONFIG_RTE_LIBRTE_SFC_EFX_TSO=n # # Compile software PMD backed by SZEDATA2 device diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index 6be4fba..0a05a0a 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -171,12 +171,6 @@ Please note that enabling debugging options may affect system performance. Enable compilation of the extra run-time consistency checks. -- ``CONFIG_RTE_LIBRTE_SFC_EFX_TSO`` (default **n**) - - Toggle TCP segmentation offload support. - Enabling the feature limits the number of available transmit queues - significantly due to the limited number of adapter TSO contexts. - Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile index 14d6536..619a0ed 100644 --- a/drivers/net/sfc/Makefile +++ b/drivers/net/sfc/Makefile @@ -89,8 +89,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c - -SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_TSO) += sfc_tso.c +SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c VPATH += $(SRCDIR)/base @@ -140,7 +139,6 @@ DEPDIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += lib/librte_kvargs DEPDIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += lib/librte_ether DEPDIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += lib/librte_mempool DEPDIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += lib/librte_mbuf - -DEPDIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_TSO) += lib/librte_net +DEPDIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += lib/librte_net include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 648ad8c..457a53e 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -621,13 +621,9 @@ if (rc != 0) goto fail_set_rss_defaults; -#ifdef RTE_LIBRTE_SFC_EFX_TSO sa->tso = efx_nic_cfg_get(sa->nic)->enc_fw_assisted_tso_v2_enabled; if (!sa->tso) sfc_warn(sa, "TSO support isn't available on this adapter"); -#else /* !RTE_LIBRTE_SFC_EFX_TSO */ - sa->tso = B_FALSE; -#endif /* RTE_LIBRTE_SFC_EFX_TSO */ sfc_log_init(sa, "fini nic"); efx_nic_fini(enp); diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c index 3e64c0f..e772584 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -650,7 +650,6 @@ */ pkt_descs += sfc_tx_maybe_insert_tag(txq, m_seg, &pend); -#ifdef RTE_LIBRTE_SFC_EFX_TSO if (m_seg->ol_flags & PKT_TX_TCP_SEG) { /* * We expect correct 'pkt->l[2, 3, 4]_len' values @@ -688,7 +687,6 @@ * as for the usual non-TSO path */ } -#endif /* RTE_LIBRTE_SFC_EFX_TSO */ for (; m_seg != NULL; m_seg = m_seg->next) { efsys_dma_addr_t next_frag; diff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h index 581e2aa..39977a5 100644 --- a/drivers/net/sfc/sfc_tx.h +++ b/drivers/net/sfc/sfc_tx.h @@ -50,9 +50,7 @@ struct sfc_tx_sw_desc { struct rte_mbuf *mbuf; -#ifdef RTE_LIBRTE_SFC_EFX_TSO uint8_t *tsoh; /* Buffer to store TSO header */ -#endif /* RTE_LIBRTE_SFC_EFX_TSO */ }; enum sfc_txq_state_bit { @@ -116,7 +114,6 @@ int sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index, uint16_t sfc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); -#ifdef RTE_LIBRTE_SFC_EFX_TSO /* From 'sfc_tso.c' */ int sfc_tso_alloc_tsoh_objs(struct sfc_tx_sw_desc *sw_ring, unsigned int txq_entries, unsigned int socket_id); @@ -125,21 +122,6 @@ void sfc_tso_free_tsoh_objs(struct sfc_tx_sw_desc *sw_ring, int sfc_tso_do(struct sfc_txq *txq, unsigned int idx, struct rte_mbuf **in_seg, size_t *in_off, efx_desc_t **pend, unsigned int *pkt_descs, size_t *pkt_len); -#else /* !RTE_LIBRTE_SFC_EFX_TSO */ -static inline int -sfc_tso_alloc_tsoh_objs(__rte_unused struct sfc_tx_sw_desc *sw_ring, - __rte_unused unsigned int txq_entries, - __rte_unused unsigned int socket_id) -{ - return 0; -} - -static inline void -sfc_tso_free_tsoh_objs(__rte_unused struct sfc_tx_sw_desc *sw_ring, - __rte_unused unsigned int txq_entries) -{ -} -#endif /* RTE_LIBRTE_SFC_EFX_TSO */ #ifdef __cplusplus }