[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20260209032421.1278325-1-kyle-jk.liao@mediatek.com>
Date: Mon, 9 Feb 2026 11:24:13 +0800
From: <kyle-jk.liao@...iatek.com>
To: Marc Zyngier <maz@...nel.org>, Oliver Upton <oupton@...nel.org>, Joey
Gouly <joey.gouly@....com>, Suzuki K Poulose <suzuki.poulose@....com>,
Zenghui Yu <yuzenghui@...wei.com>, Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will@...nel.org>, Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>, Quentin
Perret <qperret@...gle.com>, Vincent Donnefort <vdonnefort@...gle.com>,
<linux-arm-kernel@...ts.infradead.org>, <kvmarm@...ts.linux.dev>,
<linux-kernel@...r.kernel.org>, <linux-mediatek@...ts.infradead.org>
CC: <wsd_upstream@...iatek.com>, <rock.yeh@...iatek.com>,
<hungwen.chien@...iatek.com>, kyle-jk.liao <kyle-jk.liao@...iatek.com>
Subject: [PATCH] KVM: arm64: Allow module-owned pages in host stage-2 range adjustment
From: "kyle-jk.liao" <kyle-jk.liao@...iatek.com>
The host_stage2_adjust_range() function triggers a WARN_ON when
encountering pages marked as both PKVM_NOPAGE and PKVM_MODULE_OWNED_PAGE.
This occurs when load_unaligned_zeropad() accesses memory that crosses
page boundaries, where one of the pages is module-owned.
Extend the check to accept pages with the PKVM_MODULE_OWNED_PAGE flag
in addition to PKVM_NOPAGE, preventing spurious warnings during normal
module memory access patterns.
Signed-off-by: kyle-jk.liao <kyle-jk.liao@...iatek.com>
---
arch/arm64/kvm/hyp/nvhe/mem_protect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
index 49db32f3ddf7..baaabf4b5112 100644
--- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c
+++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
@@ -495,6 +495,7 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range)
u64 granule;
s8 level;
int ret;
+ enum pkvm_page_state state;
hyp_assert_lock_held(&host_mmu.lock);
ret = kvm_pgtable_get_leaf(&host_mmu.pgt, addr, &pte, &level);
@@ -505,8 +506,9 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range)
return -EAGAIN;
if (pte) {
+ state = get_host_state(hyp_phys_to_page(addr));
WARN_ON(addr_is_memory(addr) &&
- get_host_state(hyp_phys_to_page(addr)) != PKVM_NOPAGE);
+ (state != PKVM_NOPAGE && state != (PKVM_NOPAGE | PKVM_MODULE_OWNED_PAGE)));
return -EPERM;
}
--
2.45.2
Powered by blists - more mailing lists