diff mbox series

[Concept,27/37] malloc: Avoid defining calloc()

Message ID	20251201170529.3237986-28-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Mon, 1 Dec 2025 10:05:06 -0700 Message-ID: <20251201170529.3237986-28-sjg@u-boot.org> In-Reply-To: <20251201170529.3237986-1-sjg@u-boot.org> References: <20251201170529.3237986-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: P7YRUJTEI7ODKLCUPBHVRAOFOVKNV2TW CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <simon.glass@canonical.com>, Simon Glass <sjg@chromium.org>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH 27/37] malloc: Avoid defining calloc() Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/P7YRUJTEI7ODKLCUPBHVRAOFOVKNV2TW/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	malloc: Import dlmalloc 2.8.6 \| [Concept,00/37] malloc: Import dlmalloc 2.8.6 [Concept,01/37] test: hooks: Add a symlink for tasman [Concept,02/37] treewide: Add missing string.h includes [Concept,03/37] imx8mp: Increase the BSS limit for a few boards [Concept,04/37] test: Use TOTAL_MALLOC_LEN for abuf and alist tests [Concept,05/37] malloc: Rename dlmalloc.c to dlmalloc_old.c [Concept,06/37] malloc: Rename malloc.h to malloc_old.h [Concept,07/37] malloc: Import dlmalloc 2.8.6 [Concept,08/37] malloc: Add mem_malloc_init() and sbrk() [Concept,09/37] malloc: Add U-Boot configuration for dlmalloc 2.8.6 [Concept,10/37] malloc: Fix assert warning [Concept,11/37] malloc: return NULL if not initialized yet [Concept,12/37] Add a simple malloc() implementation for pre-relocation [Concept,13/37] malloc: Enable assertions if UNIT_TEST is enabled [Concept,14/37] malloc: Reduce code size with INSECURE and NO_MALLINFO [Concept,15/37] malloc: work around some memalign fragmentation issues [Concept,16/37] malloc: use hidden visibility [Concept,17/37] dlmalloc: calloc: fix zeroing early allocations [Concept,18/37] sandbox: Use a prefix for all allocation functions [Concept,19/37] malloc: Annotate allocator for valgrind [Concept,20/37] test: Support testing malloc() failures [Concept,21/37] dlmalloc: Fix a warning with clang-15 [Concept,22/37] mcheck: prepare +1 tier for mcheck-wrappers, in dl-*alloc commands [Concept,23/37] mcheck: Use memset/memcpy instead of MALLOC_ZERO/MALLOC_COPY for mcheck. [Concept,24/37] mcheck: integrate mcheck into dlmalloc.c [Concept,25/37] mcheck: support memalign [Concept,26/37] mcheck: add pedantic mode support [Concept,27/37] malloc: Avoid defining calloc() [Concept,28/37] malloc: Set up the malloc() state in mem_malloc_init() [Concept,29/37] malloc: Allow building dlmalloc with SPL_SYS_MALLOC_SIMPLE [Concept,30/37] malloc: Add a way to control the size of dlmalloc [Concept,31/37] malloc: Add NO_REALLOC_IN_PLACE option to reduce code size [Concept,32/37] malloc: Add NO_TREE_BINS option to reduce code size [Concept,33/37] malloc: Add SIMPLE_MEMALIGN to simplify memalign for code size [Concept,34/37] malloc: Add SMALLCHUNKS_AS_FUNCS to convert macros to funcs [Concept,35/37] test: Add some tests for dlmalloc [Concept,36/37] malloc: Switch to the new malloc() implementation [Concept,37/37] doc: Add malloc documentation

Commit Message

Simon Glass Dec. 1, 2025, 5:05 p.m. UTC

  From: Simon Glass <simon.glass@canonical.com>

The C runtime calls malloc() before starting main(), e.g. to get some
memory to use for dynamic linking.

If CONFIG_TPL_SYS_MALLOC_SIMPLE is enabled, the calloc() symbol is
defined within U-Boot. The C runtime may call that too.

Add the SYS_MALLOC_SIMPLE section to the new malloc.h header to
redirect malloc, realloc, calloc, and memalign to their simple
implementations when SYS_MALLOC_SIMPLE is enabled.

Add a COMPILING_DLMALLOC guard so that dlmalloc.c can include malloc.h
without hitting the SYS_MALLOC_SIMPLE redirects, which would otherwise
cause conflicts with the dlfree/free macro definitions.

Changes from original commit:
- Applied to new dlmalloc 2.8.6 malloc.h header structure

Signed-off-by: Simon Glass <sjg@chromium.org>
Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
(cherry picked from commit 22f87ef53045c19df9a770c4101ed3ba744c1b35)
---

 include/malloc.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff mbox series

Patch

diff --git a/include/malloc.h b/include/malloc.h
index 72db7fdb507..f8f0dbb9b70 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -68,6 +68,24 @@  extern "C" {
 #define USE_DL_PREFIX
 #endif
 
+/*
+ * When using simple malloc (SPL/TPL), redirect to simple implementations.
+ * Skip this when compiling dlmalloc.c itself to avoid conflicts.
+ */
+#if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
+#define malloc malloc_simple
+#define realloc realloc_simple
+#define calloc calloc_simple
+#define memalign memalign_simple
+#if IS_ENABLED(CONFIG_VALGRIND)
+#define free free_simple
+#else
+static inline void free(void *ptr) {}
+#endif
+void *calloc(size_t nmemb, size_t size);
+void *realloc_simple(void *ptr, size_t size);
+#else /* !SYS_MALLOC_SIMPLE || COMPILING_DLMALLOC */
+
 #ifndef USE_DL_PREFIX
 #define dlcalloc               calloc
 #define dlfree                 free
@@ -106,6 +124,7 @@  extern "C" {
 #define malloc_stats()         dlmalloc_stats()
 #define malloc_usable_size(p)  dlmalloc_usable_size(p)
 #endif /* USE_DL_PREFIX */
+#endif /* !SYS_MALLOC_SIMPLE || COMPILING_DLMALLOC */
 
 #if !NO_MALLINFO 
 #ifndef HAVE_USR_INCLUDE_MALLOC_H