Commit 5264406c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-work.iov_iter-base' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs iov_iter updates from Al Viro:
 "Part 1 - isolated cleanups and optimizations.

  One of the goals is to reduce the overhead of using ->read_iter() and
  ->write_iter() instead of ->read()/->write().

  new_sync_{read,write}() has a surprising amount of overhead, in
  particular inside iocb_flags(). That's the explanation for the
  beginning of the series is in this pile; it's not directly
  iov_iter-related, but it's a part of the same work..."

* tag 'pull-work.iov_iter-base' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  first_iovec_segment(): just return address
  iov_iter: massage calling conventions for first_{iovec,bvec}_segment()
  iov_iter: first_{iovec,bvec}_segment() - simplify a bit
  iov_iter: lift dealing with maxpages out of first_{iovec,bvec}_segment()
  iov_iter_get_pages{,_alloc}(): cap the maxsize with MAX_RW_COUNT
  iov_iter_bvec_advance(): don't bother with bvec_iter
  copy_page_{to,from}_iter(): switch iovec variants to generic
  keep iocb_flags() result cached in struct file
  iocb: delay evaluation of IS_SYNC(...) until we want to check IOCB_DSYNC
  struct file: use anonymous union member for rcuhead and llist
  btrfs: use IOMAP_DIO_NOSYNC
  teach iomap_dio_rw() to suppress dsync
  No need of likely/unlikely on calls of check_copy_size()
parents 200e340f dd45ab9d

arch/powerpc/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ copy_mc_to_kernel(void *to, const void *from, unsigned long size) 
static inline unsigned long __must_check

copy_mc_to_user(void __user *to, const void *from, unsigned long n)

{

	if (likely(check_copy_size(from, n, true))) {

	if (check_copy_size(from, n, true)) {

		if (access_ok(to, n)) {

			allow_write_to_user(to, n);

			n = copy_mc_generic((void *)to, from, n);

arch/s390/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ _copy_from_user_key(void *to, const void __user *from, unsigned long n, unsigned 
static __always_inline unsigned long __must_check

copy_from_user_key(void *to, const void __user *from, unsigned long n, unsigned long key)

{

	if (likely(check_copy_size(to, n, false)))

	if (check_copy_size(to, n, false))

		n = _copy_from_user_key(to, from, n, key);

	return n;

}
@@ -50,7 +50,7 @@ _copy_to_user_key(void __user *to, const void *from, unsigned long n, unsigned l 
static __always_inline unsigned long __must_check

copy_to_user_key(void __user *to, const void *from, unsigned long n, unsigned long key)

{

	if (likely(check_copy_size(from, n, true)))

	if (check_copy_size(from, n, true))

		n = _copy_to_user_key(to, from, n, key);

	return n;

}

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static blk_opf_t dio_bio_write_op(struct kiocb *iocb) 
	blk_opf_t opf = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE;



	/* avoid the need for a I/O completion work item */

	if (iocb->ki_flags & IOCB_DSYNC)

	if (iocb_is_dsync(iocb))

		opf |= REQ_FUA;

	return opf;

}

drivers/nvme/target/io-cmd-file.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos, 


	iocb->ki_pos = pos;

	iocb->ki_filp = req->ns->file;

	iocb->ki_flags = ki_flags | iocb_flags(req->ns->file);

	iocb->ki_flags = ki_flags | iocb->ki_filp->f_iocb_flags;



	return call_iter(iocb, &iter);

}

fs/aio.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static int aio_prep_rw(struct kiocb *req, const struct iocb *iocb) 
	req->ki_complete = aio_complete_rw;

	req->private = NULL;

	req->ki_pos = iocb->aio_offset;

	req->ki_flags = iocb_flags(req->ki_filp);

	req->ki_flags = req->ki_filp->f_iocb_flags;

	if (iocb->aio_flags & IOCB_FLAG_RESFD)

		req->ki_flags |= IOCB_EVENTFD;

	if (iocb->aio_flags & IOCB_FLAG_IOPRIO) {