| Message ID | 5014F0B5.50602@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jul 29, 2012 at 04:13:41PM +0800, Xiao Guangrong wrote: > Then, get_hwpoison_pfn and is_hwpoison_pfn can be removed > > Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> > --- > arch/x86/kvm/mmu.c | 2 +- > include/linux/kvm_host.h | 4 ++-- > virt/kvm/kvm_main.c | 13 +------------ > 3 files changed, 4 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index 19bac91..320a781 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -2651,7 +2651,7 @@ static void kvm_send_hwpoison_signal(unsigned long address, struct task_struct * > static int kvm_handle_bad_page(struct kvm_vcpu *vcpu, gfn_t gfn, pfn_t pfn) > { > kvm_release_pfn_clean(pfn); > - if (is_hwpoison_pfn(pfn)) { > + if (pfn == kvm_hwpoison_pfn) { > kvm_send_hwpoison_signal(gfn_to_hva(vcpu->kvm, gfn), current); > return 0; > } > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 7cd6871..4de56cd 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -48,7 +48,8 @@ > #define KVM_MAX_MMIO_FRAGMENTS \ > (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS) > > -#define kvm_fault_pfn (-EFAULT) > +#define kvm_fault_pfn (-EFAULT) > +#define kvm_hwpoison_pfn (-EHWPOISON) Same here as kvm_fault_pfn. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 19bac91..320a781 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2651,7 +2651,7 @@ static void kvm_send_hwpoison_signal(unsigned long address, struct task_struct * static int kvm_handle_bad_page(struct kvm_vcpu *vcpu, gfn_t gfn, pfn_t pfn) { kvm_release_pfn_clean(pfn); - if (is_hwpoison_pfn(pfn)) { + if (pfn == kvm_hwpoison_pfn) { kvm_send_hwpoison_signal(gfn_to_hva(vcpu->kvm, gfn), current); return 0; } diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 7cd6871..4de56cd 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -48,7 +48,8 @@ #define KVM_MAX_MMIO_FRAGMENTS \ (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS) -#define kvm_fault_pfn (-EFAULT) +#define kvm_fault_pfn (-EFAULT) +#define kvm_hwpoison_pfn (-EHWPOISON) /* * vcpu->requests bit members @@ -396,7 +397,6 @@ extern struct page *bad_page; int is_error_page(struct page *page); int is_error_pfn(pfn_t pfn); -int is_hwpoison_pfn(pfn_t pfn); int is_noslot_pfn(pfn_t pfn); int is_invalid_pfn(pfn_t pfn); int kvm_is_error_hva(unsigned long addr); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2117aa8..390a03d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -948,17 +948,6 @@ static pfn_t get_bad_pfn(void) return -ENOENT; } -static pfn_t get_hwpoison_pfn(void) -{ - return -EHWPOISON; -} - -int is_hwpoison_pfn(pfn_t pfn) -{ - return pfn == -EHWPOISON; -} -EXPORT_SYMBOL_GPL(is_hwpoison_pfn); - int is_noslot_pfn(pfn_t pfn) { return pfn == -ENOENT; @@ -1124,7 +1113,7 @@ static pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async, if (npages == -EHWPOISON || (!async && check_user_page_hwpoison(addr))) { up_read(¤t->mm->mmap_sem); - return get_hwpoison_pfn(); + return kvm_hwpoison_pfn; } vma = find_vma_intersection(current->mm, addr, addr+1);
Then, get_hwpoison_pfn and is_hwpoison_pfn can be removed Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> --- arch/x86/kvm/mmu.c | 2 +- include/linux/kvm_host.h | 4 ++-- virt/kvm/kvm_main.c | 13 +------------ 3 files changed, 4 insertions(+), 15 deletions(-)