From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: netdev@vger.kernel.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
virtualization@lists.linux.dev, bpf@vger.kernel.org
Subject: [PATCH net-next v4 01/15] virtio_ring: introduce dma map api for page
Date: Tue, 11 Jun 2024 19:41:33 +0800 [thread overview]
Message-ID: <20240611114147.31320-2-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240611114147.31320-1-xuanzhuo@linux.alibaba.com>
The virtio-net sq will use these APIs to map the scatterlist.
For scatterlist, the page dma APIs are more appropriate.
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);
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/virtio/virtio_ring.c | 54 ++++++++++++++++++++++++++++++++++++
include/linux/virtio.h | 7 +++++
2 files changed, 61 insertions(+)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 2a972752ff1b..3d28008d6cd4 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -3152,6 +3152,60 @@ void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t addr,
}
EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_single_attrs);
+/**
+ * virtqueue_dma_map_page_attrs - map 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) {
+ kmsan_handle_dma(page, offset, size, dir);
+ return 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 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_mapping_error - check dma address
* @_vq: the struct virtqueue we're talking about.
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 96fea920873b..ca318a66a7e1 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -234,6 +234,13 @@ dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr, size
void virtqueue_dma_unmap_single_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_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);
int virtqueue_dma_mapping_error(struct virtqueue *_vq, dma_addr_t addr);
bool virtqueue_dma_need_sync(struct virtqueue *_vq, dma_addr_t addr);
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-06-11 11:41 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-11 11:41 [PATCH net-next v4 00/15] virtio-net: support AF_XDP zero copy Xuan Zhuo
2024-06-11 11:41 ` Xuan Zhuo [this message]
2024-06-12 23:20 ` [PATCH net-next v4 01/15] virtio_ring: introduce dma map api for page Jakub Kicinski
2024-06-13 2:38 ` Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 02/15] virtio_ring: introduce vring_need_unmap_buffer Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 03/15] virtio_ring: virtqueue_set_dma_premapped() support to disable Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 04/15] virtio_net: separate virtnet_rx_resize() Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 05/15] virtio_net: separate virtnet_tx_resize() Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 06/15] virtio_net: separate receive_buf Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 07/15] virtio_net: refactor the xmit type Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 08/15] virtio_net: sq support premapped mode Xuan Zhuo
2024-06-12 23:23 ` Jakub Kicinski
2024-06-13 2:39 ` Xuan Zhuo
2024-06-12 23:41 ` Michael S. Tsirkin
2024-06-13 2:47 ` Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 09/15] virtio_net: xsk: bind/unbind xsk Xuan Zhuo
2024-06-12 23:43 ` Michael S. Tsirkin
2024-06-13 2:43 ` Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 10/15] virtio_net: xsk: prevent disable tx napi Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 11/15] virtio_net: xsk: tx: support xmit xsk buffer Xuan Zhuo
2024-06-12 23:25 ` Jakub Kicinski
2024-06-12 23:44 ` Michael S. Tsirkin
2024-06-13 2:43 ` Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 12/15] virtio_net: xsk: tx: support wakeup Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 13/15] virtio_net: xsk: tx: handle the transmitted xsk buffer Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 14/15] virtio_net: xsk: rx: support fill with " Xuan Zhuo
2024-06-11 11:41 ` [PATCH net-next v4 15/15] virtio_net: xsk: rx: support recv small mode Xuan Zhuo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240611114147.31320-2-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eperezma@redhat.com \
--cc=hawk@kernel.org \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=virtualization@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox