From nobody Thu Aug 01 22:27:57 2024 X-Original-To: dev-commits-src-branches@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 4WZkB63SDzz5RZpy; Thu, 01 Aug 2024 22:27:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZkB52LkXz4ZXC; Thu, 1 Aug 2024 22:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551277; 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=QeYYn/Z6vE+5PQCGXSPYzuEAFqVTDxVQAv01MoQ1FCk=; b=CiODkbBvXaXiP01LlIyNKZiDm2QKZSf6Q1hBNyEM8lAd3md6Byil//CauU48dLNkUXdFkC KbnW9g5+EcR7ct0bdOVD0akG1rMc5tNSfuvsP9+8oaNsI7d5yoNsOjgjiODZkDvvB/pzBR /BrtmbjsJZszGJvJu8N4ViCSU7K36rQB9ICkYlCVfiyLniAQqotzRudjQB1ivVh/AEc8P7 HSmkvv69UaPG+n7ylNcuqjyq8woHIPbZApzpvIpg5l+bbJMLYl77+jQf3Ec3RhJZJl5MZx EucivveftDCI9ZVPv1DVIeiDmEdhys4WXzBPpxJWKuwkUt0Ct4NevHl6H+nRKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551277; a=rsa-sha256; cv=none; b=J5qBRjTYTPhPILOSd15lO7FuLbj/CrHbrutlLrL4u32S1mZF/6fayI7T7w1Az1OxYl/Itn f1R9SkJlnk/4cQBGLMaRPx/FVpqXAsduczx3Nsh0JUQpv8l1xb4XkJTgU3XSH5HfDPd8/m 1i1QvOL0zZTyTHli+6UJFb+5v8nXQ4kzrJV3pwCB0AUZ1wW9sBRCxO7fKx2wEkLT204DBL sU13Z6uNVX1Z3KgDQpxrpgSs3W/I0OBN7a+9lwXcMoWvb/oTnHOkwialK2Z3MJ243INGSX 55ZdlkvVEVYeGYXQ1o6MXBVAmo9vxzvvFjJzg/jYKVkWR+13qYf/snThlqq+xw== 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=1722551277; 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=QeYYn/Z6vE+5PQCGXSPYzuEAFqVTDxVQAv01MoQ1FCk=; b=XV3zhABd4xuGSX6I8Ks9+9Ud3bME4Uds0iJ+tfNT+BDt3l8g7o2HSNfOIKU+A7Q5qF3vCD uL266s19cb5gHghKomrPzmhFlajoe1/9TlBbTVSLbhCAs1fcPU6UINgSwvbiNtvwpAiBpq aiUf80tfY0aoqjEMfKymkJvO5tOy6/5vF8omD8+Zok89Pyd0ngQZrgk5lYFoM2nFhvSTFJ H7gEx0ccLAANCZY77JCnsapagBrJ58/frLvOQsfhDX8Cs1FZ5u9mcWOH8JXA+DmfPrjeS7 wXU3JeYYFtt5LZW/Wb78jDIQPJjhTbvIkAFyFaD51zok3jiFTGWlHa3B9M6SMw== 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 4WZkB51wvpz12Jn; Thu, 1 Aug 2024 22:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471MRvOL028377; Thu, 1 Aug 2024 22:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRvMx028374; Thu, 1 Aug 2024 22:27:57 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:57 GMT Message-Id: <202408012227.471MRvMx028374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: d8394e282f47 - stable/14 - LinuxKPI: Add kvrealloc to linux/slab.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d8394e282f47f6e0f5670ca37d0d9c1d87b73933 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d8394e282f47f6e0f5670ca37d0d9c1d87b73933 commit d8394e282f47f6e0f5670ca37d0d9c1d87b73933 Author: Vladimir Kondratyev AuthorDate: 2024-07-21 13:08:28 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:14:10 +0000 LinuxKPI: Add kvrealloc to linux/slab.h Sponsored by: Serenity Cyber Security, LLC MFC after: 1 week Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D45616 (cherry picked from commit ab6e1167909bf1e2792a2ba33000e13d33aaf551) --- sys/compat/linuxkpi/common/include/linux/slab.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 298306b6ea05..e2d17e0558c2 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -91,6 +91,8 @@ struct linux_kmem_cache; #define ZERO_SIZE_PTR ((void *)16) #define ZERO_OR_NULL_PTR(x) ((x) == NULL || (x) == ZERO_SIZE_PTR) +extern void *lkpi_kmalloc(size_t size, gfp_t flags); + static inline gfp_t linux_check_m_flags(gfp_t flags) { @@ -212,13 +214,29 @@ kfree_sensitive(const void *ptr) zfree(__DECONST(void *, ptr), M_KMALLOC); } +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)); + + newptr = kvmalloc(newsize, flags); + if (newptr != NULL) { + memcpy(newptr, ptr, oldsize); + kvfree(ptr); + } + + return (newptr); +} + static inline size_t ksize(const void *ptr) { return (malloc_usable_size(ptr)); } -extern void *lkpi_kmalloc(size_t size, gfp_t flags); extern struct linux_kmem_cache *linux_kmem_cache_create(const char *name, size_t size, size_t align, unsigned flags, linux_kmem_ctor_t *ctor); extern void *lkpi_kmem_cache_alloc(struct linux_kmem_cache *, gfp_t);