From nobody Tue May 12 16:55:27 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 4gFN515QcKz6cl3S for ; Tue, 12 May 2026 16:55:33 +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 4gFN5112Hjz3wGN for ; Tue, 12 May 2026 16:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QfMUnhsbCLreXKDo+xqePsDZpkQ+hK+hFKSd0dEG0i0=; b=xQ+TjD6Mvi9y6gKZlRZamgxzsm//5CkBqi7h5yxvR3SodYg8wRiNm9WqrLXht9yd1fifoo zlZLki/Ybwug4hma9/7mLtT3nS7jR7akwZ2axad/r6D0n/co4wKGPpIn4fUfFPBRTAFoa7 A6oJCXXEP6SXMav09mvrluCFxknZfH6RAZVqowRDsHzgj4XY82i0V+5tLaVAZbRpON2+jS rm6+1pWyTXbCPA3xBw1DKrKRtuS71IlzrZ0LHm2yLNcRIoMbmnGvfReThJtQauP7VPbe30 SlW7Q57DxHM5P2BgfANloMOUqumjMUpKiLb9h3b6AgfHww4Rwk04MZqF8O54eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604933; a=rsa-sha256; cv=none; b=FZOpmkoYdm8UHb+OG83Dfdh81/G5hiwZTr11zPWXFdvdVMHFTR8vIeK9vbrwFwijvF4fbr FPjqYkGP4g37MD7xgpAFkStukcNNUyhvZVwrk68RmWBKfNdPNHlQC7n4d1s7mTMWCKI/01 NJBLYcgTmQ8Cr/EOpBK3tBg+7TgFohQVh+dbZgzwVJfu6fuFFEtE7AruYHZ0Fsv4LS/BaX uBmQc0vmQy9KQiMYQQGfiEbdmlmjf1t9f75rF5XrWzLHSR390/39bULLOLAkKdd76IxxvR t/a0UK3lFptkQUEB0qmoyGtGW9Vd39Gh/i/iWbCNfbd0UC9aBfRVBSapXKcJaQ== 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=1778604933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QfMUnhsbCLreXKDo+xqePsDZpkQ+hK+hFKSd0dEG0i0=; b=U4X/EQC7EHdI09cH8977juS3vx/JOHPWRhtXz2uSGe67EzWVcn+GUl5yaFCMmmtrjJeikZ OLX0Fk+zj6cN9fsJqMfgk/XRWN4C1XJx4PQmbT3DmAvOWm4/sWRatpM4sKNlRXpKAcRwVP jUoCGq5QcLqlOwGbQVMhpaLrEevHV0DpsgaXtt6DNeJoJE0OvJHPvtcVi4/sGr/MXrzfSZ 8LJE1aCz36fX3aHDfOOkarAzRzutn+iVz3IAXjjb7tkEZmAvOT5PyNgqskSxtXhvhFn6iy /Ju3rf/yl6PAKvR7iUSZZhkxKBAQaod6kiSTzk9XY3TCrcamYr2Z2LsFgwllYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN506qS4z19nH for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: cd2512eaab5c - main - vm: Add flags for unprotected allocations 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd2512eaab5cd402a0177a8078b9234b215b39bd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:27 +0000 Message-Id: <6a035b7f.3e1ba.1c3bccb@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2512eaab5cd402a0177a8078b9234b215b39bd commit cd2512eaab5cd402a0177a8078b9234b215b39bd Author: Sarah Walker AuthorDate: 2026-05-12 12:16:00 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 vm: Add flags for unprotected allocations Unprotected allocations are intended to be accessible outside of the current VM on systems such as Arm CCA. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56518 --- sys/sys/malloc.h | 1 + sys/vm/pmap.h | 1 + sys/vm/vm_kern.c | 23 ++++++++++++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 9b281da4b4d4..68dffb395534 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -61,6 +61,7 @@ #define M_EXEC 0x4000 /* allocate executable space */ #define M_NEXTFIT 0x8000 /* only for vmem, follow cursor */ #define M_NEVERFREED 0x10000 /* chunk will never get freed */ +#define M_UNPROTECTED 0x20000 /* alloc out of unprotected memory */ #define M_VERSION 2024073001 diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index e6dcd47d32f6..868bb787dc98 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -104,6 +104,7 @@ extern vm_offset_t kernel_vm_end; #define PMAP_ENTER_NOSLEEP 0x00000100 #define PMAP_ENTER_WIRED 0x00000200 #define PMAP_ENTER_LARGEPAGE 0x00000400 +#define PMAP_ENTER_UNPROTECTED 0x00000800 #define PMAP_ENTER_RESERVED 0xFF000000 /* diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index fc5d0de424bd..41ba07373976 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -270,6 +270,7 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_size_t asize; int pflags; vm_prot_t prot; + u_int pmap_enter_flags; object = kernel_object; asize = round_page(size); @@ -279,6 +280,11 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, offset = addr - VM_MIN_KERNEL_ADDRESS; pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED; prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW; + + pmap_enter_flags = prot | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + VM_OBJECT_WLOCK(object); for (i = 0; i < asize; i += PAGE_SIZE) { m = kmem_alloc_contig_pages(object, atop(offset + i), @@ -296,7 +302,7 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, pmap_zero_page(m); vm_page_valid(m); pmap_enter(kernel_pmap, addr + i, m, prot, - prot | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); } VM_OBJECT_WUNLOCK(object); kmem_alloc_san(addr, size, asize, flags); @@ -363,6 +369,7 @@ kmem_alloc_contig_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_size_t asize; u_long npages; int pflags; + u_int pmap_enter_flags; object = kernel_object; asize = round_page(size); @@ -385,12 +392,17 @@ kmem_alloc_contig_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_page_domain(m), domain)); end_m = m + npages; tmp = addr; + + pmap_enter_flags = VM_PROT_RW | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + for (; m < end_m; m++) { if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0) pmap_zero_page(m); vm_page_valid(m); pmap_enter(kernel_pmap, tmp, m, VM_PROT_RW, - VM_PROT_RW | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); tmp += PAGE_SIZE; } VM_OBJECT_WUNLOCK(object); @@ -549,6 +561,7 @@ kmem_back_domain(int domain, vm_object_t object, vm_offset_t addr, vm_page_t m; vm_prot_t prot; int pflags; + u_int pmap_enter_flags; KASSERT(object == kernel_object, ("kmem_back_domain: only supports kernel object.")); @@ -560,6 +573,10 @@ kmem_back_domain(int domain, vm_object_t object, vm_offset_t addr, pflags |= VM_ALLOC_WAITFAIL; prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW; + pmap_enter_flags = prot | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + i = 0; vm_page_iter_init(&pages, object); VM_OBJECT_WLOCK(object); @@ -589,7 +606,7 @@ retry: ("kmem_malloc: page %p is managed", m)); vm_page_valid(m); pmap_enter(kernel_pmap, addr + i, m, prot, - prot | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); if (__predict_false((prot & VM_PROT_EXECUTE) != 0)) m->oflags |= VPO_KMEM_EXEC; }