diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 20:25:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 20:25:05 -0400 |
commit | 3696e4f0b0072eb9753ffa1387be1dd2ebe2cb8f (patch) | |
tree | eedd00376002895af5392c3a2b641d51101b413b | |
parent | 7d62d947605640b403fcb75d7928241d34231b4a (diff) | |
parent | e41b1355508debe45fda33ef8c03ff3ba5d206b9 (diff) |
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
-rw-r--r-- | drivers/virtio/virtio_balloon.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 408c174ef0d5..22caf808bfab 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c | |||
@@ -663,6 +663,12 @@ static int virtballoon_restore(struct virtio_device *vdev) | |||
663 | } | 663 | } |
664 | #endif | 664 | #endif |
665 | 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 | |||
666 | static unsigned int features[] = { | 672 | static unsigned int features[] = { |
667 | VIRTIO_BALLOON_F_MUST_TELL_HOST, | 673 | VIRTIO_BALLOON_F_MUST_TELL_HOST, |
668 | VIRTIO_BALLOON_F_STATS_VQ, | 674 | VIRTIO_BALLOON_F_STATS_VQ, |
@@ -675,6 +681,7 @@ static struct virtio_driver virtio_balloon_driver = { | |||
675 | .driver.name = KBUILD_MODNAME, | 681 | .driver.name = KBUILD_MODNAME, |
676 | .driver.owner = THIS_MODULE, | 682 | .driver.owner = THIS_MODULE, |
677 | .id_table = id_table, | 683 | .id_table = id_table, |
684 | .validate = virtballoon_validate, | ||
678 | .probe = virtballoon_probe, | 685 | .probe = virtballoon_probe, |
679 | .remove = virtballoon_remove, | 686 | .remove = virtballoon_remove, |
680 | .config_changed = virtballoon_changed, | 687 | .config_changed = virtballoon_changed, |