| Message ID | 20240611102243.47904-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: interrupt kvm_gmem_populate() on signals | expand |
On Tue, Jun 11, 2024 at 06:22:43AM -0400, Paolo Bonzini <pbonzini@redhat.com> wrote: > kvm_gmem_populate() is a potentially lengthy operation that can involve > multiple calls to the firmware. Interrupt it if a signal arrives. What about cond_resched() in the loop? kvm_gmem_allocate() has both. The change itself looks good for TDX because KVM_TDX_INIT_MEMREGION checks the signal. I can drop the duplicated check. Similar to cond_resched().
diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 9714add38852..3bfe1824ec2d 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -629,6 +629,11 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long gfn_t gfn = start_gfn + i; kvm_pfn_t pfn; + if (signal_pending(current)) { + ret = -EINTR; + break; + } + ret = __kvm_gmem_get_pfn(file, slot, gfn, &pfn, &max_order, false); if (ret) break;
kvm_gmem_populate() is a potentially lengthy operation that can involve multiple calls to the firmware. Interrupt it if a signal arrives. Fixes: 1f6c06b177513 ("KVM: guest_memfd: Add interface for populating gmem pages with user data") Cc: Isaku Yamahata <isaku.yamahata@intel.com> Cc: Michael Roth <michael.roth@amd.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- virt/kvm/guest_memfd.c | 5 +++++ 1 file changed, 5 insertions(+)