Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/32472/?format=api
{ "id": 32472, "url": "https://patches.dpdk.org/api/patches/32472/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/69a29e4ac2822d0c4b1f6c599b428977b2b25505.1513681966.git.anatoly.burakov@intel.com/", "project": { "id": 1, "url": "https://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": "<69a29e4ac2822d0c4b1f6c599b428977b2b25505.1513681966.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/69a29e4ac2822d0c4b1f6c599b428977b2b25505.1513681966.git.anatoly.burakov@intel.com", "date": "2017-12-19T11:14:47", "name": "[dpdk-dev,RFC,v2,20/23] eal: make memzones use rte_fbarray", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b6fb02c1b3cb3df9caedc45f68cbc838856eca39", "submitter": { "id": 4, "url": "https://patches.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/69a29e4ac2822d0c4b1f6c599b428977b2b25505.1513681966.git.anatoly.burakov@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/32472/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/32472/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 5F5431B208;\n\tTue, 19 Dec 2017 12:15:31 +0100 (CET)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 18F171B01E\n\tfor <dev@dpdk.org>; Tue, 19 Dec 2017 12:14:56 +0100 (CET)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Dec 2017 03:14:55 -0800", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga005.fm.intel.com with ESMTP; 19 Dec 2017 03:14:54 -0800", "from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com\n\t[10.237.217.45])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tvBJBErag003147; Tue, 19 Dec 2017 11:14:53 GMT", "from sivswdev01.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev01.ir.intel.com with ESMTP id vBJBErW3010327;\n\tTue, 19 Dec 2017 11:14:53 GMT", "(from aburakov@localhost)\n\tby sivswdev01.ir.intel.com with LOCAL id vBJBErBC010319;\n\tTue, 19 Dec 2017 11:14:53 GMT" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.45,426,1508828400\"; d=\"scan'208\";a=\"188049082\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "andras.kovacs@ericsson.com, laszlo.vadkeri@ericsson.com,\n\tkeith.wiles@intel.com, benjamin.walker@intel.com,\n\tbruce.richardson@intel.com, thomas@monjalon.net", "Date": "Tue, 19 Dec 2017 11:14:47 +0000", "Message-Id": "<69a29e4ac2822d0c4b1f6c599b428977b2b25505.1513681966.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": [ "<cover.1513681966.git.anatoly.burakov@intel.com>", "<cover.1513681966.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1513681966.git.anatoly.burakov@intel.com>", "<cover.1513681966.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [RFC v2 20/23] eal: make memzones use rte_fbarray", "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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "We greatly expand memzone list, and it makes some operations faster.\nPlus, it's there, so we might as well use it.\n\nAs part of this commit, a potential memory leak is fixed (when we\nallocate a memzone but there's no room in config, we don't free it\nback), and there's a compile fix for ENA driver.\n\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\n---\n config/common_base | 2 +-\n drivers/net/ena/ena_ethdev.c | 10 +-\n lib/librte_eal/common/eal_common_memzone.c | 168 ++++++++++++++++------\n lib/librte_eal/common/include/rte_eal_memconfig.h | 4 +-\n 4 files changed, 137 insertions(+), 47 deletions(-)", "diff": "diff --git a/config/common_base b/config/common_base\nindex 9730d4c..cce464d 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -92,7 +92,7 @@ CONFIG_RTE_MAX_LCORE=128\n CONFIG_RTE_MAX_NUMA_NODES=8\n CONFIG_RTE_MAX_MEMSEG_LISTS=16\n CONFIG_RTE_MAX_MEMSEG_PER_LIST=32768\n-CONFIG_RTE_MAX_MEMZONE=2560\n+CONFIG_RTE_MAX_MEMZONE=32768\n CONFIG_RTE_MAX_TAILQ=32\n CONFIG_RTE_ENABLE_ASSERT=n\n CONFIG_RTE_LOG_LEVEL=RTE_LOG_INFO\ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 22db895..aa37cad 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -249,11 +249,15 @@ static const struct eth_dev_ops ena_dev_ops = {\n static inline int ena_cpu_to_node(int cpu)\n {\n \tstruct rte_config *config = rte_eal_get_configuration();\n+\tconst struct rte_fbarray *arr = &config->mem_config->memzones;\n+\tconst struct rte_memzone *mz;\n \n-\tif (likely(cpu < RTE_MAX_MEMZONE))\n-\t\treturn config->mem_config->memzone[cpu].socket_id;\n+\tif (unlikely(cpu >= RTE_MAX_MEMZONE))\n+\t\treturn NUMA_NO_NODE;\n \n-\treturn NUMA_NO_NODE;\n+\tmz = rte_fbarray_get(arr, cpu);\n+\n+\treturn mz->socket_id;\n }\n \n static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf,\ndiff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c\nindex a9a4bef..58a4f25 100644\n--- a/lib/librte_eal/common/eal_common_memzone.c\n+++ b/lib/librte_eal/common/eal_common_memzone.c\n@@ -58,20 +58,23 @@ static inline const struct rte_memzone *\n memzone_lookup_thread_unsafe(const char *name)\n {\n \tconst struct rte_mem_config *mcfg;\n+\tconst struct rte_fbarray *arr;\n \tconst struct rte_memzone *mz;\n-\tunsigned i = 0;\n+\tint i = 0;\n \n \t/* get pointer to global configuration */\n \tmcfg = rte_eal_get_configuration()->mem_config;\n+\tarr = &mcfg->memzones;\n \n \t/*\n \t * the algorithm is not optimal (linear), but there are few\n \t * zones and this function should be called at init only\n \t */\n-\tfor (i = 0; i < RTE_MAX_MEMZONE; i++) {\n-\t\tmz = &mcfg->memzone[i];\n-\t\tif (mz->addr != NULL && !strncmp(name, mz->name, RTE_MEMZONE_NAMESIZE))\n-\t\t\treturn &mcfg->memzone[i];\n+\twhile ((i = rte_fbarray_find_next_used(arr, i)) >= 0) {\n+\t\tmz = rte_fbarray_get(arr, i++);\n+\t\tif (mz->addr != NULL &&\n+\t\t\t\t!strncmp(name, mz->name, RTE_MEMZONE_NAMESIZE))\n+\t\t\treturn mz;\n \t}\n \n \treturn NULL;\n@@ -81,17 +84,44 @@ static inline struct rte_memzone *\n get_next_free_memzone(void)\n {\n \tstruct rte_mem_config *mcfg;\n-\tunsigned i = 0;\n+\tstruct rte_fbarray *arr;\n+\tint i = 0;\n \n \t/* get pointer to global configuration */\n \tmcfg = rte_eal_get_configuration()->mem_config;\n+\tarr = &mcfg->memzones;\n+\n+\ti = rte_fbarray_find_next_free(arr, 0);\n+\tif (i < 0) {\n+\t\t/* no space in config, so try expanding the list */\n+\t\tint old_len = arr->len;\n+\t\tint new_len = old_len * 2;\n+\t\tnew_len = RTE_MIN(new_len, arr->capacity);\n+\n+\t\tif (old_len == new_len) {\n+\t\t\t/* can't expand, the list is full */\n+\t\t\tRTE_LOG(ERR, EAL, \"%s(): no space in memzone list\\n\",\n+\t\t\t\t__func__);\n+\t\t\treturn NULL;\n+\t\t}\n \n-\tfor (i = 0; i < RTE_MAX_MEMZONE; i++) {\n-\t\tif (mcfg->memzone[i].addr == NULL)\n-\t\t\treturn &mcfg->memzone[i];\n-\t}\n+\t\tif (rte_fbarray_resize(arr, new_len)) {\n+\t\t\tRTE_LOG(ERR, EAL, \"%s(): can't resize memzone list\\n\",\n+\t\t\t\t__func__);\n+\t\t\treturn NULL;\n+\t\t}\n \n-\treturn NULL;\n+\t\t/* ensure we have free space */\n+\t\ti = rte_fbarray_find_next_free(arr, old_len);\n+\n+\t\tif (i < 0) {\n+\t\t\tRTE_LOG(ERR, EAL, \"%s(): Cannot find room in config!\\n\",\n+\t\t\t\t__func__);\n+\t\t\treturn NULL;\n+\t\t}\n+\t}\n+\trte_fbarray_set_used(arr, i, true);\n+\treturn rte_fbarray_get(arr, i);\n }\n \n /* This function will return the greatest free block if a heap has been\n@@ -132,14 +162,16 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,\n {\n \tstruct rte_memzone *mz;\n \tstruct rte_mem_config *mcfg;\n+\tstruct rte_fbarray *arr;\n \tsize_t requested_len;\n \tint socket;\n \n \t/* get pointer to global configuration */\n \tmcfg = rte_eal_get_configuration()->mem_config;\n+\tarr = &mcfg->memzones;\n \n \t/* no more room in config */\n-\tif (mcfg->memzone_cnt >= RTE_MAX_MEMZONE) {\n+\tif (arr->count >= arr->capacity) {\n \t\tRTE_LOG(ERR, EAL, \"%s(): No more room in config\\n\", __func__);\n \t\trte_errno = ENOSPC;\n \t\treturn NULL;\n@@ -231,19 +263,19 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,\n \t\treturn NULL;\n \t}\n \n-\tconst struct malloc_elem *elem = malloc_elem_from_data(mz_addr);\n+\tstruct malloc_elem *elem = malloc_elem_from_data(mz_addr);\n \n \t/* fill the zone in config */\n \tmz = get_next_free_memzone();\n \n \tif (mz == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"%s(): Cannot find free memzone but there is room \"\n-\t\t\t\t\"in config!\\n\", __func__);\n+\t\tRTE_LOG(ERR, EAL, \"%s(): Cannot find free memzone but there is room in config!\\n\",\n+\t\t\t__func__);\n \t\trte_errno = ENOSPC;\n+\t\tmalloc_heap_free(elem);\n \t\treturn NULL;\n \t}\n \n-\tmcfg->memzone_cnt++;\n \tsnprintf(mz->name, sizeof(mz->name), \"%s\", name);\n \tmz->iova = rte_malloc_virt2iova(mz_addr);\n \tmz->addr = mz_addr;\n@@ -356,6 +388,8 @@ int\n rte_memzone_free(const struct rte_memzone *mz)\n {\n \tstruct rte_mem_config *mcfg;\n+\tstruct rte_fbarray *arr;\n+\tstruct rte_memzone *found_mz;\n \tint ret = 0;\n \tvoid *addr;\n \tunsigned idx;\n@@ -364,21 +398,22 @@ rte_memzone_free(const struct rte_memzone *mz)\n \t\treturn -EINVAL;\n \n \tmcfg = rte_eal_get_configuration()->mem_config;\n+\tarr = &mcfg->memzones;\n \n \trte_rwlock_write_lock(&mcfg->mlock);\n \n-\tidx = ((uintptr_t)mz - (uintptr_t)mcfg->memzone);\n-\tidx = idx / sizeof(struct rte_memzone);\n+\tidx = rte_fbarray_find_idx(arr, mz);\n+\tfound_mz = rte_fbarray_get(arr, idx);\n \n-\taddr = mcfg->memzone[idx].addr;\n+\taddr = found_mz->addr;\n \tif (addr == NULL)\n \t\tret = -EINVAL;\n-\telse if (mcfg->memzone_cnt == 0) {\n+\telse if (arr->count == 0) {\n \t\trte_panic(\"%s(): memzone address not NULL but memzone_cnt is 0!\\n\",\n \t\t\t\t__func__);\n \t} else {\n-\t\tmemset(&mcfg->memzone[idx], 0, sizeof(mcfg->memzone[idx]));\n-\t\tmcfg->memzone_cnt--;\n+\t\tmemset(found_mz, 0, sizeof(*found_mz));\n+\t\trte_fbarray_set_used(arr, idx, false);\n \t}\n \n \trte_rwlock_write_unlock(&mcfg->mlock);\n@@ -412,25 +447,71 @@ rte_memzone_lookup(const char *name)\n void\n rte_memzone_dump(FILE *f)\n {\n+\tstruct rte_fbarray *arr;\n \tstruct rte_mem_config *mcfg;\n-\tunsigned i = 0;\n+\tint i = 0;\n \n \t/* get pointer to global configuration */\n \tmcfg = rte_eal_get_configuration()->mem_config;\n+\tarr = &mcfg->memzones;\n \n \trte_rwlock_read_lock(&mcfg->mlock);\n \t/* dump all zones */\n-\tfor (i=0; i<RTE_MAX_MEMZONE; i++) {\n-\t\tif (mcfg->memzone[i].addr == NULL)\n-\t\t\tbreak;\n-\t\tfprintf(f, \"Zone %u: name:<%s>, IO:0x%\"PRIx64\", len:0x%zx\"\n+\twhile ((i = rte_fbarray_find_next_used(arr, i)) >= 0) {\n+\t\tvoid *cur_addr, *mz_end;\n+\t\tstruct rte_memzone *mz;\n+\t\tstruct rte_memseg_list *msl = NULL;\n+\t\tstruct rte_memseg *ms;\n+\t\tint msl_idx, ms_idx;\n+\n+\t\tmz = rte_fbarray_get(arr, i);\n+\n+\t\t/*\n+\t\t * memzones can span multiple physical pages, so dump addresses\n+\t\t * of all physical pages this memzone spans.\n+\t\t */\n+\n+\t\tfprintf(f, \"Zone %u: name:<%s>, len:0x%zx\"\n \t\t \", virt:%p, socket_id:%\"PRId32\", flags:%\"PRIx32\"\\n\", i,\n-\t\t mcfg->memzone[i].name,\n-\t\t mcfg->memzone[i].iova,\n-\t\t mcfg->memzone[i].len,\n-\t\t mcfg->memzone[i].addr,\n-\t\t mcfg->memzone[i].socket_id,\n-\t\t mcfg->memzone[i].flags);\n+\t\t mz->name,\n+\t\t mz->len,\n+\t\t mz->addr,\n+\t\t mz->socket_id,\n+\t\t mz->flags);\n+\n+\t\t/* get pointer to appropriate memseg list */\n+\t\tfor (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS; msl_idx++) {\n+\t\t\tif (mcfg->memsegs[msl_idx].hugepage_sz != mz->hugepage_sz)\n+\t\t\t\tcontinue;\n+\t\t\tif (mcfg->memsegs[msl_idx].socket_id != mz->socket_id)\n+\t\t\t\tcontinue;\n+\t\t\tmsl = &mcfg->memsegs[msl_idx];\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (!msl) {\n+\t\t\tRTE_LOG(DEBUG, EAL, \"Skipping bad memzone\\n\");\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tcur_addr = RTE_PTR_ALIGN_FLOOR(mz->addr, mz->hugepage_sz);\n+\t\tmz_end = RTE_PTR_ADD(cur_addr, mz->len);\n+\n+\t\tms_idx = RTE_PTR_DIFF(mz->addr, msl->base_va) /\n+\t\t\t\tmsl->hugepage_sz;\n+\t\tms = rte_fbarray_get(&msl->memseg_arr, ms_idx);\n+\n+\t\tfprintf(f, \"physical pages used:\\n\");\n+\t\tdo {\n+\t\t\tfprintf(f, \" addr: %p iova: 0x%\" PRIx64 \" len: 0x%\" PRIx64 \" len: 0x%\" PRIx64 \"\\n\",\n+\t\t\t\tcur_addr, ms->iova, ms->len, ms->hugepage_sz);\n+\n+\t\t\t/* advance VA to next page */\n+\t\t\tcur_addr = RTE_PTR_ADD(cur_addr, ms->hugepage_sz);\n+\n+\t\t\t/* memzones occupy contiguous segments */\n+\t\t\t++ms;\n+\t\t} while (cur_addr < mz_end);\n+\t\ti++;\n \t}\n \trte_rwlock_read_unlock(&mcfg->mlock);\n }\n@@ -459,9 +540,11 @@ rte_eal_memzone_init(void)\n \n \trte_rwlock_write_lock(&mcfg->mlock);\n \n-\t/* delete all zones */\n-\tmcfg->memzone_cnt = 0;\n-\tmemset(mcfg->memzone, 0, sizeof(mcfg->memzone));\n+\tif (rte_fbarray_alloc(&mcfg->memzones, \"memzone\", 256,\n+\t\t\tRTE_MAX_MEMZONE, sizeof(struct rte_memzone))) {\n+\t\tRTE_LOG(ERR, EAL, \"Cannot allocate memzone list\\n\");\n+\t\treturn -1;\n+\t}\n \n \trte_rwlock_write_unlock(&mcfg->mlock);\n \n@@ -473,14 +556,19 @@ void rte_memzone_walk(void (*func)(const struct rte_memzone *, void *),\n \t\t void *arg)\n {\n \tstruct rte_mem_config *mcfg;\n-\tunsigned i;\n+\tstruct rte_fbarray *arr;\n+\tint i;\n \n \tmcfg = rte_eal_get_configuration()->mem_config;\n+\tarr = &mcfg->memzones;\n+\n+\ti = 0;\n \n \trte_rwlock_read_lock(&mcfg->mlock);\n-\tfor (i=0; i<RTE_MAX_MEMZONE; i++) {\n-\t\tif (mcfg->memzone[i].addr != NULL)\n-\t\t\t(*func)(&mcfg->memzone[i], arg);\n+\twhile ((i = rte_fbarray_find_next_used(arr, i)) > 0) {\n+\t\tstruct rte_memzone *mz = rte_fbarray_get(arr, i);\n+\t\t(*func)(mz, arg);\n+\t\ti++;\n \t}\n \trte_rwlock_read_unlock(&mcfg->mlock);\n }\ndiff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h\nindex c9b57a4..8f4cc34 100644\n--- a/lib/librte_eal/common/include/rte_eal_memconfig.h\n+++ b/lib/librte_eal/common/include/rte_eal_memconfig.h\n@@ -86,10 +86,8 @@ struct rte_mem_config {\n \trte_rwlock_t qlock; /**< used for tailq operation for thread safe. */\n \trte_rwlock_t mplock; /**< only used by mempool LIB for thread-safe. */\n \n-\tuint32_t memzone_cnt; /**< Number of allocated memzones */\n-\n \t/* memory segments and zones */\n-\tstruct rte_memzone memzone[RTE_MAX_MEMZONE]; /**< Memzone descriptors. */\n+\tstruct rte_fbarray memzones; /**< Memzone descriptors. */\n \n \tstruct rte_memseg_list memsegs[RTE_MAX_MEMSEG_LISTS];\n \t/**< list of dynamic arrays holding memsegs */\n", "prefixes": [ "dpdk-dev", "RFC", "v2", "20/23" ] }