From nobody Wed Sep 09 14:23:11 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 4hg31r11PLz6sB4t for ; Wed, 09 Sep 2026 14:23: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hg31q5v7yz3KFD for ; Wed, 09 Sep 2026 14:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963791; 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=JTuOsFp+LqZM8d1IFchUGBOdUYNYaYvhYRDVVu3Zj4o=; b=TiJx1fAebedqDjBoqxuGAaCg7huNkf3NgxJwb0rGDmApbivl9PL3lo+xkmIMbY9Gk9v2wL oO1gEA4XxT72pyEkUwnKNlPNZleQdEmrchxXpWbnOcA49jVmQnScLbl0W124A3GtAE+ZvG k1g/sH9NJja/iR0fbhurie0O8OpS3AKDzkT/QKksRqfjx61mge/WmceO6jBjxy0c/bW2kM 8bsBnvftr3pYd/YpwfDGk34NR0S+SciqVAhOJgadk2gL4BNVBu2PmKNAX+lazUwd3Rgajo zbrQJu7C7/SQBiIi05c2QxO35lBfXdfez6eK2LdnQdaBgrTbQhvheN1YUe9GJw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1788963791; b=unOmz/YjwDAhSuM88nPREvjkwh4rijm7dnDWJ0SbQK/3WNlLUAkHMcHYwaEqju8XePaaT5 Eak6ntIwSiFzfWXUPDL15/EDoAfgp0xyaudWbOYLlay5J340sfHtP7/OGoBo/aMC/bAxLe o7/U6ynhVX/YnJBN63OJutK7ztlcTwCSvqU4C+ynCb9DrEmDKbtoi1f1WUfKo2wRVN6YGY qiejnNiGfPOan80edk/hnIeoygTNadK3uFqzfBkAA+PMiIg6u8dJr/DUxAqWMZUSFYBVdH 8zJ/eGu+q2OA5C7T1/8Av8PQkjrD+Dm6mGw8y/n6mku0JbrrwhRWYMEcQOjgBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963791; 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=JTuOsFp+LqZM8d1IFchUGBOdUYNYaYvhYRDVVu3Zj4o=; b=ORmEPgdlgUZVShlTIp1XZg/0xtC2h3X7myHXr/mNjm8U6IvaMRm/LITymVjHohBFBicmZH SnXs9i8gmiaxN6yBC/GfpgF2QgUczhHjOr3nxDXAQ0jqmTB6sBu+/HLgtfv6R2kFJcFu3j v6zGQQMu07vjygwcOkNdauwRW3RwzYk9eS2O2/FLs/pMoCQhZoQ+eSBoMT6aZzW1vdqJEa TzNAS3EHi/8ZlqowfrPY4eeXSZEMMF4+wKGefa+vWud+ePVwfiH5lQO1L/G/oJWRp4ozJM 8dw4xisi31ZAvakOryq/pN0HZHPttg/vRdg0AeurKCzNSTkjiPawRoAwstDhlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hg31q4zD9z10pX for ; Wed, 09 Sep 2026 14:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18745 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 09 Sep 2026 14:23:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: 728d9f322935 - main - arm64/pmap: Fix invalidate_icache condition in stage2 fault 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 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: 728d9f322935905c09236e8312b3268b6ff8691b Auto-Submitted: auto-generated Date: Wed, 09 Sep 2026 14:23:11 +0000 Message-Id: <6aa16bcf.18745.46daa5d8@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=728d9f322935905c09236e8312b3268b6ff8691b commit 728d9f322935905c09236e8312b3268b6ff8691b Author: Kajetan Puchalski AuthorDate: 2026-09-08 11:21:52 +0000 Commit: Andrew Turner CommitDate: 2026-09-08 03:05:28 +0000 arm64/pmap: Fix invalidate_icache condition in stage2 fault pmap_stage2_fault is supposed to invalidate the icache if it is accessing an executable page. Instead, the condition currently checks whether execution is disallowed at any EL. Make it check whether execution is allowed at any EL to match the intended behaviour. Signed-off-by: Kajetan Puchalski Reviewed by: andrew Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/2416 --- sys/arm64/arm64/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index f9b3217c9678..38beb5270f50 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9761,7 +9761,7 @@ fault_exec: * of Coherency. */ if ((pte & ATTR_S2_XN_MASK) != - ATTR_S2_XN(ATTR_S2_XN_NONE)) { + ATTR_S2_XN(ATTR_S2_XN_ALL)) { invalidate_icache(); } pmap_set_bits(ptep, ATTR_AF | ATTR_DESCR_VALID);