From nobody Mon Jul 6 01:06:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gtmQR067dz6k7HL for ; Mon, 06 Jul 2026 01:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gtmQQ0xrRz3RCH for ; Mon, 06 Jul 2026 01:06:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783299982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WuhRAuu+zl7+5Tf77E0im/C/ukysen3inASXFS+8vRk=; b=St6JVm3bOlLvBXp2121AI+kCD3VCrydQho1eXARAzJh9s9XJFEv5O3YaXsvVFm9BXy6mZx F0sX4dMfNPOXXcUMFhGLfXRoqTopBAmkP5AfCTzq5oVzT9dQBLFis2PTvuqUAU3ZK62YQD Ht9DtfSijh1C680nMYx4cnM7Ul38dpjY0/CwgDdUcfuUD80aJLr8heF4rbiRBCXd3/PtLU e3GO74PUh7bzhRyTcQqglZkcNUcFj9WfMhI3mnbpTy7bS0oIzO33hhd1gBNG9BZ+xzKD91 WiKR68jWRGq0wo60VZdZ8Vhj8RcyP/dWF5tny7avtSSlzVdi5OTUEvkg4VXhyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783299982; a=rsa-sha256; cv=none; b=hk5jTwgTdiyOavU1W82GGwoof2HaqT4KzAqZe2azNFFZv6NTL9OX4fgDOu+UNJxST6EUWc 4tptav2NpqSz5DDdWG/eNGzff2OZpiRFGdtx5PpMMYpv1bRLBt1GOtOQ4/f1ashmqpH6FQ F62qVE35P/z7RLfjbei3IvUM5jn4RwE3WUZcGX2yHb3jSLrtmvtjmbi+6hN+G6wxdZBdXa hAQpga9YgerxrP5iNaEJ3TMLvacnLY3pH0P4WZsBl41Sj9ot80M4dJ5AfJKWIflVd402GW cF5WtKEV9FyWhFRQiYwcxKS5AvwPU29MG8J2Ogl7zLAfhtrLtgZS+YZr/faopg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783299982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WuhRAuu+zl7+5Tf77E0im/C/ukysen3inASXFS+8vRk=; b=fXMrrCcpHKzUAZPmvqnQEd3gRb30caRJpFsAfooYKqRh/XCcp47WrVKAhEDZ6QJyLRu4Vi gWLF/ezlrLSm9GOSG9I+XngFPV/7IGqKZyRSAHslyEuRXcoSg2cVyi7ZLOiGPccLvnXrW9 AXj3q8xDV1DrcZ92mpcC/M6IAvUNj1u8FyB/yjOtkTM805Gbxca6bUYRgF2kwlqnY/nZWy t+5fUikVWoWXXdf04EuezwtfvGz9AdYsRuXxpkEBXiZYujJrPCBYdWiqWkmXy1QIvui1rj R8w4I3vKsSr8I94XahC20ZD4gzfsdT7gtITRogChVhHqy/udLUUvIqwpSBVf6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtmQP6wWmzjyf for ; Mon, 06 Jul 2026 01:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 394d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:06:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e8658b2c5046 - stable/15 - rtld: add spinlock around the crt malloc calls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e8658b2c5046fa3dbb00a2c8855d1c6790776a24 Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:06:16 +0000 Message-Id: <6a4aff88.394d2.1adbd0b0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e8658b2c5046fa3dbb00a2c8855d1c6790776a24 commit e8658b2c5046fa3dbb00a2c8855d1c6790776a24 Author: Konstantin Belousov AuthorDate: 2026-06-27 18:50:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:05:50 +0000 rtld: add spinlock around the crt malloc calls (cherry picked from commit 559f45638dfa50195c591bb0f7f3d3d8f3bb8dc0) --- libexec/rtld-elf/rtld.c | 25 ---------------- libexec/rtld-elf/xmalloc.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 26 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 2a05afe66902..938e4b0b8a6b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -6878,31 +6878,6 @@ getenv(const char *name) strlen(name)))); } -/* malloc */ -void * -malloc(size_t nbytes) -{ - return (__crt_malloc(nbytes)); -} - -void * -calloc(size_t num, size_t size) -{ - return (__crt_calloc(num, size)); -} - -void -free(void *cp) -{ - __crt_free(cp); -} - -void * -realloc(void *cp, size_t nbytes) -{ - return (__crt_realloc(cp, nbytes)); -} - extern int _rtld_version__FreeBSD_version __exported; int _rtld_version__FreeBSD_version = __FreeBSD_version; diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c index 5f7c1b5ba10a..4c67939fc27f 100644 --- a/libexec/rtld-elf/xmalloc.c +++ b/libexec/rtld-elf/xmalloc.c @@ -26,6 +26,8 @@ */ #include +#include +#include #include #include #include @@ -35,12 +37,36 @@ #include "rtld_malloc.h" #include "rtld_libc.h" +static int rtld_malloc_spinlock; + +/* + * Almost always the rtld malloc is called under the write-locked rtld + * bind lock. Due to this, xlock() would need a single CAS to take + * the spinlock. But some places only own read-locked rtld bind lock, + * and then the spinlock protects the malloc structures from the + * parallel updates. + */ +static void +xlock(void) +{ + while (atomic_cmpset_acq_int(&rtld_malloc_spinlock, 0, 1) == 0) + cpu_spinwait(); +} + +static void +xunlock(void) +{ + atomic_store_rel_int(&rtld_malloc_spinlock, 0); +} + void * xcalloc(size_t number, size_t size) { void *p; + xlock(); p = __crt_calloc(number, size); + xunlock(); if (p == NULL) { rtld_fdputstr(STDERR_FILENO, "Out of memory\n"); _exit(1); @@ -51,10 +77,11 @@ xcalloc(size_t number, size_t size) void * xmalloc(size_t size) { - void *p; + xlock(); p = __crt_malloc(size); + xunlock(); if (p == NULL) { rtld_fdputstr(STDERR_FILENO, "Out of memory\n"); _exit(1); @@ -83,10 +110,53 @@ xmalloc_aligned(size_t size, size_t align, size_t offset) if (align < sizeof(void *)) align = sizeof(void *); + xlock(); res = __crt_aligned_alloc_offset(align, size, offset); + xunlock(); if (res == NULL) { rtld_fdputstr(STDERR_FILENO, "Out of memory\n"); _exit(1); } return (res); } + +void * +malloc(size_t size) +{ + void *p; + + xlock(); + p = __crt_malloc(size); + xunlock(); + return (p); +} + +void * +calloc(size_t num, size_t size) +{ + void *p; + + xlock(); + p = __crt_calloc(num, size); + xunlock(); + return (p); +} + +void +free(void *cp) +{ + xlock(); + __crt_free(cp); + xunlock(); +} + +void * +realloc(void *cp, size_t nbytes) +{ + void *p; + + xlock(); + p = __crt_realloc(cp, nbytes); + xunlock(); + return (p); +}