@@ -191,9 +191,6 @@ struct vring_virtqueue {
/* Host publishes avail event idx */
bool event;
- /* Do DMA mapping by driver */
- bool premapped;
-
/* Head of free buffer list. */
unsigned int free_head;
/* Number we've added since last sync. */
@@ -314,7 +311,7 @@ static bool vring_use_dma_api(const struct virtio_device *vdev)
static bool vring_need_unmap_buffer(const struct vring_virtqueue *vring)
{
- return vring->use_dma_api && !vring->premapped;
+ return vring->use_dma_api && !vring->vq.premapped;
}
size_t virtio_max_dma_size(const struct virtio_device *vdev)
@@ -386,7 +383,7 @@ static struct device *vring_dma_dev(const struct vring_virtqueue *vq)
static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatterlist *sg,
enum dma_data_direction direction, dma_addr_t *addr)
{
- if (vq->premapped) {
+ if (vq->vq.premapped) {
*addr = sg_dma_address(sg);
return 0;
}
@@ -2158,9 +2155,9 @@ static struct virtqueue *vring_create_virtqueue_packed(
vq->use_dma_api = vring_use_dma_api(vdev);
if (premapped && vq->use_dma_api)
- vq->premapped = true;
+ vq->vq.premapped = true;
else
- vq->premapped = false;
+ vq->vq.premapped = false;
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
@@ -2709,9 +2706,9 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
vq->use_dma_api = vring_use_dma_api(vdev);
if (premapped && vq->use_dma_api)
- vq->premapped = true;
+ vq->vq.premapped = true;
else
- vq->premapped = false;
+ vq->vq.premapped = false;
vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
!context;
@@ -2881,7 +2878,7 @@ int virtqueue_set_dma_premapped(struct virtqueue *_vq)
return -EINVAL;
}
- vq->premapped = true;
+ vq->vq.premapped = true;
if (vq->packed_ring) {
kfree(vq->packed.desc_dma);
@@ -36,6 +36,7 @@ struct virtqueue {
unsigned int num_free;
unsigned int num_max;
bool reset;
+ bool premapped;
void *priv;
};
Export the premapped to drivers, then drivers can check the vq premapped mode after the find_vqs(). Because the find_vqs() just try to enable the vq premapped mode, the driver must check that after find_vqs(). Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> --- drivers/virtio/virtio_ring.c | 17 +++++++---------- include/linux/virtio.h | 1 + 2 files changed, 8 insertions(+), 10 deletions(-)