Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80542/?format=api
{ "id": 80542, "url": "http://patches.dpdk.org/api/patches/80542/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1602596753-32282-19-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1602596753-32282-19-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1602596753-32282-19-git-send-email-arybchenko@solarflare.com", "date": "2020-10-13T13:45:35", "name": "[18/36] net/sfc: support multi-segment transmit for EF100 datapath", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "06d5c38025c61789f98520f17e14bd24559542c8", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1602596753-32282-19-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 12916, "url": "http://patches.dpdk.org/api/series/12916/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12916", "date": "2020-10-13T13:45:18", "name": "net/sfc: add EF100 support", "version": 1, "mbox": "http://patches.dpdk.org/series/12916/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/80542/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/80542/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 85443A04B7;\n\tTue, 13 Oct 2020 15:58:17 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 585B01BE89;\n\tTue, 13 Oct 2020 15:46:57 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id E6BA91DB86\n for <dev@dpdk.org>; Tue, 13 Oct 2020 15:46:05 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.150])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n A3B68200C4 for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:03 +0000 (UTC)", "from us4-mdac16-4.at1.mdlocal (unknown [10.110.49.155])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A1890800A3\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:03 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.7])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 409FA100071\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:03 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 09E294C006D\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:03 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Tue, 13 Oct 2020 14:45:56 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Tue, 13 Oct 2020 14:45:56 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09DDju9W006060\n for <dev@dpdk.org>; Tue, 13 Oct 2020 14:45:56 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 343D01613AB\n for <dev@dpdk.org>; Tue, 13 Oct 2020 14:45:56 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "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\n s5f4WtvNxdWTh8Js6i46+SVwoqNqfTPxUynfZAkjKrDHzH6zmUWiIpNv3rjMdVCaFwrbicq+5Ne\n iQRB8ToVBqNqdFhwBHhRRlRwitBdJaKq8Xvex6Up1e7Xbb6Im2lzWPAcG6DFAjFFYmmGGytzL/s\n tjflLyfXcTzXjB9k+bjNVkqJwsOUfJXKdirIsTiXtpzPuHdtTCaVixrzjDaFMgVZAf8m502BUCx\n /X5xkUniltkvKgM0StVIIpqOHmPD1qzqw/UFRAtHY6D1GLgcsB0HPaew1kGCZsoi2XrUn/Jn6Kd\n MrRsL14qtq5d3cxkNSHykI9pHZPku3U+W6JcP9RIDnP4/FzpLdy3WXxFLzhGsuiIrZ3pMDfAvpL\n 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\n\tfor EF100 datapath", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n doc/guides/nics/sfc_efx.rst | 4 +-\n drivers/net/sfc/sfc_ef100_tx.c | 69 ++++++++++++++++++++++++++++++++--\n 2 files changed, 67 insertions(+), 6 deletions(-)", "diff": "diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst\nindex 726d653fa8..17e9461bea 100644\n--- a/doc/guides/nics/sfc_efx.rst\n+++ b/doc/guides/nics/sfc_efx.rst\n@@ -328,8 +328,8 @@ boolean parameters value.\n **ef10_simple** chooses EF10 (SFN7xxx, SFN8xxx, X2xxx) native datapath which\n is even more faster then **ef10** but does not support multi-segment\n mbufs, disallows multiple mempools and neglects mbuf reference counters.\n- **ef100** chooses EF100 native datapath which does not support multi-segment\n- mbufs and any offloads.\n+ **ef100** chooses EF100 native datapath which does not support\n+ any offloads except multi-segment mbufs.\n \n - ``perf_profile`` [auto|throughput|low-latency] (default **throughput**)\n \ndiff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c\nindex 20b7c786cc..0a7bd74651 100644\n--- a/drivers/net/sfc/sfc_ef100_tx.c\n+++ b/drivers/net/sfc/sfc_ef100_tx.c\n@@ -36,6 +36,10 @@\n #define SFC_EF100_TX_SEND_DESC_LEN_MAX \\\n \t((1u << ESF_GZ_TX_SEND_LEN_WIDTH) - 1)\n \n+/** Maximum length of the segment descriptor data */\n+#define SFC_EF100_TX_SEG_DESC_LEN_MAX \\\n+\t((1u << ESF_GZ_TX_SEG_LEN_WIDTH) - 1)\n+\n /**\n * Maximum number of descriptors/buffers in the Tx ring.\n * It should guarantee that corresponding event queue never overfill.\n@@ -82,6 +86,32 @@ sfc_ef100_txq_by_dp_txq(struct sfc_dp_txq *dp_txq)\n \treturn container_of(dp_txq, struct sfc_ef100_txq, dp);\n }\n \n+static uint16_t\n+sfc_ef100_tx_prepare_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n+\t\t\t uint16_t nb_pkts)\n+{\n+\tstruct sfc_ef100_txq * const txq = sfc_ef100_txq_by_dp_txq(tx_queue);\n+\tuint16_t i;\n+\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tstruct rte_mbuf *m = tx_pkts[i];\n+\t\tint ret;\n+\n+\t\tret = sfc_dp_tx_prepare_pkt(m, 0, txq->max_fill_level, 0, 0);\n+\t\tif (unlikely(ret != 0)) {\n+\t\t\trte_errno = ret;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (m->nb_segs > EFX_MASK32(ESF_GZ_TX_SEND_NUM_SEGS)) {\n+\t\t\trte_errno = EINVAL;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn i;\n+}\n+\n static bool\n sfc_ef100_tx_get_event(struct sfc_ef100_txq *txq, efx_qword_t *ev)\n {\n@@ -189,10 +219,20 @@ sfc_ef100_tx_qdesc_send_create(const struct rte_mbuf *m, efx_oword_t *tx_desc)\n \tEFX_POPULATE_OWORD_4(*tx_desc,\n \t\t\tESF_GZ_TX_SEND_ADDR, rte_mbuf_data_iova(m),\n \t\t\tESF_GZ_TX_SEND_LEN, rte_pktmbuf_data_len(m),\n-\t\t\tESF_GZ_TX_SEND_NUM_SEGS, 1,\n+\t\t\tESF_GZ_TX_SEND_NUM_SEGS, m->nb_segs,\n \t\t\tESF_GZ_TX_DESC_TYPE, ESE_GZ_TX_DESC_TYPE_SEND);\n }\n \n+static void\n+sfc_ef100_tx_qdesc_seg_create(rte_iova_t addr, uint16_t len,\n+\t\t\t efx_oword_t *tx_desc)\n+{\n+\tEFX_POPULATE_OWORD_3(*tx_desc,\n+\t\t\tESF_GZ_TX_SEG_ADDR, addr,\n+\t\t\tESF_GZ_TX_SEG_LEN, len,\n+\t\t\tESF_GZ_TX_DESC_TYPE, ESE_GZ_TX_DESC_TYPE_SEG);\n+}\n+\n static inline void\n sfc_ef100_tx_qpush(struct sfc_ef100_txq *txq, unsigned int added)\n {\n@@ -231,8 +271,17 @@ sfc_ef100_tx_pkt_descs_max(const struct rte_mbuf *m)\n \tRTE_BUILD_BUG_ON(SFC_EF100_TX_SEND_DESC_LEN_MAX <\n \t\tRTE_MIN((unsigned int)EFX_MAC_PDU_MAX, SFC_MBUF_SEG_LEN_MAX));\n \n-\tSFC_ASSERT(m->nb_segs == 1);\n-\treturn 1;\n+\t/*\n+\t * Any segment of scattered packet cannot be bigger than maximum\n+\t * segment length and maximum packet legnth since TSO is not\n+\t * supported yet.\n+\t * Make sure that subsequent segments do not need fragmentation (split\n+\t * into many Tx descriptors).\n+\t */\n+\tRTE_BUILD_BUG_ON(SFC_EF100_TX_SEG_DESC_LEN_MAX <\n+\t\tRTE_MIN((unsigned int)EFX_MAC_PDU_MAX, SFC_MBUF_SEG_LEN_MAX));\n+\n+\treturn m->nb_segs;\n }\n \n static uint16_t\n@@ -306,6 +355,17 @@ sfc_ef100_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t */\n \t\ttxq->sw_ring[id].mbuf = m_seg;\n \n+\t\twhile ((m_seg = m_seg->next) != NULL) {\n+\t\t\tRTE_BUILD_BUG_ON(SFC_MBUF_SEG_LEN_MAX >\n+\t\t\t\t\t SFC_EF100_TX_SEG_DESC_LEN_MAX);\n+\n+\t\t\tid = added++ & txq->ptr_mask;\n+\t\t\tsfc_ef100_tx_qdesc_seg_create(rte_mbuf_data_iova(m_seg),\n+\t\t\t\t\trte_pktmbuf_data_len(m_seg),\n+\t\t\t\t\t&txq->txq_hw_ring[id]);\n+\t\t\ttxq->sw_ring[id].mbuf = m_seg;\n+\t\t}\n+\n \t\tdma_desc_space -= (added - pkt_start);\n \t}\n \n@@ -532,7 +592,7 @@ struct sfc_dp_tx sfc_ef100_tx = {\n \t},\n \t.features\t\t= SFC_DP_TX_FEAT_MULTI_PROCESS,\n \t.dev_offload_capa\t= 0,\n-\t.queue_offload_capa\t= 0,\n+\t.queue_offload_capa\t= DEV_TX_OFFLOAD_MULTI_SEGS,\n \t.get_dev_info\t\t= sfc_ef100_get_dev_info,\n \t.qsize_up_rings\t\t= sfc_ef100_tx_qsize_up_rings,\n \t.qcreate\t\t= sfc_ef100_tx_qcreate,\n@@ -542,5 +602,6 @@ struct sfc_dp_tx sfc_ef100_tx = {\n \t.qstop\t\t\t= sfc_ef100_tx_qstop,\n \t.qreap\t\t\t= sfc_ef100_tx_qreap,\n \t.qdesc_status\t\t= sfc_ef100_tx_qdesc_status,\n+\t.pkt_prepare\t\t= sfc_ef100_tx_prepare_pkts,\n \t.pkt_burst\t\t= sfc_ef100_xmit_pkts,\n };\n", "prefixes": [ "18/36" ] }