public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH] io_uring: Add skip option for __io_sqe_files_update
@ 2021-01-26 20:23 noah
       [not found] ` <CAFUsyfLChkYYjBBtkcAErqrs3XaZ80zaPCB3Qn3rWPYTDd88Mg@mail.gmail.com>
  0 siblings, 1 reply; 2+ messages in thread
From: noah @ 2021-01-26 20:23 UTC (permalink / raw)
  Cc: axboe, viro, io-uring, linux-fsdevel, linux-kernel, goldstein.w.n

This patch adds support for skipping a file descriptor when using
IORING_REGISTER_FILES_UPDATE.  __io_sqe_files_update will skip fds set
to IORING_REGISTER_FILES_SKIP. IORING_REGISTER_FILES_SKIP is inturn
added as a #define in io_uring.h

Signed-off-by: noah <[email protected]>
---
Supporting documentation and tests in liburing can be added in PR284
(https://github.com/axboe/liburing/pull/284) if this patch is applied.
    
 fs/io_uring.c                 | 3 +++
 include/uapi/linux/io_uring.h | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 2c307dea162b..03748faa5295 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -8039,6 +8039,9 @@ static int __io_sqe_files_update(struct io_ring_ctx *ctx,
 			err = -EFAULT;
 			break;
 		}
+		if (fd == IORING_REGISTER_FILES_SKIP)
+			continue;
+
 		i = array_index_nospec(up->offset + done, ctx->nr_user_files);
 		table = &ctx->file_data->table[i >> IORING_FILE_TABLE_SHIFT];
 		index = i & IORING_FILE_TABLE_MASK;
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index f9f106c54d90..e8b481040fb3 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -298,6 +298,13 @@ struct io_uring_rsrc_update {
 	__aligned_u64 data;
 };
 
+/*
+ * fd value in *((__s32 *)io_uring_rsrc_update->data)
+ */
+
+/* Skip updating fd indexes set to this value */
+#define IORING_REGISTER_FILES_SKIP  (-2)
+
 #define IO_URING_OP_SUPPORTED	(1U << 0)
 
 struct io_uring_probe_op {
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] io_uring: Add skip option for __io_sqe_files_update
       [not found] ` <CAFUsyfLChkYYjBBtkcAErqrs3XaZ80zaPCB3Qn3rWPYTDd88Mg@mail.gmail.com>
@ 2021-02-02 20:29   ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2021-02-02 20:29 UTC (permalink / raw)
  To: Noah Goldstein; +Cc: Alexander Viro, io-uring, linux-fsdevel, linux-kernel

On 2/2/21 1:16 PM, Noah Goldstein wrote:
> Ping

It's already in.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-02 20:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-26 20:23 [PATCH] io_uring: Add skip option for __io_sqe_files_update noah
     [not found] ` <CAFUsyfLChkYYjBBtkcAErqrs3XaZ80zaPCB3Qn3rWPYTDd88Mg@mail.gmail.com>
2021-02-02 20:29   ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox