From nobody Wed Apr 22 20:47:23 2026 X-Original-To: dev-commits-src-main@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 4g1B9l72bJz6bJ1x for ; Wed, 22 Apr 2026 20:47: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1B9l54Lsz3YBh for ; Wed, 22 Apr 2026 20:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776890843; 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=TBsiGoFzSgkfQeHTFZs4xVvo1u09+yKC57YcPqrTx7U=; b=VZGeWMjuJzJeSiuwZozGlIFSKTrt460XZLphLi8ZkblyVrupiicK3jH67o10fv8RX62WnB jPZEWawl9kuSKQzDu4y5m7rntq2cq8o7Q6sVHdQecqSaoJhF26lGjbdosyA7TmAcSH41Y3 XQBBrPprMh/cpLBHenxxY0vTZJPbg23ci8Yv/Rzyu1hLUB4LFdDOYoKcXDOqjZ12yQVuRy IYBC3Sxbw7myqCl4Hs1bECiGhk69vxJL8hSnb30gldb54ZPGO+2o8fXBPN0QINQsR4PK+s IZ3A64YNY1fY9lqd1JTj97Dk4fCuOdEt17BFH73PdS9vVjBmhi/K5Kx8bb4mmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776890843; a=rsa-sha256; cv=none; b=Yo6RtIEXxwx5tmuvrToPGXlrUARsjX0tBq9QA8OouF5waQL+wfe4jxeMO4RgMhaMHaCq3V RmcUZ70kOmkj3SW9aNKpbZyIWTh70F0iKJmr79/dCnMo8VN4mFWrAsEJle8jKu+PU85RQa 2HILxM0y94dk6z5/Kf97XZAeK0xBN2if5c5nBFMaENz8mxVRNcZVG5NetD3HCKm8IL4W+N jgFJKbQACy8uajEoVePhngtTM+TcJRw1law3s7bwCEJTl5QayCcp2FjBQz/iIlVnrhLgvj Lh4Ym5r5o7CvcguNwE5BpEZ9+UAnLOhmkFJT3mABcnpluajmM83FHR67PyfdYw== 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=1776890843; 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=TBsiGoFzSgkfQeHTFZs4xVvo1u09+yKC57YcPqrTx7U=; b=J20ee+JYXkJlUbvWvpweDYgmE0o51SXUQp+XdxcIqe63K71i9h+F/sQppd+TjM1OH5AaDH QFPOPsOHduZ/u+ToODR7fsD9J6kILXf3uyFHKRhuFMcP2EhrHgPQYW2BGbMR+Wgfhg6ydM 82wmXRb79GLghTNkmIjyOPEfnTDio2rNQWmshUnfMfcuPbka/0Nk9tgciWVybkZ4Hc5q+y J7BNUiL0Ibt3GJ2uQo1znmkXxPPkfNp/uemLC1NNzuZ6IZqkh+gLOttk8Qb/JNkpiHJbNi KZT7S8WTNumYHGX5Ono6X+OVgvEU4aF3YW84BwwOW2344z9OAaprTWdcLQFnVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1B9l4dM2zmqx for ; Wed, 22 Apr 2026 20:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26762 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 20:47:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: d74fa49d0c04 - main - linuxkpi: Add Linux 6.12 variant of `kvrealloc()` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d74fa49d0c0476353af137d22b5ef8711c67b854 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 20:47:23 +0000 Message-Id: <69e933db.26762.572df123@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=d74fa49d0c0476353af137d22b5ef8711c67b854 commit d74fa49d0c0476353af137d22b5ef8711c67b854 Author: Jean-Sébastien Pédron AuthorDate: 2026-04-14 00:01:26 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-22 20:46:57 +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 Differential Revision: https://reviews.freebsd.org/D56453 --- 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;