Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55961/?format=api
{ "id": 55961, "url": "http://patches.dpdk.org/api/patches/55961/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190703084244.33553-50-jerinj@marvell.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": "<20190703084244.33553-50-jerinj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190703084244.33553-50-jerinj@marvell.com", "date": "2019-07-03T08:42:35", "name": "[v3,49/58] net/octeontx2: add Rx multi segment version", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d570dbfe171535d81a688bf65e8c3177bdd64e13", "submitter": { "id": 1188, "url": "http://patches.dpdk.org/api/people/1188/?format=api", "name": "Jerin Jacob Kollanukkaran", "email": "jerinj@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190703084244.33553-50-jerinj@marvell.com/mbox/", "series": [ { "id": 5302, "url": "http://patches.dpdk.org/api/series/5302/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5302", "date": "2019-07-03T08:41:48", "name": "OCTEON TX2 Ethdev driver", "version": 3, "mbox": "http://patches.dpdk.org/series/5302/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/55961/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/55961/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 799231B9DF;\n\tWed, 3 Jul 2019 10:47:42 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id CBE731B99F\n\tfor <dev@dpdk.org>; Wed, 3 Jul 2019 10:47:40 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx638j2i2030561; Wed, 3 Jul 2019 01:47:40 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2tgrv182d8-8\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); \n\tWed, 03 Jul 2019 01:47:39 -0700", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com\n\t(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tWed, 3 Jul 2019 01:45:54 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n\t(10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Wed, 3 Jul 2019 01:45:54 -0700", "from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])\n\tby maili.marvell.com (Postfix) with ESMTP id C51013F703F;\n\tWed, 3 Jul 2019 01:45:51 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-transfer-encoding : content-type; s=pfpt0818;\n\tbh=Psbh8dO9E81wCLz3IGSxA0f6PPr0G0//UfjacLQSOvk=;\n\tb=RrO+sx/2PlkMsndnogfrMTAakA8/FAj7TCIUm469IcmDqpCX8goN4IIbeLr9p/rNt8+f\n\tr6b2NRmmqJoNERW0TR55D6j2pZp0soxB4er+J8P2dB+aH1W0SSODnKF+Mjy5UeHjR48c\n\tgK4Y/Fkb1MMRPgmeHUkvPL0pE8+dQpLnMuoegUfg2cUXnCOhiW1NI0lePalp1rOekivD\n\tdH0fs/k1fyg40ZXswz5wVc3A1us9UZja7/JzpOzs2L585NMPbtB9r8hlSPNndJKq6Szm\n\tTPxOO6KieqD5iPHr7dVX3RUppk75cLL0E/9KW5kCSV7WMCIdbYtUdJTW0Ttgl6Q1tydy\n\tRQ== ", "From": "<jerinj@marvell.com>", "To": "<dev@dpdk.org>, John McNamara <john.mcnamara@intel.com>, Marko Kovacevic\n\t<marko.kovacevic@intel.com>, Jerin Jacob <jerinj@marvell.com>, \"Nithin\n\tDabilpuram\" <ndabilpuram@marvell.com>, Kiran Kumar K\n\t<kirankumark@marvell.com>, Anatoly Burakov <anatoly.burakov@intel.com>", "CC": "Pavan Nikhilesh <pbhagavatula@marvell.com>", "Date": "Wed, 3 Jul 2019 14:12:35 +0530", "Message-ID": "<20190703084244.33553-50-jerinj@marvell.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190703084244.33553-1-jerinj@marvell.com>", "References": "<20190630180609.36705-1-jerinj@marvell.com>\n\t<20190703084244.33553-1-jerinj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:, ,\n\tdefinitions=2019-07-03_03:, , signatures=0", "Subject": "[dpdk-dev] [PATCH v3 49/58] net/octeontx2: add Rx multi segment\n\tversion", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Nithin Dabilpuram <ndabilpuram@marvell.com>\n\nAdd multi segment version of packet Receive function.\n\nSigned-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>\nSigned-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>\n---\n doc/guides/nics/features/octeontx2.ini | 2 +\n doc/guides/nics/features/octeontx2_vec.ini | 1 +\n doc/guides/nics/features/octeontx2_vf.ini | 2 +\n doc/guides/nics/octeontx2.rst | 2 +\n drivers/net/octeontx2/otx2_rx.c | 25 ++++++++++\n drivers/net/octeontx2/otx2_rx.h | 55 +++++++++++++++++++++-\n 6 files changed, 86 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/features/octeontx2.ini b/doc/guides/nics/features/octeontx2.ini\nindex 211ff93e7..3280cba78 100644\n--- a/doc/guides/nics/features/octeontx2.ini\n+++ b/doc/guides/nics/features/octeontx2.ini\n@@ -24,6 +24,8 @@ Inner RSS = Y\n VLAN filter = Y\n Flow control = Y\n Flow API = Y\n+Jumbo frame = Y\n+Scattered Rx = Y\n VLAN offload = Y\n QinQ offload = Y\n Packet type parsing = Y\ndiff --git a/doc/guides/nics/features/octeontx2_vec.ini b/doc/guides/nics/features/octeontx2_vec.ini\nindex 967a3757d..315722e60 100644\n--- a/doc/guides/nics/features/octeontx2_vec.ini\n+++ b/doc/guides/nics/features/octeontx2_vec.ini\n@@ -24,6 +24,7 @@ Inner RSS = Y\n VLAN filter = Y\n Flow control = Y\n Flow API = Y\n+Jumbo frame = Y\n VLAN offload = Y\n QinQ offload = Y\n Packet type parsing = Y\ndiff --git a/doc/guides/nics/features/octeontx2_vf.ini b/doc/guides/nics/features/octeontx2_vf.ini\nindex 884167c88..17b223221 100644\n--- a/doc/guides/nics/features/octeontx2_vf.ini\n+++ b/doc/guides/nics/features/octeontx2_vf.ini\n@@ -19,6 +19,8 @@ RSS reta update = Y\n Inner RSS = Y\n VLAN filter = Y\n Flow API = Y\n+Jumbo frame = Y\n+Scattered Rx = Y\n VLAN offload = Y\n QinQ offload = Y\n Packet type parsing = Y\ndiff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst\nindex 457980acf..4556187ce 100644\n--- a/doc/guides/nics/octeontx2.rst\n+++ b/doc/guides/nics/octeontx2.rst\n@@ -18,6 +18,7 @@ Features of the OCTEON TX2 Ethdev PMD are:\n \n - Packet type information\n - Promiscuous mode\n+- Jumbo frames\n - SR-IOV VF\n - Lock-free Tx queue\n - Multiple queues for TX and RX\n@@ -28,6 +29,7 @@ Features of the OCTEON TX2 Ethdev PMD are:\n - Port hardware statistics\n - Link state information\n - Link flow control\n+- Scatter-Gather IO support\n - Debug utilities - Context dump and error interrupt support\n - IEEE1588 timestamping\n \ndiff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c\nindex 4d5223e10..fca182785 100644\n--- a/drivers/net/octeontx2/otx2_rx.c\n+++ b/drivers/net/octeontx2/otx2_rx.c\n@@ -92,6 +92,14 @@ otx2_nix_recv_pkts_ ## name(void *rx_queue,\t\t\t\t \\\n {\t\t\t\t\t\t\t\t\t \\\n \treturn nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));\t\t \\\n }\t\t\t\t\t\t\t\t\t \\\n+\t\t\t\t\t\t\t\t\t \\\n+static uint16_t __rte_noinline\t__hot\t\t\t\t\t \\\n+otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,\t\t\t \\\n+\t\t\tstruct rte_mbuf **rx_pkts, uint16_t pkts)\t \\\n+{\t\t\t\t\t\t\t\t\t \\\n+\treturn nix_recv_pkts(rx_queue, rx_pkts, pkts,\t\t\t \\\n+\t\t\t (flags) | NIX_RX_MULTI_SEG_F);\t\t \\\n+}\t\t\t\t\t\t\t\t\t \\\n \n NIX_RX_FASTPATH_MODES\n #undef R\n@@ -115,15 +123,32 @@ pick_rx_func(struct rte_eth_dev *eth_dev,\n void\n otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)\n {\n+\tstruct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);\n+\n \tconst eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {\n #define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t\\\n \t[f5][f4][f3][f2][f1][f0] = otx2_nix_recv_pkts_ ## name,\n \n+NIX_RX_FASTPATH_MODES\n+#undef R\n+\t};\n+\n+\tconst eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t\\\n+\t[f5][f4][f3][f2][f1][f0] = otx2_nix_recv_pkts_mseg_ ## name,\n+\n NIX_RX_FASTPATH_MODES\n #undef R\n \t};\n \n \tpick_rx_func(eth_dev, nix_eth_rx_burst);\n \n+\tif (dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER)\n+\t\tpick_rx_func(eth_dev, nix_eth_rx_burst_mseg);\n+\n+\t/* Copy multi seg version with no offload for tear down sequence */\n+\tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n+\t\tdev->rx_pkt_burst_no_offload =\n+\t\t\tnix_eth_rx_burst_mseg[0][0][0][0][0][0];\n \trte_mb();\n }\ndiff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h\nindex 629768aab..e150f38d7 100644\n--- a/drivers/net/octeontx2/otx2_rx.h\n+++ b/drivers/net/octeontx2/otx2_rx.h\n@@ -23,6 +23,11 @@\n #define NIX_RX_OFFLOAD_MARK_UPDATE_F BIT(4)\n #define NIX_RX_OFFLOAD_TSTAMP_F BIT(5)\n \n+/* Flags to control cqe_to_mbuf conversion function.\n+ * Defining it from backwards to denote its been\n+ * not used as offload flags to pick function\n+ */\n+#define NIX_RX_MULTI_SEG_F BIT(15)\n #define NIX_TIMESYNC_RX_OFFSET\t\t8\n \n struct otx2_timesync_info {\n@@ -133,6 +138,51 @@ nix_update_match_id(const uint16_t match_id, uint64_t ol_flags,\n \treturn ol_flags;\n }\n \n+static __rte_always_inline void\n+nix_cqe_xtract_mseg(const struct nix_rx_parse_s *rx,\n+\t\t struct rte_mbuf *mbuf, uint64_t rearm)\n+{\n+\tconst rte_iova_t *iova_list;\n+\tstruct rte_mbuf *head;\n+\tconst rte_iova_t *eol;\n+\tuint8_t nb_segs;\n+\tuint64_t sg;\n+\n+\tsg = *(const uint64_t *)(rx + 1);\n+\tnb_segs = (sg >> 48) & 0x3;\n+\tmbuf->nb_segs = nb_segs;\n+\tmbuf->data_len = sg & 0xFFFF;\n+\tsg = sg >> 16;\n+\n+\teol = ((const rte_iova_t *)(rx + 1) + ((rx->desc_sizem1 + 1) << 1));\n+\t/* Skip SG_S and first IOVA*/\n+\tiova_list = ((const rte_iova_t *)(rx + 1)) + 2;\n+\tnb_segs--;\n+\n+\trearm = rearm & ~0xFFFF;\n+\n+\thead = mbuf;\n+\twhile (nb_segs) {\n+\t\tmbuf->next = ((struct rte_mbuf *)*iova_list) - 1;\n+\t\tmbuf = mbuf->next;\n+\n+\t\t__mempool_check_cookies(mbuf->pool, (void **)&mbuf, 1, 1);\n+\n+\t\tmbuf->data_len = sg & 0xFFFF;\n+\t\tsg = sg >> 16;\n+\t\t*(uint64_t *)(&mbuf->rearm_data) = rearm;\n+\t\tnb_segs--;\n+\t\tiova_list++;\n+\n+\t\tif (!nb_segs && (iova_list + 1 < eol)) {\n+\t\t\tsg = *(const uint64_t *)(iova_list);\n+\t\t\tnb_segs = (sg >> 48) & 0x3;\n+\t\t\thead->nb_segs += nb_segs;\n+\t\t\tiova_list = (const rte_iova_t *)(iova_list + 1);\n+\t\t}\n+\t}\n+}\n+\n static __rte_always_inline void\n otx2_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,\n \t\t struct rte_mbuf *mbuf, const void *lookup_mem,\n@@ -178,7 +228,10 @@ otx2_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,\n \t*(uint64_t *)(&mbuf->rearm_data) = val;\n \tmbuf->pkt_len = len;\n \n-\tmbuf->data_len = len;\n+\tif (flag & NIX_RX_MULTI_SEG_F)\n+\t\tnix_cqe_xtract_mseg(rx, mbuf, val);\n+\telse\n+\t\tmbuf->data_len = len;\n }\n \n #define CKSUM_F NIX_RX_OFFLOAD_CHECKSUM_F\n", "prefixes": [ "v3", "49/58" ] }