From ab71832edb3a19ada49ecca1c5023b93dfd4970d Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:57 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Drop FOLL_FORCE when pinning guest memory pages" This reverts commit 3f5ffbd827db867581cbb84c0bd68eb91e68ea44. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ie38216650f36b6b38f0c4052cec515955e239b80 --- arch/arm64/kvm/mmu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index fc39dfc04fca..30d2a349786f 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1163,7 +1163,10 @@ static int pkvm_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, unsigned long hva) { struct mm_struct *mm = current->mm; - unsigned int flags = FOLL_HWPOISON | FOLL_LONGTERM | FOLL_WRITE; + unsigned int flags = FOLL_FORCE | + FOLL_HWPOISON | + FOLL_LONGTERM | + FOLL_WRITE; struct kvm_pinned_page *ppage; struct kvm *kvm = vcpu->kvm; struct page *page;