From patchwork Mon Dec 1 17:04:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 793 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=1764608936; bh=mzRckNuCPzkkCD6kGGdZR/F3b1EiL3dZAchn5j2khfw=; 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=HYauKE3rZEIO4C9rOW3JkQlY3rASjfr8OGy3SXMtPZ30OSOYoLQp7vPnMCeV5ci8u 0m56pvYmOSsEytEWeg2FMJGy85fiT2ZdP2RdsSHW6h6M5KOu8Zbw57NXzxCP9UVwTO oYdcyorTj0aOsT8eJqYrJ9/niR+01+R+2ltPl9vHRr1cYSjvI8GZek9tD2NKYhMbXt xs2/vRkTRL9/IAT5v92N9RephEGODvPyBG66wpF75FaNuxqPVrG24pV0LNDGccx+Hl KD/4Gpfq9NuNUznSoMQgcBC4ijxHJzIfb3GVcphUS5tY5Hb3KmjW625A52ySmiJadl pcJYKI82NwXUg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 868656888B for ; Mon, 1 Dec 2025 10:08:56 -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 npTRvhG7MHJ3 for ; Mon, 1 Dec 2025 10:08:56 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608934; bh=mzRckNuCPzkkCD6kGGdZR/F3b1EiL3dZAchn5j2khfw=; 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=ASOF7un8jclP/k6AW2FWhTsBfQobc9hZhfTtgp6IZfhfLbGzdYB+pA6bJvDfzRTSB H+vpCR8wZbF1+aK7oDiMm1zURLa5+s1gAkkbL7CIF/BEadH2yUNQZUYsB4REHWBjHs DhBs96ILXzbgUz+9T+biZ8bbvWUbe6BizxU8MspYiPg+cktGSxMDv02Dk9sfnb8aEs C50CAt6Cddjqxxaclg23tD8/r7KQ2mM7AaSaw2eRdikUszvRjOO9uO547LrXVGlZ7C d4AwXzrrmChO71pPAp6OuxrnqPepz/VfwWsVVUab8FCibSxE+PkObbpQRnvMGjSwms bLrlx32V2AteQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 93809688D7 for ; Mon, 1 Dec 2025 10:08:54 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608932; bh=rVqFcaRcLzgNM5XH7EyjPnXT1QBn+mmz9lOTYKn4U30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J9GOlcUSvu0D9CXWCUNnYnAnJOlxtpf3OgBTWgpUFD3ppoCDIhAs+NNwEV7UoJ6Ge QSHnlW5OlC5a4DRS+CRcvm3jDXsUvF5sGkAdbwZmcVY3FU7JuUM6E59qsDiq9Q2C9h c+MiiLcZ1kl1e5brxaVBDwmE5Whs4lqBIF2vCKGip+6sLzsmvfEqfM0YGvqHrkmJpb TGpLnNgMqw/tGcZ8kWrT05iNdBxlQ1+JPqYtESiUdcIj5ye4BXvPScjmM3qm10H+Jc mrC9B9ItiVObOg+IkRM54YDUblsEhTeHTrDSauyoMvR6iTZpe6/3dftIMnQ+oSccYx aOpVCyMFL/SXA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 6011C5E439; Mon, 1 Dec 2025 10:08:52 -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 hJI1hWowLjsN; Mon, 1 Dec 2025 10:08:52 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1764608932; bh=MEBS1WYHw61Qxw9vFbggvMa/qglecxKF598rsm1TyUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kHQDXNi31bws1NBFWwiU/HGLWTjdJDR3k3oqLzH2gX+uYUpZRXtBdxoT0T4KOp8Ps 3Q58K7yA1rJyCt2M40YM3zmweZjzF54RY9j3GPRNIhE6wpJ0Gr9NMD0ZK5+gywfIka i5duX4DQBWAw3zcX1KqgOvKrxH4lO3lH/rU7bt3+yKPtsppaRyEizBbuduyXqfEBkp b/MXvoSM1L/Hj3H71IDjx4+jI3QOsrtuLd0P02Z2Y3FZ+8OaxiXjb6GwODW2msrObt RXQ48cPUOcDOrNGfJ/VbNc+WiXr6QEcMgLTqifmdyBJ4sCspza/mhb/mK7W8TskvyS /p9H8n7+EouUQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id B36D268821; Mon, 1 Dec 2025 10:08:51 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Mon, 1 Dec 2025 10:04:57 -0700 Message-ID: <20251201170529.3237986-19-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: 57ZNGFFL5VTRE6E7XQMZCGXKA4RO3NZD X-Message-ID-Hash: 57ZNGFFL5VTRE6E7XQMZCGXKA4RO3NZD 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 , Simon Glass , Claude X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 18/37] sandbox: Use a prefix for all allocation functions 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 In order to allow use of both U-Boot's malloc() and the C library's version, set a prefix for the allocation functions so that they can co-exist. This is only done for sandbox. For other archs everything remains the same. Signed-off-by: Simon Glass Co-developed-by: Claude Signed-off-by: Simon Glass (cherry picked from cfda60f99ae237494e9341aad9676152d3bac3c9) --- include/malloc.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/malloc.h b/include/malloc.h index d5cccc96e50..76068032da7 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -60,6 +60,14 @@ extern "C" { #if !ONLY_MSPACES +/* + * Rename the U-Boot alloc functions so that sandbox can still use the system + * ones + */ +#ifdef CONFIG_SANDBOX +#define USE_DL_PREFIX +#endif + #ifndef USE_DL_PREFIX #define dlcalloc calloc #define dlfree free @@ -82,6 +90,21 @@ extern "C" { #define dlindependent_calloc independent_calloc #define dlindependent_comalloc independent_comalloc #define dlbulk_free bulk_free +#else /* USE_DL_PREFIX */ +/* Ensure that U-Boot actually uses dlmalloc versions */ +#define calloc(n, s) dlcalloc(n, s) +#define free(p) dlfree(p) +#define malloc(s) dlmalloc(s) +#define memalign(a, s) dlmemalign(a, s) +#define posix_memalign(p, a, s) dlposix_memalign(p, a, s) +#define realloc(p, s) dlrealloc(p, s) +#define valloc(s) dlvalloc(s) +#define pvalloc(s) dlpvalloc(s) +#define mallinfo() dlmallinfo() +#define mallopt(p, v) dlmallopt(p, v) +#define malloc_trim(s) dlmalloc_trim(s) +#define malloc_stats() dlmalloc_stats() +#define malloc_usable_size(p) dlmalloc_usable_size(p) #endif /* USE_DL_PREFIX */ #if !NO_MALLINFO