From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85443A04B7; Tue, 13 Oct 2020 15:58:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 585B01BE89; Tue, 13 Oct 2020 15:46:57 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id E6BA91DB86 for ; Tue, 13 Oct 2020 15:46:05 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.150]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A3B68200C4 for ; Tue, 13 Oct 2020 13:46:03 +0000 (UTC) Received: from us4-mdac16-4.at1.mdlocal (unknown [10.110.49.155]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A1890800A3 for ; Tue, 13 Oct 2020 13:46:03 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.7]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 409FA100071 for ; Tue, 13 Oct 2020 13:46:03 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 09E294C006D for ; Tue, 13 Oct 2020 13:46:03 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Oct 2020 14:45:56 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 13 Oct 2020 14:45:56 +0100 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 09DDju9W006060 for ; Tue, 13 Oct 2020 14:45:56 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 343D01613AB for ; Tue, 13 Oct 2020 14:45:56 +0100 (BST) From: Andrew Rybchenko To: Date: Tue, 13 Oct 2020 14:45:35 +0100 Message-ID: <1602596753-32282-19-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1602596753-32282-1-git-send-email-arybchenko@solarflare.com> References: <1602596753-32282-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.6.1012-25722.003 X-TM-AS-Result: No-7.989500-8.000000-10 X-TMASE-MatchedRID: pAw+ZS4Swzeh9oPbMj7PPJxVZzZr7+O7S1zwNuiBtITVU2WiOk7jaII7 s5f4WtvNxdWTh8Js6i46+SVwoqNqfTPxUynfZAkjKrDHzH6zmUWiIpNv3rjMdVCaFwrbicq+5Ne iQRB8ToVBqNqdFhwBHhRRlRwitBdJaKq8Xvex6Up1e7Xbb6Im2lzWPAcG6DFAjFFYmmGGytzL/s tjflLyfXcTzXjB9k+bjNVkqJwsOUfJXKdirIsTiXtpzPuHdtTCaVixrzjDaFMgVZAf8m502BUCx /X5xkUniltkvKgM0StVIIpqOHmPD1qzqw/UFRAtHY6D1GLgcsB0HPaew1kGCZsoi2XrUn/Jn6Kd MrRsL14qtq5d3cxkNSHykI9pHZPku3U+W6JcP9RIDnP4/FzpLdy3WXxFLzhGsuiIrZ3pMDfAvpL E+mvX8g== X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--7.989500-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25722.003 X-MDID: 1602596763-Lfr5BPCLV691 X-PPE-DISP: 1602596763;Lfr5BPCLV691 Subject: [dpdk-dev] [PATCH 18/36] net/sfc: support multi-segment transmit for EF100 datapath 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" Signed-off-by: Andrew Rybchenko --- doc/guides/nics/sfc_efx.rst | 4 +- drivers/net/sfc/sfc_ef100_tx.c | 69 ++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index 726d653fa8..17e9461bea 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -328,8 +328,8 @@ boolean parameters value. **ef10_simple** chooses EF10 (SFN7xxx, SFN8xxx, X2xxx) native datapath which is even more faster then **ef10** but does not support multi-segment mbufs, disallows multiple mempools and neglects mbuf reference counters. - **ef100** chooses EF100 native datapath which does not support multi-segment - mbufs and any offloads. + **ef100** chooses EF100 native datapath which does not support + any offloads except multi-segment mbufs. - ``perf_profile`` [auto|throughput|low-latency] (default **throughput**) diff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c index 20b7c786cc..0a7bd74651 100644 --- a/drivers/net/sfc/sfc_ef100_tx.c +++ b/drivers/net/sfc/sfc_ef100_tx.c @@ -36,6 +36,10 @@ #define SFC_EF100_TX_SEND_DESC_LEN_MAX \ ((1u << ESF_GZ_TX_SEND_LEN_WIDTH) - 1) +/** Maximum length of the segment descriptor data */ +#define SFC_EF100_TX_SEG_DESC_LEN_MAX \ + ((1u << ESF_GZ_TX_SEG_LEN_WIDTH) - 1) + /** * Maximum number of descriptors/buffers in the Tx ring. * It should guarantee that corresponding event queue never overfill. @@ -82,6 +86,32 @@ sfc_ef100_txq_by_dp_txq(struct sfc_dp_txq *dp_txq) return container_of(dp_txq, struct sfc_ef100_txq, dp); } +static uint16_t +sfc_ef100_tx_prepare_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, + uint16_t nb_pkts) +{ + struct sfc_ef100_txq * const txq = sfc_ef100_txq_by_dp_txq(tx_queue); + uint16_t i; + + for (i = 0; i < nb_pkts; i++) { + struct rte_mbuf *m = tx_pkts[i]; + int ret; + + ret = sfc_dp_tx_prepare_pkt(m, 0, txq->max_fill_level, 0, 0); + if (unlikely(ret != 0)) { + rte_errno = ret; + break; + } + + if (m->nb_segs > EFX_MASK32(ESF_GZ_TX_SEND_NUM_SEGS)) { + rte_errno = EINVAL; + break; + } + } + + return i; +} + static bool sfc_ef100_tx_get_event(struct sfc_ef100_txq *txq, efx_qword_t *ev) { @@ -189,10 +219,20 @@ sfc_ef100_tx_qdesc_send_create(const struct rte_mbuf *m, efx_oword_t *tx_desc) EFX_POPULATE_OWORD_4(*tx_desc, ESF_GZ_TX_SEND_ADDR, rte_mbuf_data_iova(m), ESF_GZ_TX_SEND_LEN, rte_pktmbuf_data_len(m), - ESF_GZ_TX_SEND_NUM_SEGS, 1, + ESF_GZ_TX_SEND_NUM_SEGS, m->nb_segs, ESF_GZ_TX_DESC_TYPE, ESE_GZ_TX_DESC_TYPE_SEND); } +static void +sfc_ef100_tx_qdesc_seg_create(rte_iova_t addr, uint16_t len, + efx_oword_t *tx_desc) +{ + EFX_POPULATE_OWORD_3(*tx_desc, + ESF_GZ_TX_SEG_ADDR, addr, + ESF_GZ_TX_SEG_LEN, len, + ESF_GZ_TX_DESC_TYPE, ESE_GZ_TX_DESC_TYPE_SEG); +} + static inline void sfc_ef100_tx_qpush(struct sfc_ef100_txq *txq, unsigned int added) { @@ -231,8 +271,17 @@ sfc_ef100_tx_pkt_descs_max(const struct rte_mbuf *m) RTE_BUILD_BUG_ON(SFC_EF100_TX_SEND_DESC_LEN_MAX < RTE_MIN((unsigned int)EFX_MAC_PDU_MAX, SFC_MBUF_SEG_LEN_MAX)); - SFC_ASSERT(m->nb_segs == 1); - return 1; + /* + * Any segment of scattered packet cannot be bigger than maximum + * segment length and maximum packet legnth since TSO is not + * supported yet. + * Make sure that subsequent segments do not need fragmentation (split + * into many Tx descriptors). + */ + RTE_BUILD_BUG_ON(SFC_EF100_TX_SEG_DESC_LEN_MAX < + RTE_MIN((unsigned int)EFX_MAC_PDU_MAX, SFC_MBUF_SEG_LEN_MAX)); + + return m->nb_segs; } static uint16_t @@ -306,6 +355,17 @@ sfc_ef100_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) */ txq->sw_ring[id].mbuf = m_seg; + while ((m_seg = m_seg->next) != NULL) { + RTE_BUILD_BUG_ON(SFC_MBUF_SEG_LEN_MAX > + SFC_EF100_TX_SEG_DESC_LEN_MAX); + + id = added++ & txq->ptr_mask; + sfc_ef100_tx_qdesc_seg_create(rte_mbuf_data_iova(m_seg), + rte_pktmbuf_data_len(m_seg), + &txq->txq_hw_ring[id]); + txq->sw_ring[id].mbuf = m_seg; + } + dma_desc_space -= (added - pkt_start); } @@ -532,7 +592,7 @@ struct sfc_dp_tx sfc_ef100_tx = { }, .features = SFC_DP_TX_FEAT_MULTI_PROCESS, .dev_offload_capa = 0, - .queue_offload_capa = 0, + .queue_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS, .get_dev_info = sfc_ef100_get_dev_info, .qsize_up_rings = sfc_ef100_tx_qsize_up_rings, .qcreate = sfc_ef100_tx_qcreate, @@ -542,5 +602,6 @@ struct sfc_dp_tx sfc_ef100_tx = { .qstop = sfc_ef100_tx_qstop, .qreap = sfc_ef100_tx_qreap, .qdesc_status = sfc_ef100_tx_qdesc_status, + .pkt_prepare = sfc_ef100_tx_prepare_pkts, .pkt_burst = sfc_ef100_xmit_pkts, }; -- 2.17.1