malloc: add function to dump heap contents

Malloc heap is now a doubly linked list, so it's now possible to
iterate over each malloc element regardless of its state.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Tested-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Tested-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>

diff --git a/lib/librte_eal/common/include/rte_malloc.h b/lib/librte_eal/common/include/rte_malloc.h
index f02a8ba1df398f82e4dca666a9bfed813fb51504..a9fb7e4526fed5e4e038a6a9d34aaf6fc180976a 100644 (file)
--- a/lib/librte_eal/common/include/rte_malloc.h
+++ b/lib/librte_eal/common/include/rte_malloc.h
@@ -13,6 +13,7 @@
 
 #include <stdio.h>
 #include <stddef.h>
+#include <rte_compat.h>
 #include <rte_memory.h>
 
 #ifdef __cplusplus
@@ -277,6 +278,15 @@ rte_malloc_get_socket_stats(int socket,
 void
 rte_malloc_dump_stats(FILE *f, const char *type);
 
+/**
+ * Dump contents of all malloc heaps to a file.
+ *
+ * @param f
+ *   A pointer to a file for output
+ */
+void __rte_experimental
+rte_malloc_dump_heaps(FILE *f);
+
 /**
  * Set the maximum amount of allocated memory for this type.
  *

diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c
index eb41200f9f9577d1bd001cb3e2be0321ebf58afe..e02ed888c1698b214acc2254f9fdfa6948dc37cf 100644 (file)
--- a/lib/librte_eal/common/malloc_elem.c
+++ b/lib/librte_eal/common/malloc_elem.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2010-2014 Intel Corporation
  */
+#include <inttypes.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -434,3 +435,26 @@ malloc_elem_resize(struct malloc_elem *elem, size_t size)
        }
        return 0;
 }
+
+static inline const char *
+elem_state_to_str(enum elem_state state)
+{
+       switch (state) {
+       case ELEM_PAD:
+               return "PAD";
+       case ELEM_BUSY:
+               return "BUSY";
+       case ELEM_FREE:
+               return "FREE";
+       }
+       return "ERROR";
+}
+
+void
+malloc_elem_dump(const struct malloc_elem *elem, FILE *f)
+{
+       fprintf(f, "Malloc element at %p (%s)\n", elem,
+                       elem_state_to_str(elem->state));
+       fprintf(f, "  len: 0x%zx pad: 0x%" PRIx32 "\n", elem->size, elem->pad);
+       fprintf(f, "  prev: %p next: %p\n", elem->prev, elem->next);
+}

diff --git a/lib/librte_eal/common/malloc_elem.h b/lib/librte_eal/common/malloc_elem.h
index 238e45195a7727d91c137335590446dfef4a77b5..40e8eb5e0f1c0492181090a7ec7f20127b479360 100644 (file)
--- a/lib/librte_eal/common/malloc_elem.h
+++ b/lib/librte_eal/common/malloc_elem.h
@@ -148,6 +148,12 @@ malloc_elem_free(struct malloc_elem *elem);
 int
 malloc_elem_resize(struct malloc_elem *elem, size_t size);
 
+/*
+ * dump contents of malloc elem to a file.
+ */
+void
+malloc_elem_dump(const struct malloc_elem *elem, FILE *f);
+
 /*
  * Given an element size, compute its freelist index.
  */

diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
index 9c951667541191e0da7b966542e3a1188bd821d9..44538d7beec37ec5b8e12799e6495b51e4c9dd8f 100644 (file)
--- a/lib/librte_eal/common/malloc_heap.c
+++ b/lib/librte_eal/common/malloc_heap.c
@@ -217,6 +217,28 @@ malloc_heap_get_stats(struct malloc_heap *heap,
        return 0;
 }
 
+/*
+ * Function to retrieve data for heap on given socket
+ */
+void
+malloc_heap_dump(struct malloc_heap *heap, FILE *f)
+{
+       struct malloc_elem *elem;
+
+       rte_spinlock_lock(&heap->lock);
+
+       fprintf(f, "Heap size: 0x%zx\n", heap->total_size);
+       fprintf(f, "Heap alloc count: %u\n", heap->alloc_count);
+
+       elem = heap->first;
+       while (elem) {
+               malloc_elem_dump(elem, f);
+               elem = elem->next;
+       }
+
+       rte_spinlock_unlock(&heap->lock);
+}
+
 int
 rte_eal_malloc_heap_init(void)
 {

diff --git a/lib/librte_eal/common/malloc_heap.h b/lib/librte_eal/common/malloc_heap.h
index ab0005c35a61f2c13c755cad669ab54f926a569e..bb28422fe8f89fbbb29379038e603734f4d6d6aa 100644 (file)
--- a/lib/librte_eal/common/malloc_heap.h
+++ b/lib/librte_eal/common/malloc_heap.h
@@ -37,6 +37,9 @@ int
 malloc_heap_get_stats(struct malloc_heap *heap,
                struct rte_malloc_socket_stats *socket_stats);
 
+void
+malloc_heap_dump(struct malloc_heap *heap, FILE *f);
+
 int
 rte_eal_malloc_heap_init(void);
 

diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c
index 970813ed164e14caafa609f296ea53b6fc0d1981..f11a82209245a04bff2f4493d653d3d9a8ac77d7 100644 (file)
--- a/lib/librte_eal/common/rte_malloc.c
+++ b/lib/librte_eal/common/rte_malloc.c
@@ -181,6 +181,23 @@ rte_malloc_get_socket_stats(int socket,
        return malloc_heap_get_stats(&mcfg->malloc_heaps[socket], socket_stats);
 }
 
+/*
+ * Function to dump contents of all heaps
+ */
+void __rte_experimental
+rte_malloc_dump_heaps(FILE *f)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       unsigned int idx;
+
+       for (idx = 0; idx < rte_socket_count(); idx++) {
+               unsigned int socket = rte_socket_id_by_idx(idx);
+               fprintf(f, "Heap on socket %i:\n", socket);
+               malloc_heap_dump(&mcfg->malloc_heaps[socket], f);
+       }
+
+}
+
 /*
  * Print stats on memory type. If type is NULL, info on all types is printed
  */

diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index dd38783a2cd503173a310871be7d8782410b9ddf..d9fc458d1e64f91fdac78c533f1ce7fe7f6efa8f 100644 (file)
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -222,6 +222,7 @@ EXPERIMENTAL {
        rte_eal_hotplug_remove;
        rte_eal_mbuf_user_pool_ops;
        rte_log_register_type_and_pick_level;
+       rte_malloc_dump_heaps;
        rte_mp_action_register;
        rte_mp_action_unregister;
        rte_mp_reply;