io-uring.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
To: axboe@kernel.dk, asml.silence@gmail.com, io-uring@vger.kernel.org
Subject: [PATCH v5 02/13] io_uring: generalize io_queue_rsrc_removal
Date: Tue, 12 Jan 2021 13:33:02 -0800	[thread overview]
Message-ID: <1610487193-21374-3-git-send-email-bijan.mottahedeh@oracle.com> (raw)
In-Reply-To: <1610487193-21374-1-git-send-email-bijan.mottahedeh@oracle.com>

Generalize io_queue_rsrc_removal to handle both files and buffers.

Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
---
 fs/io_uring.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 195ba12..12eede8 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -195,13 +195,22 @@ struct io_mapped_ubuf {
 	unsigned long	acct_pages;
 };
 
+struct io_ring_ctx;
+
 struct io_rsrc_put {
 	struct list_head list;
-	struct file *file;
+	union {
+		void *rsrc;
+		struct file *file;
+		struct io_mapped_ubuf *buf;
+	};
 };
 
 struct fixed_rsrc_table {
-	struct file		**files;
+	union {
+		struct file		**files;
+		struct io_mapped_ubuf	*bufs;
+	};
 };
 
 struct fixed_rsrc_ref_node {
@@ -209,6 +218,8 @@ struct fixed_rsrc_ref_node {
 	struct list_head		node;
 	struct list_head		rsrc_list;
 	struct fixed_rsrc_data		*rsrc_data;
+	void				(*rsrc_put)(struct io_ring_ctx *ctx,
+						    struct io_rsrc_put *prsrc);
 	struct llist_node		llist;
 	bool				done;
 };
@@ -7552,8 +7563,9 @@ static int io_sqe_alloc_file_tables(struct fixed_rsrc_data *file_data,
 	return 1;
 }
 
-static void io_ring_file_put(struct io_ring_ctx *ctx, struct file *file)
+static void io_ring_file_put(struct io_ring_ctx *ctx, struct io_rsrc_put *prsrc)
 {
+	struct file *file = prsrc->file;
 #if defined(CONFIG_UNIX)
 	struct sock *sock = ctx->ring_sock->sk;
 	struct sk_buff_head list, *head = &sock->sk_receive_queue;
@@ -7622,7 +7634,7 @@ static void __io_rsrc_put_work(struct fixed_rsrc_ref_node *ref_node)
 
 	list_for_each_entry_safe(prsrc, tmp, &ref_node->rsrc_list, list) {
 		list_del(&prsrc->list);
-		io_ring_file_put(ctx, prsrc->file);
+		ref_node->rsrc_put(ctx, prsrc);
 		kfree(prsrc);
 	}
 
@@ -7701,6 +7713,7 @@ static struct fixed_rsrc_ref_node *alloc_fixed_file_ref_node(
 	INIT_LIST_HEAD(&ref_node->node);
 	INIT_LIST_HEAD(&ref_node->rsrc_list);
 	ref_node->rsrc_data = ctx->file_data;
+	ref_node->rsrc_put = io_ring_file_put;
 	ref_node->done = false;
 	return ref_node;
 }
@@ -7858,8 +7871,7 @@ static int io_sqe_file_register(struct io_ring_ctx *ctx, struct file *file,
 #endif
 }
 
-static int io_queue_rsrc_removal(struct fixed_rsrc_data *data,
-				 struct file *rsrc)
+static int io_queue_rsrc_removal(struct fixed_rsrc_data *data, void *rsrc)
 {
 	struct io_rsrc_put *prsrc;
 	struct fixed_rsrc_ref_node *ref_node = data->node;
@@ -7868,7 +7880,7 @@ static int io_queue_rsrc_removal(struct fixed_rsrc_data *data,
 	if (!prsrc)
 		return -ENOMEM;
 
-	prsrc->file = rsrc;
+	prsrc->rsrc = rsrc;
 	list_add(&prsrc->list, &ref_node->rsrc_list);
 
 	return 0;
@@ -7877,7 +7889,7 @@ static int io_queue_rsrc_removal(struct fixed_rsrc_data *data,
 static inline int io_queue_file_removal(struct fixed_rsrc_data *data,
 					struct file *file)
 {
-	return io_queue_rsrc_removal(data, file);
+	return io_queue_rsrc_removal(data, (void *)file);
 }
 
 static int __io_sqe_files_update(struct io_ring_ctx *ctx,
-- 
1.8.3.1


  parent reply	other threads:[~2021-01-12 22:01 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-12 21:33 [PATCH v5 00/13] io_uring: buffer registration enhancements Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 01/13] io_uring: rename file related variables to rsrc Bijan Mottahedeh
2021-01-12 21:33 ` Bijan Mottahedeh [this message]
2021-01-12 21:33 ` [PATCH v5 03/13] io_uring: separate ref_list from fixed_rsrc_data Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 04/13] io_uring: split alloc_fixed_file_ref_node Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 05/13] io_uring: add rsrc_ref locking routines Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 06/13] io_uring: implement fixed buffers registration similar to fixed files Bijan Mottahedeh
2021-01-15 17:41   ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 07/13] io_uring: create common fixed_rsrc_ref_node handling routines Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 08/13] io_uring: generalize files_update functionlity to rsrc_update Bijan Mottahedeh
2021-01-16 18:20   ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 09/13] io_uring: support buffer registration updates Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 10/13] io_uring: create common fixed_rsrc_data allocation routines Bijan Mottahedeh
2021-01-16 18:26   ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 11/13] io_uring: make percpu_ref_release names consistent Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 12/13] io_uring: call io_get_fixed_rsrc_ref for buffers Bijan Mottahedeh
2021-01-15 17:44   ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 13/13] io_uring: support buffer registration sharing Bijan Mottahedeh
2021-01-14  2:01   ` Bijan Mottahedeh
2021-01-14 21:17     ` Bijan Mottahedeh
2021-01-16 18:30   ` Pavel Begunkov
2021-01-14 21:20 ` [PATCH v5 00/13] io_uring: buffer registration enhancements Pavel Begunkov
2021-01-14 22:44   ` Bijan Mottahedeh
2021-01-14 22:54     ` Bijan Mottahedeh
2021-01-15  4:42       ` Pavel Begunkov

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=1610487193-21374-3-git-send-email-bijan.mottahedeh@oracle.com \
    --to=bijan.mottahedeh@oracle.com \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=io-uring@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).