Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/95229/?format=api
{ "id": 95229, "url": "http://patches.dpdk.org/api/patches/95229/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210702211408.777-4-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": "<20210702211408.777-4-pbhagavatula@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210702211408.777-4-pbhagavatula@marvell.com", "date": "2021-07-02T21:14:05", "name": "[v6,4/7] event/cnxk: add Tx adapter fastpath ops", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "83ab7f0a27c003be7226166d4b1d5a17fe2c3c8d", "submitter": { "id": 1183, "url": "http://patches.dpdk.org/api/people/1183/?format=api", "name": "Pavan Nikhilesh Bhagavatula", "email": "pbhagavatula@marvell.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210702211408.777-4-pbhagavatula@marvell.com/mbox/", "series": [ { "id": 17603, "url": "http://patches.dpdk.org/api/series/17603/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17603", "date": "2021-07-02T21:14:02", "name": "[v6,1/7] event/cnxk: add Rx adapter support", "version": 6, "mbox": "http://patches.dpdk.org/series/17603/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/95229/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/95229/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 2DB87A0C3F;\n\tFri, 2 Jul 2021 23:14:46 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B6EEA41428;\n\tFri, 2 Jul 2021 23:14:28 +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 5160A41427\n for <dev@dpdk.org>; Fri, 2 Jul 2021 23:14:27 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id\n 162LBAZD019871 for <dev@dpdk.org>; Fri, 2 Jul 2021 14:14:26 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com with ESMTP id 39j3y41d5x-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Fri, 02 Jul 2021 14:14:26 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Fri, 2 Jul 2021 14:14:24 -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; Fri, 2 Jul 2021 14:14:24 -0700", "from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.177.176])\n by maili.marvell.com (Postfix) with ESMTP id F2CDD5B6937;\n Fri, 2 Jul 2021 14:14:22 -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=+gACcgNZ0lXcNBJnY1mSMePOPl3PVVwJXizIhRQGdN4=;\n b=CRgkKk68gFAM4PIcUlLJcwO7jXrHrWJHDVFLjIswOlY6C6qnSOGMANLV/VB5AdIHD6j4\n LP8VktJkaE0zpZ7T/zmzdGj6ZtDzF7SUzBfy2cp5PVB5rks9vXxjiHmQwcToGjla5PkC\n dz8toB3B0xsRQtKU/6pUsxwwNm5XjmuLabKV7k1BUDVDhbPzWVq3QSB3UtC328gerni3\n YgmuSxKBI1/SdspojV5z4c/4XaIVHJfPJ/fvfMjdD7MZw7hmqAuIjMa4oApYy1dCBy9h\n X3CMrmdbYwHqkCsDsTqLhPWoZqILY5U5kueon7c7rQ+W1wJUGADoHRLecCd632gA/PPQ ew==", "From": "<pbhagavatula@marvell.com>", "To": "<jerinj@marvell.com>, Pavan Nikhilesh <pbhagavatula@marvell.com>, \"Shijith\n Thotton\" <sthotton@marvell.com>", "CC": "<dev@dpdk.org>", "Date": "Sat, 3 Jul 2021 02:44:05 +0530", "Message-ID": "<20210702211408.777-4-pbhagavatula@marvell.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20210702211408.777-1-pbhagavatula@marvell.com>", "References": "<20210629080109.581-1-pbhagavatula@marvell.com>\n <20210702211408.777-1-pbhagavatula@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "Onk_61mQSZjmCZ5MgHDsipcx_bYJoKdS", "X-Proofpoint-GUID": "Onk_61mQSZjmCZ5MgHDsipcx_bYJoKdS", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790\n definitions=2021-07-02_10:2021-07-02,\n 2021-07-02 signatures=0", "Subject": "[dpdk-dev] [PATCH v6 4/7] event/cnxk: add Tx adapter fastpath ops", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Pavan Nikhilesh <pbhagavatula@marvell.com>\n\nAdd support for event eth Tx adapter fastpath operations.\n\nSigned-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>\n---\n drivers/event/cnxk/cn10k_eventdev.c | 38 ++++++++\n drivers/event/cnxk/cn10k_worker.h | 67 +++++++++++++\n drivers/event/cnxk/cn10k_worker_tx_enq.c | 23 +++++\n drivers/event/cnxk/cn10k_worker_tx_enq_seg.c | 23 +++++\n drivers/event/cnxk/cn9k_eventdev.c | 81 ++++++++++++++++\n drivers/event/cnxk/cn9k_worker.h | 97 +++++++++++++++++++\n drivers/event/cnxk/cn9k_worker_dual_tx_enq.c | 23 +++++\n .../event/cnxk/cn9k_worker_dual_tx_enq_seg.c | 23 +++++\n drivers/event/cnxk/cn9k_worker_tx_enq.c | 23 +++++\n drivers/event/cnxk/cn9k_worker_tx_enq_seg.c | 23 +++++\n drivers/event/cnxk/cnxk_worker.h | 27 +++---\n drivers/event/cnxk/meson.build | 6 ++\n 12 files changed, 440 insertions(+), 14 deletions(-)\n create mode 100644 drivers/event/cnxk/cn10k_worker_tx_enq.c\n create mode 100644 drivers/event/cnxk/cn10k_worker_tx_enq_seg.c\n create mode 100644 drivers/event/cnxk/cn9k_worker_dual_tx_enq.c\n create mode 100644 drivers/event/cnxk/cn9k_worker_dual_tx_enq_seg.c\n create mode 100644 drivers/event/cnxk/cn9k_worker_tx_enq.c\n create mode 100644 drivers/event/cnxk/cn9k_worker_tx_enq_seg.c", "diff": "diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c\nindex 8a9b04a3d..e462f770c 100644\n--- a/drivers/event/cnxk/cn10k_eventdev.c\n+++ b/drivers/event/cnxk/cn10k_eventdev.c\n@@ -328,6 +328,23 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)\n #undef R\n \t\t};\n \n+\t/* Tx modes */\n+\tconst event_tx_adapter_enqueue\n+\t\tsso_hws_tx_adptr_enq[2][2][2][2][2][2] = {\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\t[f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_##name,\n+\t\t\tNIX_TX_FASTPATH_MODES\n+#undef T\n+\t\t};\n+\n+\tconst event_tx_adapter_enqueue\n+\t\tsso_hws_tx_adptr_enq_seg[2][2][2][2][2][2] = {\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\t[f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_seg_##name,\n+\t\t\tNIX_TX_FASTPATH_MODES\n+#undef T\n+\t\t};\n+\n \tevent_dev->enqueue = cn10k_sso_hws_enq;\n \tevent_dev->enqueue_burst = cn10k_sso_hws_enq_burst;\n \tevent_dev->enqueue_new_burst = cn10k_sso_hws_enq_new_burst;\n@@ -407,6 +424,27 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)\n \t\t\t\t[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];\n \t\t}\n \t}\n+\n+\tif (dev->tx_offloads & NIX_TX_MULTI_SEG_F) {\n+\t\t/* [SEC] [TSMP] [MBUF_NOFF] [VLAN] [OL3_L4_CSUM] [L3_L4_CSUM] */\n+\t\tevent_dev->txa_enqueue = sso_hws_tx_adptr_enq_seg\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];\n+\t} else {\n+\t\tevent_dev->txa_enqueue = sso_hws_tx_adptr_enq\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];\n+\t}\n+\n+\tevent_dev->txa_enqueue_same_dest = event_dev->txa_enqueue;\n }\n \n static void\ndiff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h\nindex b724083ca..3c90c8500 100644\n--- a/drivers/event/cnxk/cn10k_worker.h\n+++ b/drivers/event/cnxk/cn10k_worker.h\n@@ -11,6 +11,7 @@\n \n #include \"cn10k_ethdev.h\"\n #include \"cn10k_rx.h\"\n+#include \"cn10k_tx.h\"\n \n /* SSO Operations */\n \n@@ -251,4 +252,70 @@ uint16_t __rte_hot cn10k_sso_hws_enq_fwd_burst(void *port,\n NIX_RX_FASTPATH_MODES\n #undef R\n \n+static __rte_always_inline const struct cn10k_eth_txq *\n+cn10k_sso_hws_xtract_meta(struct rte_mbuf *m,\n+\t\t\t const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT])\n+{\n+\treturn (const struct cn10k_eth_txq *)\n+\t\ttxq_data[m->port][rte_event_eth_tx_adapter_txq_get(m)];\n+}\n+\n+static __rte_always_inline uint16_t\n+cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev,\n+\t\t uint64_t *cmd,\n+\t\t const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT],\n+\t\t const uint32_t flags)\n+{\n+\tconst struct cn10k_eth_txq *txq;\n+\tstruct rte_mbuf *m = ev->mbuf;\n+\tuint16_t ref_cnt = m->refcnt;\n+\tuintptr_t lmt_addr;\n+\tuint16_t lmt_id;\n+\tuintptr_t pa;\n+\n+\tlmt_addr = ws->lmt_base;\n+\tROC_LMT_BASE_ID_GET(lmt_addr, lmt_id);\n+\ttxq = cn10k_sso_hws_xtract_meta(m, txq_data);\n+\tcn10k_nix_tx_skeleton(txq, cmd, flags);\n+\t/* Perform header writes before barrier for TSO */\n+\tif (flags & NIX_TX_OFFLOAD_TSO_F)\n+\t\tcn10k_nix_xmit_prepare_tso(m, flags);\n+\n+\tcn10k_nix_xmit_prepare(m, cmd, lmt_addr, flags, txq->lso_tun_fmt);\n+\tif (flags & NIX_TX_MULTI_SEG_F) {\n+\t\tconst uint16_t segdw =\n+\t\t\tcn10k_nix_prepare_mseg(m, (uint64_t *)lmt_addr, flags);\n+\t\tpa = txq->io_addr | ((segdw - 1) << 4);\n+\t} else {\n+\t\tpa = txq->io_addr | (cn10k_nix_tx_ext_subs(flags) + 1) << 4;\n+\t}\n+\tif (!ev->sched_type)\n+\t\tcnxk_sso_hws_head_wait(ws->tx_base + SSOW_LF_GWS_TAG);\n+\n+\troc_lmt_submit_steorl(lmt_id, pa);\n+\n+\tif (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {\n+\t\tif (ref_cnt > 1)\n+\t\t\treturn 1;\n+\t}\n+\n+\tcnxk_sso_hws_swtag_flush(ws->tx_base + SSOW_LF_GWS_TAG,\n+\t\t\t\t ws->tx_base + SSOW_LF_GWS_OP_SWTAG_FLUSH);\n+\n+\treturn 1;\n+}\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events); \\\n+\tuint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events); \\\n+\tuint16_t __rte_hot cn10k_sso_hws_dual_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events); \\\n+\tuint16_t __rte_hot cn10k_sso_hws_dual_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events);\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\n+\n #endif\ndiff --git a/drivers/event/cnxk/cn10k_worker_tx_enq.c b/drivers/event/cnxk/cn10k_worker_tx_enq.c\nnew file mode 100644\nindex 000000000..f9968ac0d\n--- /dev/null\n+++ b/drivers/event/cnxk/cn10k_worker_tx_enq.c\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2021 Marvell.\n+ */\n+\n+#include \"cn10k_worker.h\"\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events) \\\n+\t{ \\\n+\t\tstruct cn10k_sso_hws *ws = port; \\\n+\t\tuint64_t cmd[sz]; \\\n+\t\t\t\t\t\t\t\t\t \\\n+\t\tRTE_SET_USED(nb_events); \\\n+\t\treturn cn10k_sso_hws_event_tx( \\\n+\t\t\tws, &ev[0], cmd, \\\n+\t\t\t(const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \\\n+\t\t\t\tws->tx_adptr_data, \\\n+\t\t\tflags); \\\n+\t}\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\ndiff --git a/drivers/event/cnxk/cn10k_worker_tx_enq_seg.c b/drivers/event/cnxk/cn10k_worker_tx_enq_seg.c\nnew file mode 100644\nindex 000000000..a24fc42e5\n--- /dev/null\n+++ b/drivers/event/cnxk/cn10k_worker_tx_enq_seg.c\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2021 Marvell.\n+ */\n+\n+#include \"cn10k_worker.h\"\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events) \\\n+\t{ \\\n+\t\tuint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2]; \\\n+\t\tstruct cn10k_sso_hws *ws = port; \\\n+\t\t\t\t\t\t\t\t\t \\\n+\t\tRTE_SET_USED(nb_events); \\\n+\t\treturn cn10k_sso_hws_event_tx( \\\n+\t\t\tws, &ev[0], cmd, \\\n+\t\t\t(const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \\\n+\t\t\t\tws->tx_adptr_data, \\\n+\t\t\t(flags) | NIX_TX_MULTI_SEG_F); \\\n+\t}\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\ndiff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c\nindex 21f80323d..a69edff19 100644\n--- a/drivers/event/cnxk/cn9k_eventdev.c\n+++ b/drivers/event/cnxk/cn9k_eventdev.c\n@@ -430,6 +430,39 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)\n #undef R\n \t\t};\n \n+\t/* Tx modes */\n+\tconst event_tx_adapter_enqueue\n+\t\tsso_hws_tx_adptr_enq[2][2][2][2][2][2] = {\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_tx_adptr_enq_##name,\n+\t\t\tNIX_TX_FASTPATH_MODES\n+#undef T\n+\t\t};\n+\n+\tconst event_tx_adapter_enqueue\n+\t\tsso_hws_tx_adptr_enq_seg[2][2][2][2][2][2] = {\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_tx_adptr_enq_seg_##name,\n+\t\t\tNIX_TX_FASTPATH_MODES\n+#undef T\n+\t\t};\n+\n+\tconst event_tx_adapter_enqueue\n+\t\tsso_hws_dual_tx_adptr_enq[2][2][2][2][2][2] = {\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_tx_adptr_enq_##name,\n+\t\t\tNIX_TX_FASTPATH_MODES\n+#undef T\n+\t\t};\n+\n+\tconst event_tx_adapter_enqueue\n+\t\tsso_hws_dual_tx_adptr_enq_seg[2][2][2][2][2][2] = {\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_tx_adptr_enq_seg_##name,\n+\t\t\tNIX_TX_FASTPATH_MODES\n+#undef T\n+\t\t};\n+\n \tevent_dev->enqueue = cn9k_sso_hws_enq;\n \tevent_dev->enqueue_burst = cn9k_sso_hws_enq_burst;\n \tevent_dev->enqueue_new_burst = cn9k_sso_hws_enq_new_burst;\n@@ -510,6 +543,25 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)\n \t\t}\n \t}\n \n+\tif (dev->tx_offloads & NIX_TX_MULTI_SEG_F) {\n+\t\t/* [SEC] [TSMP] [MBUF_NOFF] [VLAN] [OL3_L4_CSUM] [L3_L4_CSUM] */\n+\t\tevent_dev->txa_enqueue = sso_hws_tx_adptr_enq_seg\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];\n+\t} else {\n+\t\tevent_dev->txa_enqueue = sso_hws_tx_adptr_enq\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]\n+\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];\n+\t}\n+\n \tif (dev->dual_ws) {\n \t\tevent_dev->enqueue = cn9k_sso_hws_dual_enq;\n \t\tevent_dev->enqueue_burst = cn9k_sso_hws_dual_enq_burst;\n@@ -618,8 +670,37 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)\n \t\t\t\t\t\t NIX_RX_OFFLOAD_RSS_F)];\n \t\t\t}\n \t\t}\n+\n+\t\tif (dev->tx_offloads & NIX_TX_MULTI_SEG_F) {\n+\t\t\t/* [TSMP] [MBUF_NOFF] [VLAN] [OL3_L4_CSUM] [L3_L4_CSUM]\n+\t\t\t */\n+\t\t\tevent_dev->txa_enqueue = sso_hws_dual_tx_adptr_enq_seg\n+\t\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]\n+\t\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_MBUF_NOFF_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_VLAN_QINQ_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_L3_L4_CSUM_F)];\n+\t\t} else {\n+\t\t\tevent_dev->txa_enqueue = sso_hws_dual_tx_adptr_enq\n+\t\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]\n+\t\t\t\t[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_MBUF_NOFF_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_VLAN_QINQ_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]\n+\t\t\t\t[!!(dev->tx_offloads &\n+\t\t\t\t NIX_TX_OFFLOAD_L3_L4_CSUM_F)];\n+\t\t}\n \t}\n \n+\tevent_dev->txa_enqueue_same_dest = event_dev->txa_enqueue;\n \trte_mb();\n }\n \ndiff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h\nindex c01c00e1d..3f9751211 100644\n--- a/drivers/event/cnxk/cn9k_worker.h\n+++ b/drivers/event/cnxk/cn9k_worker.h\n@@ -11,6 +11,7 @@\n \n #include \"cn9k_ethdev.h\"\n #include \"cn9k_rx.h\"\n+#include \"cn9k_tx.h\"\n \n /* SSO Operations */\n \n@@ -416,4 +417,100 @@ NIX_RX_FASTPATH_MODES\n NIX_RX_FASTPATH_MODES\n #undef R\n \n+static __rte_always_inline void\n+cn9k_sso_txq_fc_wait(const struct cn9k_eth_txq *txq)\n+{\n+\twhile (!(((txq)->nb_sqb_bufs_adj - *(txq)->fc_mem)\n+\t\t << (txq)->sqes_per_sqb_log2))\n+\t\t;\n+}\n+\n+static __rte_always_inline const struct cn9k_eth_txq *\n+cn9k_sso_hws_xtract_meta(struct rte_mbuf *m,\n+\t\t\t const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT])\n+{\n+\treturn (const struct cn9k_eth_txq *)\n+\t\ttxq_data[m->port][rte_event_eth_tx_adapter_txq_get(m)];\n+}\n+\n+static __rte_always_inline void\n+cn9k_sso_hws_prepare_pkt(const struct cn9k_eth_txq *txq, struct rte_mbuf *m,\n+\t\t\t uint64_t *cmd, const uint32_t flags)\n+{\n+\troc_lmt_mov(cmd, txq->cmd, cn9k_nix_tx_ext_subs(flags));\n+\tcn9k_nix_xmit_prepare(m, cmd, flags, txq->lso_tun_fmt);\n+}\n+\n+static __rte_always_inline uint16_t\n+cn9k_sso_hws_event_tx(uint64_t base, struct rte_event *ev, uint64_t *cmd,\n+\t\t const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT],\n+\t\t const uint32_t flags)\n+{\n+\tstruct rte_mbuf *m = ev->mbuf;\n+\tconst struct cn9k_eth_txq *txq;\n+\tuint16_t ref_cnt = m->refcnt;\n+\n+\t/* Perform header writes before barrier for TSO */\n+\tcn9k_nix_xmit_prepare_tso(m, flags);\n+\t/* Lets commit any changes in the packet here in case when\n+\t * fast free is set as no further changes will be made to mbuf.\n+\t * In case of fast free is not set, both cn9k_nix_prepare_mseg()\n+\t * and cn9k_nix_xmit_prepare() has a barrier after refcnt update.\n+\t */\n+\tif (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F))\n+\t\trte_io_wmb();\n+\ttxq = cn9k_sso_hws_xtract_meta(m, txq_data);\n+\tcn9k_sso_hws_prepare_pkt(txq, m, cmd, flags);\n+\n+\tif (flags & NIX_TX_MULTI_SEG_F) {\n+\t\tconst uint16_t segdw = cn9k_nix_prepare_mseg(m, cmd, flags);\n+\t\tif (!CNXK_TT_FROM_EVENT(ev->event)) {\n+\t\t\tcn9k_nix_xmit_mseg_prep_lmt(cmd, txq->lmt_addr, segdw);\n+\t\t\tcnxk_sso_hws_head_wait(base + SSOW_LF_GWS_TAG);\n+\t\t\tcn9k_sso_txq_fc_wait(txq);\n+\t\t\tif (cn9k_nix_xmit_submit_lmt(txq->io_addr) == 0)\n+\t\t\t\tcn9k_nix_xmit_mseg_one(cmd, txq->lmt_addr,\n+\t\t\t\t\t\t txq->io_addr, segdw);\n+\t\t} else {\n+\t\t\tcn9k_nix_xmit_mseg_one(cmd, txq->lmt_addr, txq->io_addr,\n+\t\t\t\t\t segdw);\n+\t\t}\n+\t} else {\n+\t\tif (!CNXK_TT_FROM_EVENT(ev->event)) {\n+\t\t\tcn9k_nix_xmit_prep_lmt(cmd, txq->lmt_addr, flags);\n+\t\t\tcnxk_sso_hws_head_wait(base + SSOW_LF_GWS_TAG);\n+\t\t\tcn9k_sso_txq_fc_wait(txq);\n+\t\t\tif (cn9k_nix_xmit_submit_lmt(txq->io_addr) == 0)\n+\t\t\t\tcn9k_nix_xmit_one(cmd, txq->lmt_addr,\n+\t\t\t\t\t\t txq->io_addr, flags);\n+\t\t} else {\n+\t\t\tcn9k_nix_xmit_one(cmd, txq->lmt_addr, txq->io_addr,\n+\t\t\t\t\t flags);\n+\t\t}\n+\t}\n+\n+\tif (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {\n+\t\tif (ref_cnt > 1)\n+\t\t\treturn 1;\n+\t}\n+\n+\tcnxk_sso_hws_swtag_flush(base + SSOW_LF_GWS_TAG,\n+\t\t\t\t base + SSOW_LF_GWS_OP_SWTAG_FLUSH);\n+\n+\treturn 1;\n+}\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn9k_sso_hws_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events); \\\n+\tuint16_t __rte_hot cn9k_sso_hws_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events); \\\n+\tuint16_t __rte_hot cn9k_sso_hws_dual_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events); \\\n+\tuint16_t __rte_hot cn9k_sso_hws_dual_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events);\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\n+\n #endif\ndiff --git a/drivers/event/cnxk/cn9k_worker_dual_tx_enq.c b/drivers/event/cnxk/cn9k_worker_dual_tx_enq.c\nnew file mode 100644\nindex 000000000..92e2981f0\n--- /dev/null\n+++ b/drivers/event/cnxk/cn9k_worker_dual_tx_enq.c\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2021 Marvell.\n+ */\n+\n+#include \"cn9k_worker.h\"\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn9k_sso_hws_dual_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events) \\\n+\t{ \\\n+\t\tstruct cn9k_sso_hws_dual *ws = port; \\\n+\t\tuint64_t cmd[sz]; \\\n+\t\t\t\t\t\t\t\t\t \\\n+\t\tRTE_SET_USED(nb_events); \\\n+\t\treturn cn9k_sso_hws_event_tx( \\\n+\t\t\tws->base[!ws->vws], &ev[0], cmd, \\\n+\t\t\t(const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \\\n+\t\t\t\tws->tx_adptr_data, \\\n+\t\t\tflags); \\\n+\t}\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\ndiff --git a/drivers/event/cnxk/cn9k_worker_dual_tx_enq_seg.c b/drivers/event/cnxk/cn9k_worker_dual_tx_enq_seg.c\nnew file mode 100644\nindex 000000000..dfb574cf9\n--- /dev/null\n+++ b/drivers/event/cnxk/cn9k_worker_dual_tx_enq_seg.c\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2021 Marvell.\n+ */\n+\n+#include \"cn9k_worker.h\"\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn9k_sso_hws_dual_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events) \\\n+\t{ \\\n+\t\tuint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2]; \\\n+\t\tstruct cn9k_sso_hws_dual *ws = port; \\\n+\t\t\t\t\t\t\t\t\t \\\n+\t\tRTE_SET_USED(nb_events); \\\n+\t\treturn cn9k_sso_hws_event_tx( \\\n+\t\t\tws->base[!ws->vws], &ev[0], cmd, \\\n+\t\t\t(const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \\\n+\t\t\t\tws->tx_adptr_data, \\\n+\t\t\t(flags) | NIX_TX_MULTI_SEG_F); \\\n+\t}\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\ndiff --git a/drivers/event/cnxk/cn9k_worker_tx_enq.c b/drivers/event/cnxk/cn9k_worker_tx_enq.c\nnew file mode 100644\nindex 000000000..3df649c0c\n--- /dev/null\n+++ b/drivers/event/cnxk/cn9k_worker_tx_enq.c\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2021 Marvell.\n+ */\n+\n+#include \"cn9k_worker.h\"\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn9k_sso_hws_tx_adptr_enq_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events) \\\n+\t{ \\\n+\t\tstruct cn9k_sso_hws *ws = port; \\\n+\t\tuint64_t cmd[sz]; \\\n+\t\t\t\t\t\t\t\t\t \\\n+\t\tRTE_SET_USED(nb_events); \\\n+\t\treturn cn9k_sso_hws_event_tx( \\\n+\t\t\tws->base, &ev[0], cmd, \\\n+\t\t\t(const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \\\n+\t\t\t\tws->tx_adptr_data, \\\n+\t\t\tflags); \\\n+\t}\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\ndiff --git a/drivers/event/cnxk/cn9k_worker_tx_enq_seg.c b/drivers/event/cnxk/cn9k_worker_tx_enq_seg.c\nnew file mode 100644\nindex 000000000..0efe29113\n--- /dev/null\n+++ b/drivers/event/cnxk/cn9k_worker_tx_enq_seg.c\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2021 Marvell.\n+ */\n+\n+#include \"cn9k_worker.h\"\n+\n+#define T(name, f5, f4, f3, f2, f1, f0, sz, flags) \\\n+\tuint16_t __rte_hot cn9k_sso_hws_tx_adptr_enq_seg_##name( \\\n+\t\tvoid *port, struct rte_event ev[], uint16_t nb_events) \\\n+\t{ \\\n+\t\tuint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2]; \\\n+\t\tstruct cn9k_sso_hws *ws = port; \\\n+\t\t\t\t\t\t\t\t\t \\\n+\t\tRTE_SET_USED(nb_events); \\\n+\t\treturn cn9k_sso_hws_event_tx( \\\n+\t\t\tws->base, &ev[0], cmd, \\\n+\t\t\t(const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \\\n+\t\t\t\tws->tx_adptr_data, \\\n+\t\t\t(flags) | NIX_TX_MULTI_SEG_F); \\\n+\t}\n+\n+NIX_TX_FASTPATH_MODES\n+#undef T\ndiff --git a/drivers/event/cnxk/cnxk_worker.h b/drivers/event/cnxk/cnxk_worker.h\nindex 4eb46ae16..7891b749d 100644\n--- a/drivers/event/cnxk/cnxk_worker.h\n+++ b/drivers/event/cnxk/cnxk_worker.h\n@@ -79,21 +79,20 @@ static __rte_always_inline void\n cnxk_sso_hws_head_wait(uintptr_t tag_op)\n {\n #ifdef RTE_ARCH_ARM64\n-\tuint64_t swtp;\n-\n-\tasm volatile(PLT_CPU_FEATURE_PREAMBLE\n-\t\t \"\t\tldr %[swtb], [%[swtp_loc]]\t\\n\"\n-\t\t \"\t\ttbz %[swtb], 35, done%=\t\t\\n\"\n-\t\t \"\t\tsevl\t\t\t\t\\n\"\n-\t\t \"rty%=:\twfe\t\t\t\t\\n\"\n-\t\t \"\t\tldr %[swtb], [%[swtp_loc]]\t\\n\"\n-\t\t \"\t\ttbnz %[swtb], 35, rty%=\t\t\\n\"\n-\t\t \"done%=:\t\t\t\t\t\\n\"\n-\t\t : [swtb] \"=&r\"(swtp)\n-\t\t : [swtp_loc] \"r\"(tag_op));\n+\tuint64_t tag;\n+\n+\tasm volatile(\" ldr %[tag], [%[tag_op]] \\n\"\n+\t\t \" tbnz %[tag], 35, done%= \\n\"\n+\t\t \" sevl \\n\"\n+\t\t \"rty%=: wfe \\n\"\n+\t\t \" ldr %[tag], [%[tag_op]] \\n\"\n+\t\t \" tbz %[tag], 35, rty%= \\n\"\n+\t\t \"done%=: \\n\"\n+\t\t : [tag] \"=&r\"(tag)\n+\t\t : [tag_op] \"r\"(tag_op));\n #else\n-\t/* Wait for the SWTAG/SWTAG_FULL operation */\n-\twhile (plt_read64(tag_op) & BIT_ULL(35))\n+\t/* Wait for the HEAD to be set */\n+\twhile (!(plt_read64(tag_op) & BIT_ULL(35)))\n \t\t;\n #endif\n }\ndiff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build\nindex c5c1c0ee8..13e0634e8 100644\n--- a/drivers/event/cnxk/meson.build\n+++ b/drivers/event/cnxk/meson.build\n@@ -17,11 +17,17 @@ sources = files(\n 'cn9k_worker_dual_deq.c',\n 'cn9k_worker_dual_deq_burst.c',\n 'cn9k_worker_dual_deq_tmo.c',\n+ 'cn9k_worker_tx_enq.c',\n+ 'cn9k_worker_tx_enq_seg.c',\n+ 'cn9k_worker_dual_tx_enq.c',\n+ 'cn9k_worker_dual_tx_enq_seg.c',\n 'cn10k_eventdev.c',\n 'cn10k_worker.c',\n 'cn10k_worker_deq.c',\n 'cn10k_worker_deq_burst.c',\n 'cn10k_worker_deq_tmo.c',\n+ 'cn10k_worker_tx_enq.c',\n+ 'cn10k_worker_tx_enq_seg.c',\n 'cnxk_eventdev.c',\n 'cnxk_eventdev_adptr.c',\n 'cnxk_eventdev_selftest.c',\n", "prefixes": [ "v6", "4/7" ] }