Commit 616355cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.18/block-2022-03-18' of git://git.kernel.dk/linux-block 

Pull block updates from Jens Axboe:

 - BFQ cleanups and fixes (Yu, Zhang, Yahu, Paolo)

 - blk-rq-qos completion fix (Tejun)

 - blk-cgroup merge fix (Tejun)

 - Add offline error return value to distinguish it from an IO error on
   the device (Song)

 - IO stats fixes (Zhang, Christoph)

 - blkcg refcount fixes (Ming, Yu)

 - Fix for indefinite dispatch loop softlockup (Shin'ichiro)

 - blk-mq hardware queue management improvements (Ming)

 - sbitmap dead code removal (Ming, John)

 - Plugging merge improvements (me)

 - Show blk-crypto capabilities in sysfs (Eric)

 - Multiple delayed queue run improvement (David)

 - Block throttling fixes (Ming)

 - Start deprecating auto module loading based on dev_t (Christoph)

 - bio allocation improvements (Christoph, Chaitanya)

 - Get rid of bio_devname (Christoph)

 - bio clone improvements (Christoph)

 - Block plugging improvements (Christoph)

 - Get rid of genhd.h header (Christoph)

 - Ensure drivers use appropriate flush helpers (Christoph)

 - Refcounting improvements (Christoph)

 - Queue initialization and teardown improvements (Ming, Christoph)

 - Misc fixes/improvements (Barry, Chaitanya, Colin, Dan, Jiapeng,
   Lukas, Nian, Yang, Eric, Chengming)

* tag 'for-5.18/block-2022-03-18' of git://git.kernel.dk/linux-block: (127 commits)
  block: cancel all throttled bios in del_gendisk()
  block: let blkcg_gq grab request queue's refcnt
  block: avoid use-after-free on throttle data
  block: limit request dispatch loop duration
  block/bfq-iosched: Fix spelling mistake "tenative" -> "tentative"
  sr: simplify the local variable initialization in sr_block_open()
  block: don't merge across cgroup boundaries if blkcg is enabled
  block: fix rq-qos breakage from skipping rq_qos_done_bio()
  block: flush plug based on hardware and software queue order
  block: ensure plug merging checks the correct queue at least once
  block: move rq_qos_exit() into disk_release()
  block: do more work in elevator_exit
  block: move blk_exit_queue into disk_release
  block: move q_usage_counter release into blk_queue_release
  block: don't remove hctx debugfs dir from blk_mq_exit_queue
  block: move blkcg initialization/destroy into disk allocation/release handler
  sr: implement ->free_disk to simplify refcounting
  sd: implement ->free_disk to simplify refcounting
  sd: delay calling free_opal_dev
  sd: call sd_zbc_release_disk before releasing the scsi_device reference
  ...
parents b080cee7 8f9e7b65

Documentation/ABI/stable/sysfs-block

+49 −0
Original line number Diff line number Diff line
@@ -155,6 +155,55 @@ Description: 
		last zone of the device which may be smaller.





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

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		The presence of this subdirectory of /sys/block/<disk>/queue/

		indicates that the device supports inline encryption.  This

		subdirectory contains files which describe the inline encryption

		capabilities of the device.  For more information about inline

		encryption, refer to Documentation/block/inline-encryption.rst.





What:		/sys/block/<disk>/queue/crypto/max_dun_bits

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		[RO] This file shows the maximum length, in bits, of data unit

		numbers accepted by the device in inline encryption requests.





What:		/sys/block/<disk>/queue/crypto/modes/<mode>

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		[RO] For each crypto mode (i.e., encryption/decryption

		algorithm) the device supports with inline encryption, a file

		will exist at this location.  It will contain a hexadecimal

		number that is a bitmask of the supported data unit sizes, in

		bytes, for that crypto mode.



		Currently, the crypto modes that may be supported are:



		   * AES-256-XTS

		   * AES-128-CBC-ESSIV

		   * Adiantum



		For example, if a device supports AES-256-XTS inline encryption

		with data unit sizes of 512 and 4096 bytes, the file

		/sys/block/<disk>/queue/crypto/modes/AES-256-XTS will exist and

		will contain "0x1200".





What:		/sys/block/<disk>/queue/crypto/num_keyslots

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		[RO] This file shows the number of keyslots the device has for

		use with inline encryption.





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

Date:		June 2016

Contact:	linux-block@vger.kernel.org

Documentation/block/biodoc.rst

deleted100644 → 0
+0 −1164

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/block/capability.rst

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ This file documents the sysfs file ``block/<disk>/capability``. 
``capability`` is a bitfield, printed in hexadecimal, indicating which

capabilities a specific block device supports:



.. kernel-doc:: include/linux/genhd.h
 
.. kernel-doc:: include/linux/blkdev.h

Documentation/block/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Block 
   :maxdepth: 1



   bfq-iosched

   biodoc

   biovecs

   blk-mq

   capability

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3441,6 +3441,7 @@ F: Documentation/ABI/stable/sysfs-block 
F:	Documentation/block/

F:	block/

F:	drivers/block/

F:	include/linux/bio.h

F:	include/linux/blk*

F:	kernel/trace/blktrace.c

F:	lib/sbitmap.c