Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/83080/?format=api
{ "id": 83080, "url": "http://patches.dpdk.org/api/patches/83080/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1604101900-19657-21-git-send-email-timothy.mcdaniel@intel.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": "<1604101900-19657-21-git-send-email-timothy.mcdaniel@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1604101900-19657-21-git-send-email-timothy.mcdaniel@intel.com", "date": "2020-10-30T23:51:37", "name": "[v7,20/23] event/dlb2: add PMD's token pop public interface", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1f361c0e6811e5650c8255a6f1ca20c1f54a41ca", "submitter": { "id": 826, "url": "http://patches.dpdk.org/api/people/826/?format=api", "name": "Timothy McDaniel", "email": "timothy.mcdaniel@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1604101900-19657-21-git-send-email-timothy.mcdaniel@intel.com/mbox/", "series": [ { "id": 13513, "url": "http://patches.dpdk.org/api/series/13513/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13513", "date": "2020-10-30T23:51:17", "name": "Add DLB2 PMD", "version": 7, "mbox": "http://patches.dpdk.org/series/13513/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/83080/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/83080/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 42378A04E6;\n\tSat, 31 Oct 2020 00:55:00 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A0EDEC802;\n\tSat, 31 Oct 2020 00:51:25 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by dpdk.org (Postfix) with ESMTP id 35FB6C83E\n for <dev@dpdk.org>; Sat, 31 Oct 2020 00:50:13 +0100 (CET)", "from orsmga003.jf.intel.com ([10.7.209.27])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 30 Oct 2020 16:50:12 -0700", "from txasoft-yocto.an.intel.com ([10.123.72.192])\n by orsmga003.jf.intel.com with ESMTP; 30 Oct 2020 16:50:11 -0700" ], "IronPort-SDR": [ "\n 8ZH/mdgnCMMnvQNjsmfasqENx0tAsouWrWZcctxmfknTblWKrLkF/TezQjpp3wHQUGRiNZu8E+\n kb+sJZ67gkGg==", "\n 4WL9rE6J3cNHhOOvxZ489gWg463fwRzQRIsL5G3DnkMTscdEfJgB8mH2SbIYfXqeVyTgMfaceR\n +vMy8f5bWBwA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9790\"; a=\"148536727\"", "E=Sophos;i=\"5.77,435,1596524400\"; d=\"scan'208\";a=\"148536727\"", "E=Sophos;i=\"5.77,435,1596524400\"; d=\"scan'208\";a=\"319474394\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Timothy McDaniel <timothy.mcdaniel@intel.com>", "To": "Ray Kinsella <mdr@ashroe.eu>,\n\tNeil Horman <nhorman@tuxdriver.com>", "Cc": "dev@dpdk.org, erik.g.carrillo@intel.com, gage.eads@intel.com,\n harry.van.haaren@intel.com, jerinj@marvell.com, thomas@monjalon.net", "Date": "Fri, 30 Oct 2020 18:51:37 -0500", "Message-Id": "<1604101900-19657-21-git-send-email-timothy.mcdaniel@intel.com>", "X-Mailer": "git-send-email 1.7.10", "In-Reply-To": "<1604101900-19657-1-git-send-email-timothy.mcdaniel@intel.com>", "References": "<1602958879-8558-2-git-send-email-timothy.mcdaniel@intel.com>\n <1604101900-19657-1-git-send-email-timothy.mcdaniel@intel.com>", "Subject": "[dpdk-dev] [PATCH v7 20/23] event/dlb2: add PMD's token pop public\n\tinterface", "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": "The PMD uses a public interface to allow applications to\ncontrol the token pop mode. Supported token pop modes are\nas follows, and they impact core scheduling affinity for\nldb ports.\n\nAUTO_POP: Pop the CQ tokens immediately after dequeueing.\nDELAYED_POP: Pop CQ tokens after (dequeue_depth - 1) events\n are released. Supported on load-balanced ports\n only.\nDEFERRED_POP: Pop the CQ tokens during next dequeue operation.\n\nSigned-off-by: Timothy McDaniel <timothy.mcdaniel@intel.com>\nReviewed-by: Gage Eads <gage.eads@intel.com>\n---\n doc/api/doxy-api-index.md | 1 +\n drivers/event/dlb2/dlb2.c | 53 ++++++++++++++++++++++++----\n drivers/event/dlb2/dlb2_priv.h | 3 ++\n drivers/event/dlb2/meson.build | 5 ++-\n drivers/event/dlb2/rte_pmd_dlb2.c | 39 +++++++++++++++++++++\n drivers/event/dlb2/rte_pmd_dlb2.h | 72 +++++++++++++++++++++++++++++++++++++++\n drivers/event/dlb2/version.map | 6 ++++\n 7 files changed, 172 insertions(+), 7 deletions(-)\n create mode 100644 drivers/event/dlb2/rte_pmd_dlb2.c\n create mode 100644 drivers/event/dlb2/rte_pmd_dlb2.h", "diff": "diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md\nindex a9c12d1..00f13e2 100644\n--- a/doc/api/doxy-api-index.md\n+++ b/doc/api/doxy-api-index.md\n@@ -52,6 +52,7 @@ The public API headers are grouped by topics:\n [dpaa2_cmdif] (@ref rte_pmd_dpaa2_cmdif.h),\n [dpaa2_qdma] (@ref rte_pmd_dpaa2_qdma.h),\n [crypto_scheduler] (@ref rte_cryptodev_scheduler.h)\n+ [dlb2]\t (@ref rte_pmd_dlb2.h)\n \n - **memory**:\n [memseg] (@ref rte_memory.h),\ndiff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c\nindex 82108b6..7a22231 100644\n--- a/drivers/event/dlb2/dlb2.c\n+++ b/drivers/event/dlb2/dlb2.c\n@@ -1197,7 +1197,7 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2,\n \tqm_port->qid_mappings = &dlb2->qm_ldb_to_ev_queue_id[0];\n \n \tqm_port->dequeue_depth = dequeue_depth;\n-\n+\tqm_port->token_pop_thresh = dequeue_depth;\n \tqm_port->owed_tokens = 0;\n \tqm_port->issued_releases = 0;\n \n@@ -1365,6 +1365,8 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2,\n \n \tqm_port->dequeue_depth = dequeue_depth;\n \n+\t/* Directed ports are auto-pop, by default. */\n+\tqm_port->token_pop_mode = AUTO_POP;\n \tqm_port->owed_tokens = 0;\n \tqm_port->issued_releases = 0;\n \n@@ -2612,6 +2614,14 @@ dlb2_event_enqueue_burst(void *event_port,\n \t\tdlb2_event_build_hcws(qm_port, &events[i], j,\n \t\t\t\t sched_types, queue_ids);\n \n+\t\tif (qm_port->token_pop_mode == DELAYED_POP && j < 4 &&\n+\t\t qm_port->issued_releases >= qm_port->token_pop_thresh - 1) {\n+\t\t\tdlb2_construct_token_pop_qe(qm_port, j);\n+\n+\t\t\t/* Reset the releases counter for the next QE batch */\n+\t\t\tqm_port->issued_releases -= qm_port->token_pop_thresh;\n+\t\t}\n+\n \t\tdlb2_hw_do_enqueue(qm_port, i == 0, port_data);\n \n \t\tcnt += j;\n@@ -2620,6 +2630,11 @@ dlb2_event_enqueue_burst(void *event_port,\n \t\t\tbreak;\n \t}\n \n+\tif (qm_port->token_pop_mode == DELAYED_POP &&\n+\t qm_port->issued_releases >= qm_port->token_pop_thresh - 1) {\n+\t\tdlb2_consume_qe_immediate(qm_port, qm_port->owed_tokens);\n+\t\tqm_port->issued_releases -= qm_port->token_pop_thresh;\n+\t}\n \treturn cnt;\n }\n \n@@ -3097,11 +3112,25 @@ dlb2_event_release(struct dlb2_eventdev *dlb2,\n \t\tif (j == 0)\n \t\t\tbreak;\n \n+\t\tif (qm_port->token_pop_mode == DELAYED_POP && j < 4 &&\n+\t\t qm_port->issued_releases >= qm_port->token_pop_thresh - 1) {\n+\t\t\tdlb2_construct_token_pop_qe(qm_port, j);\n+\n+\t\t\t/* Reset the releases counter for the next QE batch */\n+\t\t\tqm_port->issued_releases -= qm_port->token_pop_thresh;\n+\t\t}\n+\n \t\tdlb2_hw_do_enqueue(qm_port, i == 0, port_data);\n \n \t\tcnt += j;\n \t}\n \n+\tif (qm_port->token_pop_mode == DELAYED_POP &&\n+\t qm_port->issued_releases >= qm_port->token_pop_thresh - 1) {\n+\t\tdlb2_consume_qe_immediate(qm_port, qm_port->owed_tokens);\n+\t\tqm_port->issued_releases -= qm_port->token_pop_thresh;\n+\t}\n+\n sw_credit_update:\n \t/* each release returns one credit */\n \tif (!ev_port->outstanding_releases) {\n@@ -3185,8 +3214,8 @@ dlb2_hw_dequeue_sparse(struct dlb2_eventdev *dlb2,\n \tqm_port->owed_tokens += num;\n \n \tif (num) {\n-\n-\t\tdlb2_consume_qe_immediate(qm_port, num);\n+\t\tif (qm_port->token_pop_mode == AUTO_POP)\n+\t\t\tdlb2_consume_qe_immediate(qm_port, num);\n \n \t\tev_port->outstanding_releases += num;\n \n@@ -3312,8 +3341,8 @@ dlb2_hw_dequeue(struct dlb2_eventdev *dlb2,\n \tqm_port->owed_tokens += num;\n \n \tif (num) {\n-\n-\t\tdlb2_consume_qe_immediate(qm_port, num);\n+\t\tif (qm_port->token_pop_mode == AUTO_POP)\n+\t\t\tdlb2_consume_qe_immediate(qm_port, num);\n \n \t\tev_port->outstanding_releases += num;\n \n@@ -3328,6 +3357,7 @@ dlb2_event_dequeue_burst(void *event_port, struct rte_event *ev, uint16_t num,\n \t\t\t uint64_t wait)\n {\n \tstruct dlb2_eventdev_port *ev_port = event_port;\n+\tstruct dlb2_port *qm_port = &ev_port->qm_port;\n \tstruct dlb2_eventdev *dlb2 = ev_port->dlb2;\n \tuint16_t cnt;\n \n@@ -3343,6 +3373,9 @@ dlb2_event_dequeue_burst(void *event_port, struct rte_event *ev, uint16_t num,\n \t\tDLB2_INC_STAT(ev_port->stats.tx_implicit_rel, out_rels);\n \t}\n \n+\tif (qm_port->token_pop_mode == DEFERRED_POP && qm_port->owed_tokens)\n+\t\tdlb2_consume_qe_immediate(qm_port, qm_port->owed_tokens);\n+\n \tcnt = dlb2_hw_dequeue(dlb2, ev_port, ev, num, wait);\n \n \tDLB2_INC_STAT(ev_port->stats.traffic.total_polls, 1);\n@@ -3362,6 +3395,7 @@ dlb2_event_dequeue_burst_sparse(void *event_port, struct rte_event *ev,\n \t\t\t\tuint16_t num, uint64_t wait)\n {\n \tstruct dlb2_eventdev_port *ev_port = event_port;\n+\tstruct dlb2_port *qm_port = &ev_port->qm_port;\n \tstruct dlb2_eventdev *dlb2 = ev_port->dlb2;\n \tuint16_t cnt;\n \n@@ -3377,6 +3411,9 @@ dlb2_event_dequeue_burst_sparse(void *event_port, struct rte_event *ev,\n \t\tDLB2_INC_STAT(ev_port->stats.tx_implicit_rel, out_rels);\n \t}\n \n+\tif (qm_port->token_pop_mode == DEFERRED_POP && qm_port->owed_tokens)\n+\t\tdlb2_consume_qe_immediate(qm_port, qm_port->owed_tokens);\n+\n \tcnt = dlb2_hw_dequeue_sparse(dlb2, ev_port, ev, num, wait);\n \n \tDLB2_INC_STAT(ev_port->stats.traffic.total_polls, 1);\n@@ -3681,7 +3718,7 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev,\n \t\t\t struct dlb2_devargs *dlb2_args)\n {\n \tstruct dlb2_eventdev *dlb2;\n-\tint err;\n+\tint err, i;\n \n \tdlb2 = dev->data->dev_private;\n \n@@ -3731,6 +3768,10 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev,\n \t\treturn err;\n \t}\n \n+\t/* Initialize each port's token pop mode */\n+\tfor (i = 0; i < DLB2_MAX_NUM_PORTS; i++)\n+\t\tdlb2->ev_ports[i].qm_port.token_pop_mode = AUTO_POP;\n+\n \trte_spinlock_init(&dlb2->qm_instance.resource_lock);\n \n \tdlb2_iface_low_level_io_init();\ndiff --git a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h\nindex 61567a6..b73cf3f 100644\n--- a/drivers/event/dlb2/dlb2_priv.h\n+++ b/drivers/event/dlb2/dlb2_priv.h\n@@ -12,6 +12,7 @@\n #include <rte_config.h>\n #include \"dlb2_user.h\"\n #include \"dlb2_log.h\"\n+#include \"rte_pmd_dlb2.h\"\n \n #ifndef RTE_LIBRTE_PMD_DLB2_QUELL_STATS\n #define DLB2_INC_STAT(_stat, _incr_val) ((_stat) += _incr_val)\n@@ -290,6 +291,7 @@ struct dlb2_port {\n \tbool gen_bit;\n \tuint16_t dir_credits;\n \tuint32_t dequeue_depth;\n+\tenum dlb2_token_pop_mode token_pop_mode;\n \tunion dlb2_port_config cfg;\n \tuint32_t *credit_pool[DLB2_NUM_QUEUE_TYPES]; /* use __atomic builtins */\n \tuint16_t cached_ldb_credits;\n@@ -298,6 +300,7 @@ struct dlb2_port {\n \tbool int_armed;\n \tuint16_t owed_tokens;\n \tint16_t issued_releases;\n+\tint16_t token_pop_thresh;\n \tint cq_depth;\n \tuint16_t cq_idx;\n \tuint16_t cq_idx_unmasked;\ndiff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build\nindex dc16c96..b734ff6 100644\n--- a/drivers/event/dlb2/meson.build\n+++ b/drivers/event/dlb2/meson.build\n@@ -1,3 +1,4 @@\n+\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2019-2020 Intel Corporation\n \n@@ -12,7 +13,9 @@ sources = files('dlb2.c',\n \t\t'dlb2_xstats.c',\n \t\t'pf/dlb2_main.c',\n \t\t'pf/dlb2_pf.c',\n-\t\t'pf/base/dlb2_resource.c'\n+\t\t'pf/base/dlb2_resource.c',\n+\t\t'rte_pmd_dlb2.c'\n )\n \n deps += ['mbuf', 'mempool', 'ring', 'pci', 'bus_pci']\n+install_headers('rte_pmd_dlb2.h')\ndiff --git a/drivers/event/dlb2/rte_pmd_dlb2.c b/drivers/event/dlb2/rte_pmd_dlb2.c\nnew file mode 100644\nindex 0000000..b09b585\n--- /dev/null\n+++ b/drivers/event/dlb2/rte_pmd_dlb2.c\n@@ -0,0 +1,39 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2020 Intel Corporation\n+ */\n+\n+#include <rte_eventdev.h>\n+#include <rte_eventdev_pmd.h>\n+\n+#include \"rte_pmd_dlb2.h\"\n+#include \"dlb2_priv.h\"\n+#include \"dlb2_inline_fns.h\"\n+\n+int\n+rte_pmd_dlb2_set_token_pop_mode(uint8_t dev_id,\n+\t\t\t\tuint8_t port_id,\n+\t\t\t\tenum dlb2_token_pop_mode mode)\n+{\n+\tstruct dlb2_eventdev *dlb2;\n+\tstruct rte_eventdev *dev;\n+\n+\tRTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);\n+\tdev = &rte_eventdevs[dev_id];\n+\n+\tdlb2 = dlb2_pmd_priv(dev);\n+\n+\tif (mode >= NUM_TOKEN_POP_MODES)\n+\t\treturn -EINVAL;\n+\n+\t/* The event device must be configured, but not yet started */\n+\tif (!dlb2->configured || dlb2->run_state != DLB2_RUN_STATE_STOPPED)\n+\t\treturn -EINVAL;\n+\n+\t/* The token pop mode must be set before configuring the port */\n+\tif (port_id >= dlb2->num_ports || dlb2->ev_ports[port_id].setup_done)\n+\t\treturn -EINVAL;\n+\n+\tdlb2->ev_ports[port_id].qm_port.token_pop_mode = mode;\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/event/dlb2/rte_pmd_dlb2.h b/drivers/event/dlb2/rte_pmd_dlb2.h\nnew file mode 100644\nindex 0000000..74399db\n--- /dev/null\n+++ b/drivers/event/dlb2/rte_pmd_dlb2.h\n@@ -0,0 +1,72 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2020 Intel Corporation\n+ */\n+\n+/*!\n+ * @file rte_pmd_dlb2.h\n+ *\n+ * @brief DLB PMD-specific functions\n+ */\n+\n+#ifndef _RTE_PMD_DLB2_H_\n+#define _RTE_PMD_DLB2_H_\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+#include <stdint.h>\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice\n+ *\n+ * Selects the token pop mode for a DLB2 port.\n+ */\n+enum dlb2_token_pop_mode {\n+\t/* Pop the CQ tokens immediately after dequeueing. */\n+\tAUTO_POP,\n+\t/* Pop CQ tokens after (dequeue_depth - 1) events are released.\n+\t * Supported on load-balanced ports only.\n+\t */\n+\tDELAYED_POP,\n+\t/* Pop the CQ tokens during next dequeue operation. */\n+\tDEFERRED_POP,\n+\n+\t/* NUM_TOKEN_POP_MODES must be last */\n+\tNUM_TOKEN_POP_MODES\n+};\n+\n+/*!\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice\n+ *\n+ * Configure the token pop mode for a DLB2 port. By default, all ports use\n+ * AUTO_POP. This function must be called before calling rte_event_port_setup()\n+ * for the port, but after calling rte_event_dev_configure().\n+ *\n+ * @param dev_id\n+ * The identifier of the event device.\n+ * @param port_id\n+ * The identifier of the event port.\n+ * @param mode\n+ * The token pop mode.\n+ *\n+ * @return\n+ * - 0: Success\n+ * - EINVAL: Invalid dev_id, port_id, or mode\n+ * - EINVAL: The DLB2 is not configured, is already running, or the port is\n+ * already setup\n+ */\n+\n+__rte_experimental\n+int\n+rte_pmd_dlb2_set_token_pop_mode(uint8_t dev_id,\n+\t\t\t\tuint8_t port_id,\n+\t\t\t\tenum dlb2_token_pop_mode mode);\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif /* _RTE_PMD_DLB2_H_ */\ndiff --git a/drivers/event/dlb2/version.map b/drivers/event/dlb2/version.map\nindex 4a76d1d..b1e4dff 100644\n--- a/drivers/event/dlb2/version.map\n+++ b/drivers/event/dlb2/version.map\n@@ -1,3 +1,9 @@\n DPDK_21 {\n \tlocal: *;\n };\n+\n+EXPERIMENTAL {\n+\tglobal:\n+\n+\trte_pmd_dlb2_set_token_pop_mode;\n+};\n", "prefixes": [ "v7", "20/23" ] }