Skip to content

Commit d456068

Browse files
committed
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
2 parents eb5e56d + 0823dc6 commit d456068

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/vhost/vdpa.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,13 +1481,7 @@ static vm_fault_t vhost_vdpa_fault(struct vm_fault *vmf)
14811481

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

1484-
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
1485-
if (remap_pfn_range(vma, vmf->address & PAGE_MASK,
1486-
PFN_DOWN(notify.addr), PAGE_SIZE,
1487-
vma->vm_page_prot))
1488-
return VM_FAULT_SIGBUS;
1489-
1490-
return VM_FAULT_NOPAGE;
1484+
return vmf_insert_pfn(vma, vmf->address & PAGE_MASK, PFN_DOWN(notify.addr));
14911485
}
14921486

14931487
static const struct vm_operations_struct vhost_vdpa_vm_ops = {

0 commit comments

Comments
 (0)