Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62480/?format=api
{ "id": 62480, "url": "http://patchwork.dpdk.org/api/patches/62480/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20191105153707.14645-6-olivier.matz@6wind.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20191105153707.14645-6-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191105153707.14645-6-olivier.matz@6wind.com", "date": "2019-11-05T15:37:04", "name": "[v4,5/7] mempool: introduce helpers for populate and calc mem size", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ad0a1dfa536416afa68f2ecd6ba8365b2987c62d", "submitter": { "id": 8, "url": "http://patchwork.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20191105153707.14645-6-olivier.matz@6wind.com/mbox/", "series": [ { "id": 7258, "url": "http://patchwork.dpdk.org/api/series/7258/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=7258", "date": "2019-11-05T15:36:59", "name": "mempool: avoid objects allocations across pages", "version": 4, "mbox": "http://patchwork.dpdk.org/series/7258/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/62480/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/62480/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 1067DA04A2;\n\tTue, 5 Nov 2019 16:37:54 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id EA31A1BFC9;\n\tTue, 5 Nov 2019 16:37:27 +0100 (CET)", "from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com\n [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 7F6891BFAC\n for <dev@dpdk.org>; Tue, 5 Nov 2019 16:37:19 +0100 (CET)", "from glumotte.dev.6wind.com. (unknown [10.16.0.195])\n by proxy.6wind.com (Postfix) with ESMTP id 6A50A33B0F2;\n Tue, 5 Nov 2019 16:37:19 +0100 (CET)" ], "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Cc": "Anatoly Burakov <anatoly.burakov@intel.com>,\n Andrew Rybchenko <arybchenko@solarflare.com>,\n Ferruh Yigit <ferruh.yigit@linux.intel.com>,\n \"Giridharan, Ganesan\" <ggiridharan@rbbn.com>,\n Jerin Jacob Kollanukkaran <jerinj@marvell.com>,\n \"Kiran Kumar Kokkilagadda\" <kirankumark@marvell.com>,\n Stephen Hemminger <sthemmin@microsoft.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Vamsi Krishna Attunuru <vattunuru@marvell.com>,\n Hemant Agrawal <hemant.agrawal@nxp.com>, Nipun Gupta <nipun.gupta@nxp.com>,\n David Marchand <david.marchand@redhat.com>", "Date": "Tue, 5 Nov 2019 16:37:04 +0100", "Message-Id": "<20191105153707.14645-6-olivier.matz@6wind.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191105153707.14645-1-olivier.matz@6wind.com>", "References": "<20190719133845.32432-1-olivier.matz@6wind.com>\n <20191105153707.14645-1-olivier.matz@6wind.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 5/7] mempool: introduce helpers for populate\n\tand calc mem size", "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": "Introduce new functions that can used by mempool drivers to\ncalculate required memory size and to populate mempool.\n\nFor now, these helpers just replace the *_default() functions\nwithout change. They will be enhanced in next commit.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\nAcked-by: Nipun Gupta <nipun.gupta@nxp.com>\nReviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/mempool/bucket/Makefile | 1 +\n drivers/mempool/bucket/meson.build | 2 +\n drivers/mempool/bucket/rte_mempool_bucket.c | 2 +-\n drivers/mempool/dpaa/dpaa_mempool.c | 2 +-\n drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 2 +-\n drivers/mempool/octeontx/Makefile | 2 +\n drivers/mempool/octeontx/meson.build | 2 +\n .../mempool/octeontx/rte_mempool_octeontx.c | 4 +-\n drivers/mempool/octeontx2/Makefile | 2 +\n drivers/mempool/octeontx2/meson.build | 2 +\n drivers/mempool/octeontx2/otx2_mempool_ops.c | 4 +-\n lib/librte_mempool/rte_mempool.h | 71 ++++++++++++++++++-\n lib/librte_mempool/rte_mempool_ops_default.c | 31 ++++++--\n lib/librte_mempool/rte_mempool_version.map | 2 +\n 14 files changed, 113 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/mempool/bucket/Makefile b/drivers/mempool/bucket/Makefile\nindex 7364916bc..d6660b09c 100644\n--- a/drivers/mempool/bucket/Makefile\n+++ b/drivers/mempool/bucket/Makefile\n@@ -15,6 +15,7 @@ LIB = librte_mempool_bucket.a\n \n CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n \n LDLIBS += -lrte_eal -lrte_mempool -lrte_ring\n \ndiff --git a/drivers/mempool/bucket/meson.build b/drivers/mempool/bucket/meson.build\nindex 618d79128..2fd77f9d4 100644\n--- a/drivers/mempool/bucket/meson.build\n+++ b/drivers/mempool/bucket/meson.build\n@@ -6,4 +6,6 @@\n # This software was jointly developed between OKTET Labs (under contract\n # for Solarflare) and Solarflare Communications, Inc.\n \n+allow_experimental_apis = true\n+\n sources = files('rte_mempool_bucket.c')\ndiff --git a/drivers/mempool/bucket/rte_mempool_bucket.c b/drivers/mempool/bucket/rte_mempool_bucket.c\nindex 78d2b9d04..dfeaf4e45 100644\n--- a/drivers/mempool/bucket/rte_mempool_bucket.c\n+++ b/drivers/mempool/bucket/rte_mempool_bucket.c\n@@ -585,7 +585,7 @@ bucket_populate(struct rte_mempool *mp, unsigned int max_objs,\n \n \t\thdr->fill_cnt = 0;\n \t\thdr->lcore_id = LCORE_ID_ANY;\n-\t\trc = rte_mempool_op_populate_default(mp,\n+\t\trc = rte_mempool_op_populate_helper(mp,\n \t\t\t\t\t\t RTE_MIN(bd->obj_per_bucket,\n \t\t\t\t\t\t\t max_objs - n_objs),\n \t\t\t\t\t\t iter + bucket_header_sz,\ndiff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c\nindex a25697f05..27736e6c2 100644\n--- a/drivers/mempool/dpaa/dpaa_mempool.c\n+++ b/drivers/mempool/dpaa/dpaa_mempool.c\n@@ -341,7 +341,7 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs,\n \t */\n \tTAILQ_INSERT_HEAD(&rte_dpaa_memsegs, ms, next);\n \n-\treturn rte_mempool_op_populate_default(mp, max_objs, vaddr, paddr, len,\n+\treturn rte_mempool_op_populate_helper(mp, max_objs, vaddr, paddr, len,\n \t\t\t\t\t obj_cb, obj_cb_arg);\n }\n \ndiff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\nindex f26c30b00..8f8dbeada 100644\n--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\n+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c\n@@ -421,7 +421,7 @@ dpaa2_populate(struct rte_mempool *mp, unsigned int max_objs,\n \t/* Insert entry into the PA->VA Table */\n \tdpaax_iova_table_update(paddr, vaddr, len);\n \n-\treturn rte_mempool_op_populate_default(mp, max_objs, vaddr, paddr, len,\n+\treturn rte_mempool_op_populate_helper(mp, max_objs, vaddr, paddr, len,\n \t\t\t\t\t obj_cb, obj_cb_arg);\n }\n \ndiff --git a/drivers/mempool/octeontx/Makefile b/drivers/mempool/octeontx/Makefile\nindex a3e1dce88..25efc5cf2 100644\n--- a/drivers/mempool/octeontx/Makefile\n+++ b/drivers/mempool/octeontx/Makefile\n@@ -11,6 +11,8 @@ LIB = librte_mempool_octeontx.a\n \n CFLAGS += $(WERROR_FLAGS)\n CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/\n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n+\n EXPORT_MAP := rte_mempool_octeontx_version.map\n \n LIBABIVER := 1\ndiff --git a/drivers/mempool/octeontx/meson.build b/drivers/mempool/octeontx/meson.build\nindex 3baaf7db2..195435950 100644\n--- a/drivers/mempool/octeontx/meson.build\n+++ b/drivers/mempool/octeontx/meson.build\n@@ -1,6 +1,8 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017 Cavium, Inc\n \n+allow_experimental_apis = true\n+\n sources = files('octeontx_fpavf.c',\n \t\t'rte_mempool_octeontx.c'\n )\ndiff --git a/drivers/mempool/octeontx/rte_mempool_octeontx.c b/drivers/mempool/octeontx/rte_mempool_octeontx.c\nindex ab94dfe91..fff33e5c6 100644\n--- a/drivers/mempool/octeontx/rte_mempool_octeontx.c\n+++ b/drivers/mempool/octeontx/rte_mempool_octeontx.c\n@@ -137,7 +137,7 @@ octeontx_fpavf_calc_mem_size(const struct rte_mempool *mp,\n \t * Simply need space for one more object to be able to\n \t * fulfil alignment requirements.\n \t */\n-\tmem_size = rte_mempool_op_calc_mem_size_default(mp, obj_num + 1,\n+\tmem_size = rte_mempool_op_calc_mem_size_helper(mp, obj_num + 1,\n \t\t\t\t\t\t\tpg_shift,\n \t\t\t\t\t\t\tmin_chunk_size, align);\n \tif (mem_size >= 0) {\n@@ -184,7 +184,7 @@ octeontx_fpavf_populate(struct rte_mempool *mp, unsigned int max_objs,\n \tif (ret < 0)\n \t\treturn ret;\n \n-\treturn rte_mempool_op_populate_default(mp, max_objs, vaddr, iova, len,\n+\treturn rte_mempool_op_populate_helper(mp, max_objs, vaddr, iova, len,\n \t\t\t\t\t obj_cb, obj_cb_arg);\n }\n \ndiff --git a/drivers/mempool/octeontx2/Makefile b/drivers/mempool/octeontx2/Makefile\nindex 87cce22c6..4961a4a35 100644\n--- a/drivers/mempool/octeontx2/Makefile\n+++ b/drivers/mempool/octeontx2/Makefile\n@@ -23,6 +23,8 @@ CFLAGS += -diag-disable 2259\n endif\n endif\n \n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n+\n EXPORT_MAP := rte_mempool_octeontx2_version.map\n \n LIBABIVER := 1\ndiff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build\nindex 9fde40f0e..8255377df 100644\n--- a/drivers/mempool/octeontx2/meson.build\n+++ b/drivers/mempool/octeontx2/meson.build\n@@ -2,6 +2,8 @@\n # Copyright(C) 2019 Marvell International Ltd.\n #\n \n+allow_experimental_apis = true\n+\n sources = files('otx2_mempool_ops.c',\n \t\t'otx2_mempool.c',\n \t\t'otx2_mempool_irq.c',\ndiff --git a/drivers/mempool/octeontx2/otx2_mempool_ops.c b/drivers/mempool/octeontx2/otx2_mempool_ops.c\nindex d769575f4..3aea92a01 100644\n--- a/drivers/mempool/octeontx2/otx2_mempool_ops.c\n+++ b/drivers/mempool/octeontx2/otx2_mempool_ops.c\n@@ -717,7 +717,7 @@ otx2_npa_calc_mem_size(const struct rte_mempool *mp, uint32_t obj_num,\n \t * Simply need space for one more object to be able to\n \t * fulfill alignment requirements.\n \t */\n-\treturn rte_mempool_op_calc_mem_size_default(mp, obj_num + 1, pg_shift,\n+\treturn rte_mempool_op_calc_mem_size_helper(mp, obj_num + 1, pg_shift,\n \t\t\t\t\t\t min_chunk_size, align);\n }\n \n@@ -749,7 +749,7 @@ otx2_npa_populate(struct rte_mempool *mp, unsigned int max_objs, void *vaddr,\n \tif (npa_lf_aura_range_update_check(mp->pool_id) < 0)\n \t\treturn -EBUSY;\n \n-\treturn rte_mempool_op_populate_default(mp, max_objs, vaddr, iova, len,\n+\treturn rte_mempool_op_populate_helper(mp, max_objs, vaddr, iova, len,\n \t\t\t\t\t obj_cb, obj_cb_arg);\n }\n \ndiff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h\nindex 9e41f595e..ad7cc6ad2 100644\n--- a/lib/librte_mempool/rte_mempool.h\n+++ b/lib/librte_mempool/rte_mempool.h\n@@ -465,8 +465,13 @@ typedef ssize_t (*rte_mempool_calc_mem_size_t)(const struct rte_mempool *mp,\n \t\tsize_t *min_chunk_size, size_t *align);\n \n /**\n- * Default way to calculate memory size required to store given number of\n- * objects.\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * @internal Helper to calculate memory size required to store given\n+ * number of objects.\n+ *\n+ * This function is internal to mempool library and mempool drivers.\n *\n * If page boundaries may be ignored, it is just a product of total\n * object size including header and trailer and number of objects.\n@@ -479,6 +484,32 @@ typedef ssize_t (*rte_mempool_calc_mem_size_t)(const struct rte_mempool *mp,\n *\n * Minimum size of memory chunk is the total element size.\n * Required memory chunk alignment is the cache line size.\n+ *\n+ * @param[in] mp\n+ * A pointer to the mempool structure.\n+ * @param[in] obj_num\n+ * Number of objects to be added in mempool.\n+ * @param[in] pg_shift\n+ * LOG2 of the physical pages size. If set to 0, ignore page boundaries.\n+ * @param[out] min_chunk_size\n+ * Location for minimum size of the memory chunk which may be used to\n+ * store memory pool objects.\n+ * @param[out] align\n+ * Location for required memory chunk alignment.\n+ * @return\n+ * Required memory size.\n+ */\n+__rte_experimental\n+ssize_t rte_mempool_op_calc_mem_size_helper(const struct rte_mempool *mp,\n+\t\tuint32_t obj_num, uint32_t pg_shift,\n+\t\tsize_t *min_chunk_size, size_t *align);\n+\n+/**\n+ * Default way to calculate memory size required to store given number of\n+ * objects.\n+ *\n+ * Equivalent to rte_mempool_op_calc_mem_size_helper(mp, obj_num, pg_shift,\n+ * min_chunk_size, align).\n */\n ssize_t rte_mempool_op_calc_mem_size_default(const struct rte_mempool *mp,\n \t\tuint32_t obj_num, uint32_t pg_shift,\n@@ -533,8 +564,42 @@ typedef int (*rte_mempool_populate_t)(struct rte_mempool *mp,\n \t\trte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg);\n \n /**\n- * Default way to populate memory pool object using provided memory\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice.\n+ *\n+ * @internal Helper to populate memory pool object using provided memory\n * chunk: just slice objects one by one.\n+ *\n+ * This function is internal to mempool library and mempool drivers.\n+ *\n+ * @param[in] mp\n+ * A pointer to the mempool structure.\n+ * @param[in] max_objs\n+ * Maximum number of objects to be added in mempool.\n+ * @param[in] vaddr\n+ * The virtual address of memory that should be used to store objects.\n+ * @param[in] iova\n+ * The IO address corresponding to vaddr, or RTE_BAD_IOVA.\n+ * @param[in] len\n+ * The length of memory in bytes.\n+ * @param[in] obj_cb\n+ * Callback function to be executed for each populated object.\n+ * @param[in] obj_cb_arg\n+ * An opaque pointer passed to the callback function.\n+ * @return\n+ * The number of objects added in mempool.\n+ */\n+__rte_experimental\n+int rte_mempool_op_populate_helper(struct rte_mempool *mp,\n+\t\tunsigned int max_objs,\n+\t\tvoid *vaddr, rte_iova_t iova, size_t len,\n+\t\trte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg);\n+\n+/**\n+ * Default way to populate memory pool object using provided memory chunk.\n+ *\n+ * Equivalent to rte_mempool_op_populate_helper(mp, max_objs, vaddr, iova,\n+ * len, obj_cb, obj_cb_arg).\n */\n int rte_mempool_op_populate_default(struct rte_mempool *mp,\n \t\tunsigned int max_objs,\ndiff --git a/lib/librte_mempool/rte_mempool_ops_default.c b/lib/librte_mempool/rte_mempool_ops_default.c\nindex f6aea7662..0bfc63497 100644\n--- a/lib/librte_mempool/rte_mempool_ops_default.c\n+++ b/lib/librte_mempool/rte_mempool_ops_default.c\n@@ -7,9 +7,9 @@\n #include <rte_mempool.h>\n \n ssize_t\n-rte_mempool_op_calc_mem_size_default(const struct rte_mempool *mp,\n-\t\t\t\t uint32_t obj_num, uint32_t pg_shift,\n-\t\t\t\t size_t *min_chunk_size, size_t *align)\n+rte_mempool_op_calc_mem_size_helper(const struct rte_mempool *mp,\n+\t\t\t\tuint32_t obj_num, uint32_t pg_shift,\n+\t\t\t\tsize_t *min_chunk_size, size_t *align)\n {\n \tsize_t total_elt_sz;\n \tsize_t obj_per_page, pg_sz, objs_in_last_page;\n@@ -61,10 +61,19 @@ rte_mempool_op_calc_mem_size_default(const struct rte_mempool *mp,\n \treturn mem_size;\n }\n \n+ssize_t\n+rte_mempool_op_calc_mem_size_default(const struct rte_mempool *mp,\n+\t\t\t\tuint32_t obj_num, uint32_t pg_shift,\n+\t\t\t\tsize_t *min_chunk_size, size_t *align)\n+{\n+\treturn rte_mempool_op_calc_mem_size_helper(mp, obj_num, pg_shift,\n+\t\t\t\t\t\tmin_chunk_size, align);\n+}\n+\n int\n-rte_mempool_op_populate_default(struct rte_mempool *mp, unsigned int max_objs,\n-\t\tvoid *vaddr, rte_iova_t iova, size_t len,\n-\t\trte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg)\n+rte_mempool_op_populate_helper(struct rte_mempool *mp, unsigned int max_objs,\n+\t\t\tvoid *vaddr, rte_iova_t iova, size_t len,\n+\t\t\trte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg)\n {\n \tsize_t total_elt_sz;\n \tsize_t off;\n@@ -84,3 +93,13 @@ rte_mempool_op_populate_default(struct rte_mempool *mp, unsigned int max_objs,\n \n \treturn i;\n }\n+\n+int\n+rte_mempool_op_populate_default(struct rte_mempool *mp, unsigned int max_objs,\n+\t\t\t\tvoid *vaddr, rte_iova_t iova, size_t len,\n+\t\t\t\trte_mempool_populate_obj_cb_t *obj_cb,\n+\t\t\t\tvoid *obj_cb_arg)\n+{\n+\treturn rte_mempool_op_populate_helper(mp, max_objs, vaddr, iova,\n+\t\t\t\t\tlen, obj_cb, obj_cb_arg);\n+}\ndiff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map\nindex aa75cf086..ce9e791e7 100644\n--- a/lib/librte_mempool/rte_mempool_version.map\n+++ b/lib/librte_mempool/rte_mempool_version.map\n@@ -61,4 +61,6 @@ EXPERIMENTAL {\n \n \t# added in 19.11\n \trte_mempool_get_page_size;\n+\trte_mempool_op_calc_mem_size_helper;\n+\trte_mempool_op_populate_helper;\n };\n", "prefixes": [ "v4", "5/7" ] }