Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53835/?format=api
{ "id": 53835, "url": "http://patches.dpdk.org/api/patches/53835/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/46a8e5a6397080752091860a8e3b8df6da312925.1559147228.git.anatoly.burakov@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": "<46a8e5a6397080752091860a8e3b8df6da312925.1559147228.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/46a8e5a6397080752091860a8e3b8df6da312925.1559147228.git.anatoly.burakov@intel.com", "date": "2019-05-29T16:30:53", "name": "[07/25] malloc: use new memory locking API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "01d54cd41315c05dd8081cadc8a2c459591afc2a", "submitter": { "id": 4, "url": "http://patches.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/46a8e5a6397080752091860a8e3b8df6da312925.1559147228.git.anatoly.burakov@intel.com/mbox/", "series": [ { "id": 4813, "url": "http://patches.dpdk.org/api/series/4813/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4813", "date": "2019-05-29T16:30:46", "name": "Make shared memory config non-public", "version": 1, "mbox": "http://patches.dpdk.org/series/4813/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/53835/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/53835/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 2E0D81B9AD;\n\tWed, 29 May 2019 18:31:33 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 1D16E1B994\n\tfor <dev@dpdk.org>; Wed, 29 May 2019 18:31:25 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 May 2019 09:31:25 -0700", "from silpixa00399498.ir.intel.com (HELO\n\tsilpixa00399498.ger.corp.intel.com) ([10.237.223.125])\n\tby orsmga005.jf.intel.com with ESMTP; 29 May 2019 09:31:24 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "stephen@networkplumber.org, thomas@monjalon.net,\n\tdavid.marchand@redhat.com", "Date": "Wed, 29 May 2019 17:30:53 +0100", "Message-Id": "<46a8e5a6397080752091860a8e3b8df6da312925.1559147228.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": [ "<cover.1559147228.git.anatoly.burakov@intel.com>", "<cover.1559147228.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1559147228.git.anatoly.burakov@intel.com>", "<cover.1559147228.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH 07/25] malloc: use new memory locking API", "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": "Replace usages of direct access to shared memory config with\ncalls to the new API.\n\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\n---\n lib/librte_eal/common/malloc_heap.c | 14 ++++++-------\n lib/librte_eal/common/rte_malloc.c | 32 +++++++++++++----------------\n 2 files changed, 20 insertions(+), 26 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c\nindex f9235932e..0298ec1ca 100644\n--- a/lib/librte_eal/common/malloc_heap.c\n+++ b/lib/librte_eal/common/malloc_heap.c\n@@ -485,10 +485,9 @@ try_expand_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,\n \t\tint socket, unsigned int flags, size_t align, size_t bound,\n \t\tbool contig)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tint ret;\n \n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_lock();\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\tret = try_expand_heap_primary(heap, pg_sz, elt_size, socket,\n@@ -498,7 +497,7 @@ try_expand_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,\n \t\t\t\tflags, align, bound, contig);\n \t}\n \n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_unlock();\n \treturn ret;\n }\n \n@@ -821,7 +820,6 @@ malloc_heap_free_pages(void *aligned_start, size_t aligned_len)\n int\n malloc_heap_free(struct malloc_elem *elem)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap;\n \tvoid *start, *aligned_start, *end, *aligned_end;\n \tsize_t len, aligned_len, page_sz;\n@@ -935,7 +933,7 @@ malloc_heap_free(struct malloc_elem *elem)\n \n \t/* now we can finally free us some pages */\n \n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_lock();\n \n \t/*\n \t * we allow secondary processes to clear the heap of this allocated\n@@ -990,7 +988,7 @@ malloc_heap_free(struct malloc_elem *elem)\n \tRTE_LOG(DEBUG, EAL, \"Heap on socket %d was shrunk by %zdMB\\n\",\n \t\tmsl->socket_id, aligned_len >> 20ULL);\n \n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_unlock();\n free_unlock:\n \trte_spinlock_unlock(&(heap->lock));\n \treturn ret;\n@@ -1344,7 +1342,7 @@ rte_eal_malloc_heap_init(void)\n \n \tif (register_mp_requests()) {\n \t\tRTE_LOG(ERR, EAL, \"Couldn't register malloc multiprocess actions\\n\");\n-\t\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\t\trte_eal_mcfg_mem_read_unlock();\n \t\treturn -1;\n \t}\n \n@@ -1352,7 +1350,7 @@ rte_eal_malloc_heap_init(void)\n \t * even come before primary itself is fully initialized, and secondaries\n \t * do not need to initialize the heap.\n \t */\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_unlock();\n \n \t/* secondary process does not need to initialize anything */\n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\ndiff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c\nindex 54792ea5b..4d83bf518 100644\n--- a/lib/librte_eal/common/rte_malloc.c\n+++ b/lib/librte_eal/common/rte_malloc.c\n@@ -223,7 +223,7 @@ rte_malloc_heap_get_socket(const char *name)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_lock();\n \tfor (idx = 0; idx < RTE_MAX_HEAPS; idx++) {\n \t\tstruct malloc_heap *tmp = &mcfg->malloc_heaps[idx];\n \n@@ -239,7 +239,7 @@ rte_malloc_heap_get_socket(const char *name)\n \t\trte_errno = ENOENT;\n \t\tret = -1;\n \t}\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -254,7 +254,7 @@ rte_malloc_heap_socket_is_external(int socket_id)\n \tif (socket_id == SOCKET_ID_ANY)\n \t\treturn 0;\n \n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_lock();\n \tfor (idx = 0; idx < RTE_MAX_HEAPS; idx++) {\n \t\tstruct malloc_heap *tmp = &mcfg->malloc_heaps[idx];\n \n@@ -264,7 +264,7 @@ rte_malloc_heap_socket_is_external(int socket_id)\n \t\t\tbreak;\n \t\t}\n \t}\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_unlock();\n \n \treturn ret;\n }\n@@ -352,7 +352,6 @@ int\n rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \t\trte_iova_t iova_addrs[], unsigned int n_pages, size_t page_sz)\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@@ -369,7 +368,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_lock();\n \n \t/* find our heap */\n \theap = find_named_heap(heap_name);\n@@ -398,7 +397,7 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n \trte_spinlock_unlock(&heap->lock);\n \n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n@@ -406,7 +405,6 @@ rte_malloc_heap_memory_add(const char *heap_name, void *va_addr, size_t len,\n int\n rte_malloc_heap_memory_remove(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 \tint ret;\n@@ -418,7 +416,7 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_lock();\n \t/* find our heap */\n \theap = find_named_heap(heap_name);\n \tif (heap == NULL) {\n@@ -448,7 +446,7 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n \tret = malloc_heap_destroy_external_seg(msl);\n \n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n@@ -456,7 +454,6 @@ rte_malloc_heap_memory_remove(const char *heap_name, void *va_addr, size_t len)\n static int\n sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)\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 \tint ret;\n@@ -468,7 +465,7 @@ sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_read_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_lock();\n \n \t/* find our heap */\n \theap = find_named_heap(heap_name);\n@@ -516,7 +513,7 @@ sync_memory(const char *heap_name, void *va_addr, size_t len, bool attach)\n \t\t}\n \t}\n unlock:\n-\trte_rwlock_read_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_read_unlock();\n \treturn ret;\n }\n \n@@ -549,7 +546,7 @@ rte_malloc_heap_create(const char *heap_name)\n \t/* check if there is space in the heap list, or if heap with this name\n \t * already exists.\n \t */\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_lock();\n \n \tfor (i = 0; i < RTE_MAX_HEAPS; i++) {\n \t\tstruct malloc_heap *tmp = &mcfg->malloc_heaps[i];\n@@ -578,7 +575,7 @@ rte_malloc_heap_create(const char *heap_name)\n \t/* we're sure that we can create a new heap, so do it */\n \tret = malloc_heap_create(heap, heap_name);\n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n@@ -586,7 +583,6 @@ rte_malloc_heap_create(const char *heap_name)\n int\n rte_malloc_heap_destroy(const char *heap_name)\n {\n-\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct malloc_heap *heap = NULL;\n \tint ret;\n \n@@ -597,7 +593,7 @@ rte_malloc_heap_destroy(const char *heap_name)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\trte_rwlock_write_lock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_lock();\n \n \t/* start from non-socket heaps */\n \theap = find_named_heap(heap_name);\n@@ -621,7 +617,7 @@ rte_malloc_heap_destroy(const char *heap_name)\n \tif (ret < 0)\n \t\trte_spinlock_unlock(&heap->lock);\n unlock:\n-\trte_rwlock_write_unlock(&mcfg->memory_hotplug_lock);\n+\trte_eal_mcfg_mem_write_unlock();\n \n \treturn ret;\n }\n", "prefixes": [ "07/25" ] }