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

Merge tag 'for-linus-20190112' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe pull request from Christoph, with little fixes all over the map

 - Loop caching fix for offset/bs change (Jaegeuk Kim)

 - Block documentation tweaks (Jeff, Jon, Weiping, John)

 - null_blk zoned tweak (John)

 - ahch mvebu suspend/resume support. Should have gone into the merge
   window, but there was some confusion on which tree had it. (Miquel)

* tag 'for-linus-20190112' of git://git.kernel.dk/linux-block: (22 commits)
  ata: ahci: mvebu: request PHY suspend/resume for Armada 3700
  ata: ahci: mvebu: add Armada 3700 initialization needed for S2RAM
  ata: ahci: mvebu: do Armada 38x configuration only on relevant SoCs
  ata: ahci: mvebu: remove stale comment
  ata: libahci_platform: comply to PHY framework
  loop: drop caches if offset or block_size are changed
  block: fix kerneldoc comment for blk_attempt_plug_merge()
  nvme: don't initlialize ctrl->cntlid twice
  nvme: introduce NVME_QUIRK_IGNORE_DEV_SUBNQN
  nvme: pad fake subsys NQN vid and ssvid with zeros
  nvme-multipath: zero out ANA log buffer
  nvme-fabrics: unset write/poll queues for discovery controllers
  nvme-tcp: don't ask if controller is fabrics
  nvme-tcp: remove dead code
  nvme-pci: fix out of bounds access in nvme_cqe_pending
  nvme-pci: rerun irq setup on IO queue init errors
  nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
  nvme-pci: fix the wrong setting of nr_maps
  block: doc: add slice_idle_us to bfq documentation
  block: clarify documentation for blk_{start|finish}_plug
  ...
parents 66c56cfa bde0b5c1

Documentation/ABI/testing/sysfs-block

+9 −0
Original line number Diff line number Diff line
@@ -279,3 +279,12 @@ Description: 
		size in 512B sectors of the zones of the device, with

		the eventual exception of the last zone of the device

		which may be smaller.



What:		/sys/block/<disk>/queue/io_timeout

Date:		November 2018

Contact:	Weiping Zhang <zhangweiping@didiglobal.com>

Description:

		io_timeout is the request timeout in milliseconds. If a request

		does not complete in this time then the block driver timeout

		handler is invoked. That timeout handler can decide to retry

		the request, to fail it or to start a device recovery strategy.

Documentation/block/bfq-iosched.txt

+7 −0
Original line number Diff line number Diff line
@@ -357,6 +357,13 @@ video playing/streaming, a very low drop rate may be more important 
than maximum throughput. In these cases, consider setting the

strict_guarantees parameter.



slice_idle_us

-------------



Controls the same tuning parameter as slice_idle, but in microseconds.

Either tunable can be used to set idling behavior.  Afterwards, the

other tunable will reflect the newly set value in sysfs.



strict_guarantees

-----------------

Documentation/block/null_blk.txt

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ shared_tags=[0/1]: Default: 0 


zoned=[0/1]: Default: 0

  0: Block device is exposed as a random-access block device.

  1: Block device is exposed as a host-managed zoned block device.

  1: Block device is exposed as a host-managed zoned block device. Requires

     CONFIG_BLK_DEV_ZONED.



zone_size=[MB]: Default: 256

  Per zone size when exposed as a zoned block device. Must be a power of two.

Documentation/block/queue-sysfs.txt

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,13 @@ If set to a value larger than 0, the kernel will put the process issuing 
IO to sleep for this amount of microseconds before entering classic

polling.



io_timeout (RW)

---------------

io_timeout is the request timeout in milliseconds. If a request does not

complete in this time then the block driver timeout handler is invoked.

That timeout handler can decide to retry the request, to fail it or to start

a device recovery strategy.



iostats (RW)

-------------

This file is used to control (on/off) the iostats accounting of the

block/blk-core.c

+19 −1
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ no_merge: 
 * blk_attempt_plug_merge - try to merge with %current's plugged list

 * @q: request_queue new bio is being queued at

 * @bio: new bio being queued

 * @request_count: out parameter for number of traversed plugged requests

 * @same_queue_rq: pointer to &struct request that gets filled in when

 * another request associated with @q is found on the plug list

 * (optional, may be %NULL)
@@ -1683,6 +1682,15 @@ EXPORT_SYMBOL(kblockd_mod_delayed_work_on); 
 * @plug:	The &struct blk_plug that needs to be initialized

 *

 * Description:

 *   blk_start_plug() indicates to the block layer an intent by the caller

 *   to submit multiple I/O requests in a batch.  The block layer may use

 *   this hint to defer submitting I/Os from the caller until blk_finish_plug()

 *   is called.  However, the block layer may choose to submit requests

 *   before a call to blk_finish_plug() if the number of queued I/Os

 *   exceeds %BLK_MAX_REQUEST_COUNT, or if the size of the I/O is larger than

 *   %BLK_PLUG_FLUSH_SIZE.  The queued I/Os may also be submitted early if

 *   the task schedules (see below).

 *

 *   Tracking blk_plug inside the task_struct will help with auto-flushing the

 *   pending I/O should the task end up blocking between blk_start_plug() and

 *   blk_finish_plug(). This is important from a performance perspective, but
@@ -1765,6 +1773,16 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) 
		blk_mq_flush_plug_list(plug, from_schedule);

}



/**

 * blk_finish_plug - mark the end of a batch of submitted I/O

 * @plug:	The &struct blk_plug passed to blk_start_plug()

 *

 * Description:

 * Indicate that a batch of I/O submissions is complete.  This function

 * must be paired with an initial call to blk_start_plug().  The intent

 * is to allow the block layer to optimize I/O submission.  See the

 * documentation for blk_start_plug() for more information.

 */

void blk_finish_plug(struct blk_plug *plug)

{

	if (plug != current->plug)

CRA Git | Maintained and supported by SUSTech CRA and CCSE