Merge tag 'for-5.5/io_uring-20191121' of git://git.kernel.dk/linux-block (fb4b3d3f) · Commits · 戴 / test

Pull io_uring updates from Jens Axboe: "A lot of stuff has been going on this cycle, with improving the support for networked IO (and hence unbounded request completion times) being one of the major themes. There's been a set of fixes done this week, I'll send those out as well once we're certain we're fully happy with them. This contains: - Unification of the "normal" submit path and the SQPOLL path (Pavel) - Support for sparse (and bigger) file sets, and updating of those file sets without needing to unregister/register again. - Independently sized CQ ring, instead of just making it always 2x the SQ ring size. This makes it more flexible for networked applications. - Support for overflowed CQ ring, never dropping events but providing backpressure on submits. - Add support for absolute timeouts, not just relative ones. - Support for generic cancellations. This divorces io_uring from workqueues as well, which additionally gets us one step closer to generic async system call support. - With cancellations, we can support grabbing the process file table as well, just like we do mm context. This allows support for system calls that create file descriptors, like accept4() support that's built on top of that. - Support for io_uring tracing (Dmitrii) - Support for linked timeouts. These abort an operation if it isn't completed by the time noted in the linke timeout. - Speedup tracking of poll requests - Various cleanups making the coder easier to follow (Jackie, Pavel, Bob, YueHaibing, me) - Update MAINTAINERS with new io_uring list" * tag 'for-5.5/io_uring-20191121' of git://git.kernel.dk/linux-block: (64 commits) io_uring: make POLL_ADD/POLL_REMOVE scale better io-wq: remove now redundant struct io_wq_nulls_list io_uring: Fix getting file for non-fd opcodes io_uring: introduce req_need_defer() io_uring: clean up io_uring_cancel_files() io-wq: ensure free/busy list browsing see all items io-wq: ensure we have a stable view of ->cur_work for cancellations io_wq: add get/put_work handlers to io_wq_create() io_uring: check for validity of ->rings in teardown io_uring: fix potential deadlock in io_poll_wake() io_uring: use correct "is IO worker" helper io_uring: fix -ENOENT issue with linked timer with short timeout io_uring: don't do flush cancel under inflight_lock io_uring: flag SQPOLL busy condition to userspace io_uring: make ASYNC_CANCEL work with poll and timeout io_uring: provide fallback request for OOM situations io_uring: convert accept4() -ERESTARTSYS into -EINTR io_uring: fix error clear of ->file_table in io_sqe_files_register() io_uring: separate the io_free_req and io_free_req_find_next interface io_uring: keep io_put_req only responsible for release and put req ...

MAINTAINERS

+3 −2

Original line number	Diff line number	Diff line
		@@ -8564,12 +8564,13 @@ F: include/linux/iova.h

		IO_URING
		M: Jens Axboe <axboe@kernel.dk>
		L: linux-block@vger.kernel.org
		L: linux-fsdevel@vger.kernel.org
		L: io-uring@vger.kernel.org
		T: git git://git.kernel.dk/linux-block
		T: git git://git.kernel.dk/liburing
		S: Maintained
		F: fs/io_uring.c
		F: fs/io-wq.c
		F: fs/io-wq.h
		F: include/uapi/linux/io_uring.h

		IPMI SUBSYSTEM

fs/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -322,4 +322,7 @@ source "fs/nls/Kconfig"
		source "fs/dlm/Kconfig"
		source "fs/unicode/Kconfig"

		config IO_WQ
		bool

		endmenu

fs/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ obj-$(CONFIG_EVENTFD) += eventfd.o
		obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
		obj-$(CONFIG_AIO) += aio.o
		obj-$(CONFIG_IO_URING) += io_uring.o
		obj-$(CONFIG_IO_WQ) += io-wq.o
		obj-$(CONFIG_FS_DAX) += dax.o
		obj-$(CONFIG_FS_ENCRYPTION) += crypto/
		obj-$(CONFIG_FS_VERITY) += verity/

fs/io-wq.c

0 → 100644

+1065 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/io-wq.h

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		#ifndef INTERNAL_IO_WQ_H
		#define INTERNAL_IO_WQ_H

		struct io_wq;

		enum {
		IO_WQ_WORK_CANCEL = 1,
		IO_WQ_WORK_HAS_MM = 2,
		IO_WQ_WORK_HASHED = 4,
		IO_WQ_WORK_NEEDS_USER = 8,
		IO_WQ_WORK_NEEDS_FILES = 16,
		IO_WQ_WORK_UNBOUND = 32,
		IO_WQ_WORK_INTERNAL = 64,

		IO_WQ_HASH_SHIFT = 24, /* upper 8 bits are used for hash key */
		};

		enum io_wq_cancel {
		IO_WQ_CANCEL_OK, /* cancelled before started */
		IO_WQ_CANCEL_RUNNING, /* found, running, and attempted cancelled */
		IO_WQ_CANCEL_NOTFOUND, /* work not found */
		};

		struct io_wq_work {
		struct list_head list;
		void (func)(struct io_wq_work *);
		unsigned flags;
		struct files_struct *files;
		};

		#define INIT_IO_WORK(work, _func) \
		do { \
		(work)->func = _func; \
		(work)->flags = 0; \
		(work)->files = NULL; \
		} while (0) \

		typedef void (get_work_fn)(struct io_wq_work *);
		typedef void (put_work_fn)(struct io_wq_work *);

		struct io_wq io_wq_create(unsigned bounded, struct mm_struct mm,
		struct user_struct *user,
		get_work_fn get_work, put_work_fn put_work);
		void io_wq_destroy(struct io_wq *wq);

		void io_wq_enqueue(struct io_wq wq, struct io_wq_work work);
		void io_wq_enqueue_hashed(struct io_wq wq, struct io_wq_work work, void *val);
		void io_wq_flush(struct io_wq *wq);

		void io_wq_cancel_all(struct io_wq *wq);
		enum io_wq_cancel io_wq_cancel_work(struct io_wq wq, struct io_wq_work cwork);

		typedef bool (work_cancel_fn)(struct io_wq_work , void );

		enum io_wq_cancel io_wq_cancel_cb(struct io_wq wq, work_cancel_fn cancel,
		void *data);

		#if defined(CONFIG_IO_WQ)
		extern void io_wq_worker_sleeping(struct task_struct *);
		extern void io_wq_worker_running(struct task_struct *);
		#else
		static inline void io_wq_worker_sleeping(struct task_struct *tsk)
		{
		}
		static inline void io_wq_worker_running(struct task_struct *tsk)
		{
		}
		#endif

		static inline bool io_wq_current_is_worker(void)
		{
		return in_task() && (current->flags & PF_IO_WORKER);
		}
		#endif

Admin message