Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64572/?format=api
{ "id": 64572, "url": "http://patches.dpdk.org/api/patches/64572/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200113172518.37815-7-honnappa.nagarahalli@arm.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": "<20200113172518.37815-7-honnappa.nagarahalli@arm.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200113172518.37815-7-honnappa.nagarahalli@arm.com", "date": "2020-01-13T17:25:18", "name": "[v8,6/6] lib/eventdev: use custom element size ring for event rings", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2ef1d4ec19047fd08abd4251b95c01a0a9fd41c0", "submitter": { "id": 1045, "url": "http://patches.dpdk.org/api/people/1045/?format=api", "name": "Honnappa Nagarahalli", "email": "honnappa.nagarahalli@arm.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200113172518.37815-7-honnappa.nagarahalli@arm.com/mbox/", "series": [ { "id": 8086, "url": "http://patches.dpdk.org/api/series/8086/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8086", "date": "2020-01-13T17:25:12", "name": "lib/ring: APIs to support custom element size", "version": 8, "mbox": "http://patches.dpdk.org/series/8086/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64572/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/64572/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 6E4CEA04F1;\n\tMon, 13 Jan 2020 18:26:34 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CD4111D404;\n\tMon, 13 Jan 2020 18:25:51 +0100 (CET)", "from foss.arm.com (foss.arm.com [217.140.110.172])\n by dpdk.org (Postfix) with ESMTP id 981561D16E\n for <dev@dpdk.org>; Mon, 13 Jan 2020 18:25:40 +0100 (CET)", "from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])\n by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E88B81474;\n Mon, 13 Jan 2020 09:25:39 -0800 (PST)", "from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com\n [10.118.14.48])\n by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DC6C63F85E;\n Mon, 13 Jan 2020 09:25:39 -0800 (PST)" ], "From": "Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>", "To": "olivier.matz@6wind.com, sthemmin@microsoft.com, jerinj@marvell.com,\n bruce.richardson@intel.com, david.marchand@redhat.com,\n pbhagavatula@marvell.com, konstantin.ananyev@intel.com,\n honnappa.nagarahalli@arm.com", "Cc": "dev@dpdk.org, dharmik.thakkar@arm.com, ruifeng.wang@arm.com,\n gavin.hu@arm.com, nd@arm.com", "Date": "Mon, 13 Jan 2020 11:25:18 -0600", "Message-Id": "<20200113172518.37815-7-honnappa.nagarahalli@arm.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200113172518.37815-1-honnappa.nagarahalli@arm.com>", "References": "<20190906190510.11146-1-honnappa.nagarahalli@arm.com>\n <20200113172518.37815-1-honnappa.nagarahalli@arm.com>", "Subject": "[dpdk-dev] [PATCH v8 6/6] lib/eventdev: use custom element size\n\tring for event rings", "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": "Use custom element size ring APIs to replace event ring\nimplementation. This avoids code duplication.\n\nSigned-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\nReviewed-by: Gavin Hu <gavin.hu@arm.com>\nReviewed-by: Ola Liljedahl <ola.liljedahl@arm.com>\n---\n lib/librte_eventdev/rte_event_ring.c | 147 ++-------------------------\n lib/librte_eventdev/rte_event_ring.h | 45 ++++----\n 2 files changed, 24 insertions(+), 168 deletions(-)", "diff": "diff --git a/lib/librte_eventdev/rte_event_ring.c b/lib/librte_eventdev/rte_event_ring.c\nindex 50190de01..d27e23901 100644\n--- a/lib/librte_eventdev/rte_event_ring.c\n+++ b/lib/librte_eventdev/rte_event_ring.c\n@@ -1,5 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n * Copyright(c) 2017 Intel Corporation\n+ * Copyright(c) 2019 Arm Limited\n */\n \n #include <sys/queue.h>\n@@ -11,13 +12,6 @@\n #include <rte_eal_memconfig.h>\n #include \"rte_event_ring.h\"\n \n-TAILQ_HEAD(rte_event_ring_list, rte_tailq_entry);\n-\n-static struct rte_tailq_elem rte_event_ring_tailq = {\n-\t.name = RTE_TAILQ_EVENT_RING_NAME,\n-};\n-EAL_REGISTER_TAILQ(rte_event_ring_tailq)\n-\n int\n rte_event_ring_init(struct rte_event_ring *r, const char *name,\n \tunsigned int count, unsigned int flags)\n@@ -35,150 +29,21 @@ struct rte_event_ring *\n rte_event_ring_create(const char *name, unsigned int count, int socket_id,\n \t\tunsigned int flags)\n {\n-\tchar mz_name[RTE_MEMZONE_NAMESIZE];\n-\tstruct rte_event_ring *r;\n-\tstruct rte_tailq_entry *te;\n-\tconst struct rte_memzone *mz;\n-\tssize_t ring_size;\n-\tint mz_flags = 0;\n-\tstruct rte_event_ring_list *ring_list = NULL;\n-\tconst unsigned int requested_count = count;\n-\tint ret;\n-\n-\tring_list = RTE_TAILQ_CAST(rte_event_ring_tailq.head,\n-\t\trte_event_ring_list);\n-\n-\t/* for an exact size ring, round up from count to a power of two */\n-\tif (flags & RING_F_EXACT_SZ)\n-\t\tcount = rte_align32pow2(count + 1);\n-\telse if (!rte_is_power_of_2(count)) {\n-\t\trte_errno = EINVAL;\n-\t\treturn NULL;\n-\t}\n-\n-\tring_size = sizeof(*r) + (count * sizeof(struct rte_event));\n-\n-\tret = snprintf(mz_name, sizeof(mz_name), \"%s%s\",\n-\t\tRTE_RING_MZ_PREFIX, name);\n-\tif (ret < 0 || ret >= (int)sizeof(mz_name)) {\n-\t\trte_errno = ENAMETOOLONG;\n-\t\treturn NULL;\n-\t}\n-\n-\tte = rte_zmalloc(\"RING_TAILQ_ENTRY\", sizeof(*te), 0);\n-\tif (te == NULL) {\n-\t\tRTE_LOG(ERR, RING, \"Cannot reserve memory for tailq\\n\");\n-\t\trte_errno = ENOMEM;\n-\t\treturn NULL;\n-\t}\n-\n-\trte_mcfg_tailq_write_lock();\n-\n-\t/*\n-\t * reserve a memory zone for this ring. If we can't get rte_config or\n-\t * we are secondary process, the memzone_reserve function will set\n-\t * rte_errno for us appropriately - hence no check in this this function\n-\t */\n-\tmz = rte_memzone_reserve(mz_name, ring_size, socket_id, mz_flags);\n-\tif (mz != NULL) {\n-\t\tr = mz->addr;\n-\t\t/* Check return value in case rte_ring_init() fails on size */\n-\t\tint err = rte_event_ring_init(r, name, requested_count, flags);\n-\t\tif (err) {\n-\t\t\tRTE_LOG(ERR, RING, \"Ring init failed\\n\");\n-\t\t\tif (rte_memzone_free(mz) != 0)\n-\t\t\t\tRTE_LOG(ERR, RING, \"Cannot free memzone\\n\");\n-\t\t\trte_free(te);\n-\t\t\trte_mcfg_tailq_write_unlock();\n-\t\t\treturn NULL;\n-\t\t}\n-\n-\t\tte->data = (void *) r;\n-\t\tr->r.memzone = mz;\n-\n-\t\tTAILQ_INSERT_TAIL(ring_list, te, next);\n-\t} else {\n-\t\tr = NULL;\n-\t\tRTE_LOG(ERR, RING, \"Cannot reserve memory\\n\");\n-\t\trte_free(te);\n-\t}\n-\trte_mcfg_tailq_write_unlock();\n-\n-\treturn r;\n+\treturn (struct rte_event_ring *)rte_ring_create_elem(name,\n+\t\t\t\t\t\tsizeof(struct rte_event),\n+\t\t\t\t\t\tcount, socket_id, flags);\n }\n \n \n struct rte_event_ring *\n rte_event_ring_lookup(const char *name)\n {\n-\tstruct rte_tailq_entry *te;\n-\tstruct rte_event_ring *r = NULL;\n-\tstruct rte_event_ring_list *ring_list;\n-\n-\tring_list = RTE_TAILQ_CAST(rte_event_ring_tailq.head,\n-\t\t\trte_event_ring_list);\n-\n-\trte_mcfg_tailq_read_lock();\n-\n-\tTAILQ_FOREACH(te, ring_list, next) {\n-\t\tr = (struct rte_event_ring *) te->data;\n-\t\tif (strncmp(name, r->r.name, RTE_RING_NAMESIZE) == 0)\n-\t\t\tbreak;\n-\t}\n-\n-\trte_mcfg_tailq_read_unlock();\n-\n-\tif (te == NULL) {\n-\t\trte_errno = ENOENT;\n-\t\treturn NULL;\n-\t}\n-\n-\treturn r;\n+\treturn (struct rte_event_ring *)rte_ring_lookup(name);\n }\n \n /* free the ring */\n void\n rte_event_ring_free(struct rte_event_ring *r)\n {\n-\tstruct rte_event_ring_list *ring_list = NULL;\n-\tstruct rte_tailq_entry *te;\n-\n-\tif (r == NULL)\n-\t\treturn;\n-\n-\t/*\n-\t * Ring was not created with rte_event_ring_create,\n-\t * therefore, there is no memzone to free.\n-\t */\n-\tif (r->r.memzone == NULL) {\n-\t\tRTE_LOG(ERR, RING,\n-\t\t\t\"Cannot free ring (not created with rte_event_ring_create()\");\n-\t\treturn;\n-\t}\n-\n-\tif (rte_memzone_free(r->r.memzone) != 0) {\n-\t\tRTE_LOG(ERR, RING, \"Cannot free memory\\n\");\n-\t\treturn;\n-\t}\n-\n-\tring_list = RTE_TAILQ_CAST(rte_event_ring_tailq.head,\n-\t\t\trte_event_ring_list);\n-\trte_mcfg_tailq_write_lock();\n-\n-\t/* find out tailq entry */\n-\tTAILQ_FOREACH(te, ring_list, next) {\n-\t\tif (te->data == (void *) r)\n-\t\t\tbreak;\n-\t}\n-\n-\tif (te == NULL) {\n-\t\trte_mcfg_tailq_write_unlock();\n-\t\treturn;\n-\t}\n-\n-\tTAILQ_REMOVE(ring_list, te, next);\n-\n-\trte_mcfg_tailq_write_unlock();\n-\n-\trte_free(te);\n+\trte_ring_free((struct rte_ring *)r);\n }\ndiff --git a/lib/librte_eventdev/rte_event_ring.h b/lib/librte_eventdev/rte_event_ring.h\nindex 827a3209e..c0861b0ec 100644\n--- a/lib/librte_eventdev/rte_event_ring.h\n+++ b/lib/librte_eventdev/rte_event_ring.h\n@@ -1,5 +1,6 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n * Copyright(c) 2016-2017 Intel Corporation\n+ * Copyright(c) 2019 Arm Limited\n */\n \n /**\n@@ -19,6 +20,7 @@\n #include <rte_memory.h>\n #include <rte_malloc.h>\n #include <rte_ring.h>\n+#include <rte_ring_elem.h>\n #include \"rte_eventdev.h\"\n \n #define RTE_TAILQ_EVENT_RING_NAME \"RTE_EVENT_RING\"\n@@ -88,22 +90,17 @@ rte_event_ring_enqueue_burst(struct rte_event_ring *r,\n \t\tconst struct rte_event *events,\n \t\tunsigned int n, uint16_t *free_space)\n {\n-\tuint32_t prod_head, prod_next;\n-\tuint32_t free_entries;\n+\tunsigned int num;\n+\tuint32_t space;\n \n-\tn = __rte_ring_move_prod_head(&r->r, r->r.prod.single, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE,\n-\t\t\t&prod_head, &prod_next, &free_entries);\n-\tif (n == 0)\n-\t\tgoto end;\n+\tnum = rte_ring_enqueue_burst_elem(&r->r, events,\n+\t\t\t\tsizeof(struct rte_event), n,\n+\t\t\t\t&space);\n \n-\tENQUEUE_PTRS(&r->r, &r[1], prod_head, events, n, struct rte_event);\n-\n-\tupdate_tail(&r->r.prod, prod_head, prod_next, r->r.prod.single, 1);\n-end:\n \tif (free_space != NULL)\n-\t\t*free_space = free_entries - n;\n-\treturn n;\n+\t\t*free_space = space;\n+\n+\treturn num;\n }\n \n /**\n@@ -129,23 +126,17 @@ rte_event_ring_dequeue_burst(struct rte_event_ring *r,\n \t\tstruct rte_event *events,\n \t\tunsigned int n, uint16_t *available)\n {\n-\tuint32_t cons_head, cons_next;\n-\tuint32_t entries;\n-\n-\tn = __rte_ring_move_cons_head(&r->r, r->r.cons.single, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE,\n-\t\t\t&cons_head, &cons_next, &entries);\n-\tif (n == 0)\n-\t\tgoto end;\n+\tunsigned int num;\n+\tuint32_t remaining;\n \n-\tDEQUEUE_PTRS(&r->r, &r[1], cons_head, events, n, struct rte_event);\n+\tnum = rte_ring_dequeue_burst_elem(&r->r, events,\n+\t\t\t\tsizeof(struct rte_event), n,\n+\t\t\t\t&remaining);\n \n-\tupdate_tail(&r->r.cons, cons_head, cons_next, r->r.cons.single, 0);\n-\n-end:\n \tif (available != NULL)\n-\t\t*available = entries - n;\n-\treturn n;\n+\t\t*available = remaining;\n+\n+\treturn num;\n }\n \n /*\n", "prefixes": [ "v8", "6/6" ] }