Xuan Zhuo
2023-Oct-11 09:27 UTC
[PATCH vhost 02/22] virtio_ring: introduce virtqueue_dma_[un]map_page_attrs
Introduce virtqueue_dma_[un]map_page_attrs() to do dma/unmap for pages.
Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com>
---
drivers/virtio/virtio_ring.c | 52 ++++++++++++++++++++++++++++++++++++
include/linux/virtio.h | 7 +++++
2 files changed, 59 insertions(+)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index b3ded56722f4..36aae63336b8 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -3111,6 +3111,58 @@ const struct vring *virtqueue_get_vring(const struct
virtqueue *vq)
}
EXPORT_SYMBOL_GPL(virtqueue_get_vring);
+/**
+ * virtqueue_dma_map_page_attrs - map page DMA for _vq
+ * @_vq: the struct virtqueue we're talking about.
+ * @page: the page to do dma
+ * @offset: the offset inside the page
+ * @size: the size of the page to do dma
+ * @dir: DMA direction
+ * @attrs: DMA Attrs
+ *
+ * The caller calls this to do dma mapping in advance. The DMA address can be
+ * passed to this _vq when it is in pre-mapped mode.
+ *
+ * return DMA address. Caller should check that by
virtqueue_dma_mapping_error().
+ */
+dma_addr_t virtqueue_dma_map_page_attrs(struct virtqueue *_vq, struct page
*page,
+ size_t offset, size_t size,
+ enum dma_data_direction dir,
+ unsigned long attrs)
+{
+ struct vring_virtqueue *vq = to_vvq(_vq);
+
+ if (!vq->use_dma_api)
+ return (dma_addr_t)(page_to_phys(page) + offset);
+
+ return dma_map_page_attrs(vring_dma_dev(vq), page, offset, size, dir, attrs);
+}
+EXPORT_SYMBOL_GPL(virtqueue_dma_map_page_attrs);
+
+/**
+ * virtqueue_dma_unmap_page_attrs - unmap page DMA for _vq
+ * @_vq: the struct virtqueue we're talking about.
+ * @addr: the dma address to unmap
+ * @size: the size of the buffer
+ * @dir: DMA direction
+ * @attrs: DMA Attrs
+ *
+ * Unmap the address that is mapped by the virtqueue_dma_map_* APIs.
+ *
+ */
+void virtqueue_dma_unmap_page_attrs(struct virtqueue *_vq, dma_addr_t addr,
+ size_t size, enum dma_data_direction dir,
+ unsigned long attrs)
+{
+ struct vring_virtqueue *vq = to_vvq(_vq);
+
+ if (!vq->use_dma_api)
+ return;
+
+ dma_unmap_page_attrs(vring_dma_dev(vq), addr, size, dir, attrs);
+}
+EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_page_attrs);
+
/**
* virtqueue_dma_map_single_attrs - map DMA for _vq
* @_vq: the struct virtqueue we're talking about.
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 1cf7b004348b..d7c7f4fdee2f 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -212,6 +212,13 @@ void unregister_virtio_driver(struct virtio_driver *drv);
module_driver(__virtio_driver, register_virtio_driver, \
unregister_virtio_driver)
+dma_addr_t virtqueue_dma_map_page_attrs(struct virtqueue *_vq, struct page
*page,
+ size_t offset, size_t size,
+ enum dma_data_direction dir,
+ unsigned long attrs);
+void virtqueue_dma_unmap_page_attrs(struct virtqueue *_vq, dma_addr_t addr,
+ size_t size, enum dma_data_direction dir,
+ unsigned long attrs);
dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr,
size_t size,
enum dma_data_direction dir, unsigned long attrs);
void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t addr,
--
2.32.0.3.g01195cf9f
Xuan Zhuo
2023-Oct-18 07:53 UTC
[PATCH vhost 02/22] virtio_ring: introduce virtqueue_dma_[un]map_page_attrs
Hi Michael, Do you think it's appropriate to push the first two patches of this patch set to linux 6.6? Thanks. On Wed, 11 Oct 2023 17:27:08 +0800, Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote:> Introduce virtqueue_dma_[un]map_page_attrs() to do dma/unmap for pages. > > Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com> > --- > drivers/virtio/virtio_ring.c | 52 ++++++++++++++++++++++++++++++++++++ > include/linux/virtio.h | 7 +++++ > 2 files changed, 59 insertions(+) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index b3ded56722f4..36aae63336b8 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -3111,6 +3111,58 @@ const struct vring *virtqueue_get_vring(const struct virtqueue *vq) > } > EXPORT_SYMBOL_GPL(virtqueue_get_vring); > > +/** > + * virtqueue_dma_map_page_attrs - map page DMA for _vq > + * @_vq: the struct virtqueue we're talking about. > + * @page: the page to do dma > + * @offset: the offset inside the page > + * @size: the size of the page to do dma > + * @dir: DMA direction > + * @attrs: DMA Attrs > + * > + * The caller calls this to do dma mapping in advance. The DMA address can be > + * passed to this _vq when it is in pre-mapped mode. > + * > + * return DMA address. Caller should check that by virtqueue_dma_mapping_error(). > + */ > +dma_addr_t virtqueue_dma_map_page_attrs(struct virtqueue *_vq, struct page *page, > + size_t offset, size_t size, > + enum dma_data_direction dir, > + unsigned long attrs) > +{ > + struct vring_virtqueue *vq = to_vvq(_vq); > + > + if (!vq->use_dma_api) > + return (dma_addr_t)(page_to_phys(page) + offset); > + > + return dma_map_page_attrs(vring_dma_dev(vq), page, offset, size, dir, attrs); > +} > +EXPORT_SYMBOL_GPL(virtqueue_dma_map_page_attrs); > + > +/** > + * virtqueue_dma_unmap_page_attrs - unmap page DMA for _vq > + * @_vq: the struct virtqueue we're talking about. > + * @addr: the dma address to unmap > + * @size: the size of the buffer > + * @dir: DMA direction > + * @attrs: DMA Attrs > + * > + * Unmap the address that is mapped by the virtqueue_dma_map_* APIs. > + * > + */ > +void virtqueue_dma_unmap_page_attrs(struct virtqueue *_vq, dma_addr_t addr, > + size_t size, enum dma_data_direction dir, > + unsigned long attrs) > +{ > + struct vring_virtqueue *vq = to_vvq(_vq); > + > + if (!vq->use_dma_api) > + return; > + > + dma_unmap_page_attrs(vring_dma_dev(vq), addr, size, dir, attrs); > +} > +EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_page_attrs); > + > /** > * virtqueue_dma_map_single_attrs - map DMA for _vq > * @_vq: the struct virtqueue we're talking about. > diff --git a/include/linux/virtio.h b/include/linux/virtio.h > index 1cf7b004348b..d7c7f4fdee2f 100644 > --- a/include/linux/virtio.h > +++ b/include/linux/virtio.h > @@ -212,6 +212,13 @@ void unregister_virtio_driver(struct virtio_driver *drv); > module_driver(__virtio_driver, register_virtio_driver, \ > unregister_virtio_driver) > > +dma_addr_t virtqueue_dma_map_page_attrs(struct virtqueue *_vq, struct page *page, > + size_t offset, size_t size, > + enum dma_data_direction dir, > + unsigned long attrs); > +void virtqueue_dma_unmap_page_attrs(struct virtqueue *_vq, dma_addr_t addr, > + size_t size, enum dma_data_direction dir, > + unsigned long attrs); > dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr, size_t size, > enum dma_data_direction dir, unsigned long attrs); > void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t addr, > -- > 2.32.0.3.g01195cf9f >