superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/1085/head
Sean Christopherson 2024-10-10 11:23:15 -07:00 committed by Paolo Bonzini
parent e2d2ca71ac
commit eec1e5db46
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virt/kvm/kvm_main.c
View File

@ -2804,8 +2804,6 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault,
struct page *page; struct page *page;
int npages; int npages;
might_sleep();
if (writable) if (writable)
*writable = write_fault; *writable = write_fault;
@ -2939,6 +2937,8 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool interruptible, bool *async,
kvm_pfn_t pfn; kvm_pfn_t pfn;
int npages, r; int npages, r;
might_sleep();
if (hva_to_pfn_fast(addr, write_fault, writable, &pfn)) if (hva_to_pfn_fast(addr, write_fault, writable, &pfn))
return pfn; return pfn;