From nobody Mon Aug 28 00:28:24 2023 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 4RYry067WMz4rpQ4; Mon, 28 Aug 2023 00:28:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RYry05Q94z3YF3; Mon, 28 Aug 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182504; 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=00EYOtNI52v+h021hT/dN9AQAEXKL87v/1bqa2vs44Q=; b=WvtI+iBnILNMnl/efMjmR2w4q/GHTwWs3fnr21vXHO8wFTb3BgM+wmJ/Rb9WoWrhBLDVFM FTAmwEcbJ9ejubpEm+KWAtSA7pV4ZXSmc+bPsqaIgf+LkAa2Vwgz5ooptGr1nnvV5zwtu0 6tQOVaz+HchyeWLzmxL12yGzZPjW9Oj157rMeprMRjyTKOjsZecAkIZ5ZpjVHv/mOiDxXs A6DUVSyvw+l2/LGh9MFUL0l4wiLtKLMs8NoGCC2miig7kQXaPz+g8ur/j4qqT4RSc3nq0B yJ/mp1S72RnyNS7jL1HwdCw6fgGVt0ILmV/GOJYRpY0jiM8FMwBsDBdSL/KuxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182504; 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=00EYOtNI52v+h021hT/dN9AQAEXKL87v/1bqa2vs44Q=; b=qjGLMy5xkEB2V488asjeznmsZ/QXKyFOZmXH9M/V1XKFnSd2etps2U3PHLeaWNqJD9cnnb m8vE/h54D/UpJgbrc937djCv+0988EM3/c8KlmD09Eq4KkNL+aX6bd8qimXYq1th52wpnJ +NqLFmBpfH35NT+a9QE3mWC84CEcAs4LRqDomD1Ko1HO8kSzrLWfj1w6YBlIYrBtZQsnkl D79tr8QvhCn+lvXhas4VHL2w7Xswu8C3LDxGbbhke67jsgUqGae1he/8Y19OlKqdoaPmvM zXlLrQ3x3ajl/c7HuiBvzMQUDi7QMVLJ1fTNWvUjeEjBHxTnHBDnfTHppxu0nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693182504; a=rsa-sha256; cv=none; b=q2xBn8KMBsr32PnxDXTQziPPY8jTeeE66pa0Edby/uu4xtp3cHGn2lDEvNq1ATC/kUd0mW ZdJnwZQ2R/EINytb0hQN5+T5+5u1tWcVS3Yhbg3PfPUL4BoxqPl5J29gp1CZoVs4tQJY9X EKVSxjtc29NTwcbcL73fyhS6tEjVR1v5ohbwP9w9ipdPfEjTuybLXLP4a5czATsQe7nM43 L1Wk0jmlYVUaFY4om7frWEUHGVilRf5xMaIXRkJAcO2sRA5jrVCxwlCgwI1YprdPHHRvEa wrCPXWre0i0q9TTdUNjEYFBxlRads03QxumVAou22Fwb1lXADcHC46iU4aD/GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RYry04Rm1zn1h; Mon, 28 Aug 2023 00:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37S0SOmO069787; Mon, 28 Aug 2023 00:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37S0SOqp069784; Mon, 28 Aug 2023 00:28:24 GMT (envelope-from git) Date: Mon, 28 Aug 2023 00:28:24 GMT Message-Id: <202308280028.37S0SOqp069784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a3a71ddc77c2 - stable/13 - rtld_malloc: add __crt_aligned_alloc_offset() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: a3a71ddc77c214ed712507cb6e0dc9684feaef35 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a3a71ddc77c214ed712507cb6e0dc9684feaef35 commit a3a71ddc77c214ed712507cb6e0dc9684feaef35 Author: Konstantin Belousov AuthorDate: 2023-07-22 04:21:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-28 00:27:48 +0000 rtld_malloc: add __crt_aligned_alloc_offset() (cherry picked from commit c29ee08204ce4106d4992474005c5f2fb7d5fbf1) --- libexec/rtld-elf/rtld_malloc.c | 34 +++++++++++++++++++++++++++++++--- libexec/rtld-elf/rtld_malloc.h | 1 + 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index ac8af4d6b6e1..6e011e88ba5a 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -86,13 +86,15 @@ static void morecore(int bucket); static int morepages(int n); #define MAGIC 0xef /* magic # on accounting info */ +#define AMAGIC 0xdf /* magic # for aligned alloc */ /* * nextf[i] is the pointer to the next free block of size * (FIRST_BUCKET_SIZE << i). The overhead information precedes the data * area returned to the user. */ -#define FIRST_BUCKET_SIZE 8 +#define LOW_BITS 3 +#define FIRST_BUCKET_SIZE (1U << LOW_BITS) #define NBUCKETS 30 static union overhead *nextf[NBUCKETS]; @@ -169,6 +171,28 @@ __crt_calloc(size_t num, size_t size) return (ret); } +void * +__crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) +{ + void *mem, *ov; + union overhead ov1; + uintptr_t x; + + if (align < FIRST_BUCKET_SIZE) + align = FIRST_BUCKET_SIZE; + offset &= align - 1; + mem = __crt_malloc(size + align + offset + sizeof(union overhead)); + if (mem == NULL) + return (NULL); + x = roundup2((uintptr_t)mem + sizeof(union overhead), align); + x += offset; + ov = cp2op((void *)x); + ov1.ov_magic = AMAGIC; + ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + memcpy(ov, &ov1, sizeof(ov1)); + return ((void *)x); +} + /* * Allocate more memory to the indicated bucket. */ @@ -210,12 +234,16 @@ morecore(int bucket) void __crt_free(void *cp) { + union overhead *op, op1; + void *opx; int size; - union overhead *op; if (cp == NULL) return; - op = cp2op(cp); + opx = cp2op(cp); + memcpy(&op1, opx, sizeof(op1)); + op = op1.ov_magic == AMAGIC ? (void *)((caddr_t)cp - op1.ov_index) : + opx; if (op->ov_magic != MAGIC) return; /* sanity */ size = op->ov_index; diff --git a/libexec/rtld-elf/rtld_malloc.h b/libexec/rtld-elf/rtld_malloc.h index f9780c552821..247726b9f470 100644 --- a/libexec/rtld-elf/rtld_malloc.h +++ b/libexec/rtld-elf/rtld_malloc.h @@ -32,6 +32,7 @@ #ifndef RTLD_MALLOC_H #define RTLD_MALLOC_H +void *__crt_aligned_alloc_offset(size_t align, size_t size, size_t offset); void *__crt_calloc(size_t num, size_t size); void __crt_free(void *cp); void *__crt_malloc(size_t nbytes);