From nobody Thu Apr 23 18:16:27 2026 X-Original-To: dev-commits-src-main@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 4g1kn75sDxz6bFng for ; Thu, 23 Apr 2026 18:16:27 +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 4g1kn74DV0z3Qxj for ; Thu, 23 Apr 2026 18:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776968187; 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=ZqMUuMyYN937RPxBvF2XFhKN1iDjtzy3Y+SPN4ZmmOM=; b=ep3jinPEcalCC1baMz7Q2UvqF4WKX0DotIa1AkBRpvyGD223/IUPZu51z78fbknaWkifA4 hdBqhhL8NuUAOeSHux8aT32rClRA+qdRdvFnOW0kftcaKriekSbnT9egJI62A60J6DNSvr b8FTkVoN6Q+kFI2y7OR82lVT0twnrSXRoTKyYNYJyhrs0x8bnx97jOAnHQ7ed4B0y/XMgT gIoGPAsadrdscNxG5PGj6mT/2fHbFHcR7K1YsvZOHXpbW4QOqUQVTE7EmS5pvpLwU54FYa /9JXgle7D9hy+nm2GMSBvr0EbcoFrcz1YOEBUebDVdhfMdfKhlB6DV/fjFZzmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776968187; a=rsa-sha256; cv=none; b=sX3HOLGDcH132VgrEXKdpsKvSRc+4A6vAaAGX3qTCL2caDICJC8xXKc7LJXvuwhlrevtzz zekFgkjetCZKWhLmR43MXW38wrXzC1L6zCx5pebYFkKmflWFEv3i69RYCQUiIB8EXfwcdX jOFbZUdZ5H/6RqSmuQ4z8EvBgktJJmqGQlJ9o40DMvBBS0Bmv4dl26+1yiNJ9cC7lHB5gA RVFz086zhx+0CqqezHz4nrajBf0M6xgIWP/Wj1OqLRW0GEohEFQuXowpExM1KuAdlrWP6S Ly2RFEMQH33WXCsu5TMOfKuqV/k+5hT7rGd1Q1nb9/SLz2H8I0qWX9fvdrfJPg== 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=1776968187; 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=ZqMUuMyYN937RPxBvF2XFhKN1iDjtzy3Y+SPN4ZmmOM=; b=gcOl/TW1DcnN3zt4cLqXnGFFqd4JSmuR2+wcAL0KZKOeq2NczuWJqDY1QID/kvIp/tZdg2 MU9fwZLnNKiMUyj4jjMxROrt+ZLa5NmemYqkEVtkGgho6EbrOQ+MwtL+A8VGsEKX8v4sQ4 t0ZJSxefmkQ/59M29JDnLqwt1lcBFpL10uiE0zISn0HwL4i5wRAadQJTFbDWVW4+GsANw3 3/RdddGIOMFSb05gMd0AOv7hM2Esbp9h5yXDtYvkxzGBn9FL+xIKrNRu/peRxd04oAmFbG C8AHk68T10r/Rp1UQXch3unPc/3sYTGr5dzHm/SAh1eDP+Rn/Bq36iActHMq2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1kn73VvkzBhR for ; Thu, 23 Apr 2026 18:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 450bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 18:16:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bee1aae0b3f1 - main - ncsw: Allow pmap_kextract to handle direct map addresses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: bee1aae0b3f19df40452ee91096fa957104db12f Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 18:16:27 +0000 Message-Id: <69ea61fb.450bc.428fad34@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bee1aae0b3f19df40452ee91096fa957104db12f commit bee1aae0b3f19df40452ee91096fa957104db12f Author: John Baldwin AuthorDate: 2026-04-23 17:05:55 +0000 Commit: John Baldwin 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: "