Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/67778/?format=api
{ "id": 67778, "url": "https://patches.dpdk.org/api/patches/67778/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200403153709.3703448-20-jerinj@marvell.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": "<20200403153709.3703448-20-jerinj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200403153709.3703448-20-jerinj@marvell.com", "date": "2020-04-03T15:36:55", "name": "[v4,19/33] eal/trace: add memory tracepoints", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "81f5f1a9c332f28f1299cce11fb9445b8452e062", "submitter": { "id": 1188, "url": "https://patches.dpdk.org/api/people/1188/?format=api", "name": "Jerin Jacob Kollanukkaran", "email": "jerinj@marvell.com" }, "delegate": { "id": 24651, "url": "https://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200403153709.3703448-20-jerinj@marvell.com/mbox/", "series": [ { "id": 9192, "url": "https://patches.dpdk.org/api/series/9192/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9192", "date": "2020-04-03T15:36:36", "name": "DPDK Trace support", "version": 4, "mbox": "https://patches.dpdk.org/series/9192/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/67778/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/67778/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0ECA9A0562;\n\tFri, 3 Apr 2020 17:41:12 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AE50D1C217;\n\tFri, 3 Apr 2020 17:38:10 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id B93FC1C217\n for <dev@dpdk.org>; Fri, 3 Apr 2020 17:38:09 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 033FaIjp029207; Fri, 3 Apr 2020 08:38:09 -0700", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0a-0016f401.pphosted.com with ESMTP id 304855y7fy-2\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Fri, 03 Apr 2020 08:38:08 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Fri, 3 Apr 2020 08:38:07 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Fri, 3 Apr 2020 08:38:07 -0700", "from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])\n by maili.marvell.com (Postfix) with ESMTP id E38383F703F;\n Fri, 3 Apr 2020 08:38:04 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0818;\n bh=bIP6JIOg/pOnKrLFC58/zFEwh23dUtYODwI234nFElk=;\n b=SaAmvJvsdHmIpenut0V96GjEjatOrONh0eYzkveRfFldroFgTbYxGm/dGxy6Pn/rDjon\n aWnkNG2tExv10OknS7j31jdGEsJQkN1f3JYhClo291QAtho6EA2EceFVjJx9LEcV3R9X\n aGx/S27JBAN9S0YlF8+LYzRn3AbnHVYSuWziZKvfq18UDYOWIA/8p/IGyv4opUQhGzvS\n 9+j5r8mvkYAYkxytRSDrFcHZnFhLR1gnesIAHdR7OmcJPBzjWoh38uyRlrRMCwzfkDWc\n vhqpkASEnUsGFyOcXmEVK2avxuBgnOOjN3eLL4Y5rCFoX1+i4keebv9MKx3i87bzStro FQ==", "From": "<jerinj@marvell.com>", "To": "Jerin Jacob <jerinj@marvell.com>, Sunil Kumar Kori <skori@marvell.com>,\n Anatoly Burakov <anatoly.burakov@intel.com>", "CC": "<dev@dpdk.org>, <thomas@monjalon.net>, <bruce.richardson@intel.com>,\n <david.marchand@redhat.com>, <mattias.ronnblom@ericsson.com>", "Date": "Fri, 3 Apr 2020 21:06:55 +0530", "Message-ID": "<20200403153709.3703448-20-jerinj@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200403153709.3703448-1-jerinj@marvell.com>", "References": "<20200329144342.1543749-1-jerinj@marvell.com>\n <20200403153709.3703448-1-jerinj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676\n definitions=2020-04-03_11:2020-04-03,\n 2020-04-03 signatures=0", "Subject": "[dpdk-dev] [PATCH v4 19/33] eal/trace: add memory tracepoints", "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 <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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Jerin Jacob <jerinj@marvell.com>\n\nAdd the following memory-related tracepoints.\n\nrte_trace_lib_eal_mem_zmalloc;\nrte_trace_lib_eal_mem_malloc;\nrte_trace_lib_eal_mem_realloc;\nrte_trace_lib_eal_mem_free;\n\nrte_malloc() and rte_free() has been used in the trace implementation,\nin order to avoid tracing implementation specific events, added\nan internal no trace version rte_malloc() and rte_free().\n\nSigned-off-by: Jerin Jacob <jerinj@marvell.com>\n---\n lib/librte_eal/common/eal_common_trace.c | 4 +-\n .../common/eal_common_trace_points.c | 14 +++++\n lib/librte_eal/common/eal_private.h | 5 ++\n lib/librte_eal/common/rte_malloc.c | 60 ++++++++++++++++---\n lib/librte_eal/include/rte_trace_eal.h | 33 ++++++++++\n lib/librte_eal/rte_eal_version.map | 4 ++\n 6 files changed, 109 insertions(+), 11 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c\nindex 6b1600758..840cab5a1 100644\n--- a/lib/librte_eal/common/eal_common_trace.c\n+++ b/lib/librte_eal/common/eal_common_trace.c\n@@ -428,7 +428,7 @@ __rte_trace_mem_per_thread_alloc(void)\n \t}\n \n \t/* First attempt from huge page */\n-\theader = rte_malloc(NULL, trace_mem_sz(trace->buff_len), 8);\n+\theader = eal_malloc_no_trace(NULL, trace_mem_sz(trace->buff_len), 8);\n \tif (header) {\n \t\ttrace->lcore_meta[count].area = TRACE_AREA_HUGEPAGE;\n \t\tgoto found;\n@@ -480,7 +480,7 @@ trace_mem_per_thread_free(void)\n \tfor (count = 0; count < trace->nb_trace_mem_list; count++) {\n \t\tmem = trace->lcore_meta[count].mem;\n \t\tif (trace->lcore_meta[count].area == TRACE_AREA_HUGEPAGE)\n-\t\t\trte_free(mem);\n+\t\t\teal_free_no_trace(mem);\n \t\telse if (trace->lcore_meta[count].area == TRACE_AREA_HEAP)\n \t\t\tfree(mem);\n \t}\ndiff --git a/lib/librte_eal/common/eal_common_trace_points.c b/lib/librte_eal/common/eal_common_trace_points.c\nindex 16261b1d6..dcae51bac 100644\n--- a/lib/librte_eal/common/eal_common_trace_points.c\n+++ b/lib/librte_eal/common/eal_common_trace_points.c\n@@ -26,6 +26,11 @@ RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_generic_func);\n RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_alarm_set);\n RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_alarm_cancel);\n \n+RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_mem_zmalloc);\n+RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_mem_malloc);\n+RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_mem_realloc);\n+RTE_TRACE_POINT_DEFINE(rte_trace_lib_eal_mem_free);\n+\n RTE_INIT(eal_trace_init)\n {\n \tRTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_generic_void,\n@@ -66,4 +71,13 @@ RTE_INIT(eal_trace_init)\n \tRTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_alarm_cancel,\n \t\t\t\t lib.eal.alarm.cancel, INFO);\n \n+\tRTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_mem_zmalloc,\n+\t\t\t\t lib.eal.mem.zmalloc, INFO);\n+\tRTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_mem_malloc,\n+\t\t\t\t lib.eal.mem.malloc, INFO);\n+\tRTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_mem_realloc,\n+\t\t\t\t lib.eal.mem.realloc, INFO);\n+\tRTE_TRACE_POINT_REGISTER(rte_trace_lib_eal_mem_free,\n+\t\t\t\t lib.eal.mem.free, INFO);\n+\n }\ndiff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h\nindex 81694616b..f61f52eff 100644\n--- a/lib/librte_eal/common/eal_private.h\n+++ b/lib/librte_eal/common/eal_private.h\n@@ -446,4 +446,9 @@ eal_get_baseaddr(void);\n const char *\n eal_loglevel_to_string(uint32_t level);\n \n+void *\n+eal_malloc_no_trace(const char *type, size_t size, unsigned int align);\n+\n+void eal_free_no_trace(void *addr);\n+\n #endif /* _EAL_PRIVATE_H_ */\ndiff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c\nindex d6026a2b1..9ad032aed 100644\n--- a/lib/librte_eal/common/rte_malloc.c\n+++ b/lib/librte_eal/common/rte_malloc.c\n@@ -20,6 +20,7 @@\n #include <rte_lcore.h>\n #include <rte_common.h>\n #include <rte_spinlock.h>\n+#include <rte_trace_eal.h>\n \n #include <rte_malloc.h>\n #include \"malloc_elem.h\"\n@@ -30,20 +31,35 @@\n \n \n /* Free the memory space back to heap */\n-void rte_free(void *addr)\n+static void\n+mem_free(void *addr, const bool trace_ena)\n {\n+\tif (trace_ena == true)\n+\t\trte_trace_lib_eal_mem_free(addr);\n+\n \tif (addr == NULL) return;\n \tif (malloc_heap_free(malloc_elem_from_data(addr)) < 0)\n \t\tRTE_LOG(ERR, EAL, \"Error: Invalid memory\\n\");\n }\n \n-/*\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+void\n+rte_free(void *addr)\n {\n+\treturn mem_free(addr, true);\n+}\n+\n+void\n+eal_free_no_trace(void *addr)\n+{\n+\treturn mem_free(addr, false);\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+{\n+\tvoid *ptr;\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@@ -57,8 +73,29 @@ rte_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-\treturn malloc_heap_alloc(type, size, socket_arg, 0,\n+\tptr = malloc_heap_alloc(type, size, socket_arg, 0,\n \t\t\talign == 0 ? 1 : align, 0, false);\n+\n+\tif (trace_ena == true)\n+\t\trte_trace_lib_eal_mem_malloc(type, size, align,\n+\t\t\t\t\t socket_arg, ptr);\n+\treturn ptr;\n+}\n+\n+/*\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+{\n+\treturn malloc_socket(type, size, align, socket_arg, true);\n+}\n+\n+void *\n+eal_malloc_no_trace(const char *type, size_t size, unsigned int align)\n+{\n+\treturn malloc_socket(type, size, align, SOCKET_ID_ANY, false);\n }\n \n /*\n@@ -87,6 +124,8 @@ rte_zmalloc_socket(const char *type, size_t size, unsigned align, int socket)\n \tif (ptr != NULL)\n \t\tmemset(ptr, 0, size);\n #endif\n+\n+\trte_trace_lib_eal_mem_zmalloc(type, size, align, socket, ptr);\n \treturn ptr;\n }\n \n@@ -140,8 +179,10 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)\n \tif ((socket == SOCKET_ID_ANY ||\n \t (unsigned int)socket == elem->heap->socket_id) &&\n \t\t\tRTE_PTR_ALIGN(ptr, align) == ptr &&\n-\t\t\tmalloc_heap_resize(elem, size) == 0)\n+\t\t\tmalloc_heap_resize(elem, size) == 0) {\n+\t\trte_trace_lib_eal_mem_realloc(size, align, socket, ptr);\n \t\treturn ptr;\n+\t}\n \n \t/* either requested socket id doesn't match, alignment is off\n \t * or we have no room to expand,\n@@ -155,6 +196,7 @@ rte_realloc_socket(void *ptr, size_t size, unsigned int align, int socket)\n \trte_memcpy(new_ptr, ptr, old_size < size ? old_size : size);\n \trte_free(ptr);\n \n+\trte_trace_lib_eal_mem_realloc(size, align, socket, new_ptr);\n \treturn new_ptr;\n }\n \ndiff --git a/lib/librte_eal/include/rte_trace_eal.h b/lib/librte_eal/include/rte_trace_eal.h\nindex df1b3854b..597cf9ca3 100644\n--- a/lib/librte_eal/include/rte_trace_eal.h\n+++ b/lib/librte_eal/include/rte_trace_eal.h\n@@ -133,6 +133,39 @@ RTE_TRACE_POINT(\n \trte_trace_ctf_int(count);\n )\n \n+/* Memory */\n+RTE_TRACE_POINT(\n+\trte_trace_lib_eal_mem_zmalloc,\n+\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n+\t\t\t int socket, void *ptr),\n+\trte_trace_ctf_string(type); rte_trace_ctf_long(size);\n+\trte_trace_ctf_u32(align); rte_trace_ctf_int(socket);\n+\trte_trace_ctf_ptr(ptr);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_trace_lib_eal_mem_malloc,\n+\tRTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,\n+\t\t\t int socket, void *ptr),\n+\trte_trace_ctf_string(type); rte_trace_ctf_long(size);\n+\trte_trace_ctf_u32(align); rte_trace_ctf_int(socket);\n+\trte_trace_ctf_ptr(ptr);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_trace_lib_eal_mem_realloc,\n+\tRTE_TRACE_POINT_ARGS(size_t size, unsigned int align,\n+\t\t\t int socket, void *ptr),\n+\trte_trace_ctf_long(size); rte_trace_ctf_u32(align);\n+\trte_trace_ctf_int(socket); rte_trace_ctf_ptr(ptr);\n+)\n+\n+RTE_TRACE_POINT(\n+\trte_trace_lib_eal_mem_free,\n+\tRTE_TRACE_POINT_ARGS(void *ptr),\n+\trte_trace_ctf_ptr(ptr);\n+)\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map\nindex 67c8e0b51..96c8e9099 100644\n--- a/lib/librte_eal/rte_eal_version.map\n+++ b/lib/librte_eal/rte_eal_version.map\n@@ -384,4 +384,8 @@ EXPERIMENTAL {\n \t__rte_trace_lib_eal_generic_func;\n \t__rte_trace_lib_eal_alarm_set;\n \t__rte_trace_lib_eal_alarm_cancel;\n+\t__rte_trace_lib_eal_mem_zmalloc;\n+\t__rte_trace_lib_eal_mem_malloc;\n+\t__rte_trace_lib_eal_mem_realloc;\n+\t__rte_trace_lib_eal_mem_free;\n };\n", "prefixes": [ "v4", "19/33" ] }