Commit fe5ed56c authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

kvm: Add KVM_PFN_ERR_SIGPENDING 



Add a new pfn error to show that we've got a pending signal to handle
during hva_to_pfn_slow() procedure (of -EINTR retval).

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20221011195809.557016-3-peterx@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 93c5c61d

include/linux/kvm_host.h

+10 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#define KVM_PFN_ERR_FAULT	(KVM_PFN_ERR_MASK)

#define KVM_PFN_ERR_HWPOISON	(KVM_PFN_ERR_MASK + 1)

#define KVM_PFN_ERR_RO_FAULT	(KVM_PFN_ERR_MASK + 2)

#define KVM_PFN_ERR_SIGPENDING	(KVM_PFN_ERR_MASK + 3)



/*

 * error pfns indicate that the gfn is in slot but faild to
@@ -106,6 +107,15 @@ static inline bool is_error_pfn(kvm_pfn_t pfn) 
	return !!(pfn & KVM_PFN_ERR_MASK);

}



/*

 * KVM_PFN_ERR_SIGPENDING indicates that fetching the PFN was interrupted

 * by a pending signal.  Note, the signal may or may not be fatal.

 */

static inline bool is_sigpending_pfn(kvm_pfn_t pfn)

{

	return pfn == KVM_PFN_ERR_SIGPENDING;

}



/*

 * error_noslot pfns indicate that the gfn can not be

 * translated to pfn - it is not in slot or failed to

virt/kvm/kvm_main.c

+2 −0
Original line number Diff line number Diff line
@@ -2667,6 +2667,8 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async, 
	npages = hva_to_pfn_slow(addr, async, write_fault, writable, &pfn);

	if (npages == 1)

		return pfn;

	if (npages == -EINTR)

		return KVM_PFN_ERR_SIGPENDING;



	mmap_read_lock(current->mm);

	if (npages == -EHWPOISON ||