Commit d4560686 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio fix from Michael Tsirkin:
 "Fix a single, long-standing issue with kick pass-through vdpa"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler
parents eb5e56d1 0823dc64

drivers/vhost/vdpa.c

+1 −7
Original line number Diff line number Diff line
@@ -1481,13 +1481,7 @@ static vm_fault_t vhost_vdpa_fault(struct vm_fault *vmf) 


	notify = ops->get_vq_notification(vdpa, index);



	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	if (remap_pfn_range(vma, vmf->address & PAGE_MASK,

			    PFN_DOWN(notify.addr), PAGE_SIZE,

			    vma->vm_page_prot))

		return VM_FAULT_SIGBUS;



	return VM_FAULT_NOPAGE;

	return vmf_insert_pfn(vma, vmf->address & PAGE_MASK, PFN_DOWN(notify.addr));

}



static const struct vm_operations_struct vhost_vdpa_vm_ops = {