Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/75069/?format=api
{ "id": 75069, "url": "http://patches.dpdk.org/api/patches/75069/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1596138614-17409-19-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": "<1596138614-17409-19-git-send-email-timothy.mcdaniel@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1596138614-17409-19-git-send-email-timothy.mcdaniel@intel.com", "date": "2020-07-30T19:50:05", "name": "[18/27] event/dlb: add queue setup", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a70b0bb183906ac50aecee256001952739a627d5", "submitter": { "id": 826, "url": "http://patches.dpdk.org/api/people/826/?format=api", "name": "Timothy McDaniel", "email": "timothy.mcdaniel@intel.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/1596138614-17409-19-git-send-email-timothy.mcdaniel@intel.com/mbox/", "series": [ { "id": 11425, "url": "http://patches.dpdk.org/api/series/11425/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11425", "date": "2020-07-30T19:49:47", "name": "Add Intel DLM PMD to 20.11", "version": 1, "mbox": "http://patches.dpdk.org/series/11425/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/75069/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/75069/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 2A19FA052B;\n\tThu, 30 Jul 2020 21:56:17 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 480B71C135;\n\tThu, 30 Jul 2020 21:53:38 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by dpdk.org (Postfix) with ESMTP id CC87B1C0C5\n for <dev@dpdk.org>; Thu, 30 Jul 2020 21:53:19 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 30 Jul 2020 12:53:19 -0700", "from txasoft-yocto.an.intel.com ([10.123.72.192])\n by orsmga005.jf.intel.com with ESMTP; 30 Jul 2020 12:53:17 -0700" ], "IronPort-SDR": [ "\n 3rG7IbiskiciI1mRRU5aKdWAxLybH5CB4/0wC7FOygrctqJ4nBpFQ5JOR3tJ1+IRpkQWF75pzT\n 587mT/ZRG2EA==", "\n d/qz6lIMUYFcBrSWyQreOn5DPveOHJU+CrbBuAv2RJE4gItM6EoWH3nf/6JQDauwsvvb8rCWCZ\n fMFBlkuxTmpw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9698\"; a=\"139672333\"", "E=Sophos;i=\"5.75,415,1589266800\"; d=\"scan'208\";a=\"139672333\"", "E=Sophos;i=\"5.75,415,1589266800\"; d=\"scan'208\";a=\"465378133\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "\"McDaniel, Timothy\" <timothy.mcdaniel@intel.com>", "To": "jerinj@marvell.com", "Cc": "mattias.ronnblom@ericsson.com, dev@dpdk.org, gage.eads@intel.com,\n harry.van.haaren@intel.com,\n \"McDaniel, Timothy\" <timothy.mcdaniel@intel.com>", "Date": "Thu, 30 Jul 2020 14:50:05 -0500", "Message-Id": "<1596138614-17409-19-git-send-email-timothy.mcdaniel@intel.com>", "X-Mailer": "git-send-email 1.7.10", "In-Reply-To": "<1596138614-17409-1-git-send-email-timothy.mcdaniel@intel.com>", "References": "<1593232671-5690-0-git-send-email-timothy.mcdaniel@intel.com>\n <1596138614-17409-1-git-send-email-timothy.mcdaniel@intel.com>", "Subject": "[dpdk-dev] [PATCH 18/27] event/dlb: add queue setup", "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": "From: \"McDaniel, Timothy\" <timothy.mcdaniel@intel.com>\n\nSigned-off-by: McDaniel, Timothy <timothy.mcdaniel@intel.com>\n---\n drivers/event/dlb/dlb.c | 295 +++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 295 insertions(+)", "diff": "diff --git a/drivers/event/dlb/dlb.c b/drivers/event/dlb/dlb.c\nindex b1070c9..ae1d19b 100644\n--- a/drivers/event/dlb/dlb.c\n+++ b/drivers/event/dlb/dlb.c\n@@ -221,6 +221,65 @@ int dlb_string_to_int(int *result, const char *str)\n \treturn 0;\n }\n \n+static int32_t\n+dlb_hw_create_ldb_queue(struct dlb_eventdev *dlb,\n+\t\t\tstruct dlb_queue *queue,\n+\t\t\tconst struct rte_event_queue_conf *evq_conf)\n+{\n+\tstruct dlb_hw_dev *handle = &dlb->qm_instance;\n+\tstruct dlb_create_ldb_queue_args cfg;\n+\tstruct dlb_cmd_response response;\n+\tint32_t ret;\n+\tuint32_t qm_qid;\n+\tint sched_type = -1;\n+\n+\tif (evq_conf == NULL)\n+\t\treturn -EINVAL;\n+\n+\tif (evq_conf->event_queue_cfg & RTE_EVENT_QUEUE_CFG_ALL_TYPES) {\n+\t\tif (evq_conf->nb_atomic_order_sequences != 0)\n+\t\t\tsched_type = RTE_SCHED_TYPE_ORDERED;\n+\t\telse\n+\t\t\tsched_type = RTE_SCHED_TYPE_PARALLEL;\n+\t} else {\n+\t\tsched_type = evq_conf->schedule_type;\n+\t}\n+\n+\tcfg.response = (uintptr_t)&response;\n+\tcfg.num_atomic_inflights = dlb->num_atm_inflights_per_queue;\n+\tcfg.num_sequence_numbers = evq_conf->nb_atomic_order_sequences;\n+\tcfg.num_qid_inflights = evq_conf->nb_atomic_order_sequences;\n+\n+\tif (sched_type != RTE_SCHED_TYPE_ORDERED) {\n+\t\tcfg.num_sequence_numbers = 0;\n+\t\tcfg.num_qid_inflights = DLB_DEF_UNORDERED_QID_INFLIGHTS;\n+\t}\n+\n+\tret = dlb_iface_ldb_queue_create(handle, &cfg);\n+\tif (ret < 0) {\n+\t\tDLB_LOG_ERR(\"dlb: create LB event queue error, ret=%d (driver status: %s)\\n\",\n+\t\t\t ret, dlb_error_strings[response.status]);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tqm_qid = response.id;\n+\n+\t/* Save off queue config for debug, resource lookups, and reconfig */\n+\tqueue->num_qid_inflights = cfg.num_qid_inflights;\n+\tqueue->num_atm_inflights = cfg.num_atomic_inflights;\n+\n+\tqueue->sched_type = sched_type;\n+\tqueue->config_state = DLB_CONFIGURED;\n+\n+\tDLB_LOG_DBG(\"Created LB event queue %d, nb_inflights=%d, nb_seq=%d, qid inflights=%d\\n\",\n+\t\t qm_qid,\n+\t\t cfg.num_atomic_inflights,\n+\t\t cfg.num_sequence_numbers,\n+\t\t cfg.num_qid_inflights);\n+\n+\treturn qm_qid;\n+}\n+\n /* VDEV-only notes:\n * This function first unmaps all memory mappings and closes the\n * domain's file descriptor, which causes the driver to reset the\n@@ -442,6 +501,7 @@ int dlb_string_to_int(int *result, const char *str)\n }\n \n /* End HW specific */\n+\n static void\n dlb_eventdev_info_get(struct rte_eventdev *dev,\n \t\t struct rte_event_dev_info *dev_info)\n@@ -640,6 +700,240 @@ int dlb_string_to_int(int *result, const char *str)\n \tqueue_conf->priority = 0;\n }\n \n+static int32_t\n+dlb_get_sn_allocation(struct dlb_eventdev *dlb, int group)\n+{\n+\tstruct dlb_hw_dev *handle = &dlb->qm_instance;\n+\tstruct dlb_get_sn_allocation_args cfg;\n+\tstruct dlb_cmd_response response;\n+\tint ret;\n+\n+\tcfg.group = group;\n+\tcfg.response = (uintptr_t)&response;\n+\n+\tret = dlb_iface_get_sn_allocation(handle, &cfg);\n+\tif (ret < 0) {\n+\t\tDLB_LOG_ERR(\"dlb: get_sn_allocation ret=%d (driver status: %s)\\n\",\n+\t\t\t ret, dlb_error_strings[response.status]);\n+\t\treturn ret;\n+\t}\n+\n+\treturn response.id;\n+}\n+\n+static int\n+dlb_set_sn_allocation(struct dlb_eventdev *dlb, int group, int num)\n+{\n+\tstruct dlb_hw_dev *handle = &dlb->qm_instance;\n+\tstruct dlb_set_sn_allocation_args cfg;\n+\tstruct dlb_cmd_response response;\n+\tint ret;\n+\n+\tcfg.num = num;\n+\tcfg.group = group;\n+\tcfg.response = (uintptr_t)&response;\n+\n+\tret = dlb_iface_set_sn_allocation(handle, &cfg);\n+\tif (ret < 0) {\n+\t\tDLB_LOG_ERR(\"dlb: set_sn_allocation ret=%d (driver status: %s)\\n\",\n+\t\t\t ret, dlb_error_strings[response.status]);\n+\t\treturn ret;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int32_t\n+dlb_get_sn_occupancy(struct dlb_eventdev *dlb, int group)\n+{\n+\tstruct dlb_hw_dev *handle = &dlb->qm_instance;\n+\tstruct dlb_get_sn_occupancy_args cfg;\n+\tstruct dlb_cmd_response response;\n+\tint ret;\n+\n+\tcfg.group = group;\n+\tcfg.response = (uintptr_t)&response;\n+\n+\tret = dlb_iface_get_sn_occupancy(handle, &cfg);\n+\tif (ret < 0) {\n+\t\tDLB_LOG_ERR(\"dlb: get_sn_occupancy ret=%d (driver status: %s)\\n\",\n+\t\t\t ret, dlb_error_strings[response.status]);\n+\t\treturn ret;\n+\t}\n+\n+\treturn response.id;\n+}\n+\n+/* Query the current sequence number allocations and, if they conflict with the\n+ * requested LDB queue configuration, attempt to re-allocate sequence numbers.\n+ * This is best-effort; if it fails, the PMD will attempt to configure the\n+ * load-balanced queue and return an error.\n+ */\n+static void\n+dlb_program_sn_allocation(struct dlb_eventdev *dlb,\n+\t\t\t const struct rte_event_queue_conf *queue_conf)\n+{\n+\tint grp_occupancy[DLB_NUM_SN_GROUPS];\n+\tint grp_alloc[DLB_NUM_SN_GROUPS];\n+\tint i, sequence_numbers;\n+\n+\tsequence_numbers = (int)queue_conf->nb_atomic_order_sequences;\n+\n+\tfor (i = 0; i < DLB_NUM_SN_GROUPS; i++) {\n+\t\tint total_slots;\n+\n+\t\tgrp_alloc[i] = dlb_get_sn_allocation(dlb, i);\n+\t\tif (grp_alloc[i] < 0)\n+\t\t\treturn;\n+\n+\t\ttotal_slots = DLB_MAX_LDB_SN_ALLOC / grp_alloc[i];\n+\n+\t\tgrp_occupancy[i] = dlb_get_sn_occupancy(dlb, i);\n+\t\tif (grp_occupancy[i] < 0)\n+\t\t\treturn;\n+\n+\t\t/* DLB has at least one available slot for the requested\n+\t\t * sequence numbers, so no further configuration required.\n+\t\t */\n+\t\tif (grp_alloc[i] == sequence_numbers &&\n+\t\t grp_occupancy[i] < total_slots)\n+\t\t\treturn;\n+\t}\n+\n+\t/* None of the sequence number groups are configured for the requested\n+\t * sequence numbers, so we have to reconfigure one of them. This is\n+\t * only possible if a group is not in use.\n+\t */\n+\tfor (i = 0; i < DLB_NUM_SN_GROUPS; i++) {\n+\t\tif (grp_occupancy[i] == 0)\n+\t\t\tbreak;\n+\t}\n+\n+\tif (i == DLB_NUM_SN_GROUPS) {\n+\t\tprintf(\"[%s()] No groups with %d sequence_numbers are available or have free slots\\n\",\n+\t\t __func__, sequence_numbers);\n+\t\treturn;\n+\t}\n+\n+\t/* Attempt to configure slot i with the requested number of sequence\n+\t * numbers. Ignore the return value -- if this fails, the error will be\n+\t * caught during subsequent queue configuration.\n+\t */\n+\tdlb_set_sn_allocation(dlb, i, sequence_numbers);\n+}\n+\n+static int\n+dlb_eventdev_ldb_queue_setup(struct rte_eventdev *dev,\n+\t\t\t struct dlb_eventdev_queue *ev_queue,\n+\t\t\t const struct rte_event_queue_conf *queue_conf)\n+{\n+\tstruct dlb_eventdev *dlb = dlb_pmd_priv(dev);\n+\tint32_t qm_qid;\n+\n+\tif (queue_conf->nb_atomic_order_sequences)\n+\t\tdlb_program_sn_allocation(dlb, queue_conf);\n+\n+\tqm_qid = dlb_hw_create_ldb_queue(dlb,\n+\t\t\t\t\t &ev_queue->qm_queue,\n+\t\t\t\t\t queue_conf);\n+\tif (qm_qid < 0) {\n+\t\tDLB_LOG_ERR(\"Failed to create the load-balanced queue\\n\");\n+\n+\t\treturn qm_qid;\n+\t}\n+\n+\tdlb->qm_ldb_to_ev_queue_id[qm_qid] = ev_queue->id;\n+\n+\tev_queue->qm_queue.id = qm_qid;\n+\n+\treturn 0;\n+}\n+\n+static int dlb_num_dir_queues_setup(struct dlb_eventdev *dlb)\n+{\n+\tint i, num = 0;\n+\n+\tfor (i = 0; i < dlb->num_queues; i++) {\n+\t\tif (dlb->ev_queues[i].setup_done &&\n+\t\t dlb->ev_queues[i].qm_queue.is_directed)\n+\t\t\tnum++;\n+\t}\n+\n+\treturn num;\n+}\n+\n+static void\n+dlb_queue_link_teardown(struct dlb_eventdev *dlb,\n+\t\t\tstruct dlb_eventdev_queue *ev_queue)\n+{\n+\tstruct dlb_eventdev_port *ev_port;\n+\tint i, j;\n+\n+\tfor (i = 0; i < dlb->num_ports; i++) {\n+\t\tev_port = &dlb->ev_ports[i];\n+\n+\t\tfor (j = 0; j < DLB_MAX_NUM_QIDS_PER_LDB_CQ; j++) {\n+\t\t\tif (!ev_port->link[j].valid ||\n+\t\t\t ev_port->link[j].queue_id != ev_queue->id)\n+\t\t\t\tcontinue;\n+\n+\t\t\tev_port->link[j].valid = false;\n+\t\t\tev_port->num_links--;\n+\t\t}\n+\t}\n+\n+\tev_queue->num_links = 0;\n+}\n+\n+static int\n+dlb_eventdev_queue_setup(struct rte_eventdev *dev,\n+\t\t\t uint8_t ev_qid,\n+\t\t\t const struct rte_event_queue_conf *queue_conf)\n+{\n+\tstruct dlb_eventdev *dlb = dlb_pmd_priv(dev);\n+\tstruct dlb_eventdev_queue *ev_queue;\n+\tint ret;\n+\n+\tif (!queue_conf)\n+\t\treturn -EINVAL;\n+\n+\tif (ev_qid >= dlb->num_queues)\n+\t\treturn -EINVAL;\n+\n+\tev_queue = &dlb->ev_queues[ev_qid];\n+\n+\tev_queue->qm_queue.is_directed = queue_conf->event_queue_cfg &\n+\t\tRTE_EVENT_QUEUE_CFG_SINGLE_LINK;\n+\tev_queue->id = ev_qid;\n+\tev_queue->conf = *queue_conf;\n+\n+\tif (!ev_queue->qm_queue.is_directed) {\n+\t\tret = dlb_eventdev_ldb_queue_setup(dev, ev_queue, queue_conf);\n+\t} else {\n+\t\t/* The directed queue isn't setup until link time, at which\n+\t\t * point we know its directed port ID. Directed queue setup\n+\t\t * will only fail if this queue is already setup or there are\n+\t\t * no directed queues left to configure.\n+\t\t */\n+\t\tret = 0;\n+\n+\t\tev_queue->qm_queue.config_state = DLB_NOT_CONFIGURED;\n+\n+\t\tif (ev_queue->setup_done ||\n+\t\t dlb_num_dir_queues_setup(dlb) == dlb->num_dir_queues)\n+\t\t\tret = -EINVAL;\n+\t}\n+\n+\t/* Tear down pre-existing port->queue links */\n+\tif (!ret && dlb->run_state == DLB_RUN_STATE_STOPPED)\n+\t\tdlb_queue_link_teardown(dlb, ev_queue);\n+\n+\tif (!ret)\n+\t\tev_queue->setup_done = true;\n+\n+\treturn ret;\n+}\n+\n static int\n set_dev_id(const char *key __rte_unused,\n \t const char *value,\n@@ -717,6 +1011,7 @@ int dlb_string_to_int(int *result, const char *str)\n \t\t.dev_infos_get = dlb_eventdev_info_get,\n \t\t.dev_configure = dlb_eventdev_configure,\n \t\t.queue_def_conf = dlb_eventdev_queue_default_conf_get,\n+\t\t.queue_setup = dlb_eventdev_queue_setup,\n \t\t.port_def_conf = dlb_eventdev_port_default_conf_get,\n \t};\n \n", "prefixes": [ "18/27" ] }