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

virtio_balloon: disable VIOMMU support

virtio balloon bypasses the DMA API entirely so does not support the
VIOMMU right now. It's not clear we need that support, for now let's
just make sure we don't pretend to support it.

Cc: stable@vger.kernel.org
Cc: Wei Wang <wei.w.wang@intel.com>
Fixes: 1a937693993f ("virtio: new feature to detect IOMMU device quirk")
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>

Michael S. Tsirkin e41b1355 32c1431e

+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,