Commit ff6814b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.5/block-20191121' of git://git.kernel.dk/linux-block 

Pull core block updates from Jens Axboe:
 "Due to more granular branches, this one is small and will be followed
  with other core branches that add specific features. I meant to just
  have a core and drivers branch, but external dependencies we ended up
  adding a few more that are also core.

  The changes are:

   - Fixes and improvements for the zoned device support (Ajay, Damien)

   - sed-opal table writing and datastore UID (Revanth)

   - blk-cgroup (and bfq) blk-cgroup stat fixes (Tejun)

   - Improvements to the block stats tracking (Pavel)

   - Fix for overruning sysfs buffer for large number of CPUs (Ming)

   - Optimization for small IO (Ming, Christoph)

   - Fix typo in RWH lifetime hint (Eugene)

   - Dead code removal and documentation (Bart)

   - Reduction in memory usage for queue and tag set (Bart)

   - Kerneldoc header documentation (André)

   - Device/partition revalidation fixes (Jan)

   - Stats tracking for flush requests (Konstantin)

   - Various other little fixes here and there (et al)"

* tag 'for-5.5/block-20191121' of git://git.kernel.dk/linux-block: (48 commits)
  Revert "block: split bio if the only bvec's length is > SZ_4K"
  block: add iostat counters for flush requests
  block,bfq: Skip tracing hooks if possible
  block: sed-opal: Introduce SUM_SET_LIST parameter and append it using 'add_token_u64'
  blk-cgroup: cgroup_rstat_updated() shouldn't be called on cgroup1
  block: Don't disable interrupts in trigger_softirq()
  sbitmap: Delete sbitmap_any_bit_clear()
  blk-mq: Delete blk_mq_has_free_tags() and blk_mq_can_queue()
  block: split bio if the only bvec's length is > SZ_4K
  block: still try to split bio if the bvec crosses pages
  blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT
  blk-cgroup: reimplement basic IO stats using cgroup rstat
  blk-cgroup: remove now unused blkg_print_stat_{bytes|ios}_recursive()
  blk-throtl: stop using blkg->stat_bytes and ->stat_ios
  bfq-iosched: stop using blkg->stat_bytes and ->stat_ios
  bfq-iosched: relocate bfqg_*rwstat*() helpers
  block: add zone open, close and finish ioctl support
  block: add zone open, close and finish operations
  block: Simplify REQ_OP_ZONE_RESET_ALL handling
  block: Remove REQ_OP_ZONE_RESET plugging
  ...
parents 6e7b06a4 1e279153

Documentation/ABI/testing/procfs-diskstats

+5 −0
Original line number Diff line number Diff line
@@ -29,4 +29,9 @@ Description: 
		17 - sectors discarded

		18 - time spent discarding



		Kernel 5.5+ appends two more fields for flush requests:



		19 - flush requests completed successfully

		20 - time spent flushing



		For more details refer to Documentation/admin-guide/iostats.rst

Documentation/ABI/testing/sysfs-block

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ Description: 
		 9 - I/Os currently in progress

		10 - time spent doing I/Os (ms)

		11 - weighted time spent doing I/Os (ms)

		12 - discards completed

		13 - discards merged

		14 - sectors discarded

		15 - time spent discarding (ms)

		16 - flush requests completed

		17 - time spent flushing (ms)

		For more details refer Documentation/admin-guide/iostats.rst

Documentation/admin-guide/iostats.rst

+9 −0
Original line number Diff line number Diff line
@@ -121,6 +121,15 @@ Field 15 -- # of milliseconds spent discarding 
    This is the total number of milliseconds spent by all discards (as

    measured from __make_request() to end_that_request_last()).



Field 16 -- # of flush requests completed

    This is the total number of flush requests completed successfully.



    Block layer combines flush requests and executes at most one at a time.

    This counts flush requests executed by disk. Not tracked for partitions.



Field 17 -- # of milliseconds spent flushing

    This is the total number of milliseconds spent by all flush requests.



To avoid introducing performance bottlenecks, no locks are held while

modifying these counters.  This implies that minor inaccuracies may be

introduced when changes collide, so (for instance) adding up all the

Documentation/block/stat.rst

+12 −2
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ discard I/Os requests number of discard I/Os processed 
discard merges  requests      number of discard I/Os merged with in-queue I/O

discard sectors sectors       number of sectors discarded

discard ticks   milliseconds  total wait time for discard requests

flush I/Os      requests      number of flush I/Os processed

flush ticks     milliseconds  total wait time for flush requests

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



read I/Os, write I/Os, discard I/0s
@@ -48,6 +50,14 @@ read I/Os, write I/Os, discard I/0s 


These values increment when an I/O request completes.



flush I/Os

==========



These values increment when an flush I/O request completes.



Block layer combines flush requests and executes at most one at a time.

This counts flush requests executed by disk. Not tracked for partitions.



read merges, write merges, discard merges

=========================================
@@ -62,8 +72,8 @@ discarded from this block device. The "sectors" in question are the 
standard UNIX 512-byte sectors, not any device- or filesystem-specific

block size.  The counters are incremented when the I/O completes.



read ticks, write ticks, discard ticks

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

read ticks, write ticks, discard ticks, flush ticks

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



These values count the number of milliseconds that I/O requests have

waited on this block device.  If there are multiple I/O requests waiting,

block/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ config BLK_RQ_ALLOC_TIME 
config BLK_SCSI_REQUEST

	bool



config BLK_CGROUP_RWSTAT

	bool



config BLK_DEV_BSG

	bool "Block layer SG support v4"

	default y
@@ -86,6 +89,7 @@ config BLK_DEV_ZONED 
config BLK_DEV_THROTTLING

	bool "Block layer bio throttling support"

	depends on BLK_CGROUP=y

	select BLK_CGROUP_RWSTAT

	---help---

	Block layer bio throttling support. It can be used to limit

	the IO rate to a device. IO rate policies are per cgroup and

CRA Git | Maintained and supported by SUSTech CRA and CCSE