Commit 48aba79b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block 

Pull io_uring updates from Jens Axboe:
 "Fairly light set of changes this time around, and mostly some bits
  that were pushed out to 5.11 instead of 5.10, fixes/cleanups, and a
  few features. In particular:

   - Cleanups around iovec import (David Laight, Pavel)

   - Add timeout support for io_uring_enter(2), which enables us to
     clean up liburing and avoid a timeout sqe submission in the
     completion path.

     The big win here is that it allows setups that split SQ and CQ
     handling into separate threads to avoid locking, as the CQ side
     will no longer submit when timeouts are needed when waiting for
     events (Hao Xu)

   - Add support for socket shutdown, and renameat/unlinkat.

   - SQPOLL cleanups and improvements (Xiaoguang Wang)

   - Allow SQPOLL setups for CAP_SYS_NICE, and enable regular
     (non-fixed) files to be used.

   - Cancelation improvements (Pavel)

   - Fixed file reference improvements (Pavel)

   - IOPOLL related race fixes (Pavel)

   - Lots of other little fixes and cleanups (mostly Pavel)"

* tag 'for-5.11/io_uring-2020-12-14' of git://git.kernel.dk/linux-block: (43 commits)
  io_uring: fix io_cqring_events()'s noflush
  io_uring: fix racy IOPOLL flush overflow
  io_uring: fix racy IOPOLL completions
  io_uring: always let io_iopoll_complete() complete polled io
  io_uring: add timeout update
  io_uring: restructure io_timeout_cancel()
  io_uring: fix files cancellation
  io_uring: use bottom half safe lock for fixed file data
  io_uring: fix miscounting ios_left
  io_uring: change submit file state invariant
  io_uring: check kthread stopped flag when sq thread is unparked
  io_uring: share fixed_file_refs b/w multiple rsrcs
  io_uring: replace inflight_wait with tctx->wait
  io_uring: don't take fs for recvmsg/sendmsg
  io_uring: only wake up sq thread while current task is in io worker context
  io_uring: don't acquire uring_lock twice
  io_uring: initialize 'timeout' properly in io_sq_thread()
  io_uring: refactor io_sq_thread() handling
  io_uring: always batch cancel in *cancel_files()
  io_uring: pass files into kill timeouts/poll
  ...
parents 005b2a9d 59850d22

fs/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, 
long do_rmdir(int dfd, struct filename *name);

long do_unlinkat(int dfd, struct filename *name);

int may_linkat(struct path *link);

int do_renameat2(int olddfd, struct filename *oldname, int newdfd,

		 struct filename *newname, unsigned int flags);



/*

 * namespace.c

fs/io-wq.c

+0 −10
Original line number Diff line number Diff line
@@ -1078,16 +1078,6 @@ enum io_wq_cancel io_wq_cancel_cb(struct io_wq *wq, work_cancel_fn *cancel, 
	return IO_WQ_CANCEL_NOTFOUND;

}



static bool io_wq_io_cb_cancel_data(struct io_wq_work *work, void *data)

{

	return work == data;

}



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

{

	return io_wq_cancel_cb(wq, io_wq_io_cb_cancel_data, (void *)cwork, false);

}



struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)

{

	int ret = -ENOMEM, node;

fs/io-wq.h

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static inline bool io_wq_is_hashed(struct io_wq_work *work) 
}



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 *);

fs/io_uring.c

+773 −560

File changed.

Preview size limit exceeded, changes collapsed.

fs/namei.c

+22 −18
Original line number Diff line number Diff line
@@ -4346,8 +4346,8 @@ out: 
}

EXPORT_SYMBOL(vfs_rename);



static int do_renameat2(int olddfd, const char __user *oldname, int newdfd,

			const char __user *newname, unsigned int flags)

int do_renameat2(int olddfd, struct filename *from, int newdfd,

		 struct filename *to, unsigned int flags)

{

	struct dentry *old_dentry, *new_dentry;

	struct dentry *trap;
@@ -4355,32 +4355,30 @@ static int do_renameat2(int olddfd, const char __user *oldname, int newdfd, 
	struct qstr old_last, new_last;

	int old_type, new_type;

	struct inode *delegated_inode = NULL;

	struct filename *from;

	struct filename *to;

	unsigned int lookup_flags = 0, target_flags = LOOKUP_RENAME_TARGET;

	bool should_retry = false;

	int error;

	int error = -EINVAL;



	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))

		return -EINVAL;

		goto put_both;



	if ((flags & (RENAME_NOREPLACE | RENAME_WHITEOUT)) &&

	    (flags & RENAME_EXCHANGE))

		return -EINVAL;

		goto put_both;



	if (flags & RENAME_EXCHANGE)

		target_flags = 0;



retry:

	from = filename_parentat(olddfd, getname(oldname), lookup_flags,

				&old_path, &old_last, &old_type);

	from = filename_parentat(olddfd, from, lookup_flags, &old_path,

					&old_last, &old_type);

	if (IS_ERR(from)) {

		error = PTR_ERR(from);

		goto exit;

		goto put_new;

	}



	to = filename_parentat(newdfd, getname(newname), lookup_flags,

				&new_path, &new_last, &new_type);

	to = filename_parentat(newdfd, to, lookup_flags, &new_path, &new_last,

				&new_type);

	if (IS_ERR(to)) {

		error = PTR_ERR(to);

		goto exit1;
@@ -4473,34 +4471,40 @@ exit2: 
	if (retry_estale(error, lookup_flags))

		should_retry = true;

	path_put(&new_path);

	putname(to);

exit1:

	path_put(&old_path);

	putname(from);

	if (should_retry) {

		should_retry = false;

		lookup_flags |= LOOKUP_REVAL;

		goto retry;

	}

exit:

put_both:

	if (!IS_ERR(from))

		putname(from);

put_new:

	if (!IS_ERR(to))

		putname(to);

	return error;

}



SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname,

		int, newdfd, const char __user *, newname, unsigned int, flags)

{

	return do_renameat2(olddfd, oldname, newdfd, newname, flags);

	return do_renameat2(olddfd, getname(oldname), newdfd, getname(newname),

				flags);

}



SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,

		int, newdfd, const char __user *, newname)

{

	return do_renameat2(olddfd, oldname, newdfd, newname, 0);

	return do_renameat2(olddfd, getname(oldname), newdfd, getname(newname),

				0);

}



SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newname)

{

	return do_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0);

	return do_renameat2(AT_FDCWD, getname(oldname), AT_FDCWD,

				getname(newname), 0);

}



int readlink_copy(char __user *buffer, int buflen, const char *link)

CRA Git | Maintained and supported by SUSTech CRA and CCSE