get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/42509/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 42509,
    "url": "http://patches.dpdk.org/api/patches/42509/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/be19bfbab392b3938a40f70ca60d9600caffa6be.1530881548.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": "<be19bfbab392b3938a40f70ca60d9600caffa6be.1530881548.git.anatoly.burakov@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/be19bfbab392b3938a40f70ca60d9600caffa6be.1530881548.git.anatoly.burakov@intel.com",
    "date": "2018-07-06T13:17:24",
    "name": "[RFC,03/11] malloc: index heaps using heap ID rather than NUMA node",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "83b54b354fa45b2f7bf2cc1681efbbf32fc4c91b",
    "submitter": {
        "id": 4,
        "url": "http://patches.dpdk.org/api/people/4/?format=api",
        "name": "Burakov, Anatoly",
        "email": "anatoly.burakov@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/be19bfbab392b3938a40f70ca60d9600caffa6be.1530881548.git.anatoly.burakov@intel.com/mbox/",
    "series": [
        {
            "id": 453,
            "url": "http://patches.dpdk.org/api/series/453/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=453",
            "date": "2018-07-06T13:17:21",
            "name": "Support externally allocated memory in DPDK",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/453/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/42509/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/42509/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 F08621BF4D;\n\tFri,  6 Jul 2018 15:17:59 +0200 (CEST)",
            "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id 579CA1BF42\n\tfor <dev@dpdk.org>; Fri,  6 Jul 2018 15:17:57 +0200 (CEST)",
            "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Jul 2018 06:17:55 -0700",
            "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga008.fm.intel.com with ESMTP; 06 Jul 2018 06:17:34 -0700",
            "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\tw66DHXXQ027475; Fri, 6 Jul 2018 14:17:33 +0100",
            "from sivswdev01.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev01.ir.intel.com with ESMTP id w66DHXZv003761;\n\tFri, 6 Jul 2018 14:17:33 +0100",
            "(from aburakov@localhost)\n\tby sivswdev01.ir.intel.com with LOCAL id w66DHXDG003757;\n\tFri, 6 Jul 2018 14:17:33 +0100"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.51,316,1526367600\"; d=\"scan'208\";a=\"53071164\"",
        "From": "Anatoly Burakov <anatoly.burakov@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "Thomas Monjalon <thomas@monjalon.net>, srinath.mannam@broadcom.com,\n\tscott.branden@broadcom.com, ajit.khaparde@broadcom.com",
        "Date": "Fri,  6 Jul 2018 14:17:24 +0100",
        "Message-Id": "<be19bfbab392b3938a40f70ca60d9600caffa6be.1530881548.git.anatoly.burakov@intel.com>",
        "X-Mailer": "git-send-email 1.7.0.7",
        "In-Reply-To": [
            "<cover.1530881548.git.anatoly.burakov@intel.com>",
            "<cover.1530881548.git.anatoly.burakov@intel.com>"
        ],
        "References": [
            "<cover.1530881548.git.anatoly.burakov@intel.com>",
            "<cover.1530881548.git.anatoly.burakov@intel.com>"
        ],
        "Subject": "[dpdk-dev] [RFC 03/11] malloc: index heaps using heap ID rather\n\tthan NUMA node",
        "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": "Switch over all parts of EAL to use heap ID instead of NUMA node\nID to identify heaps. Heap ID for DPDK-internal heaps is NUMA\nnode's index within the detected NUMA node list.\n\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\n---\n config/common_base                            |  1 +\n lib/librte_eal/common/eal_common_memzone.c    | 46 ++++++++++------\n .../common/include/rte_eal_memconfig.h        |  4 +-\n lib/librte_eal/common/malloc_heap.c           | 53 ++++++++++++-------\n lib/librte_eal/common/rte_malloc.c            | 28 ++++++----\n 5 files changed, 84 insertions(+), 48 deletions(-)",
    "diff": "diff --git a/config/common_base b/config/common_base\nindex fcf3a1f6f..b0e3937e0 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -61,6 +61,7 @@ CONFIG_RTE_CACHE_LINE_SIZE=64\n CONFIG_RTE_LIBRTE_EAL=y\n CONFIG_RTE_MAX_LCORE=128\n CONFIG_RTE_MAX_NUMA_NODES=8\n+CONFIG_RTE_MAX_HEAPS=32\n CONFIG_RTE_MAX_MEMSEG_LISTS=64\n # each memseg list will be limited to either RTE_MAX_MEMSEG_PER_LIST pages\n # or RTE_MAX_MEM_MB_PER_LIST megabytes worth of memory, whichever is smaller\ndiff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c\nindex faa3b0615..25c56052c 100644\n--- a/lib/librte_eal/common/eal_common_memzone.c\n+++ b/lib/librte_eal/common/eal_common_memzone.c\n@@ -52,6 +52,26 @@ memzone_lookup_thread_unsafe(const char *name)\n \treturn NULL;\n }\n \n+static size_t\n+heap_max_free_elem(unsigned int heap_idx, unsigned int align)\n+{\n+\tstruct rte_malloc_socket_stats stats;\n+\tstruct rte_mem_config *mcfg;\n+\tsize_t len;\n+\n+\t/* get pointer to global configuration */\n+\tmcfg = rte_eal_get_configuration()->mem_config;\n+\n+\tmalloc_heap_get_stats(&mcfg->malloc_heaps[heap_idx], &stats);\n+\n+\tlen = stats.greatest_free_size;\n+\n+\tif (len < MALLOC_ELEM_OVERHEAD + align)\n+\t\treturn 0;\n+\n+\treturn len - MALLOC_ELEM_OVERHEAD - align;\n+}\n+\n \n /* This function will return the greatest free block if a heap has been\n  * specified. If no heap has been specified, it will return the heap and\n@@ -59,29 +79,23 @@ memzone_lookup_thread_unsafe(const char *name)\n static size_t\n find_heap_max_free_elem(int *s, unsigned align)\n {\n-\tstruct rte_mem_config *mcfg;\n-\tstruct rte_malloc_socket_stats stats;\n-\tint i, socket = *s;\n+\tunsigned int idx;\n+\tint socket = *s;\n \tsize_t len = 0;\n \n-\t/* get pointer to global configuration */\n-\tmcfg = rte_eal_get_configuration()->mem_config;\n-\n-\tfor (i = 0; i < RTE_MAX_NUMA_NODES; i++) {\n-\t\tif ((socket != SOCKET_ID_ANY) && (socket != i))\n+\tfor (idx = 0; idx < rte_socket_count(); idx++) {\n+\t\tint cur_socket = rte_socket_id_by_idx(idx);\n+\t\tif ((socket != SOCKET_ID_ANY) && (socket != cur_socket))\n \t\t\tcontinue;\n \n-\t\tmalloc_heap_get_stats(&mcfg->malloc_heaps[i], &stats);\n-\t\tif (stats.greatest_free_size > len) {\n-\t\t\tlen = stats.greatest_free_size;\n-\t\t\t*s = i;\n+\t\tsize_t cur_len = heap_max_free_elem(idx, align);\n+\t\tif (cur_len > len) {\n+\t\t\tlen = cur_len;\n+\t\t\t*s = cur_socket;\n \t\t}\n \t}\n \n-\tif (len < MALLOC_ELEM_OVERHEAD + align)\n-\t\treturn 0;\n-\n-\treturn len - MALLOC_ELEM_OVERHEAD - align;\n+\treturn len;\n }\n \n static const struct rte_memzone *\ndiff --git a/lib/librte_eal/common/include/rte_eal_memconfig.h b/lib/librte_eal/common/include/rte_eal_memconfig.h\nindex 4e8720ba6..7e03196a6 100644\n--- a/lib/librte_eal/common/include/rte_eal_memconfig.h\n+++ b/lib/librte_eal/common/include/rte_eal_memconfig.h\n@@ -71,8 +71,8 @@ struct rte_mem_config {\n \n \tstruct rte_tailq_head tailq_head[RTE_MAX_TAILQ]; /**< Tailqs for objects */\n \n-\t/* Heaps of Malloc per socket */\n-\tstruct malloc_heap malloc_heaps[RTE_MAX_NUMA_NODES];\n+\t/* Heaps of Malloc */\n+\tstruct malloc_heap malloc_heaps[RTE_MAX_HEAPS];\n \n \t/* address of mem_config in primary process. used to map shared config into\n \t * exact same address the primary process maps it.\ndiff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c\nindex 8a1f54905..e7e1838b1 100644\n--- a/lib/librte_eal/common/malloc_heap.c\n+++ b/lib/librte_eal/common/malloc_heap.c\n@@ -93,9 +93,10 @@ malloc_add_seg(const struct rte_memseg_list *msl,\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tstruct rte_memseg_list *found_msl;\n \tstruct malloc_heap *heap;\n-\tint msl_idx;\n+\tint msl_idx, heap_idx;\n \n-\theap = &mcfg->malloc_heaps[msl->socket_id];\n+\theap_idx = rte_socket_idx_by_id(msl->socket_id);\n+\theap = &mcfg->malloc_heaps[heap_idx];\n \n \t/* msl is const, so find it */\n \tmsl_idx = msl - mcfg->memsegs;\n@@ -494,14 +495,20 @@ alloc_more_mem_on_socket(struct malloc_heap *heap, size_t size, int socket,\n \n /* this will try lower page sizes first */\n static void *\n-heap_alloc_on_socket(const char *type, size_t size, int socket,\n-\t\tunsigned int flags, size_t align, size_t bound, bool contig)\n+malloc_heap_alloc_on_heap_id(const char *type, size_t size,\n+\t\tunsigned int heap_id, unsigned int flags, size_t align,\n+\t\tsize_t bound, bool contig)\n {\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n-\tstruct malloc_heap *heap = &mcfg->malloc_heaps[socket];\n+\tstruct malloc_heap *heap = &mcfg->malloc_heaps[heap_id];\n \tunsigned int size_flags = flags & ~RTE_MEMZONE_SIZE_HINT_ONLY;\n+\tint socket_id;\n \tvoid *ret;\n \n+\t/* return NULL if size is 0 or alignment is not power-of-2 */\n+\tif (size == 0 || (align && !rte_is_power_of_2(align)))\n+\t\treturn NULL;\n+\n \trte_spinlock_lock(&(heap->lock));\n \n \talign = align == 0 ? 1 : align;\n@@ -521,8 +528,13 @@ heap_alloc_on_socket(const char *type, size_t size, int socket,\n \tif (ret != NULL)\n \t\tgoto alloc_unlock;\n \n-\tif (!alloc_more_mem_on_socket(heap, size, socket, flags, align, bound,\n-\t\t\tcontig)) {\n+\tsocket_id = rte_socket_id_by_idx(heap_id);\n+\t/* if socket ID is invalid, this is an external heap */\n+\tif (socket_id < 0)\n+\t\tgoto alloc_unlock;\n+\n+\tif (!alloc_more_mem_on_socket(heap, size, socket_id, flags, align,\n+\t\t\tbound, contig)) {\n \t\tret = heap_alloc(heap, type, size, flags, align, bound, contig);\n \n \t\t/* this should have succeeded */\n@@ -538,13 +550,9 @@ void *\n malloc_heap_alloc(const char *type, size_t size, int socket_arg,\n \t\tunsigned int flags, size_t align, size_t bound, bool contig)\n {\n-\tint socket, i, cur_socket;\n+\tint socket, heap_id, i;\n \tvoid *ret;\n \n-\t/* return NULL if size is 0 or alignment is not power-of-2 */\n-\tif (size == 0 || (align && !rte_is_power_of_2(align)))\n-\t\treturn NULL;\n-\n \tif (!rte_eal_has_hugepages())\n \t\tsocket_arg = SOCKET_ID_ANY;\n \n@@ -557,18 +565,23 @@ malloc_heap_alloc(const char *type, size_t size, int socket_arg,\n \tif (socket >= RTE_MAX_NUMA_NODES)\n \t\treturn NULL;\n \n-\tret = heap_alloc_on_socket(type, size, socket, flags, align, bound,\n-\t\t\tcontig);\n+\t/* turn socket ID into heap ID */\n+\theap_id = rte_socket_idx_by_id(socket);\n+\t/* if heap id is invalid, it's a non-existent NUMA node */\n+\tif (heap_id < 0)\n+\t\treturn NULL;\n+\n+\tret = malloc_heap_alloc_on_heap_id(type, size, heap_id, flags, align,\n+\t\t\tbound, contig);\n \tif (ret != NULL || socket_arg != SOCKET_ID_ANY)\n \t\treturn ret;\n \n \t/* try other heaps */\n \tfor (i = 0; i < (int) rte_socket_count(); i++) {\n-\t\tcur_socket = rte_socket_id_by_idx(i);\n-\t\tif (cur_socket == socket)\n+\t\tif (i == heap_id)\n \t\t\tcontinue;\n-\t\tret = heap_alloc_on_socket(type, size, cur_socket, flags,\n-\t\t\t\talign, bound, contig);\n+\t\tret = malloc_heap_alloc_on_heap_id(type, size, i, flags, align,\n+\t\t\t\tbound, contig);\n \t\tif (ret != NULL)\n \t\t\treturn ret;\n \t}\n@@ -788,7 +801,7 @@ malloc_heap_resize(struct malloc_elem *elem, size_t size)\n }\n \n /*\n- * Function to retrieve data for heap on given socket\n+ * Function to retrieve data for a given heap\n  */\n int\n malloc_heap_get_stats(struct malloc_heap *heap,\n@@ -826,7 +839,7 @@ malloc_heap_get_stats(struct malloc_heap *heap,\n }\n \n /*\n- * Function to retrieve data for heap on given socket\n+ * Function to retrieve data for a given heap\n  */\n void\n malloc_heap_dump(struct malloc_heap *heap, FILE *f)\ndiff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c\nindex b51a6d111..4387bc494 100644\n--- a/lib/librte_eal/common/rte_malloc.c\n+++ b/lib/librte_eal/common/rte_malloc.c\n@@ -152,11 +152,17 @@ rte_malloc_get_socket_stats(int socket,\n \t\tstruct rte_malloc_socket_stats *socket_stats)\n {\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n+\tint heap_idx;\n \n \tif (socket >= RTE_MAX_NUMA_NODES || socket < 0)\n \t\treturn -1;\n \n-\treturn malloc_heap_get_stats(&mcfg->malloc_heaps[socket], socket_stats);\n+\theap_idx = rte_socket_idx_by_id(socket);\n+\tif (heap_idx < 0)\n+\t\treturn -1;\n+\n+\treturn malloc_heap_get_stats(&mcfg->malloc_heaps[heap_idx],\n+\t\t\tsocket_stats);\n }\n \n /*\n@@ -168,10 +174,9 @@ rte_malloc_dump_heaps(FILE *f)\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n \tunsigned int idx;\n \n-\tfor (idx = 0; idx < rte_socket_count(); idx++) {\n-\t\tunsigned int socket = rte_socket_id_by_idx(idx);\n-\t\tfprintf(f, \"Heap on socket %i:\\n\", socket);\n-\t\tmalloc_heap_dump(&mcfg->malloc_heaps[socket], f);\n+\tfor (idx = 0; idx < RTE_MAX_HEAPS; idx++) {\n+\t\tfprintf(f, \"Heap id: %u\\n\", idx);\n+\t\tmalloc_heap_dump(&mcfg->malloc_heaps[idx], f);\n \t}\n \n }\n@@ -182,14 +187,17 @@ rte_malloc_dump_heaps(FILE *f)\n void\n rte_malloc_dump_stats(FILE *f, __rte_unused const char *type)\n {\n-\tunsigned int socket;\n+\tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n+\tunsigned int heap_id;\n \tstruct rte_malloc_socket_stats sock_stats;\n+\n \t/* Iterate through all initialised heaps */\n-\tfor (socket=0; socket< RTE_MAX_NUMA_NODES; socket++) {\n-\t\tif ((rte_malloc_get_socket_stats(socket, &sock_stats) < 0))\n-\t\t\tcontinue;\n+\tfor (heap_id = 0; heap_id < RTE_MAX_HEAPS; heap_id++) {\n+\t\tstruct malloc_heap *heap = &mcfg->malloc_heaps[heap_id];\n \n-\t\tfprintf(f, \"Socket:%u\\n\", socket);\n+\t\tmalloc_heap_get_stats(heap, &sock_stats);\n+\n+\t\tfprintf(f, \"Heap id:%u\\n\", heap_id);\n \t\tfprintf(f, \"\\tHeap_size:%zu,\\n\", sock_stats.heap_totalsz_bytes);\n \t\tfprintf(f, \"\\tFree_size:%zu,\\n\", sock_stats.heap_freesz_bytes);\n \t\tfprintf(f, \"\\tAlloc_size:%zu,\\n\", sock_stats.heap_allocsz_bytes);\n",
    "prefixes": [
        "RFC",
        "03/11"
    ]
}