Skip to contentSkip to conversation

KVM: arm/arm64: Don't reschedule in unmap_stage2_range()

PATCH In review Will Deacon 2 participants 2 messages Aug 24, 2020 Stable branch

lore
Share & tools
lore

Will Deacon

author
#0 lore raw

PATCH 1/1 KVM: arm/arm64: Don't reschedule in unmap_stage2_range()

Upstream commits fdfe7cbd5880 ("KVM: Pass MMU notifier range flags to kvm_unmap_hva_range()") and b5331379bc62 ("KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set") fix a "sleeping from invalid context" BUG caused by unmap_stage2_range() attempting to reschedule when called on the OOM path.

Unfortunately, these patches rely on the MMU notifier callback being passed knowledge about whether or not blocking is permitted, which was introduced in 4.19. Rather than backport this considerable amount of infrastructure just for KVM on arm, instead just remove the conditional reschedule.

Cc <[email protected]> # v4.9 only
Cc Marc Zyngier <[email protected]>
Cc Suzuki K Poulose <[email protected]>
Cc James Morse <[email protected]>
Signed-off-by Will Deacon <[email protected]>
---
 arch/arm/kvm/mmu.c | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/kvm/mmu.c +0 -6
index bb0d5e21d60b..b5ce1e81f945 100644
@@ -298,12 +298,6 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size)
 		next = stage2_pgd_addr_end(addr, end);
 		if (!stage2_pgd_none(*pgd))
 			unmap_stage2_puds(kvm, pgd, addr, next);
-		/*
-		 * If the range is too large, release the kvm->mmu_lock
-		 * to prevent starvation and lockup detector warnings.
-		 */
-		if (next != end)
-			cond_resched_lock(&kvm->mmu_lock);
 	} while (pgd++, addr = next, addr != end);
 }
Signature · 1 line
2.28.0.297.g1956fa8f8d-goog
Acked-by on v1 1/1
#1 lore raw
Quoted 28 lines · Will Deacon

Upstream commits fdfe7cbd5880 ("KVM: Pass MMU notifier range flags to kvm_unmap_hva_range()") and b5331379bc62 ("KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set") fix a "sleeping from invalid context" BUG caused by unmap_stage2_range() attempting to reschedule when called on the OOM path.

Unfortunately, these patches rely on the MMU notifier callback being passed knowledge about whether or not blocking is permitted, which was introduced in 4.19. Rather than backport this considerable amount of infrastructure just for KVM on arm, instead just remove the conditional reschedule.

Cc <[email protected]> # v4.9 only
Cc Marc Zyngier <[email protected]>
Cc Suzuki K Poulose <[email protected]>
Cc James Morse <[email protected]>
Signed-off-by Will Deacon <[email protected]>
---
 arch/arm/kvm/mmu.c | 6 ------
 1 file changed, 6 deletions(-)
arch/arm/kvm/mmu.c +0 -0
index bb0d5e21d60b..b5ce1e81f945 100644
@@ -298,12 +298,6 @@ static void unmap_stage2_range(struct kvm *kvm,
 phys_addr_t start, u64 size)
 		next = stage2_pgd_addr_end(addr, end);

arch/arm/kvm/mmu.c static void unmap_stage2_range(struct kvm *kvm, · line 303

Quoted 10 lines
arch/arm/kvm/mmu.c +0 -6
 		if (!stage2_pgd_none(*pgd))
 			unmap_stage2_puds(kvm, pgd, addr, next);
-		/*
-		 * If the range is too large, release the kvm->mmu_lock
-		 * to prevent starvation and lockup detector warnings.
-		 */
-		if (next != end)
-			cond_resched_lock(&kvm->mmu_lock);
 	} while (pgd++, addr = next, addr != end);
 }
Acked-by Marc Zyngier <[email protected]>
        M.
Signature · 1 line
Jazz is not dead. It just smells funny...