Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52228/?format=api
{ "id": 52228, "url": "http://patches.dpdk.org/api/patches/52228/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190403200916.16349-3-gage.eads@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": "<20190403200916.16349-3-gage.eads@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190403200916.16349-3-gage.eads@intel.com", "date": "2019-04-03T20:09:10", "name": "[v7,2/8] mempool/stack: convert mempool to use rte stack", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "99b0b941ad325a9cf3008904d1cd6a6983abcbf3", "submitter": { "id": 586, "url": "http://patches.dpdk.org/api/people/586/?format=api", "name": "Eads, Gage", "email": "gage.eads@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190403200916.16349-3-gage.eads@intel.com/mbox/", "series": [ { "id": 4101, "url": "http://patches.dpdk.org/api/series/4101/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4101", "date": "2019-04-03T20:09:08", "name": "Add stack library and new mempool handler", "version": 7, "mbox": "http://patches.dpdk.org/series/4101/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/52228/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/52228/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5A8101B1F7;\n\tWed, 3 Apr 2019 22:10:11 +0200 (CEST)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 494F36CC1\n\tfor <dev@dpdk.org>; Wed, 3 Apr 2019 22:10:01 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Apr 2019 13:10:00 -0700", "from txasoft-yocto.an.intel.com ([10.123.72.192])\n\tby orsmga007.jf.intel.com with ESMTP; 03 Apr 2019 13:09:59 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,306,1549958400\"; d=\"scan'208\";a=\"128403697\"", "From": "Gage Eads <gage.eads@intel.com>", "To": "dev@dpdk.org", "Cc": "olivier.matz@6wind.com, arybchenko@solarflare.com,\n\tbruce.richardson@intel.com, konstantin.ananyev@intel.com,\n\tgavin.hu@arm.com, \n\tHonnappa.Nagarahalli@arm.com, nd@arm.com, thomas@monjalon.net", "Date": "Wed, 3 Apr 2019 15:09:10 -0500", "Message-Id": "<20190403200916.16349-3-gage.eads@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20190403200916.16349-1-gage.eads@intel.com>", "References": "<20190401211429.20282-1-gage.eads@intel.com>\n\t<20190403200916.16349-1-gage.eads@intel.com>", "Subject": "[dpdk-dev] [PATCH v7 2/8] mempool/stack: convert mempool to use rte\n\tstack", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The new rte_stack library is derived from the mempool handler, so this\ncommit removes duplicated code and simplifies the handler by migrating it\nto this new API.\n\nSigned-off-by: Gage Eads <gage.eads@intel.com>\nReviewed-by: Olivier Matz <olivier.matz@6wind.com>\n---\n MAINTAINERS | 2 +-\n drivers/mempool/stack/Makefile | 3 +-\n drivers/mempool/stack/meson.build | 6 +-\n drivers/mempool/stack/rte_mempool_stack.c | 93 +++++++++----------------------\n 4 files changed, 33 insertions(+), 71 deletions(-)", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex f30fc4aa6..e09e7d93f 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -303,7 +303,6 @@ M: Andrew Rybchenko <arybchenko@solarflare.com>\n F: lib/librte_mempool/\n F: drivers/mempool/Makefile\n F: drivers/mempool/ring/\n-F: drivers/mempool/stack/\n F: doc/guides/prog_guide/mempool_lib.rst\n F: app/test/test_mempool*\n F: app/test/test_func_reentrancy.c\n@@ -431,6 +430,7 @@ M: Gage Eads <gage.eads@intel.com>\n M: Olivier Matz <olivier.matz@6wind.com>\n F: lib/librte_stack/\n F: doc/guides/prog_guide/stack_lib.rst\n+F: drivers/mempool/stack/\n \n \n Memory Pool Drivers\ndiff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile\nindex 0444aedad..1681a62bc 100644\n--- a/drivers/mempool/stack/Makefile\n+++ b/drivers/mempool/stack/Makefile\n@@ -10,10 +10,11 @@ LIB = librte_mempool_stack.a\n \n CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n \n # Headers\n CFLAGS += -I$(RTE_SDK)/lib/librte_mempool\n-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring\n+LDLIBS += -lrte_eal -lrte_mempool -lrte_stack\n \n EXPORT_MAP := rte_mempool_stack_version.map\n \ndiff --git a/drivers/mempool/stack/meson.build b/drivers/mempool/stack/meson.build\nindex b75a3bb56..03e369a41 100644\n--- a/drivers/mempool/stack/meson.build\n+++ b/drivers/mempool/stack/meson.build\n@@ -1,4 +1,8 @@\n # SPDX-License-Identifier: BSD-3-Clause\n-# Copyright(c) 2017 Intel Corporation\n+# Copyright(c) 2017-2019 Intel Corporation\n+\n+allow_experimental_apis = true\n \n sources = files('rte_mempool_stack.c')\n+\n+deps += ['stack']\ndiff --git a/drivers/mempool/stack/rte_mempool_stack.c b/drivers/mempool/stack/rte_mempool_stack.c\nindex e6d504af5..25ccdb9af 100644\n--- a/drivers/mempool/stack/rte_mempool_stack.c\n+++ b/drivers/mempool/stack/rte_mempool_stack.c\n@@ -1,39 +1,29 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2016 Intel Corporation\n+ * Copyright(c) 2016-2019 Intel Corporation\n */\n \n #include <stdio.h>\n #include <rte_mempool.h>\n-#include <rte_malloc.h>\n-\n-struct rte_mempool_stack {\n-\trte_spinlock_t sl;\n-\n-\tuint32_t size;\n-\tuint32_t len;\n-\tvoid *objs[];\n-};\n+#include <rte_stack.h>\n \n static int\n stack_alloc(struct rte_mempool *mp)\n {\n-\tstruct rte_mempool_stack *s;\n-\tunsigned n = mp->size;\n-\tint size = sizeof(*s) + (n+16)*sizeof(void *);\n-\n-\t/* Allocate our local memory structure */\n-\ts = rte_zmalloc_socket(\"mempool-stack\",\n-\t\t\tsize,\n-\t\t\tRTE_CACHE_LINE_SIZE,\n-\t\t\tmp->socket_id);\n-\tif (s == NULL) {\n-\t\tRTE_LOG(ERR, MEMPOOL, \"Cannot allocate stack!\\n\");\n-\t\treturn -ENOMEM;\n+\tchar name[RTE_STACK_NAMESIZE];\n+\tstruct rte_stack *s;\n+\tint ret;\n+\n+\tret = snprintf(name, sizeof(name),\n+\t\t RTE_MEMPOOL_MZ_FORMAT, mp->name);\n+\tif (ret < 0 || ret >= (int)sizeof(name)) {\n+\t\trte_errno = ENAMETOOLONG;\n+\t\treturn -rte_errno;\n \t}\n \n-\trte_spinlock_init(&s->sl);\n+\ts = rte_stack_create(name, mp->size, mp->socket_id, 0);\n+\tif (s == NULL)\n+\t\treturn -rte_errno;\n \n-\ts->size = n;\n \tmp->pool_data = s;\n \n \treturn 0;\n@@ -41,69 +31,36 @@ stack_alloc(struct rte_mempool *mp)\n \n static int\n stack_enqueue(struct rte_mempool *mp, void * const *obj_table,\n-\t\tunsigned n)\n+\t unsigned int n)\n {\n-\tstruct rte_mempool_stack *s = mp->pool_data;\n-\tvoid **cache_objs;\n-\tunsigned index;\n-\n-\trte_spinlock_lock(&s->sl);\n-\tcache_objs = &s->objs[s->len];\n-\n-\t/* Is there sufficient space in the stack ? */\n-\tif ((s->len + n) > s->size) {\n-\t\trte_spinlock_unlock(&s->sl);\n-\t\treturn -ENOBUFS;\n-\t}\n-\n-\t/* Add elements back into the cache */\n-\tfor (index = 0; index < n; ++index, obj_table++)\n-\t\tcache_objs[index] = *obj_table;\n-\n-\ts->len += n;\n+\tstruct rte_stack *s = mp->pool_data;\n \n-\trte_spinlock_unlock(&s->sl);\n-\treturn 0;\n+\treturn rte_stack_push(s, obj_table, n) == 0 ? -ENOBUFS : 0;\n }\n \n static int\n stack_dequeue(struct rte_mempool *mp, void **obj_table,\n-\t\tunsigned n)\n+\t unsigned int n)\n {\n-\tstruct rte_mempool_stack *s = mp->pool_data;\n-\tvoid **cache_objs;\n-\tunsigned index, len;\n-\n-\trte_spinlock_lock(&s->sl);\n-\n-\tif (unlikely(n > s->len)) {\n-\t\trte_spinlock_unlock(&s->sl);\n-\t\treturn -ENOENT;\n-\t}\n+\tstruct rte_stack *s = mp->pool_data;\n \n-\tcache_objs = s->objs;\n-\n-\tfor (index = 0, len = s->len - 1; index < n;\n-\t\t\t++index, len--, obj_table++)\n-\t\t*obj_table = cache_objs[len];\n-\n-\ts->len -= n;\n-\trte_spinlock_unlock(&s->sl);\n-\treturn 0;\n+\treturn rte_stack_pop(s, obj_table, n) == 0 ? -ENOBUFS : 0;\n }\n \n static unsigned\n stack_get_count(const struct rte_mempool *mp)\n {\n-\tstruct rte_mempool_stack *s = mp->pool_data;\n+\tstruct rte_stack *s = mp->pool_data;\n \n-\treturn s->len;\n+\treturn rte_stack_count(s);\n }\n \n static void\n stack_free(struct rte_mempool *mp)\n {\n-\trte_free((void *)(mp->pool_data));\n+\tstruct rte_stack *s = mp->pool_data;\n+\n+\trte_stack_free(s);\n }\n \n static struct rte_mempool_ops ops_stack = {\n", "prefixes": [ "v7", "2/8" ] }