Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/139686/?format=api
{ "id": 139686, "url": "https://patches.dpdk.org/api/patches/139686/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20240425182738.4771-5-stephen@networkplumber.org/", "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": "<20240425182738.4771-5-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240425182738.4771-5-stephen@networkplumber.org", "date": "2024-04-25T18:24:01", "name": "[RFC,4/4] eal/malloc: remove type argument from internal malloc routines", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9b4ddba12be1414628da7b2d7585e600f039b755", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20240425182738.4771-5-stephen@networkplumber.org/mbox/", "series": [ { "id": 31824, "url": "https://patches.dpdk.org/api/series/31824/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=31824", "date": "2024-04-25T18:23:57", "name": "malloc type argument cleanup (part 1)", "version": 1, "mbox": "https://patches.dpdk.org/series/31824/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/139686/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/139686/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id F34F343F09;\n\tThu, 25 Apr 2024 20:28:16 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 09AE143962;\n\tThu, 25 Apr 2024 20:27:57 +0200 (CEST)", "from mail-pf1-f173.google.com (mail-pf1-f173.google.com\n [209.85.210.173])\n by mails.dpdk.org (Postfix) with ESMTP id 5D32B4394C\n for <dev@dpdk.org>; Thu, 25 Apr 2024 20:27:52 +0200 (CEST)", "by mail-pf1-f173.google.com with SMTP id\n d2e1a72fcca58-6f07de6ab93so1272751b3a.2\n for <dev@dpdk.org>; Thu, 25 Apr 2024 11:27:52 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n d7-20020a056a00244700b006f0ba1c8ddesm4067006pfj.184.2024.04.25.11.27.50\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 25 Apr 2024 11:27:51 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1714069671;\n x=1714674471; darn=dpdk.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=eToGpaZd1km8aJMGcaBIZz+3ftXcaJlJuBtSwUPoz8U=;\n b=AeMjrlYI+mrKfk0oLJc/nv1Tn0JhPesIRurfFORh9z7Td6MD2P2Hh1U8+fDLqDreAP\n vuu1fLROGj56/N6q8IEOKt6Dh6wrDE3FbXdaHYVVXM3bYzILpKjY7xoXWC+LcNOdLdFa\n CM4NdKf0L+x+6qyhFNDudTqUQONG7yEmobIqL1eDwER3+L5K8UuN95JBXr8XhGQNEizR\n 5zzNfK4plq66DK6Vmgh+3sTflRPvhTpaFZVDVB3upM/qGjI1K2cfG6f1t0WWgil6W9xt\n yMrNJindV2ABC3F43rlacgui5iPrFeGJvVb21/7EFkVK3KopFHXmF1HQmC0t9cueLb0U\n trxA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1714069671; x=1714674471;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=eToGpaZd1km8aJMGcaBIZz+3ftXcaJlJuBtSwUPoz8U=;\n b=L8I0vfQ/kLg7Ub2drDWCm3Ym5N9YxjnZu3wXHhIs73z30ZmgVJ5Tloux+gqrS/a0vO\n RrljIbA2kFvIk/Hu4XOZf9NLtVeGnC9r1E/gakfBjQoTma25foZfgycYopy2E8O2gWqH\n fz6ZyT5U+TGnp4qDEPOOIWVPh6fgMYxaek4Ra6ST2BKHLaOE3eAM1K72csE+K976Z4G/\n 5QXUhouCyjKcWoVEfwO849MhEsm1OqICcUHo/zBP4WRSC1hqjtc8ieP8bgGv1biQGaPw\n gopHjjyykXGiD+9x0tcgKrDR5+8PMdYFCfeEHY99avxL84bA8MC4QWIXeKlEsT03Ybnr\n GNEQ==", "X-Gm-Message-State": "AOJu0Yw0xRqTb014TSuHkZSnLwID3IOGxLnndx+5MZQR5v1jj2A/3gXz\n /Z6iM4AToIDBDGlSgsNA8Q+WkETgqFIfP38LMy9jXoWbccNnvZ13QTHGLpE9BkxYNFLurW3Qu+p\n O", "X-Google-Smtp-Source": "\n AGHT+IGAI4Udb8TU58DHFIDzZycafT2UzwkH7RQAUrKflKoGxfOF/Bbycu+09ErvPlI1sRjP2RuBgw==", "X-Received": "by 2002:a05:6a21:144c:b0:1a7:1b6e:4d4 with SMTP id\n oc12-20020a056a21144c00b001a71b6e04d4mr460494pzb.23.1714069671495;\n Thu, 25 Apr 2024 11:27:51 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Subject": "[RFC 4/4] eal/malloc: remove type argument from internal malloc\n routines", "Date": "Thu, 25 Apr 2024 11:24:01 -0700", "Message-ID": "<20240425182738.4771-5-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240425182738.4771-1-stephen@networkplumber.org>", "References": "<20240425182738.4771-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "The type argument is carried through malloc heap routines but\nnever used.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n lib/eal/common/eal_common_memzone.c | 6 ++---\n lib/eal/common/malloc_heap.c | 39 ++++++++++++----------------\n lib/eal/common/malloc_heap.h | 7 +++--\n lib/eal/common/rte_malloc.c | 16 +++++-------\n lib/eal/include/eal_trace_internal.h | 4 +--\n 5 files changed, 29 insertions(+), 43 deletions(-)", "diff": "diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c\nindex 32e6b78f87..2d9b6aa3e3 100644\n--- a/lib/eal/common/eal_common_memzone.c\n+++ b/lib/eal/common/eal_common_memzone.c\n@@ -191,14 +191,12 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,\n \tif (len == 0 && bound == 0) {\n \t\t/* no size constraints were placed, so use malloc elem len */\n \t\trequested_len = 0;\n-\t\tmz_addr = malloc_heap_alloc_biggest(NULL, socket_id, flags,\n-\t\t\t\talign, contig);\n+\t\tmz_addr = malloc_heap_alloc_biggest(socket_id, flags, align, contig);\n \t} else {\n \t\tif (len == 0)\n \t\t\trequested_len = bound;\n \t\t/* allocate memory on heap */\n-\t\tmz_addr = malloc_heap_alloc(NULL, requested_len, socket_id,\n-\t\t\t\tflags, align, bound, contig);\n+\t\tmz_addr = malloc_heap_alloc(requested_len, socket_id, flags, align, bound, contig);\n \t}\n \tif (mz_addr == NULL) {\n \t\trte_errno = ENOMEM;\ndiff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c\nindex 5ff27548ff..058aaf4209 100644\n--- a/lib/eal/common/malloc_heap.c\n+++ b/lib/eal/common/malloc_heap.c\n@@ -229,8 +229,8 @@ find_biggest_element(struct malloc_heap *heap, size_t *size,\n * the new element after releasing the lock.\n */\n static void *\n-heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,\n-\t\tunsigned int flags, size_t align, size_t bound, bool contig)\n+heap_alloc(struct malloc_heap *heap, size_t size, unsigned int flags,\n+\t size_t align, size_t bound, bool contig)\n {\n \tstruct malloc_elem *elem;\n \tsize_t user_size = size;\n@@ -255,8 +255,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,\n }\n \n static void *\n-heap_alloc_biggest(struct malloc_heap *heap, const char *type __rte_unused,\n-\t\tunsigned int flags, size_t align, bool contig)\n+heap_alloc_biggest(struct malloc_heap *heap, unsigned int flags, size_t align, bool contig)\n {\n \tstruct malloc_elem *elem;\n \tsize_t size;\n@@ -640,8 +639,7 @@ 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-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+malloc_heap_alloc_on_heap_id(size_t size, unsigned 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@@ -658,7 +656,7 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size,\n \n \t/* for legacy mode, try once and with all flags */\n \tif (internal_conf->legacy_mem) {\n-\t\tret = heap_alloc(heap, type, size, flags, align, bound, contig);\n+\t\tret = heap_alloc(heap, size, flags, align, bound, contig);\n \t\tgoto alloc_unlock;\n \t}\n \n@@ -679,7 +677,7 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size,\n \tif (socket_id < 0)\n \t\tsize_flags |= RTE_MEMZONE_SIZE_HINT_ONLY;\n \n-\tret = heap_alloc(heap, type, size, size_flags, align, bound, contig);\n+\tret = heap_alloc(heap, size, size_flags, align, bound, contig);\n \tif (ret != NULL)\n \t\tgoto alloc_unlock;\n \n@@ -689,7 +687,7 @@ malloc_heap_alloc_on_heap_id(const char *type, size_t size,\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+\t\tret = heap_alloc(heap, size, flags, align, bound, contig);\n \n \t\t/* this should have succeeded */\n \t\tif (ret == NULL)\n@@ -730,8 +728,8 @@ malloc_get_numa_socket(void)\n }\n \n 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+malloc_heap_alloc(size_t size, int socket_arg, unsigned int flags,\n+\t\t size_t align, size_t bound, bool contig)\n {\n \tint socket, heap_id, i;\n \tvoid *ret;\n@@ -754,8 +752,7 @@ malloc_heap_alloc(const char *type, size_t size, int socket_arg,\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+\tret = malloc_heap_alloc_on_heap_id(size, heap_id, flags, align, bound, contig);\n \tif (ret != NULL || socket_arg != SOCKET_ID_ANY)\n \t\treturn ret;\n \n@@ -765,8 +762,7 @@ malloc_heap_alloc(const char *type, size_t size, int socket_arg,\n \tfor (i = 0; i < (int) rte_socket_count(); i++) {\n \t\tif (i == heap_id)\n \t\t\tcontinue;\n-\t\tret = malloc_heap_alloc_on_heap_id(type, size, i, flags, align,\n-\t\t\t\tbound, contig);\n+\t\tret = malloc_heap_alloc_on_heap_id(size, i, flags, align, bound, contig);\n \t\tif (ret != NULL)\n \t\t\treturn ret;\n \t}\n@@ -774,7 +770,7 @@ malloc_heap_alloc(const char *type, size_t size, int socket_arg,\n }\n \n static void *\n-heap_alloc_biggest_on_heap_id(const char *type, unsigned int heap_id,\n+heap_alloc_biggest_on_heap_id(unsigned int heap_id,\n \t\tunsigned int flags, size_t align, bool contig)\n {\n \tstruct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;\n@@ -785,7 +781,7 @@ heap_alloc_biggest_on_heap_id(const char *type, unsigned int heap_id,\n \n \talign = align == 0 ? 1 : align;\n \n-\tret = heap_alloc_biggest(heap, type, flags, align, contig);\n+\tret = heap_alloc_biggest(heap, flags, align, contig);\n \n \trte_spinlock_unlock(&(heap->lock));\n \n@@ -793,8 +789,7 @@ heap_alloc_biggest_on_heap_id(const char *type, unsigned int heap_id,\n }\n \n void *\n-malloc_heap_alloc_biggest(const char *type, int socket_arg, unsigned int flags,\n-\t\tsize_t align, bool contig)\n+malloc_heap_alloc_biggest(int socket_arg, unsigned int flags, size_t align, bool contig)\n {\n \tint socket, i, cur_socket, heap_id;\n \tvoid *ret;\n@@ -817,8 +812,7 @@ malloc_heap_alloc_biggest(const char *type, int socket_arg, unsigned int flags,\n \tif (heap_id < 0)\n \t\treturn NULL;\n \n-\tret = heap_alloc_biggest_on_heap_id(type, heap_id, flags, align,\n-\t\t\tcontig);\n+\tret = heap_alloc_biggest_on_heap_id(heap_id, flags, align, contig);\n \tif (ret != NULL || socket_arg != SOCKET_ID_ANY)\n \t\treturn ret;\n \n@@ -827,8 +821,7 @@ malloc_heap_alloc_biggest(const char *type, int socket_arg, unsigned int flags,\n \t\tcur_socket = rte_socket_id_by_idx(i);\n \t\tif (cur_socket == socket)\n \t\t\tcontinue;\n-\t\tret = heap_alloc_biggest_on_heap_id(type, i, flags, align,\n-\t\t\t\tcontig);\n+\t\tret = heap_alloc_biggest_on_heap_id(i, flags, align, contig);\n \t\tif (ret != NULL)\n \t\t\treturn ret;\n \t}\ndiff --git a/lib/eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h\nindex 0c49588005..dfc56d4ae3 100644\n--- a/lib/eal/common/malloc_heap.h\n+++ b/lib/eal/common/malloc_heap.h\n@@ -34,12 +34,11 @@ struct __rte_cache_aligned malloc_heap {\n };\n \n void *\n-malloc_heap_alloc(const char *type, size_t size, int socket, unsigned int flags,\n-\t\tsize_t align, size_t bound, bool contig);\n+malloc_heap_alloc(size_t size, int socket, unsigned int flags, size_t align,\n+\t\t size_t bound, bool contig);\n \n void *\n-malloc_heap_alloc_biggest(const char *type, int socket, unsigned int flags,\n-\t\tsize_t align, bool contig);\n+malloc_heap_alloc_biggest(int socket, unsigned int flags, size_t align, bool contig);\n \n int\n malloc_heap_create(struct malloc_heap *heap, const char *heap_name);\ndiff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c\nindex 6d3c301a23..d1fcb2eff6 100644\n--- a/lib/eal/common/rte_malloc.c\n+++ b/lib/eal/common/rte_malloc.c\n@@ -51,8 +51,7 @@ eal_free_no_trace(void *addr)\n }\n \n static void *\n-malloc_socket(const char *type, size_t size, unsigned int align,\n-\t\tint socket_arg, const bool trace_ena)\n+malloc_socket(size_t size, unsigned int align, int socket_arg, const bool trace_ena)\n {\n \tvoid *ptr;\n \n@@ -69,11 +68,11 @@ malloc_socket(const char *type, size_t size, unsigned int align,\n \t\t\t\t!rte_eal_has_hugepages())\n \t\tsocket_arg = SOCKET_ID_ANY;\n \n-\tptr = malloc_heap_alloc(type, size, socket_arg, 0,\n+\tptr = malloc_heap_alloc(size, socket_arg, 0,\n \t\t\talign == 0 ? 1 : align, 0, false);\n \n \tif (trace_ena)\n-\t\trte_eal_trace_mem_malloc(type, size, align, socket_arg, ptr);\n+\t\trte_eal_trace_mem_malloc(size, align, socket_arg, ptr);\n \treturn ptr;\n }\n \n@@ -81,16 +80,15 @@ malloc_socket(const char *type, size_t size, unsigned int align,\n * Allocate memory on specified heap.\n */\n void *\n-rte_malloc_socket(const char *type, size_t size, unsigned int align,\n-\t\tint socket_arg)\n+rte_malloc_socket(const char *type __rte_unused, size_t size, unsigned int align, int socket_arg)\n {\n-\treturn malloc_socket(type, size, align, socket_arg, true);\n+\treturn malloc_socket(size, align, socket_arg, true);\n }\n \n void *\n-eal_malloc_no_trace(const char *type, size_t size, unsigned int align)\n+eal_malloc_no_trace(const char *type __rte_unused, size_t size, unsigned int align)\n {\n-\treturn malloc_socket(type, size, align, SOCKET_ID_ANY, false);\n+\treturn malloc_socket(size, align, SOCKET_ID_ANY, false);\n }\n \n /*\ndiff --git a/lib/eal/include/eal_trace_internal.h b/lib/eal/include/eal_trace_internal.h\nindex 09c354717f..fa104c975f 100644\n--- a/lib/eal/include/eal_trace_internal.h\n+++ b/lib/eal/include/eal_trace_internal.h\n@@ -103,9 +103,7 @@ RTE_TRACE_POINT(\n \n RTE_TRACE_POINT(\n \trte_eal_trace_mem_malloc,\n-\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n-\t\tint socket, void *ptr),\n-\trte_trace_point_emit_string(type);\n+\tRTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket, void *ptr),\n \trte_trace_point_emit_size_t(size);\n \trte_trace_point_emit_u32(align);\n \trte_trace_point_emit_int(socket);\n", "prefixes": [ "RFC", "4/4" ] }