From nobody Thu Apr 23 18:16:11 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 4g1kmr2v57z6bFpg for ; Thu, 23 Apr 2026 18:16:12 +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 4g1kmq6F3Yz3Qph for ; Thu, 23 Apr 2026 18:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776968171; 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=MchYSIPb9Dgf8imWuVEFp3eynJRUONJnbOW5TZHRbuI=; b=waFUqtLrX4jTx0wbhbJACTyX9azV0fXnWqnutldLh+r2p/ZmDGKCXaGxX3hCjRr5mSguFq 9dm+ca5axUj8TSlkyRYF+xT+KPITGalr713+qiGLuFRSDiSaUGqatuC8o+Ytsq8fRd8C+U Xrvi/pEj3Nn1NPTM14jbUlbI2t1vYIsmVgCdaqQe+XOugj7em/+qD/w11mWEwD0k1uZm2p 0xlleIjC2zwY4MRSfyGsXR+ygmokuCJK9tS6l6ufbKVL2D6jEo4vkSTvAMkanVRVIWOFA7 KnuyvpFdJKpzHwQikURsHBIVtvS7Jk+yDV6fTtHkA9FdQGSZNeVuzOWyf6RnQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776968171; a=rsa-sha256; cv=none; b=MZdvtDVFgHF0Jp91hzv1Red2CoiMbh2g9UTdoldtaMVxsUNw8avi0lPw0xbmmyVrNGVgSV crbLpSFirS2MOg4NEcU9uMJFkK6upVs0mT2AwIoati3JEHjzvZ6HFzLWQJ0s1dISGbF+M9 Sv5vnIv86KbTwrXxXwRXiDK+ENlBKgg3qFsSqlF6Byfpn7r4uZ1iD3CskItthOBnGvyYMT D9I+tYnz6AmEmi08onrw9LCoQjsYCOS3OxOjF17ZAanRj2N7tsE1hYh83gUOyUEifhSpi9 7uUv4maFqzCmaMORJRfZaPe9NHW7s3zg+sMvO791t56iddbIYwqYjGZGrLb0wQ== 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=1776968171; 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=MchYSIPb9Dgf8imWuVEFp3eynJRUONJnbOW5TZHRbuI=; b=Z6Si0HTSaQTVmF18+kktQmgv31HXnOrgzMDmcktBZANZzHpWv0vpvlBdTr05rey3yqZcf2 pDSNljJiZ4B2salFskg13qNvfsxoKZg8590jAIAoNLF/ShfKG4+QqbF8gyH5HedP3/y4nN oNnb3GEZDjLP+pCuvRSgIyuR6rdR05Tb6PwWgprmcCFnbJFrQ4izBYBk8Q14/9Fv3Kq+rd REtG1ru+pUsYi6ZJ9kxa3/BkTn4ZBtJHY5eul50OL8man+9VdIOR2Gi8yp4IaTOsrwn0yS uhG0NJnbFQSZ6W88vFIHRxu3RBxjF06rysUeY6IFQFekSRvuo4RW4RFbGcCsXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1kmq56FYzCSg for ; Thu, 23 Apr 2026 18:16:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46d83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 18:16:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d8863680744f - main - pmap_change_prot: Use void * instead of vm_offset_t 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8863680744f2de6a97ca80d8eba3755f506203c Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 18:16:11 +0000 Message-Id: <69ea61eb.46d83.55b6fff9@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d8863680744f2de6a97ca80d8eba3755f506203c commit d8863680744f2de6a97ca80d8eba3755f506203c Author: John Baldwin AuthorDate: 2026-04-23 17:05:54 +0000 Commit: John Baldwin CommitDate: 2026-04-23 17:05:54 +0000 pmap_change_prot: Use void * instead of vm_offset_t Effort: CHERI upstreaming Reviewed by: kib Sponsored by: AFRL, DARPA Pull Request: https://github.com/freebsd/freebsd-src/pull/2068 --- sys/amd64/amd64/pmap.c | 6 +++--- sys/amd64/include/pmap.h | 2 +- sys/arm64/arm64/pmap.c | 6 +++--- sys/arm64/include/pmap.h | 2 +- sys/kern/link_elf.c | 4 ++-- sys/kern/link_elf_obj.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 6a04088ec479..66b17f89b4ff 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -9673,16 +9673,16 @@ pmap_change_attr(void *va, vm_size_t size, int mode) * map are never executable. */ int -pmap_change_prot(vm_offset_t va, vm_size_t size, vm_prot_t prot) +pmap_change_prot(void *va, vm_size_t size, vm_prot_t prot) { int error; /* Only supported within the kernel map. */ - if (va < kva_layout.km_low) + if ((vm_offset_t)va < kva_layout.km_low) return (EINVAL); PMAP_LOCK(kernel_pmap); - error = pmap_change_props_locked(va, size, prot, -1, + error = pmap_change_props_locked((vm_offset_t)va, size, prot, -1, MAPDEV_ASSERTVALID); PMAP_UNLOCK(kernel_pmap); return (error); diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 69366588fec8..1bf67248125c 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -393,7 +393,7 @@ void pmap_allow_2m_x_ept_recalculate(void); void pmap_bootstrap(vm_paddr_t *); int pmap_cache_bits(pmap_t pmap, int mode, bool is_pde); int pmap_change_attr(void *, vm_size_t, int); -int pmap_change_prot(vm_offset_t, vm_size_t, vm_prot_t); +int pmap_change_prot(void *, vm_size_t, vm_prot_t); void pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, bool invalidate); void pmap_flush_cache_range(vm_offset_t, vm_offset_t); void pmap_flush_cache_phys_range(vm_paddr_t, vm_paddr_t, vm_memattr_t); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 285fa158ecd5..3d42ee058c28 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -8237,16 +8237,16 @@ pmap_change_attr(void *va, vm_size_t size, int mode) * map are never executable. */ int -pmap_change_prot(vm_offset_t va, vm_size_t size, vm_prot_t prot) +pmap_change_prot(void *va, vm_size_t size, vm_prot_t prot) { int error; /* Only supported within the kernel map. */ - if (va < VM_MIN_KERNEL_ADDRESS) + if ((vm_offset_t)va < VM_MIN_KERNEL_ADDRESS) return (EINVAL); PMAP_LOCK(kernel_pmap); - error = pmap_change_props_locked(va, size, prot, -1, false); + error = pmap_change_props_locked((vm_offset_t)va, size, prot, -1, false); PMAP_UNLOCK(kernel_pmap); return (error); } diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index c984ac46226c..599e5a7f46ef 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -145,7 +145,7 @@ void pmap_activate_vm(pmap_t); void pmap_bootstrap_dmap(vm_size_t); void pmap_bootstrap(void); int pmap_change_attr(void *va, vm_size_t size, int mode); -int pmap_change_prot(vm_offset_t va, vm_size_t size, vm_prot_t prot); +int pmap_change_prot(void *va, vm_size_t size, vm_prot_t prot); void pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode); void pmap_kenter_device(vm_offset_t, vm_size_t, vm_paddr_t); bool pmap_klookup(vm_offset_t va, vm_paddr_t *pa); diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 4c77f444d961..3a1bec6b09b5 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -826,8 +826,8 @@ preload_protect1(elf_file_t ef, vm_prot_t prot, bool reset) if ((phdr->p_flags & PF_X) != 0) nprot |= VM_PROT_EXECUTE; } - error = pmap_change_prot((vm_offset_t)ef->address + - phdr->p_vaddr, round_page(phdr->p_memsz), prot | nprot); + error = pmap_change_prot(ef->address + phdr->p_vaddr, + round_page(phdr->p_memsz), prot | nprot); if (error != 0) break; } diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index cb96046694ef..511a44006f03 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -232,7 +232,7 @@ link_elf_protect_range(elf_file_t ef, vm_offset_t start, vm_offset_t end, return; if (ef->preloaded) { #ifdef __amd64__ - error = pmap_change_prot(start, end - start, prot); + error = pmap_change_prot((void *)start, end - start, prot); KASSERT(error == 0, ("link_elf_protect_range: pmap_change_prot() returned %d", error));