From: Jonathan Lemon <[email protected]>
To: <[email protected]>
Cc: <[email protected]>
Subject: [RFC PATCH v2 13/13] io_uring: Make remove_ifq_region a delayed work call
Date: Tue, 18 Oct 2022 12:16:02 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Very much a WIP!
The page backing store should not be removed until all ouststanding
packets are returned. The packets may be inflight, owned by the
driver or sitting in a socket buffer.
This shows how the cleanup routine should check that there are no
pending packets in flight, before cleaning up the buffers.
Signed-off-by: Jonathan Lemon <[email protected]>
---
io_uring/zctap.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/io_uring/zctap.c b/io_uring/zctap.c
index 4a551349b600..a1525a0b0245 100644
--- a/io_uring/zctap.c
+++ b/io_uring/zctap.c
@@ -25,6 +25,7 @@ struct ifq_region {
u16 id;
spinlock_t freelist_lock;
+ struct delayed_work release_work;
struct io_zctap_buf *buf;
struct io_zctap_buf *freelist[];
@@ -199,24 +200,38 @@ static void io_zctap_put_page(struct io_zctap_ifq *ifq, struct page *page)
io_zctap_put_buf(ifq, &ifr->buf[pgid]);
}
-static void io_remove_ifq_region(struct ifq_region *ifr)
+static void io_remove_ifq_region_work(struct work_struct *work)
{
- struct io_mapped_ubuf *imu;
- struct page *page;
- int i;
+ struct ifq_region *ifr = container_of(
+ to_delayed_work(work), struct ifq_region, release_work);
+ struct io_zctap_buf *buf;
+ int i, refs;
- imu = ifr->imu;
for (i = 0; i < ifr->nr_pages; i++) {
- page = imu->bvec[i].bv_page;
+ buf = &ifr->buf[i];
+ refs = atomic_read(&buf->refcount) & IO_ZCTAP_KREF_MASK;
+ if (refs) {
+ schedule_delayed_work(&ifr->release_work, HZ);
+ return;
+ }
+ }
- ClearPagePrivate(page);
- set_page_private(page, 0);
+ for (i = 0; i < ifr->nr_pages; i++) {
+ buf = &ifr->buf[i];
+ set_page_private(buf->page, 0);
+ ClearPagePrivate(buf->page);
}
kvfree(ifr->buf);
kvfree(ifr);
}
+static void io_remove_ifq_region(struct ifq_region *ifr)
+{
+ INIT_DELAYED_WORK(&ifr->release_work, io_remove_ifq_region_work);
+ schedule_delayed_work(&ifr->release_work, 0);
+}
+
static inline struct device *
netdev2device(struct net_device *dev)
{
@@ -403,6 +418,8 @@ static struct io_zctap_ifq *io_zctap_ifq_alloc(void)
return &priv->ifq;
}
+/* XXX this seems to be called too late - MM is already torn down? */
+/* need to tear down sockets, then io_uring, then MM */
static void io_zctap_ifq_free(struct io_zctap_ifq *ifq)
{
if (ifq->queue_id != -1)
--
2.30.2
next prev parent reply other threads:[~2022-10-18 19:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 19:15 [RFC PATCH v2 00/13] zero-copy RX for io_uring Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 01/13] io_uring: add zctap ifq definition Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 02/13] netdevice: add SETUP_ZCTAP to the netdev_bpf structure Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 03/13] io_uring: add register ifq opcode Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 04/13] io_uring: create a zctap region for a mapped buffer Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 05/13] io_uring: create page freelist for the ifq region Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 06/13] io_uring: Provide driver API for zctap packet buffers Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 07/13] io_uring: Allocate the zctap buffers for the device Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 08/13] io_uring: Add zctap buffer get/put functions and refcounting Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 09/13] skbuff: Introduce SKBFL_FIXED_FRAG and skb_fixed() Jonathan Lemon
2022-10-18 19:15 ` [RFC PATCH v2 10/13] io_uring: Allocate a uarg for use by the ifq RX Jonathan Lemon
2022-10-18 19:16 ` [RFC PATCH v2 11/13] io_uring: Define the zctap iov[] returned to the user Jonathan Lemon
2022-10-18 19:16 ` [RFC PATCH v2 12/13] io_uring: add OP_RECV_ZC command Jonathan Lemon
2022-10-18 19:16 ` Jonathan Lemon [this message]
2022-10-20 3:35 ` [RFC PATCH v2 00/13] zero-copy RX for io_uring Ziyang Zhang
2022-11-02 23:33 ` 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