virtio_ring: per virtqueue dma device

This patch introduces a per virtqueue dma device. This will be used
for virtio devices whose virtqueue are backed by different underlayer
devices.

One example is the vDPA that where the control virtqueue could be
implemented through software mediation.

Some of the work are actually done before since the helper like
vring_dma_device(). This work left are:

- Let vring_dma_device() return the per virtqueue dma device instead
  of the vdev's parent.
- Allow passing a dma_device when creating the virtqueue through a new
  helper, old vring creation helper will keep using vdev's parent.

Reviewed-by: Eli Cohen <elic@nvidia.com>
Tested-by: Eli Cohen <elic@nvidia.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20230119061525.75068-2-jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 723c4e29e1d3b84d556161f4ef239755899f4aea..41144b5246a8ad05e68a2846a354283b99aee7dd 100644 (file)
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -202,6 +202,9 @@ struct vring_virtqueue {
        /* DMA, allocation, and size information */
        bool we_own_ring;
 
+       /* Device used for doing DMA */
+       struct device *dma_dev;
+
 #ifdef DEBUG
        /* They're supposed to lock for us. */
        unsigned int in_use;
@@ -219,7 +222,8 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
                                               bool context,
                                               bool (*notify)(struct virtqueue *),
                                               void (*callback)(struct virtqueue *),
-                                              const char *name);
+                                              const char *name,
+                                              struct device *dma_dev);
 static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num);
 static void vring_free(struct virtqueue *_vq);
 
@@ -297,10 +301,11 @@ size_t virtio_max_dma_size(struct virtio_device *vdev)
 EXPORT_SYMBOL_GPL(virtio_max_dma_size);
 
 static void *vring_alloc_queue(struct virtio_device *vdev, size_t size,
-                             dma_addr_t *dma_handle, gfp_t flag)
+                              dma_addr_t *dma_handle, gfp_t flag,
+                              struct device *dma_dev)
 {
        if (vring_use_dma_api(vdev)) {
-               return dma_alloc_coherent(vdev->dev.parent, size,
+               return dma_alloc_coherent(dma_dev, size,
                                          dma_handle, flag);
        } else {
                void *queue = alloc_pages_exact(PAGE_ALIGN(size), flag);
@@ -330,10 +335,11 @@ static void *vring_alloc_queue(struct virtio_device *vdev, size_t size,
 }
 
 static void vring_free_queue(struct virtio_device *vdev, size_t size,
-                            void *queue, dma_addr_t dma_handle)
+                            void *queue, dma_addr_t dma_handle,
+                            struct device *dma_dev)
 {
        if (vring_use_dma_api(vdev))
-               dma_free_coherent(vdev->dev.parent, size, queue, dma_handle);
+               dma_free_coherent(dma_dev, size, queue, dma_handle);
        else
                free_pages_exact(queue, PAGE_ALIGN(size));
 }
@@ -341,11 +347,11 @@ static void vring_free_queue(struct virtio_device *vdev, size_t size,
 /*
  * The DMA ops on various arches are rather gnarly right now, and
  * making all of the arch DMA ops work on the vring device itself
- * is a mess.  For now, we use the parent device for DMA ops.
+ * is a mess.
  */
 static inline struct device *vring_dma_dev(const struct vring_virtqueue *vq)
 {
-       return vq->vq.vdev->dev.parent;
+       return vq->dma_dev;
 }
 
 /* Map one sg entry. */
@@ -1032,11 +1038,12 @@ err_state:
 }
 
 static void vring_free_split(struct vring_virtqueue_split *vring_split,
-                            struct virtio_device *vdev)
+                            struct virtio_device *vdev, struct device *dma_dev)
 {
        vring_free_queue(vdev, vring_split->queue_size_in_bytes,
                         vring_split->vring.desc,
-                        vring_split->queue_dma_addr);
+                        vring_split->queue_dma_addr,
+                        dma_dev);
 
        kfree(vring_split->desc_state);
        kfree(vring_split->desc_extra);
@@ -1046,7 +1053,8 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split,
                                   struct virtio_device *vdev,
                                   u32 num,
                                   unsigned int vring_align,
-                                  bool may_reduce_num)
+                                  bool may_reduce_num,
+                                  struct device *dma_dev)
 {
        void *queue = NULL;
        dma_addr_t dma_addr;
@@ -1061,7 +1069,8 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split,
        for (; num && vring_size(num, vring_align) > PAGE_SIZE; num /= 2) {
                queue = vring_alloc_queue(vdev, vring_size(num, vring_align),
                                          &dma_addr,
-                                         GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
+                                         GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+                                         dma_dev);
                if (queue)
                        break;
                if (!may_reduce_num)
@@ -1074,7 +1083,8 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split,
        if (!queue) {
                /* Try to get a single page. You are my only hope! */
                queue = vring_alloc_queue(vdev, vring_size(num, vring_align),
-                                         &dma_addr, GFP_KERNEL | __GFP_ZERO);
+                                         &dma_addr, GFP_KERNEL | __GFP_ZERO,
+                                         dma_dev);
        }
        if (!queue)
                return -ENOMEM;
@@ -1100,21 +1110,22 @@ static struct virtqueue *vring_create_virtqueue_split(
        bool context,
        bool (*notify)(struct virtqueue *),
        void (*callback)(struct virtqueue *),
-       const char *name)
+       const char *name,
+       struct device *dma_dev)
 {
        struct vring_virtqueue_split vring_split = {};
        struct virtqueue *vq;
        int err;
 
        err = vring_alloc_queue_split(&vring_split, vdev, num, vring_align,
-                                     may_reduce_num);
+                                     may_reduce_num, dma_dev);
        if (err)
                return NULL;
 
        vq = __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers,
-                                  context, notify, callback, name);
+                                  context, notify, callback, name, dma_dev);
        if (!vq) {
-               vring_free_split(&vring_split, vdev);
+               vring_free_split(&vring_split, vdev, dma_dev);
                return NULL;
        }
 
@@ -1132,7 +1143,8 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
 
        err = vring_alloc_queue_split(&vring_split, vdev, num,
                                      vq->split.vring_align,
-                                     vq->split.may_reduce_num);
+                                     vq->split.may_reduce_num,
+                                     vring_dma_dev(vq));
        if (err)
                goto err;
 
@@ -1150,7 +1162,7 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
        return 0;
 
 err_state_extra:
-       vring_free_split(&vring_split, vdev);
+       vring_free_split(&vring_split, vdev, vring_dma_dev(vq));
 err:
        virtqueue_reinit_split(vq);
        return -ENOMEM;
@@ -1841,22 +1853,26 @@ static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num)
 }
 
 static void vring_free_packed(struct vring_virtqueue_packed *vring_packed,
-                             struct virtio_device *vdev)
+                             struct virtio_device *vdev,
+                             struct device *dma_dev)
 {
        if (vring_packed->vring.desc)
                vring_free_queue(vdev, vring_packed->ring_size_in_bytes,
                                 vring_packed->vring.desc,
-                                vring_packed->ring_dma_addr);
+                                vring_packed->ring_dma_addr,
+                                dma_dev);
 
        if (vring_packed->vring.driver)
                vring_free_queue(vdev, vring_packed->event_size_in_bytes,
                                 vring_packed->vring.driver,
-                                vring_packed->driver_event_dma_addr);
+                                vring_packed->driver_event_dma_addr,
+                                dma_dev);
 
        if (vring_packed->vring.device)
                vring_free_queue(vdev, vring_packed->event_size_in_bytes,
                                 vring_packed->vring.device,
-                                vring_packed->device_event_dma_addr);
+                                vring_packed->device_event_dma_addr,
+                                dma_dev);
 
        kfree(vring_packed->desc_state);
        kfree(vring_packed->desc_extra);
@@ -1864,7 +1880,7 @@ static void vring_free_packed(struct vring_virtqueue_packed *vring_packed,
 
 static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,
                                    struct virtio_device *vdev,
-                                   u32 num)
+                                   u32 num, struct device *dma_dev)
 {
        struct vring_packed_desc *ring;
        struct vring_packed_desc_event *driver, *device;
@@ -1875,7 +1891,8 @@ static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,
 
        ring = vring_alloc_queue(vdev, ring_size_in_bytes,
                                 &ring_dma_addr,
-                                GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
+                                GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+                                dma_dev);
        if (!ring)
                goto err;
 
@@ -1887,7 +1904,8 @@ static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,
 
        driver = vring_alloc_queue(vdev, event_size_in_bytes,
                                   &driver_event_dma_addr,
-                                  GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
+                                  GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+                                  dma_dev);
        if (!driver)
                goto err;
 
@@ -1897,7 +1915,8 @@ static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,
 
        device = vring_alloc_queue(vdev, event_size_in_bytes,
                                   &device_event_dma_addr,
-                                  GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
+                                  GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+                                  dma_dev);
        if (!device)
                goto err;
 
@@ -1909,7 +1928,7 @@ static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,
        return 0;
 
 err:
-       vring_free_packed(vring_packed, vdev);
+       vring_free_packed(vring_packed, vdev, dma_dev);
        return -ENOMEM;
 }
 
@@ -1987,13 +2006,14 @@ static struct virtqueue *vring_create_virtqueue_packed(
        bool context,
        bool (*notify)(struct virtqueue *),
        void (*callback)(struct virtqueue *),
-       const char *name)
+       const char *name,
+       struct device *dma_dev)
 {
        struct vring_virtqueue_packed vring_packed = {};
        struct vring_virtqueue *vq;
        int err;
 
-       if (vring_alloc_queue_packed(&vring_packed, vdev, num))
+       if (vring_alloc_queue_packed(&vring_packed, vdev, num, dma_dev))
                goto err_ring;
 
        vq = kmalloc(sizeof(*vq), GFP_KERNEL);
@@ -2014,6 +2034,7 @@ static struct virtqueue *vring_create_virtqueue_packed(
        vq->broken = false;
 #endif
        vq->packed_ring = true;
+       vq->dma_dev = dma_dev;
        vq->use_dma_api = vring_use_dma_api(vdev);
 
        vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
@@ -2040,7 +2061,7 @@ static struct virtqueue *vring_create_virtqueue_packed(
 err_state_extra:
        kfree(vq);
 err_vq:
-       vring_free_packed(&vring_packed, vdev);
+       vring_free_packed(&vring_packed, vdev, dma_dev);
 err_ring:
        return NULL;
 }
@@ -2052,7 +2073,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
        struct virtio_device *vdev = _vq->vdev;
        int err;
 
-       if (vring_alloc_queue_packed(&vring_packed, vdev, num))
+       if (vring_alloc_queue_packed(&vring_packed, vdev, num, vring_dma_dev(vq)))
                goto err_ring;
 
        err = vring_alloc_state_extra_packed(&vring_packed);
@@ -2069,7 +2090,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
        return 0;
 
 err_state_extra:
-       vring_free_packed(&vring_packed, vdev);
+       vring_free_packed(&vring_packed, vdev, vring_dma_dev(vq));
 err_ring:
        virtqueue_reinit_packed(vq);
        return -ENOMEM;
@@ -2481,7 +2502,8 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
                                               bool context,
                                               bool (*notify)(struct virtqueue *),
                                               void (*callback)(struct virtqueue *),
-                                              const char *name)
+                                              const char *name,
+                                              struct device *dma_dev)
 {
        struct vring_virtqueue *vq;
        int err;
@@ -2507,6 +2529,7 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
 #else
        vq->broken = false;
 #endif
+       vq->dma_dev = dma_dev;
        vq->use_dma_api = vring_use_dma_api(vdev);
 
        vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&
@@ -2549,14 +2572,39 @@ struct virtqueue *vring_create_virtqueue(
        if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED))
                return vring_create_virtqueue_packed(index, num, vring_align,
                                vdev, weak_barriers, may_reduce_num,
-                               context, notify, callback, name);
+                               context, notify, callback, name, vdev->dev.parent);
 
        return vring_create_virtqueue_split(index, num, vring_align,
                        vdev, weak_barriers, may_reduce_num,
-                       context, notify, callback, name);
+                       context, notify, callback, name, vdev->dev.parent);
 }
 EXPORT_SYMBOL_GPL(vring_create_virtqueue);
 
+struct virtqueue *vring_create_virtqueue_dma(
+       unsigned int index,
+       unsigned int num,
+       unsigned int vring_align,
+       struct virtio_device *vdev,
+       bool weak_barriers,
+       bool may_reduce_num,
+       bool context,
+       bool (*notify)(struct virtqueue *),
+       void (*callback)(struct virtqueue *),
+       const char *name,
+       struct device *dma_dev)
+{
+
+       if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED))
+               return vring_create_virtqueue_packed(index, num, vring_align,
+                               vdev, weak_barriers, may_reduce_num,
+                               context, notify, callback, name, dma_dev);
+
+       return vring_create_virtqueue_split(index, num, vring_align,
+                       vdev, weak_barriers, may_reduce_num,
+                       context, notify, callback, name, dma_dev);
+}
+EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma);
+
 /**
  * virtqueue_resize - resize the vring of vq
  * @_vq: the struct virtqueue we're talking about.
@@ -2645,7 +2693,8 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
 
        vring_init(&vring_split.vring, num, pages, vring_align);
        return __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers,
-                                    context, notify, callback, name);
+                                    context, notify, callback, name,
+                                    vdev->dev.parent);
 }
 EXPORT_SYMBOL_GPL(vring_new_virtqueue);
 
@@ -2658,17 +2707,20 @@ static void vring_free(struct virtqueue *_vq)
                        vring_free_queue(vq->vq.vdev,
                                         vq->packed.ring_size_in_bytes,
                                         vq->packed.vring.desc,
-                                        vq->packed.ring_dma_addr);
+                                        vq->packed.ring_dma_addr,
+                                        vring_dma_dev(vq));
 
                        vring_free_queue(vq->vq.vdev,
                                         vq->packed.event_size_in_bytes,
                                         vq->packed.vring.driver,
-                                        vq->packed.driver_event_dma_addr);
+                                        vq->packed.driver_event_dma_addr,
+                                        vring_dma_dev(vq));
 
                        vring_free_queue(vq->vq.vdev,
                                         vq->packed.event_size_in_bytes,
                                         vq->packed.vring.device,
-                                        vq->packed.device_event_dma_addr);
+                                        vq->packed.device_event_dma_addr,
+                                        vring_dma_dev(vq));
 
                        kfree(vq->packed.desc_state);
                        kfree(vq->packed.desc_extra);
@@ -2676,7 +2728,8 @@ static void vring_free(struct virtqueue *_vq)
                        vring_free_queue(vq->vq.vdev,
                                         vq->split.queue_size_in_bytes,
                                         vq->split.vring.desc,
-                                        vq->split.queue_dma_addr);
+                                        vq->split.queue_dma_addr,
+                                        vring_dma_dev(vq));
                }
        }
        if (!vq->packed_ring) {

diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 8b8af1a38991a77bed3b579b8b392ead365d7a61..8b95b69ef69484b3e7185425305e589ba013a23e 100644 (file)
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -76,6 +76,22 @@ struct virtqueue *vring_create_virtqueue(unsigned int index,
                                         void (*callback)(struct virtqueue *vq),
                                         const char *name);
 
+/*
+ * Creates a virtqueue and allocates the descriptor ring with per
+ * virtqueue DMA device.
+ */
+struct virtqueue *vring_create_virtqueue_dma(unsigned int index,
+                                            unsigned int num,
+                                            unsigned int vring_align,
+                                            struct virtio_device *vdev,
+                                            bool weak_barriers,
+                                            bool may_reduce_num,
+                                            bool ctx,
+                                            bool (*notify)(struct virtqueue *vq),
+                                            void (*callback)(struct virtqueue *vq),
+                                            const char *name,
+                                            struct device *dma_dev);
+
 /*
  * Creates a virtqueue with a standard layout but a caller-allocated
  * ring.