shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: virtio_balloon: Do not translate reported pages through DMA API

Browse Source 
The free-page reporting and hinting queues do not pass arrays of page
addresses (like the basic inflate queue) but instead pass the free page
ranges as buffers. This does not work well with DMA API: The host wants
to know the GPA, not an IOVA.

For these two virtqueues, disable DMA API and pass through buffers untranslated.

Bug: 240239989
Change-Id: I2d13a8b7e8f6775819de7fe96f4579afa08b1300
Signed-off-by: Keir Fraser <keirf@google.com>
[ qperret@: Fixed minor context conflict in virtio.h ]
Signed-off-by: Quentin Perret <qperret@google.com>
This commit is contained in:
Keir Fraser
2022-08-18 11:20:25 +00:00
committed by Quentin Perret
parent e95813e9da
commit aa2a4936ec
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/virtio/virtio_balloon.c
View File

@@ -553,11 +553,15 @@ static int init_vqs(struct virtio_balloon *vb)
virtqueue_kick(vb->stats_vq);
}
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) {
vb->free_page_vq = vqs[VIRTIO_BALLOON_VQ_FREE_PAGE];
virtqueue_disable_dma_api_for_buffers(vb->free_page_vq);
}
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING))
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) {
vb->reporting_vq = vqs[VIRTIO_BALLOON_VQ_REPORTING];
virtqueue_disable_dma_api_for_buffers(vb->reporting_vq);
}
return 0;
}

10
drivers/virtio/virtio_ring.c
View File

@@ -2863,4 +2863,14 @@ const struct vring *virtqueue_get_vring(struct virtqueue *vq)
}
EXPORT_SYMBOL_GPL(virtqueue_get_vring);
/*
* Prevents use of DMA API for buffers passed via the specified virtqueue.
* DMA API may still be used for the vrings themselves.
*/
void virtqueue_disable_dma_api_for_buffers(struct virtqueue *vq)
{
to_vvq(vq)->use_dma_api = false;
}
EXPORT_SYMBOL_GPL(virtqueue_disable_dma_api_for_buffers);
MODULE_LICENSE("GPL");

2
include/linux/virtio.h
View File

@@ -96,6 +96,8 @@ dma_addr_t virtqueue_get_used_addr(struct virtqueue *vq);
int virtqueue_resize(struct virtqueue *vq, u32 num,
void (*recycle)(struct virtqueue *vq, void *buf));
void virtqueue_disable_dma_api_for_buffers(struct virtqueue *vq);
/**
* struct virtio_device - representation of a device using virtio
* @index: unique position on the virtio bus