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

Merge tag 'for-5.9/drivers-20200803' of git://git.kernel.dk/linux-block 

Pull block driver updates from Jens Axboe:

 - NVMe:
      - ZNS support (Aravind, Keith, Matias, Niklas)
      - Misc cleanups, optimizations, fixes (Baolin, Chaitanya, David,
        Dongli, Max, Sagi)

 - null_blk zone capacity support (Aravind)

 - MD:
      - raid5/6 fixes (ChangSyun)
      - Warning fixes (Damien)
      - raid5 stripe fixes (Guoqing, Song, Yufen)
      - sysfs deadlock fix (Junxiao)
      - raid10 deadlock fix (Vitaly)

 - struct_size conversions (Gustavo)

 - Set of bcache updates/fixes (Coly)

* tag 'for-5.9/drivers-20200803' of git://git.kernel.dk/linux-block: (117 commits)
  md/raid5: Allow degraded raid6 to do rmw
  md/raid5: Fix Force reconstruct-write io stuck in degraded raid5
  raid5: don't duplicate code for different paths in handle_stripe
  raid5-cache: hold spinlock instead of mutex in r5c_journal_mode_show
  md: print errno in super_written
  md/raid5: remove the redundant setting of STRIPE_HANDLE
  md: register new md sysfs file 'uuid' read-only
  md: fix max sectors calculation for super 1.0
  nvme-loop: remove extra variable in create ctrl
  nvme-loop: set ctrl state connecting after init
  nvme-multipath: do not fall back to __nvme_find_path() for non-optimized paths
  nvme-multipath: fix logic for non-optimized paths
  nvme-rdma: fix controller reset hang during traffic
  nvme-tcp: fix controller reset hang during traffic
  nvmet: introduce the passthru Kconfig option
  nvmet: introduce the passthru configfs interface
  nvmet: Add passthru enable/disable helpers
  nvmet: add passthru code to process commands
  nvme: export nvme_find_get_ns() and nvme_put_ns()
  nvme: introduce nvme_ctrl_get_by_path()
  ...
parents 4834ce9d f59589fc

Documentation/ABI/testing/sysfs-block

+18 −0
Original line number Diff line number Diff line
@@ -273,6 +273,24 @@ Description: 
		device ("host-aware" or "host-managed" zone model). For regular

		block devices, the value is always 0.



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

Date:		July 2020

Contact:	Niklas Cassel <niklas.cassel@wdc.com>

Description:

		For zoned block devices (zoned attribute indicating

		"host-managed" or "host-aware"), the sum of zones belonging to

		any of the zone states: EXPLICIT OPEN, IMPLICIT OPEN or CLOSED,

		is limited by this value. If this value is 0, there is no limit.



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

Date:		July 2020

Contact:	Niklas Cassel <niklas.cassel@wdc.com>

Description:

		For zoned block devices (zoned attribute indicating

		"host-managed" or "host-aware"), the sum of zones belonging to

		any of the zone states: EXPLICIT OPEN or IMPLICIT OPEN,

		is limited by this value. If this value is 0, there is no limit.



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

Date:		September 2016

Contact:	Hannes Reinecke <hare@suse.com>

Documentation/admin-guide/md.rst

+4 −0
Original line number Diff line number Diff line
@@ -426,6 +426,10 @@ All md devices contain: 
     The accepted values when writing to this file are ``ppl`` and ``resync``,

     used to enable and disable PPL.



  uuid

     This indicates the UUID of the array in the following format:

     xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx





As component devices are added to an md array, they appear in the ``md``

directory as new directories named::

Documentation/block/queue-sysfs.rst

+14 −0
Original line number Diff line number Diff line
@@ -117,6 +117,20 @@ Maximum number of elements in a DMA scatter/gather list with integrity 
data that will be submitted by the block layer core to the associated

block driver.



max_active_zones (RO)

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

For zoned block devices (zoned attribute indicating "host-managed" or

"host-aware"), the sum of zones belonging to any of the zone states:

EXPLICIT OPEN, IMPLICIT OPEN or CLOSED, is limited by this value.

If this value is 0, there is no limit.



max_open_zones (RO)

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

For zoned block devices (zoned attribute indicating "host-managed" or

"host-aware"), the sum of zones belonging to any of the zone states:

EXPLICIT OPEN or IMPLICIT OPEN, is limited by this value.

If this value is 0, there is no limit.



max_sectors_kb (RW)

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

This is the maximum number of kilobytes that the block layer will allow

block/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -86,9 +86,10 @@ config BLK_DEV_ZONED 
	select MQ_IOSCHED_DEADLINE

	help

	Block layer zoned block device support. This option enables

	support for ZAC/ZBC host-managed and host-aware zoned block devices.

	support for ZAC/ZBC/ZNS host-managed and host-aware zoned block

	devices.



	Say yes here if you have a ZAC or ZBC storage device.

	Say yes here if you have a ZAC, ZBC, or ZNS storage device.



config BLK_DEV_THROTTLING

	bool "Block layer bio throttling support"

block/blk-sysfs.c

+27 −0
Original line number Diff line number Diff line
@@ -306,6 +306,16 @@ static ssize_t queue_nr_zones_show(struct request_queue *q, char *page) 
	return queue_var_show(blk_queue_nr_zones(q), page);

}



static ssize_t queue_max_open_zones_show(struct request_queue *q, char *page)

{

	return queue_var_show(queue_max_open_zones(q), page);

}



static ssize_t queue_max_active_zones_show(struct request_queue *q, char *page)

{

	return queue_var_show(queue_max_active_zones(q), page);

}



static ssize_t queue_nomerges_show(struct request_queue *q, char *page)

{

	return queue_var_show((blk_queue_nomerges(q) << 1) |
@@ -668,6 +678,16 @@ static struct queue_sysfs_entry queue_nr_zones_entry = { 
	.show = queue_nr_zones_show,

};



static struct queue_sysfs_entry queue_max_open_zones_entry = {

	.attr = {.name = "max_open_zones", .mode = 0444 },

	.show = queue_max_open_zones_show,

};



static struct queue_sysfs_entry queue_max_active_zones_entry = {

	.attr = {.name = "max_active_zones", .mode = 0444 },

	.show = queue_max_active_zones_show,

};



static struct queue_sysfs_entry queue_nomerges_entry = {

	.attr = {.name = "nomerges", .mode = 0644 },

	.show = queue_nomerges_show,
@@ -766,6 +786,8 @@ static struct attribute *queue_attrs[] = { 
	&queue_nonrot_entry.attr,

	&queue_zoned_entry.attr,

	&queue_nr_zones_entry.attr,

	&queue_max_open_zones_entry.attr,

	&queue_max_active_zones_entry.attr,

	&queue_nomerges_entry.attr,

	&queue_rq_affinity_entry.attr,

	&queue_iostats_entry.attr,
@@ -793,6 +815,11 @@ static umode_t queue_attr_visible(struct kobject *kobj, struct attribute *attr, 
		(!q->mq_ops || !q->mq_ops->timeout))

			return 0;



	if ((attr == &queue_max_open_zones_entry.attr ||

	     attr == &queue_max_active_zones_entry.attr) &&

	    !blk_queue_is_zoned(q))

		return 0;



	return attr->mode;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE