Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/48850/?format=api
{ "id": 48850, "url": "http://patchwork.dpdk.org/api/patches/48850/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/b67df321b6ab1a82b014bfde59f8b4f41d9be7d6.1544788118.git.anatoly.burakov@intel.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": "<b67df321b6ab1a82b014bfde59f8b4f41d9be7d6.1544788118.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/b67df321b6ab1a82b014bfde59f8b4f41d9be7d6.1544788118.git.anatoly.burakov@intel.com", "date": "2018-12-14T11:50:56", "name": "[v2,1/4] malloc: separate creating memseg list and malloc heap", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a29c1728eaee13cf014bee46e6353417aaaf42f0", "submitter": { "id": 4, "url": "http://patchwork.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@intel.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/b67df321b6ab1a82b014bfde59f8b4f41d9be7d6.1544788118.git.anatoly.burakov@intel.com/mbox/", "series": [ { "id": 2778, "url": "http://patchwork.dpdk.org/api/series/2778/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=2778", "date": "2018-12-14T11:50:55", "name": "Allow using external memory without malloc", "version": 2, "mbox": "http://patchwork.dpdk.org/series/2778/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/48850/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/48850/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 C566E1B9B6;\n\tFri, 14 Dec 2018 12:51:10 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id A0C391B99B\n\tfor <dev@dpdk.org>; Fri, 14 Dec 2018 12:51:07 +0100 (CET)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Dec 2018 03:51:06 -0800", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga007.jf.intel.com with ESMTP; 14 Dec 2018 03:51:05 -0800", "from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com\n\t[10.243.17.64])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\twBEBp46Z005257; Fri, 14 Dec 2018 11:51:04 GMT", "from sivswdev05.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev05.ir.intel.com with ESMTP id wBEBp4Ef007501;\n\tFri, 14 Dec 2018 11:51:04 GMT", "(from aburakov@localhost)\n\tby sivswdev05.ir.intel.com with LOCAL id wBEBp4K8007497;\n\tFri, 14 Dec 2018 11:51:04 GMT" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,352,1539673200\"; d=\"scan'208\";a=\"98736428\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "shahafs@mellanox.com, yskoh@mellanox.com, thomas@monjalon.net,\n\tshreyansh.jain@nxp.com", "Date": "Fri, 14 Dec 2018 11:50:56 +0000", "Message-Id": "<b67df321b6ab1a82b014bfde59f8b4f41d9be7d6.1544788118.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": [ "<cover.1544788118.git.anatoly.burakov@intel.com>", "<cover.1544788118.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1544788118.git.anatoly.burakov@intel.com>", "<cover.1543495935.git.anatoly.burakov@intel.com>\n\t<cover.1544788118.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v2 1/4] malloc: separate creating memseg list and\n\tmalloc heap", "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": "Currently, creating external malloc heap involves also creating\na memseg list backing that malloc heap. We need to have them as\nseparate functions, to allow creating memseg lists without\ncreating a malloc heap.\n\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\nAcked-by: Yongseok Koh <yskoh@mellanox.com>\n---\n lib/librte_eal/common/malloc_heap.c | 34 ++++++++++++++++++-----------\n lib/librte_eal/common/malloc_heap.h | 9 ++++++--\n lib/librte_eal/common/rte_malloc.c | 11 ++++++++--\n 3 files changed, 37 insertions(+), 17 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c\nindex c6a6d4f6b..25693481f 100644\n--- a/lib/librte_eal/common/malloc_heap.c\n+++ b/lib/librte_eal/common/malloc_heap.c\n@@ -1095,9 +1095,10 @@ destroy_seg(struct malloc_elem *elem, size_t len)\n \treturn 0;\n }\n \n-int\n-malloc_heap_add_external_memory(struct malloc_heap *heap, void *va_addr,\n-\t\trte_iova_t iova_addrs[], unsigned int n_pages, size_t page_sz)\n+struct rte_memseg_list *\n+malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],\n+\t\tunsigned int n_pages, size_t page_sz, const char *seg_name,\n+\t\tunsigned int socket_id)\n {\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tchar fbarray_name[RTE_FBARRAY_NAME_LEN];\n@@ -1117,17 +1118,17 @@ malloc_heap_add_external_memory(struct malloc_heap *heap, void *va_addr,\n \tif (msl == NULL) {\n \t\tRTE_LOG(ERR, EAL, \"Couldn't find empty memseg list\\n\");\n \t\trte_errno = ENOSPC;\n-\t\treturn -1;\n+\t\treturn NULL;\n \t}\n \n \tsnprintf(fbarray_name, sizeof(fbarray_name) - 1, \"%s_%p\",\n-\t\t\theap->name, va_addr);\n+\t\t\tseg_name, va_addr);\n \n \t/* create the backing fbarray */\n \tif (rte_fbarray_init(&msl->memseg_arr, fbarray_name, n_pages,\n \t\t\tsizeof(struct rte_memseg)) < 0) {\n \t\tRTE_LOG(ERR, EAL, \"Couldn't create fbarray backing the memseg list\\n\");\n-\t\treturn -1;\n+\t\treturn NULL;\n \t}\n \tarr = &msl->memseg_arr;\n \n@@ -1143,32 +1144,39 @@ malloc_heap_add_external_memory(struct malloc_heap *heap, void *va_addr,\n \t\tms->len = page_sz;\n \t\tms->nchannel = rte_memory_get_nchannel();\n \t\tms->nrank = rte_memory_get_nrank();\n-\t\tms->socket_id = heap->socket_id;\n+\t\tms->socket_id = socket_id;\n \t}\n \n \t/* set up the memseg list */\n \tmsl->base_va = va_addr;\n \tmsl->page_sz = page_sz;\n-\tmsl->socket_id = heap->socket_id;\n+\tmsl->socket_id = socket_id;\n \tmsl->len = seg_len;\n \tmsl->version = 0;\n \tmsl->external = 1;\n \n+\treturn msl;\n+}\n+\n+int\n+malloc_heap_add_external_memory(struct malloc_heap *heap,\n+\t\tstruct rte_memseg_list *msl)\n+{\n \t/* erase contents of new memory */\n-\tmemset(va_addr, 0, seg_len);\n+\tmemset(msl->base_va, 0, msl->len);\n \n \t/* now, add newly minted memory to the malloc heap */\n-\tmalloc_heap_add_memory(heap, msl, va_addr, seg_len);\n+\tmalloc_heap_add_memory(heap, msl, msl->base_va, msl->len);\n \n-\theap->total_size += seg_len;\n+\theap->total_size += msl->len;\n \n \t/* all done! */\n \tRTE_LOG(DEBUG, EAL, \"Added segment for heap %s starting at %p\\n\",\n-\t\t\theap->name, va_addr);\n+\t\t\theap->name, msl->base_va);\n \n \t/* notify all subscribers that a new memory area has been added */\n \teal_memalloc_mem_event_notify(RTE_MEM_EVENT_ALLOC,\n-\t\t\tva_addr, seg_len);\n+\t\t\tmsl->base_va, msl->len);\n \n \treturn 0;\n }\ndiff --git a/lib/librte_eal/common/malloc_heap.h b/lib/librte_eal/common/malloc_heap.h\nindex e48996d52..255a315b8 100644\n--- a/lib/librte_eal/common/malloc_heap.h\n+++ b/lib/librte_eal/common/malloc_heap.h\n@@ -39,9 +39,14 @@ malloc_heap_create(struct malloc_heap *heap, const char *heap_name);\n int\n malloc_heap_destroy(struct malloc_heap *heap);\n \n+struct rte_memseg_list *\n+malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],\n+\t\tunsigned int n_pages, size_t page_sz, const char *seg_name,\n+\t\tunsigned int socket_id);\n+\n int\n-malloc_heap_add_external_memory(struct malloc_heap *heap, void *va_addr,\n-\t\trte_iova_t iova_addrs[], unsigned int n_pages, size_t page_sz);\n+malloc_heap_add_external_memory(struct malloc_heap *heap,\n+\t\tstruct rte_memseg_list *msl);\n \n int\n malloc_heap_remove_external_memory(struct malloc_heap *heap, void *va_addr,\ndiff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c\nindex 0da5ad5e8..66bfe63c3 100644\n--- a/lib/librte_eal/common/rte_malloc.c\n+++ b/lib/librte_eal/common/rte_malloc.c\n@@ -340,6 +340,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n {\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap = NULL;\n+\tstruct rte_memseg_list *msl;\n \tunsigned int n;\n \tint ret;\n \n@@ -373,9 +374,15 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \t\tgoto unlock;\n \t}\n \n+\tmsl = malloc_heap_create_external_seg(va_addr, iova_addrs, n, page_sz,\n+\t\t\theap_name, heap->socket_id);\n+\tif (msl == NULL) {\n+\t\tret = -1;\n+\t\tgoto unlock;\n+\t}\n+\n \trte_spinlock_lock(&heap->lock);\n-\tret = malloc_heap_add_external_memory(heap, va_addr, iova_addrs, n,\n-\t\t\tpage_sz);\n+\tret = malloc_heap_add_external_memory(heap, msl);\n \trte_spinlock_unlock(&heap->lock);\n \n unlock:\n", "prefixes": [ "v2", "1/4" ] }