From nobody Thu Apr 23 18:16:25 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 4g1kn559G2z6bFnS for ; Thu, 23 Apr 2026 18:16:25 +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 4g1kn533f9z3R6t for ; Thu, 23 Apr 2026 18:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776968185; 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=WqDuUPWIvhOKI91ZaWF935jTMIuULla8Y0qFERdvuZI=; b=EQwBcpyB9FAeqrF/VjXgZl5EIoFe1DscFPwkB8jMj+bK6qOvXcPJmJenMhwqDH9Am3RoxU i3eahu/g651A2iv/4EnXnvvHfNtIyr+MHnFIuKCMMnerYql49NphjaYgw4Qt4KcudHCU/e LDedqMg+8eavk14GFIJKKQSQ1IdZBFrtyoZqDZcRw+hYrHxx43uh63nOWuPoAoQL8GqSUu 6SP6c/d3mb7KOmzx5BsPW6FyU7c7mOPpemE+9CQ8PkvY6Hod8wX7TFebB++tGhFn4lw/LI EUCGWisIcNVzHgVMXGy52wgmLZCpS7aVEVpIE2rOhk7pAfxnffOQfqBGjIBN6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776968185; a=rsa-sha256; cv=none; b=Tj8EhK90NUCFh4QlWJ5p5+ZMlAdEq7LBxilw8lH/BczAJAzr2RoX4Z2tVJOZ/OT1oyCXDA otmiA7zpZELbPMr+4Foz4CsoEV5FzK/F0Om/BfHA5/YtBPvBxVAlIK8/ZMPU/QEdzg3o0l F4Dhpk+hHpE3NAcobICuA+Ms/VAGOtUwVOE81T1e0RyfDe5z6yYUx+bS1YCIm8qjO/u7gG VFK6UbnPPkzyBZ4cHfDSPzmPfwl3BmwbKx1E1gAkmTBf0aC5HwW4zplGigkRKnIFeZZlMs EfBRsfpexJKdNu8E1+nNrcOvzKCEKOUIvFvj5o+5Gc5Dn5e0aX7inFQFBgeXiQ== 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=1776968185; 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=WqDuUPWIvhOKI91ZaWF935jTMIuULla8Y0qFERdvuZI=; b=I9CRMFYl+ugdmFTERO38Rvy5rlB91jvPFwa+R3oQILAgpH541137zpePOJnC4Sd4aWMUfZ JftUXnRqIfJaY9GNNlHynGseIuOag094wk0/4hb65tskMQhVfVfdDzfltsjjsKO9hmNhxi ARXI6Dq8PwdRo0rNZxjK1O1W0HzkJ+sS33c7Abm+gUW9y3vYwnXEgSF2+BLUzO/e/wWeZp +ReQo9gM7I0soyxkpY614KAwXhmWd8xQ9n3+rwL2RKd5JagNTDk16HakZKAyaCiSayFNuv yecrBSPgwrt2z4dRTVQitHKFlBsmJzocfPfZKPB5mIKCADgjz+L/bKFi1PHPpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1kn51mZLzCNZ for ; Thu, 23 Apr 2026 18:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4650c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 18:16:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 30af462bd264 - main - kmap_alloc_wait/kmap_free_wakeup: 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: 30af462bd2641798a6ac29235b82e49ad386d363 Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 18:16:25 +0000 Message-Id: <69ea61f9.4650c.3088e535@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=30af462bd2641798a6ac29235b82e49ad386d363 commit 30af462bd2641798a6ac29235b82e49ad386d363 Author: John Baldwin AuthorDate: 2026-04-23 17:05:55 +0000 Commit: John Baldwin CommitDate: 2026-04-23 17:05:55 +0000 kmap_alloc_wait/kmap_free_wakeup: 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/i386/linux/linux_machdep.c | 2 +- sys/kern/kern_exec.c | 14 ++++++-------- sys/vm/vm_extern.h | 4 ++-- sys/vm/vm_kern.c | 10 ++++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 0e056aadb4b5..ff1748d7db94 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -852,7 +852,7 @@ cleanup: /* Release the temporary mapping. */ if (a_out) - kmap_free_wakeup(exec_map, (vm_offset_t)a_out, PAGE_SIZE); + kmap_free_wakeup(exec_map, a_out, PAGE_SIZE); return (error); } diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 20d022050803..df5a1c044643 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1414,7 +1414,7 @@ err_exit: } struct exec_args_kva { - vm_offset_t addr; + void *addr; u_int gen; SLIST_ENTRY(exec_args_kva) next; }; @@ -1442,7 +1442,7 @@ exec_prealloc_args_kva(void *arg __unused) } SYSINIT(exec_args_kva, SI_SUB_EXEC, SI_ORDER_ANY, exec_prealloc_args_kva, NULL); -static vm_offset_t +static void * exec_alloc_args_kva(void **cookie) { struct exec_args_kva *argkva; @@ -1457,8 +1457,7 @@ exec_alloc_args_kva(void **cookie) SLIST_REMOVE_HEAD(&exec_args_kva_freelist, next); mtx_unlock(&exec_args_kva_mtx); } - kasan_mark((void *)argkva->addr, exec_map_entry_size, - exec_map_entry_size, 0); + kasan_mark(argkva->addr, exec_map_entry_size, exec_map_entry_size, 0); *(struct exec_args_kva **)cookie = argkva; return (argkva->addr); } @@ -1468,9 +1467,8 @@ exec_release_args_kva(struct exec_args_kva *argkva, u_int gen) { vm_offset_t base; - base = argkva->addr; - kasan_mark((void *)argkva->addr, 0, exec_map_entry_size, - KASAN_EXEC_ARGS_FREED); + base = (vm_offset_t)argkva->addr; + kasan_mark(argkva->addr, 0, exec_map_entry_size, KASAN_EXEC_ARGS_FREED); if (argkva->gen != gen) { (void)vm_map_madvise(exec_map, base, base + exec_map_entry_size, MADV_FREE); @@ -1533,7 +1531,7 @@ int exec_alloc_args(struct image_args *args) { - args->buf = (char *)exec_alloc_args_kva(&args->bufkva); + args->buf = exec_alloc_args_kva(&args->bufkva); return (0); } diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 725f6097d8a9..207eb721d129 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -51,8 +51,8 @@ void *kva_alloc_aligned(vm_size_t, vm_size_t); void kva_free(void *, vm_size_t); /* These operate on pageable virtual addresses. */ -vm_offset_t kmap_alloc_wait(vm_map_t, vm_size_t); -void kmap_free_wakeup(vm_map_t, vm_offset_t, vm_size_t); +void *kmap_alloc_wait(vm_map_t, vm_size_t); +void kmap_free_wakeup(vm_map_t, void *, vm_size_t); /* These operate on virtual addresses backed by memory. */ void *kmem_alloc_attr(vm_size_t size, int flags, diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 3c5dc57f3668..3a6fed6cb3e1 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -714,14 +714,14 @@ kmem_free(void *addr, vm_size_t size) * * This routine may block. */ -vm_offset_t +void * kmap_alloc_wait(vm_map_t map, vm_size_t size) { vm_offset_t addr; size = round_page(size); if (!swap_reserve(size)) - return (0); + return (NULL); for (;;) { /* @@ -744,7 +744,7 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size) vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_RW, VM_PROT_RW, MAP_ACC_CHARGED); vm_map_unlock(map); - return (addr); + return ((void *)addr); } /* @@ -754,9 +754,11 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size) * waiting for memory in that map. */ void -kmap_free_wakeup(vm_map_t map, vm_offset_t addr, vm_size_t size) +kmap_free_wakeup(vm_map_t map, void *va, vm_size_t size) { + vm_offset_t addr; + addr = (vm_offset_t)va; vm_map_lock(map); (void) vm_map_delete(map, trunc_page(addr), round_page(addr + size)); if ((map->flags & MAP_NEEDS_WAKEUP) != 0) {