From patchwork Mon Dec 1 17:05:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 806 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608982; bh=cq3oEjpO/nzn0nFy4O/TiogdOh/JxeQAVuyuby9AQao=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=kIucHXnLoi/RksUWAFOQ0LKHAPV84dHGdBhmDO/hQhWpmN94oapewC24jFYwqjXn+ E1rwwERTSKlqFMo/xQF8nofR7xfy4+/qoxW+mPx7JyiUG+LDj1RHDo9k/yq3hsRFiZ 7/OGhknXNmCa9/N7JtFS0O1UFO5deqHeTcJ8L0Hp4onQCgS/Uz/1NTqEnOB5zUdc1Y bzvL7GrcTMP5p/1y+KRF1fGyKrwoqmPmKqy3jh19ZSF1qtiCHDE/BTfT/EdidBKAUp CQQnkBoRdNWRrK8a5QXymRzlT2A54KsO5duxryuoJRKmc1Ntz44PlgDMEYoZilSdRP LmtefVmyzVLYA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 15F7D688E5 for ; Mon, 1 Dec 2025 10:09:42 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id piedT2mgJlpR for ; Mon, 1 Dec 2025 10:09:42 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608982; bh=cq3oEjpO/nzn0nFy4O/TiogdOh/JxeQAVuyuby9AQao=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=kIucHXnLoi/RksUWAFOQ0LKHAPV84dHGdBhmDO/hQhWpmN94oapewC24jFYwqjXn+ E1rwwERTSKlqFMo/xQF8nofR7xfy4+/qoxW+mPx7JyiUG+LDj1RHDo9k/yq3hsRFiZ 7/OGhknXNmCa9/N7JtFS0O1UFO5deqHeTcJ8L0Hp4onQCgS/Uz/1NTqEnOB5zUdc1Y bzvL7GrcTMP5p/1y+KRF1fGyKrwoqmPmKqy3jh19ZSF1qtiCHDE/BTfT/EdidBKAUp CQQnkBoRdNWRrK8a5QXymRzlT2A54KsO5duxryuoJRKmc1Ntz44PlgDMEYoZilSdRP LmtefVmyzVLYA== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 01269687F3 for ; Mon, 1 Dec 2025 10:09:42 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608979; bh=uzD9Ks9VTYJTIdRoVcxX+i9ybtb9vyhdqLSig5gGLC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wEJ9CrjfpDb7TUw+G0/xqqdz55fEUELGhgWYjLl7oGNq1JMheK4R5XQwsZfgQsecb yuFNGOyWZyNGbohu9HMZ+uGqHI/Ib22ZpE8krhiSXAKA9BIutZgPu58QNUeQbGCu1U CcyXD3U9Bx35QB168GF1//KcAiTAiCU5Bk7hAv1siYFFvGXPo+/pBxts3r2FtACMFA xCpMvc8LpdjqIX/dao7GDotueDHWdfj31XAhFQAmco0Xto2ZNFSxf53ZH3dns+0YrK R6dxh4qdBMrjCd5/L6XFwgxKxPddShtBdjOo/WvBwBuiv5+eAHMIhL7My2i8Qy+j6W gNsnGABEWY2jg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4C172688A4; Mon, 1 Dec 2025 10:09:39 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id M1IGPaUA1dKe; Mon, 1 Dec 2025 10:09:39 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608978; bh=tl4xJ7hgFAp03DI7dDETyHQYqtxoxdaXIa2mnC/nTFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eh9B6k7Z3fCdZBfM77bYs2n/y0cbuX/9i5gl4eVPikLM/nU56eiWIw9j/2UpXzyzu XS6LW2yBWfmmzjgyUieyJhZ0wk+8W9GGJYybFdv+XDUuFsbMmDePndVaX5ibnWAAI1 jL5pqu1dj+uYqcD8g8RfZIFKvTtE9dmlKC/YxIqFgc8NxzxBy0Ba6kzOpH9x8BBQVy TiqXZAaZGq9/BWaMDnRTDUEqhAotCUUsU1hw0Zd88vUOtjJOboMQzLRycBC1k7wtRU I+qTSNalJyd/IqhZEIB0/GYOfeEeRyyCFUvAEb7CQtRx5u903YS2xDNOBx6U/bEnmL Q7FB7vsPEXl7Q== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id C1FC4688CB; Mon, 1 Dec 2025 10:09:37 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Mon, 1 Dec 2025 10:05:10 -0700 Message-ID: <20251201170529.3237986-32-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 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: HXANCSAFQMKWY7RRWTBETX56IYDVGOX5 X-Message-ID-Hash: HXANCSAFQMKWY7RRWTBETX56IYDVGOX5 X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass , Claude X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 31/37] malloc: Add NO_REALLOC_IN_PLACE option to reduce code size List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Add a new NO_REALLOC_IN_PLACE option that disables in-place realloc optimization. When enabled via CONFIG_SYS_MALLOC_SMALL, realloc() always allocates new memory, copies data, and frees the old block instead of trying to extend the existing allocation. This saves about 500 bytes by eliminating try_realloc_chunk() and mmap_resize() functions. When unit tests are enabled, the extra realloc logic is included. Co-developed-by: Claude Signed-off-by: Simon Glass --- common/dlmalloc.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 869473b2bd1..4439d278188 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -595,6 +595,10 @@ static inline void MALLOC_COPY(void *dest, const void *src, size_t sz) { memcpy( #define INSECURE 1 #endif +#if CONFIG_IS_ENABLED(SYS_MALLOC_SMALL) +#define NO_REALLOC_IN_PLACE 1 +#endif + /* Use simplified sys_alloc for non-sandbox builds */ #if !IS_ENABLED(CONFIG_SANDBOX) #define SIMPLE_SYSALLOC 1 @@ -807,6 +811,9 @@ ulong mem_malloc_brk; #ifndef NO_SEGMENT_TRAVERSAL #define NO_SEGMENT_TRAVERSAL 0 #endif /* NO_SEGMENT_TRAVERSAL */ +#ifndef NO_REALLOC_IN_PLACE +#define NO_REALLOC_IN_PLACE 0 +#endif /* NO_REALLOC_IN_PLACE */ /* mallopt tuning options. SVID/XPG defines four standard parameter @@ -3984,7 +3991,7 @@ static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb, int flags) { } return 0; } -#endif /* !NO_REALLOC_IN_PLACE */ +#endif /* !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE */ /* -------------------------- mspace management -------------------------- */ @@ -5002,6 +5009,7 @@ void* dlcalloc_impl(size_t n_elements, size_t elem_size) { /* ------------ Internal support for realloc, memalign, etc -------------- */ +#if !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE /* Try to realloc; only in-place unless can_move true */ static mchunkptr try_realloc_chunk(mstate m, mchunkptr p, size_t nb, int can_move) { @@ -5081,6 +5089,7 @@ static mchunkptr try_realloc_chunk(mstate m, mchunkptr p, size_t nb, } return newp; } +#endif /* !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE */ static void* internal_memalign(mstate m, size_t alignment, size_t bytes) { void* mem = 0; @@ -5444,8 +5453,9 @@ void* dlrealloc_impl(void* oldmem, size_t bytes) { } #endif /* REALLOC_ZERO_BYTES_FREES */ else { - size_t nb = request2size(bytes); mchunkptr oldp = mem2chunk(oldmem); +#if !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE + size_t nb = request2size(bytes); #if ! FOOTERS mstate m = gm; #else /* FOOTERS */ @@ -5484,10 +5494,23 @@ void* dlrealloc_impl(void* oldmem, size_t bytes) { } } } +#else /* defined(__UBOOT__) && NO_REALLOC_IN_PLACE */ + mem = dlmalloc_impl(bytes); + if (mem != 0) { + size_t oc = chunksize(oldp) - overhead_for(oldp); + memcpy(mem, oldmem, (oc < bytes)? oc : bytes); +#ifdef __UBOOT__ + VALGRIND_MALLOCLIKE_BLOCK(mem, bytes, SIZE_SZ, false); + VALGRIND_FREELIKE_BLOCK(oldmem, SIZE_SZ); +#endif + dlfree_impl(oldmem); + } +#endif /* !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE */ } return mem; } +#if !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE void* dlrealloc_in_place(void* oldmem, size_t bytes) { void* mem = 0; if (oldmem != 0) { @@ -5522,6 +5545,7 @@ void* dlrealloc_in_place(void* oldmem, size_t bytes) { } return mem; } +#endif /* !defined(__UBOOT__) || !NO_REALLOC_IN_PLACE */ STATIC_IF_MCHECK void* dlmemalign_impl(size_t alignment, size_t bytes) {