Date: Thu, 23 Apr 2026 18:16:27 +0000 From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bee1aae0b3f1 - main - ncsw: Allow pmap_kextract to handle direct map addresses Message-ID: <69ea61fb.450bc.428fad34@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bee1aae0b3f19df40452ee91096fa957104db12f commit bee1aae0b3f19df40452ee91096fa957104db12f Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2026-04-23 17:05:55 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2026-04-23 17:05:55 +0000 ncsw: Allow pmap_kextract to handle direct map addresses Effort: CHERI upstreaming Reviewed by: kib Sponsored by: AFRL, DARPA Pull Request: https://github.com/freebsd/freebsd-src/pull/2068 --- sys/contrib/ncsw/user/env/xx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/contrib/ncsw/user/env/xx.c b/sys/contrib/ncsw/user/env/xx.c index 6c943f615a3f..8edddcab9934 100644 --- a/sys/contrib/ncsw/user/env/xx.c +++ b/sys/contrib/ncsw/user/env/xx.c @@ -656,11 +656,7 @@ XX_VirtToPhys(void *addr) return (XX_PInfo.portal_ci_pa[QM_PORTAL][cpu] + (vm_offset_t)addr - XX_PInfo.portal_ci_va[QM_PORTAL]); - if (PMAP_HAS_DMAP && (vm_offset_t)addr >= DMAP_BASE_ADDRESS && - (vm_offset_t)addr <= DMAP_MAX_ADDRESS) - return (DMAP_TO_PHYS(addr)); - else - paddr = pmap_kextract((vm_offset_t)addr); + paddr = pmap_kextract((vm_offset_t)addr); if (paddr == 0) printf("NetCommSW: "home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ea61fb.450bc.428fad34>