From: Jonathan Lemon <[email protected]>
To: <[email protected]>
Cc: <[email protected]>
Subject: [RFC PATCH v3 04/15] io_uring: create a zctap region for a mapped buffer
Date: Wed, 2 Nov 2022 16:32:33 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
This function takes all of a memory region that was previously
registered with io_uring, and assigns it as the backing store for
the specified ifq, binding the pages to a specific device.
The entire region is registered instead of providing individual
bufferrs, as this allows the hardware to select the optimal buffer
size for incoming packets.
The region is registered as part of the register_ifq opcode,
instead of separately, since the ifq ring requires memory when
it is created.
Signed-off-by: Jonathan Lemon <[email protected]>
---
io_uring/zctap.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-
io_uring/zctap.h | 2 ++
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/io_uring/zctap.c b/io_uring/zctap.c
index 295505c2b1ed..b7df51948b87 100644
--- a/io_uring/zctap.c
+++ b/io_uring/zctap.c
@@ -6,16 +6,73 @@
#include <linux/mm.h>
#include <linux/io_uring.h>
#include <linux/netdevice.h>
+#include <linux/nospec.h>
#include <uapi/linux/io_uring.h>
#include "io_uring.h"
#include "zctap.h"
+#include "rsrc.h"
+#include "kbuf.h"
#define NR_ZCTAP_IFQS 1
+struct ifq_region {
+ struct io_mapped_ubuf *imu;
+ int free_count;
+ int nr_pages;
+ u16 id;
+ struct page *freelist[];
+};
+
typedef int (*bpf_op_t)(struct net_device *dev, struct netdev_bpf *bpf);
+static void io_remove_ifq_region(struct ifq_region *ifr)
+{
+ kvfree(ifr);
+}
+
+int io_provide_ifq_region(struct io_zctap_ifq *ifq, u16 id)
+{
+ struct io_ring_ctx *ctx = ifq->ctx;
+ struct io_mapped_ubuf *imu;
+ struct ifq_region *ifr;
+ int i, nr_pages;
+ struct page *page;
+
+ /* XXX for now, only allow one region per ifq. */
+ if (ifq->region)
+ return -EFAULT;
+
+ if (unlikely(id >= ctx->nr_user_bufs))
+ return -EFAULT;
+ id = array_index_nospec(id, ctx->nr_user_bufs);
+ imu = ctx->user_bufs[id];
+
+ /* XXX check region is page aligned */
+ if (imu->ubuf & ~PAGE_MASK || imu->ubuf_end & ~PAGE_MASK)
+ return -EFAULT;
+
+ nr_pages = imu->nr_bvecs;
+ ifr = kvmalloc(struct_size(ifr, freelist, nr_pages), GFP_KERNEL);
+ if (!ifr)
+ return -ENOMEM;
+
+ ifr->nr_pages = nr_pages;
+ ifr->imu = imu;
+ ifr->free_count = nr_pages;
+ ifr->id = id;
+
+ for (i = 0; i < nr_pages; i++) {
+ page = imu->bvec[i].bv_page;
+ ifr->freelist[i] = page;
+ }
+
+ ifq->region = ifr;
+
+ return 0;
+}
+
static int __io_queue_mgmt(struct net_device *dev, struct io_zctap_ifq *ifq,
u16 queue_id)
{
@@ -60,6 +117,8 @@ static void io_zctap_ifq_free(struct io_zctap_ifq *ifq)
{
if (ifq->queue_id != -1)
io_close_zctap_ifq(ifq, ifq->queue_id);
+ if (ifq->region)
+ io_remove_ifq_region(ifq->region);
if (ifq->dev)
dev_put(ifq->dev);
kfree(ifq);
@@ -92,7 +151,9 @@ int io_register_ifq(struct io_ring_ctx *ctx,
if (!ifq->dev)
goto out;
- /* region attachment TBD */
+ err = io_provide_ifq_region(ifq, req.region_id);
+ if (err)
+ goto out;
err = io_open_zctap_ifq(ifq, req.queue_id);
if (err)
diff --git a/io_uring/zctap.h b/io_uring/zctap.h
index bbe4a509408b..bb44f8e972e8 100644
--- a/io_uring/zctap.h
+++ b/io_uring/zctap.h
@@ -6,4 +6,6 @@ int io_register_ifq(struct io_ring_ctx *ctx,
struct io_uring_ifq_req __user *arg);
void io_unregister_zctap_all(struct io_ring_ctx *ctx);
+int io_provide_ifq_region(struct io_zctap_ifq *ifq, u16 id);
+
#endif
--
2.30.2
next prev parent reply other threads:[~2022-11-02 23:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-02 23:32 [RFC PATCH v3 00/15] zero-copy RX for io_uring Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 01/15] io_uring: add zctap ifq definition Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 02/15] netdevice: add SETUP_ZCTAP to the netdev_bpf structure Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 03/15] io_uring: add register ifq opcode Jonathan Lemon
2022-11-02 23:32 ` Jonathan Lemon [this message]
2022-11-02 23:32 ` [RFC PATCH v3 05/15] io_uring: mark pages in ifq region with zctap information Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 06/15] io_uring: Provide driver API for zctap packet buffers Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 07/15] io_uring: Allocate zctap device buffers and dma map them Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 08/15] io_uring: Add zctap buffer get/put functions and refcounting Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 09/15] skbuff: Introduce SKBFL_FIXED_FRAG and skb_fixed() Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 10/15] io_uring: Allocate a uarg for use by the ifq RX Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 11/15] io_uring: Define the zctap iov[] returned to the user Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 12/15] io_uring: add OP_RECV_ZC command Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 13/15] io_uring: Make remove_ifq_region a delayed work call Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 14/15] io_uring: Add a buffer caching mechanism for zctap Jonathan Lemon
2022-11-02 23:32 ` [RFC PATCH v3 15/15] io_uring: Notify the application as the fillq is drained Jonathan Lemon
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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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