From: Sean Christopherson <seanjc@google.com>
Date: Thu, 10 Oct 2024 18:23:15 +0000 (-0700)
Subject: KVM: Annotate that all paths in hva_to_pfn() might sleep
X-Git-Tag: v6.13-rc1~97^2~17^2~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eec1e5db464eba928273b27246122d157fd0eff8;p=thirdparty%2Fkernel%2Flinux.git

KVM: Annotate that all paths in hva_to_pfn() might sleep

Now that hva_to_pfn() no longer supports being called in atomic context,
move the might_sleep() annotation from hva_to_pfn_slow() to hva_to_pfn().

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20241010182427.1434605-14-seanjc@google.com>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index c7506eb230865..c60b542c7241b 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2804,8 +2804,6 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,
 	struct page *page;
 	int npages;
 
-	might_sleep();
-
 	if (writable)
 		*writable = write_fault;
 
@@ -2939,6 +2937,8 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool interruptible, bool *async,
 	kvm_pfn_t pfn;
 	int npages, r;
 
+	might_sleep();
+
 	if (hva_to_pfn_fast(addr, write_fault, writable, &pfn))
 		return pfn;