From bbb0cbbae29dba98eabc7b502be7bd8f3da223a2 Mon Sep 17 00:00:00 2001 From: Vincent Donnefort Date: Thu, 12 Oct 2023 10:55:46 +0100 Subject: [PATCH] ANDROID: KVM: arm64: Allow setting device attr in stage-2 PTEs Allow pKVM to set device attributes (nGnRE) on stage-2 entries when KVM_PGTABLE_PROT_DEVICE is used. Bug: 357781595 Bug: 303529066 Change-Id: I19ddbd627cb67fb4ad295af6ea5fff129d7a94f7 Signed-off-by: Vincent Donnefort --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 06dfea39ca34..a916aa46842b 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1834,6 +1834,7 @@ static int restrict_host_page_perms(u64 addr, kvm_pte_t pte, u32 level, enum kvm } #define MODULE_PROT_ALLOWLIST (KVM_PGTABLE_PROT_RWX | \ + KVM_PGTABLE_PROT_DEVICE | \ KVM_PGTABLE_PROT_NORMAL_NC | \ KVM_PGTABLE_PROT_PXN | \ KVM_PGTABLE_PROT_UXN)