Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80201fe1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.1/block-20190302' of git://git.kernel.dk/linux-block 

Pull block layer updates from Jens Axboe:
 "Not a huge amount of changes in this round, the biggest one is that we
  finally have Mings multi-page bvec support merged. Apart from that,
  this pull request contains:

   - Small series that avoids quiescing the queue for sysfs changes that
     match what we currently have (Aleksei)

   - Series of bcache fixes (via Coly)

   - Series of lightnvm fixes (via Mathias)

   - NVMe pull request from Christoph. Nothing major, just SPDX/license
     cleanups, RR mp policy (Hannes), and little fixes (Bart,
     Chaitanya).

   - BFQ series (Paolo)

   - Save blk-mq cpu -> hw queue mapping, removing a pointer indirection
     for the fast path (Jianchao)

   - fops->iopoll() added for async IO polling, this is a feature that
     the upcoming io_uring interface will use (Christoph, me)

   - Partition scan loop fixes (Dongli)

   - mtip32xx conversion from managed resource API (Christoph)

   - cdrom registration race fix (Guenter)

   - MD pull from Song, two minor fixes.

   - Various documentation fixes (Marcos)

   - Multi-page bvec feature. This brings a lot of nice improvements
     with it, like more efficient splitting, larger IOs can be supported
     without growing the bvec table size, and so on. (Ming)

   - Various little fixes to core and drivers"

* tag 'for-5.1/block-20190302' of git://git.kernel.dk/linux-block: (117 commits)
  block: fix updating bio's front segment size
  block: Replace function name in string with __func__
  nbd: propagate genlmsg_reply return code
  floppy: remove set but not used variable 'q'
  null_blk: fix checking for REQ_FUA
  block: fix NULL pointer dereference in register_disk
  fs: fix guard_bio_eod to check for real EOD errors
  blk-mq: use HCTX_TYPE_DEFAULT but not 0 to index blk_mq_tag_set->map
  block: optimize bvec iteration in bvec_iter_advance
  block: introduce mp_bvec_for_each_page() for iterating over page
  block: optimize blk_bio_segment_split for single-page bvec
  block: optimize __blk_segment_map_sg() for single-page bvec
  block: introduce bvec_nth_page()
  iomap: wire up the iopoll method
  block: add bio_set_polled() helper
  block: wire up block device iopoll method
  fs: add an iopoll method to struct file_operations
  loop: set GENHD_FL_NO_PART_SCAN after blkdev_reread_part()
  loop: do not print warn message if partition scan is successful
  block: bounce: make sure that bvec table is updated
  ...
parents 4221b807 aaeee62c

Documentation/block/biovecs.txt

+25 −0
Original line number Diff line number Diff line
@@ -117,3 +117,28 @@ Other implications: 
   size limitations and the limitations of the underlying devices. Thus

   there's no need to define ->merge_bvec_fn() callbacks for individual block

   drivers.



Usage of helpers:

=================



* The following helpers whose names have the suffix of "_all" can only be used

on non-BIO_CLONED bio. They are usually used by filesystem code. Drivers

shouldn't use them because the bio may have been split before it reached the

driver.



	bio_for_each_segment_all()

	bio_first_bvec_all()

	bio_first_page_all()

	bio_last_bvec_all()



* The following helpers iterate over single-page segment. The passed 'struct

bio_vec' will contain a single-page IO vector during the iteration



	bio_for_each_segment()

	bio_for_each_segment_all()



* The following helpers iterate over multi-page bvec. The passed 'struct

bio_vec' will contain a multi-page IO vector during the iteration



	bio_for_each_bvec()

	rq_for_each_bvec()

Documentation/filesystems/vfs.txt

+3 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ struct file_operations { 
	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);

	ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);

	ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);

	int (*iopoll)(struct kiocb *kiocb, bool spin);

	int (*iterate) (struct file *, struct dir_context *);

	int (*iterate_shared) (struct file *, struct dir_context *);

	__poll_t (*poll) (struct file *, struct poll_table_struct *);
@@ -902,6 +903,8 @@ otherwise noted. 


  write_iter: possibly asynchronous write with iov_iter as source



  iopoll: called when aio wants to poll for completions on HIPRI iocbs



  iterate: called when the VFS needs to read the directory contents



  iterate_shared: called when the VFS needs to read the directory contents

block/bfq-iosched.c

+380 −325

File changed.

Preview size limit exceeded, changes collapsed.

block/bfq-iosched.h

+8 −3

File changed.

Preview size limit exceeded, changes collapsed.

block/bfq-wf2q.c

+12 −6

File changed.

Preview size limit exceeded, changes collapsed.