tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Pull virtio bugfix from Michael Tsirkin:
"It turns out balloon does not handle IOMMUs correctly. We should fix
that at some point, for now let's just disable this configuration"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio_balloon: disable VIOMMU support

Linus Torvalds 3696e4f0 7d62d947

+7
unified split
+7
drivers/virtio/virtio_balloon.c
··· 663 } 664 #endif 665 666 static unsigned int features[] = { 667 VIRTIO_BALLOON_F_MUST_TELL_HOST, 668 VIRTIO_BALLOON_F_STATS_VQ, ··· 681 .driver.name = KBUILD_MODNAME, 682 .driver.owner = THIS_MODULE, 683 .id_table = id_table, 684 .probe = virtballoon_probe, 685 .remove = virtballoon_remove, 686 .config_changed = virtballoon_changed,
··· 663 } 664 #endif 665 666 + static int virtballoon_validate(struct virtio_device *vdev) 667 + { 668 + __virtio_clear_bit(vdev, VIRTIO_F_IOMMU_PLATFORM); 669 + return 0; 670 + } 671 + 672 static unsigned int features[] = { 673 VIRTIO_BALLOON_F_MUST_TELL_HOST, 674 VIRTIO_BALLOON_F_STATS_VQ, ··· 675 .driver.name = KBUILD_MODNAME, 676 .driver.owner = THIS_MODULE, 677 .id_table = id_table, 678 + .validate = virtballoon_validate, 679 .probe = virtballoon_probe, 680 .remove = virtballoon_remove, 681 .config_changed = virtballoon_changed,