Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6c8ee57be9350c5c2cafdd6a99d0462d528676e2

Authored by Xiao Guangrong
Committed by Avi Kivity
1 parent 16b854c889
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

KVM: introduce KVM_PFN_ERR_FAULT 

After that, the exported and un-inline function, get_fault_pfn,
can be removed

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

Showing 3 changed files with 6 additions and 11 deletions Side-by-side Diff

... ... @@ -2512,7 +2512,7 @@
2512 2512  
2513 2513 slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn, no_dirty_log);
2514 2514 if (!slot)
2515   - return get_fault_pfn();
  2515 + return KVM_PFN_ERR_FAULT;
2516 2516  
2517 2517 hva = gfn_to_hva_memslot(slot, gfn);
2518 2518  
include/linux/kvm_host.h
Diff comments   View file @ 6c8ee57
... ... @@ -48,6 +48,8 @@
48 48 #define KVM_MAX_MMIO_FRAGMENTS \
49 49 (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS)
50 50  
  51 +#define KVM_PFN_ERR_FAULT (-EFAULT)
  52 +
51 53 /*
52 54 * vcpu->requests bit members
53 55 */
... ... @@ -443,7 +445,6 @@
443 445 void kvm_set_pfn_dirty(pfn_t pfn);
444 446 void kvm_set_pfn_accessed(pfn_t pfn);
445 447 void kvm_get_pfn(pfn_t pfn);
446   -pfn_t get_fault_pfn(void);
447 448  
448 449 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
449 450 int len);
... ... @@ -939,12 +939,6 @@
939 939 return -ENOENT;
940 940 }
941 941  
942   -pfn_t get_fault_pfn(void)
943   -{
944   - return -EFAULT;
945   -}
946   -EXPORT_SYMBOL_GPL(get_fault_pfn);
947   -
948 942 static pfn_t get_hwpoison_pfn(void)
949 943 {
950 944 return -EHWPOISON;
... ... @@ -1115,7 +1109,7 @@
1115 1109 struct vm_area_struct *vma;
1116 1110  
1117 1111 if (atomic)
1118   - return get_fault_pfn();
  1112 + return KVM_PFN_ERR_FAULT;
1119 1113  
1120 1114 down_read(&current->mm->mmap_sem);
1121 1115 if (npages == -EHWPOISON ||
... ... @@ -1127,7 +1121,7 @@
1127 1121 vma = find_vma_intersection(current->mm, addr, addr+1);
1128 1122  
1129 1123 if (vma == NULL)
1130   - pfn = get_fault_pfn();
  1124 + pfn = KVM_PFN_ERR_FAULT;
1131 1125 else if ((vma->vm_flags & VM_PFNMAP)) {
1132 1126 pfn = ((addr - vma->vm_start) >> PAGE_SHIFT) +
1133 1127 vma->vm_pgoff;
... ... @@ -1135,7 +1129,7 @@
1135 1129 } else {
1136 1130 if (async && (vma->vm_flags & VM_WRITE))
1137 1131 *async = true;
1138   - pfn = get_fault_pfn();
  1132 + pfn = KVM_PFN_ERR_FAULT;
1139 1133 }
1140 1134 up_read(&current->mm->mmap_sem);
1141 1135 } else