From nobody Wed Apr 29 21:43:09 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 4g5W4s5DsCz6c117 for ; Wed, 29 Apr 2026 21:43:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5W4s1LPzz3gxG for ; Wed, 29 Apr 2026 21:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498989; 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=LHsq0rLPFah5TCcwfQ/jmxt63c5SzkAbvBsKVD1/RCk=; b=ftl9HoaasqkDrAHMKquvqKPNNr9F/POD9uJHIeMBFmXIE+Y5Xz6ppTyE0icq0jhTUzQecL 3hcqYgPIcpkZ3MLRewg7N4Hoppc76hjz4k494MSZJsrUQXzYwdXcC2fPQcbwhuGYs035jC 3cckRW5HFXojVBBYMxwfqzunj17CHM+E2VZx8yQG7SiO9lCnMgLgYjPH1cbW605UY70uBC nmd3aXR/3CFT4hdrdC1ozALm6pwZNIR1yzJr1FuUjOpB/LEU72ozCEG/WVQBk75pXwW+Xq PlRPFOiaI/Qt0GhSm8ImWuvVD9BeaK57Il6okb3LeoYDvzVnP0nB+oJbuBus/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777498989; a=rsa-sha256; cv=none; b=NjZmLcatyMgmFbLyPp1PLJwPWzqsuWHe1MvZ6CHXqIhaNmVECS5tX7bmr1pxLczimA98+e jfUXrC5O0LpLvJpe9DGBbXT+vu2wu7k6muV5VEK4DZFuVxzzzDxDyr9WH2C5VeXHB/We7k SB5+NoP02P31qmK03mw+D9w2ShsBfzCakLRSjiaP50/KcxbN+oEBSm92tNTOHG5xA0XFgc 2Sc4p6hUlt+BQ5wCSWDSScBfE7r2brsbllxKsuWRKyi1K3u9X5D+Df6JTU5HY//WtlOzI+ n66w9b1rvL4D/z+rqApZ2t1ofcIPEPpW662anjhdNl7t5o9vTXWhfUbxlqdpzA== 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=1777498989; 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=LHsq0rLPFah5TCcwfQ/jmxt63c5SzkAbvBsKVD1/RCk=; b=rQXw89bBzXFJAAoziqU/qF6ehB6jmMJ58VRCo0TWenjAbmM3rqXfwHnft9RY4BK7zcktME +EsZ5EO+Z1gr+DQK1ixErZv8o1M7Tnnn3712v4ULTd4Hqh0fXY6f2EKU2pySTxvgLmzWAv Gv1+gKdxNskpy263KqS+Zrd7MMsow24f5DCdebNr0Y9rJjCs286sUylMUlW4Kz07YBcEi7 BbiLScgea9U/VYkXjFfZsHk/5G5v/IUREAzQetxbjwzMw0mWujNlUXQmzCcgXLSwA8qz9w pRzOQbFNwAeYOS+6blrFZMUYhEu0THAUMOIc43ZDQTEcULGGNjshaH37227f1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5W4s0tnbzyCn for ; Wed, 29 Apr 2026 21:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18d9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 21:43:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: ce3348bf1de9 - stable/15 - linuxkpi: Add Linux 6.12 variant of `kvrealloc()` 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ce3348bf1de9533074226977ac8d8945f1fe40de Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 21:43:09 +0000 Message-Id: <69f27b6d.18d9d.6cc8ded5@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=ce3348bf1de9533074226977ac8d8945f1fe40de commit ce3348bf1de9533074226977ac8d8945f1fe40de Author: Jean-Sébastien Pédron AuthorDate: 2026-04-14 00:01:26 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-29 21:04:12 +0000 linuxkpi: Add Linux 6.12 variant of `kvrealloc()` In Linux 6.12, the API changed to be closer to `krealloc()`: * The function does not take the old size anymore * The function becomes a wrapper around `krealloc()` with a fallback mechanism. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit d74fa49d0c0476353af137d22b5ef8711c67b854) --- sys/compat/linuxkpi/common/include/linux/slab.h | 39 +++++++++++++++---------- sys/compat/linuxkpi/common/src/linux_slab.c | 38 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 8d023eaddadd..b529a6303085 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -141,6 +141,13 @@ linux_check_m_flags(gfp_t flags) /* * Base functions with a native implementation. */ + +static inline size_t +ksize(const void *ptr) +{ + return (malloc_usable_size(ptr)); +} + static inline void * kmalloc(size_t size, gfp_t flags) { @@ -264,22 +271,28 @@ kvmalloc_array(size_t n, size_t size, gfp_t flags) return (kvmalloc(size * n, flags)); } +void * lkpi_kvrealloc(const void *ptr, size_t oldsize, size_t newsize, gfp_t flags); + +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION < 61200 static inline void * kvrealloc(const void *ptr, size_t oldsize, size_t newsize, gfp_t flags) { - void *newptr; - - if (newsize <= oldsize) - return (__DECONST(void *, ptr)); + return (lkpi_kvrealloc(ptr, oldsize, newsize, flags)); +} +#else +static inline void * +kvrealloc(const void *ptr, size_t newsize, gfp_t flags) +{ + size_t oldsize; - newptr = kvmalloc(newsize, flags); - if (newptr != NULL) { - memcpy(newptr, ptr, oldsize); - kvfree(ptr); - } + if (!ZERO_OR_NULL_PTR(ptr)) + oldsize = ksize(ptr); + else + oldsize = 0; - return (newptr); + return (lkpi_kvrealloc(ptr, oldsize, newsize, flags)); } +#endif /* * Misc. @@ -294,12 +307,6 @@ kfree_sensitive(const void *ptr) zfree(__DECONST(void *, ptr), M_KMALLOC); } -static inline size_t -ksize(const void *ptr) -{ - return (malloc_usable_size(ptr)); -} - static inline size_t kmalloc_size_roundup(size_t size) { diff --git a/sys/compat/linuxkpi/common/src/linux_slab.c b/sys/compat/linuxkpi/common/src/linux_slab.c index a387e5c23ad3..9fe51f0f4e10 100644 --- a/sys/compat/linuxkpi/common/src/linux_slab.c +++ b/sys/compat/linuxkpi/common/src/linux_slab.c @@ -278,6 +278,44 @@ lkpi_krealloc(const void *ptr, size_t size, gfp_t flags) return (nptr); } +void * +lkpi_kvrealloc(const void *ptr, size_t oldsize, size_t newsize, gfp_t flags) +{ + void *newptr; + + /* + * We replicate the behaviour of krealloc() instead of calling it + * because we don't need to allocate physically contiguous memory. + */ + + if (newsize == 0) { + kfree(ptr); + return (ZERO_SIZE_PTR); + } + + if (ptr == NULL) { + newptr = kvmalloc(newsize, flags); + return (newptr); + } + + newptr = realloc( + __DECONST(void *, ptr), newsize, M_KMALLOC, + linux_check_m_flags(flags)); + + if (newptr == NULL) { + newptr = kvmalloc(newsize, flags); + if (newptr == NULL) + return (NULL); + + if (ptr != NULL) { + memcpy(newptr, ptr, oldsize); + kfree(ptr); + } + } + + return (newptr); +} + struct lkpi_kmalloc_ctx { size_t size; gfp_t flags;