Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3696e4f0 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 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
parents 7d62d947 e41b1355

drivers/virtio/virtio_balloon.c

+7 −0
Original line number Diff line number Diff line
@@ -663,6 +663,12 @@ static int virtballoon_restore(struct virtio_device *vdev) 
}

#endif



static int virtballoon_validate(struct virtio_device *vdev)

{

	__virtio_clear_bit(vdev, VIRTIO_F_IOMMU_PLATFORM);

	return 0;

}



static unsigned int features[] = {

	VIRTIO_BALLOON_F_MUST_TELL_HOST,

	VIRTIO_BALLOON_F_STATS_VQ,
@@ -675,6 +681,7 @@ static struct virtio_driver virtio_balloon_driver = { 
	.driver.name =	KBUILD_MODNAME,

	.driver.owner =	THIS_MODULE,

	.id_table =	id_table,

	.validate =	virtballoon_validate,

	.probe =	virtballoon_probe,

	.remove =	virtballoon_remove,

	.config_changed = virtballoon_changed,