Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/115591/?format=api
{ "id": 115591, "url": "http://patches.dpdk.org/api/patches/115591/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220829094442.3422-3-pbhagavatula@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": "<20220829094442.3422-3-pbhagavatula@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220829094442.3422-3-pbhagavatula@marvell.com", "date": "2022-08-29T09:44:40", "name": "[3/5] examples/l3fwd: use lpm vector path for event vector", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "fdedb0506d92d77ef28616c7b9a7497ab83b52c7", "submitter": { "id": 1183, "url": "http://patches.dpdk.org/api/people/1183/?format=api", "name": "Pavan Nikhilesh Bhagavatula", "email": "pbhagavatula@marvell.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220829094442.3422-3-pbhagavatula@marvell.com/mbox/", "series": [ { "id": 24442, "url": "http://patches.dpdk.org/api/series/24442/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24442", "date": "2022-08-29T09:44:38", "name": "[1/5] examples/l3fwd: fix port group mask generation", "version": 1, "mbox": "http://patches.dpdk.org/series/24442/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/115591/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/115591/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 964F4A0542;\n\tMon, 29 Aug 2022 11:45:13 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 542D2427F9;\n\tMon, 29 Aug 2022 11:45:04 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id C247E40694\n for <dev@dpdk.org>; Mon, 29 Aug 2022 11:45:00 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id\n 27T7Poun029745;\n Mon, 29 Aug 2022 02:44:57 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3j8s2erdn7-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Mon, 29 Aug 2022 02:44:56 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Mon, 29 Aug 2022 02:44:55 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Mon, 29 Aug 2022 02:44:55 -0700", "from MININT-80QBFE8.corp.innovium.com (unknown [10.28.161.88])\n by maili.marvell.com (Postfix) with ESMTP id 5D3E63F705D;\n Mon, 29 Aug 2022 02:44:52 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=fVV7LmiFWhaHcTXcFdnw4xh2kwVvtdJnS3t66v9lfHk=;\n b=FHsXPkcM7OvGPAw88hgj0CHVUBX91426Jf2XbSWiETC/rsUejD1OpVrVKX1LImGdYebd\n 7qB8DdaL55ZtMXzjDZm78yUT4YyxXdl1nJEfzgojottGl7459kOwjElx+jV361tCe9PB\n BZSoDZk0BN5iLSeLOIra/J0Mb0DBpbJYe4tRQjztuNY8/phhlT8idTrpdpJYW7X5uK31\n A1B/foNJxohO71YnsxR4DyBy8Yh83MEw9Y2EC+CgRsh1FbKqGvYIrSD7z9yVgT2REHNH\n Wq2yEPCPbIXx5q3xYNMtla5wm+ZwBK+E48LAoPdFEar1HS0LlqVV5JayOKeXRyxStYVF XA==", "From": "<pbhagavatula@marvell.com>", "To": "<jerinj@marvell.com>, David Christensen <drc@linux.vnet.ibm.com>, \"Ruifeng\n Wang\" <ruifeng.wang@arm.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>", "CC": "<dev@dpdk.org>, Pavan Nikhilesh <pbhagavatula@marvell.com>", "Subject": "[PATCH 3/5] examples/l3fwd: use lpm vector path for event vector", "Date": "Mon, 29 Aug 2022 15:14:40 +0530", "Message-ID": "<20220829094442.3422-3-pbhagavatula@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220829094442.3422-1-pbhagavatula@marvell.com>", "References": "<20220829094442.3422-1-pbhagavatula@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "ERyVLBhWx-DDfjurdE5dpxrwR1URmNPf", "X-Proofpoint-ORIG-GUID": "ERyVLBhWx-DDfjurdE5dpxrwR1URmNPf", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1\n definitions=2022-08-29_05,2022-08-25_01,2022-06-22_01", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "From: Pavan Nikhilesh <pbhagavatula@marvell.com>\n\nUse lpm vector path to process event vector.\n\nSigned-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>\n---\n examples/l3fwd/l3fwd_altivec.h | 28 ++++++++++++++++\n examples/l3fwd/l3fwd_event.h | 58 ++++++++++++++++++++++++++++++++++\n examples/l3fwd/l3fwd_lpm.c | 33 +++++++++----------\n examples/l3fwd/l3fwd_neon.h | 43 +++++++++++++++++++++++++\n examples/l3fwd/l3fwd_sse.h | 44 ++++++++++++++++++++++++++\n 5 files changed, 190 insertions(+), 16 deletions(-)", "diff": "diff --git a/examples/l3fwd/l3fwd_altivec.h b/examples/l3fwd/l3fwd_altivec.h\nindex 87018f5dbe..00a80225cd 100644\n--- a/examples/l3fwd/l3fwd_altivec.h\n+++ b/examples/l3fwd/l3fwd_altivec.h\n@@ -222,4 +222,32 @@ send_packets_multi(struct lcore_conf *qconf, struct rte_mbuf **pkts_burst,\n \t}\n }\n \n+static __rte_always_inline uint16_t\n+process_dst_port(uint16_t *dst_ports, uint16_t nb_elem)\n+{\n+\tuint16_t i = 0, res;\n+\n+\twhile (nb_elem > 7) {\n+\t\t__vector unsigned short dp = vec_splats((short)dst_ports[0]);\n+\t\t__vector unsigned short dp1;\n+\n+\t\tdp1 = *((__vector unsigned short *)&dst_ports[i]);\n+\t\tres = vec_all_eq(dp1, dp);\n+\t\tif (!res)\n+\t\t\treturn BAD_PORT;\n+\n+\t\tnb_elem -= 8;\n+\t\ti += 8;\n+\t}\n+\n+\twhile (nb_elem) {\n+\t\tif (dst_ports[i] != dst_ports[0])\n+\t\t\treturn BAD_PORT;\n+\t\tnb_elem--;\n+\t\ti++;\n+\t}\n+\n+\treturn dst_ports[0];\n+}\n+\n #endif /* _L3FWD_ALTIVEC_H_ */\ndiff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h\nindex b93841a16f..26c3254004 100644\n--- a/examples/l3fwd/l3fwd_event.h\n+++ b/examples/l3fwd/l3fwd_event.h\n@@ -14,6 +14,14 @@\n \n #include \"l3fwd.h\"\n \n+#if defined(RTE_ARCH_X86)\n+#include \"l3fwd_sse.h\"\n+#elif defined __ARM_NEON\n+#include \"l3fwd_neon.h\"\n+#elif defined(RTE_ARCH_PPC_64)\n+#include \"l3fwd_altivec.h\"\n+#endif\n+\n #define L3FWD_EVENT_SINGLE 0x1\n #define L3FWD_EVENT_BURST 0x2\n #define L3FWD_EVENT_TX_DIRECT 0x4\n@@ -103,7 +111,57 @@ event_vector_txq_set(struct rte_event_vector *vec, uint16_t txq)\n \t}\n }\n \n+static inline uint16_t\n+filter_bad_packets(struct rte_mbuf **mbufs, uint16_t *dst_port,\n+\t\t uint16_t nb_pkts)\n+{\n+\tuint16_t *des_pos, free = 0;\n+\tstruct rte_mbuf **pos;\n+\tint i;\n+\n+\t/* Filter out and free bad packets */\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tif (dst_port[i] == BAD_PORT) {\n+\t\t\trte_pktmbuf_free(mbufs[i]);\n+\t\t\tif (!free) {\n+\t\t\t\tpos = &mbufs[i];\n+\t\t\t\tdes_pos = &dst_port[i];\n+\t\t\t}\n+\t\t\tfree++;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tif (free) {\n+\t\t\t*pos = mbufs[i];\n+\t\t\tpos++;\n+\t\t\t*des_pos = dst_port[i];\n+\t\t\tdes_pos++;\n+\t\t}\n+\t}\n+\n+\treturn nb_pkts - free;\n+}\n+\n+static inline void\n+process_event_vector(struct rte_event_vector *vec, uint16_t *dst_port)\n+{\n+\tuint16_t port, i;\n \n+\tvec->nb_elem = filter_bad_packets(vec->mbufs, dst_port, vec->nb_elem);\n+\t/* Verify destination array */\n+\tport = process_dst_port(dst_port, vec->nb_elem);\n+\tif (port == BAD_PORT) {\n+\t\tvec->attr_valid = 0;\n+\t\tfor (i = 0; i < vec->nb_elem; i++) {\n+\t\t\tvec->mbufs[i]->port = dst_port[i];\n+\t\t\trte_event_eth_tx_adapter_txq_set(vec->mbufs[i], 0);\n+\t\t}\n+\t} else {\n+\t\tvec->attr_valid = 1;\n+\t\tvec->port = port;\n+\t\tvec->queue = 0;\n+\t}\n+}\n \n struct l3fwd_event_resources *l3fwd_get_eventdev_rsrc(void);\n void l3fwd_event_resource_setup(struct rte_eth_conf *port_conf);\ndiff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c\nindex d1b850dd5b..3f67ab01d4 100644\n--- a/examples/l3fwd/l3fwd_lpm.c\n+++ b/examples/l3fwd/l3fwd_lpm.c\n@@ -425,24 +425,22 @@ lpm_event_main_loop_tx_q_burst(__rte_unused void *dummy)\n }\n \n static __rte_always_inline void\n-lpm_process_event_vector(struct rte_event_vector *vec, struct lcore_conf *lconf)\n+lpm_process_event_vector(struct rte_event_vector *vec, struct lcore_conf *lconf,\n+\t\t\t uint16_t *dst_port)\n {\n \tstruct rte_mbuf **mbufs = vec->mbufs;\n \tint i;\n \n-\t/* Process first packet to init vector attributes */\n-\tlpm_process_event_pkt(lconf, mbufs[0]);\n \tif (vec->attr_valid) {\n-\t\tif (mbufs[0]->port != BAD_PORT)\n-\t\t\tvec->port = mbufs[0]->port;\n-\t\telse\n-\t\t\tvec->attr_valid = 0;\n+\t\tl3fwd_lpm_process_packets(vec->nb_elem, mbufs, vec->port,\n+\t\t\t\t\t dst_port, lconf, 1);\n+\t} else {\n+\t\tfor (i = 0; i < vec->nb_elem; i++)\n+\t\t\tl3fwd_lpm_process_packets(1, &mbufs[i], mbufs[i]->port,\n+\t\t\t\t\t\t &dst_port[i], lconf, 1);\n \t}\n \n-\tfor (i = 1; i < vec->nb_elem; i++) {\n-\t\tlpm_process_event_pkt(lconf, mbufs[i]);\n-\t\tevent_vector_attr_validate(vec, mbufs[i]);\n-\t}\n+\tprocess_event_vector(vec, dst_port);\n }\n \n /* Same eventdev loop for single and burst of vector */\n@@ -458,6 +456,7 @@ lpm_event_loop_vector(struct l3fwd_event_resources *evt_rsrc,\n \tstruct rte_event events[MAX_PKT_BURST];\n \tint i, nb_enq = 0, nb_deq = 0;\n \tstruct lcore_conf *lconf;\n+\tuint16_t *dst_port_list;\n \tunsigned int lcore_id;\n \n \tif (event_p_id < 0)\n@@ -465,7 +464,11 @@ lpm_event_loop_vector(struct l3fwd_event_resources *evt_rsrc,\n \n \tlcore_id = rte_lcore_id();\n \tlconf = &lcore_conf[lcore_id];\n-\n+\tdst_port_list =\n+\t\trte_zmalloc(\"\", sizeof(uint16_t) * evt_rsrc->vector_size,\n+\t\t\t RTE_CACHE_LINE_SIZE);\n+\tif (dst_port_list == NULL)\n+\t\treturn;\n \tRTE_LOG(INFO, L3FWD, \"entering %s on lcore %u\\n\", __func__, lcore_id);\n \n \twhile (!force_quit) {\n@@ -483,10 +486,8 @@ lpm_event_loop_vector(struct l3fwd_event_resources *evt_rsrc,\n \t\t\t\tevents[i].op = RTE_EVENT_OP_FORWARD;\n \t\t\t}\n \n-\t\t\tlpm_process_event_vector(events[i].vec, lconf);\n-\n-\t\t\tif (flags & L3FWD_EVENT_TX_DIRECT)\n-\t\t\t\tevent_vector_txq_set(events[i].vec, 0);\n+\t\t\tlpm_process_event_vector(events[i].vec, lconf,\n+\t\t\t\t\t\t dst_port_list);\n \t\t}\n \n \t\tif (flags & L3FWD_EVENT_TX_ENQ) {\ndiff --git a/examples/l3fwd/l3fwd_neon.h b/examples/l3fwd/l3fwd_neon.h\nindex ce515e0bc4..60e6a310e0 100644\n--- a/examples/l3fwd/l3fwd_neon.h\n+++ b/examples/l3fwd/l3fwd_neon.h\n@@ -194,4 +194,47 @@ send_packets_multi(struct lcore_conf *qconf, struct rte_mbuf **pkts_burst,\n \t}\n }\n \n+static __rte_always_inline uint16_t\n+process_dst_port(uint16_t *dst_ports, uint16_t nb_elem)\n+{\n+\tuint16_t i = 0, res;\n+\n+\twhile (nb_elem > 7) {\n+\t\tuint16x8_t dp = vdupq_n_u16(dst_ports[0]);\n+\t\tuint16x8_t dp1;\n+\n+\t\tdp1 = vld1q_u16(&dst_ports[i]);\n+\t\tdp1 = vceqq_u16(dp1, dp);\n+\t\tres = vminvq_u16(dp1);\n+\t\tif (!res)\n+\t\t\treturn BAD_PORT;\n+\n+\t\tnb_elem -= 8;\n+\t\ti += 8;\n+\t}\n+\n+\twhile (nb_elem > 3) {\n+\t\tuint16x4_t dp = vdup_n_u16(dst_ports[0]);\n+\t\tuint16x4_t dp1;\n+\n+\t\tdp1 = vld1_u16(&dst_ports[i]);\n+\t\tdp1 = vceq_u16(dp1, dp);\n+\t\tres = vminv_u16(dp1);\n+\t\tif (!res)\n+\t\t\treturn BAD_PORT;\n+\n+\t\tnb_elem -= 4;\n+\t\ti += 4;\n+\t}\n+\n+\twhile (nb_elem) {\n+\t\tif (dst_ports[i] != dst_ports[0])\n+\t\t\treturn BAD_PORT;\n+\t\tnb_elem--;\n+\t\ti++;\n+\t}\n+\n+\treturn dst_ports[0];\n+}\n+\n #endif /* _L3FWD_NEON_H_ */\ndiff --git a/examples/l3fwd/l3fwd_sse.h b/examples/l3fwd/l3fwd_sse.h\nindex 0f0d0323a2..083729cdef 100644\n--- a/examples/l3fwd/l3fwd_sse.h\n+++ b/examples/l3fwd/l3fwd_sse.h\n@@ -194,4 +194,48 @@ send_packets_multi(struct lcore_conf *qconf, struct rte_mbuf **pkts_burst,\n \t}\n }\n \n+static __rte_always_inline uint16_t\n+process_dst_port(uint16_t *dst_ports, uint16_t nb_elem)\n+{\n+\tuint16_t i = 0, res;\n+\n+\twhile (nb_elem > 7) {\n+\t\t__m128i dp = _mm_set1_epi16(dst_ports[0]);\n+\t\t__m128i dp1;\n+\n+\t\tdp1 = _mm_loadu_si128((__m128i *)&dst_ports[i]);\n+\t\tdp1 = _mm_cmpeq_epi16(dp1, dp);\n+\t\tres = _mm_movemask_epi8(dp1);\n+\t\tif (res != 0xFFFF)\n+\t\t\treturn BAD_PORT;\n+\n+\t\tnb_elem -= 8;\n+\t\ti += 8;\n+\t}\n+\n+\twhile (nb_elem > 3) {\n+\t\t__m128i dp = _mm_set1_epi16(dst_ports[0]);\n+\t\t__m128i dp1;\n+\n+\t\tdp1 = _mm_loadu_si128((__m128i *)&dst_ports[i]);\n+\t\tdp1 = _mm_cmpeq_epi16(dp1, dp);\n+\t\tdp1 = _mm_unpacklo_epi16(dp1, dp1);\n+\t\tres = _mm_movemask_ps((__m128)dp1);\n+\t\tif (res != 0xF)\n+\t\t\treturn BAD_PORT;\n+\n+\t\tnb_elem -= 4;\n+\t\ti += 4;\n+\t}\n+\n+\twhile (nb_elem) {\n+\t\tif (dst_ports[i] != dst_ports[0])\n+\t\t\treturn BAD_PORT;\n+\t\tnb_elem--;\n+\t\ti++;\n+\t}\n+\n+\treturn dst_ports[0];\n+}\n+\n #endif /* _L3FWD_SSE_H_ */\n", "prefixes": [ "3/5" ] }