Commit 13400b14 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-5.18/block' into for-5.18/write-streams 

* for-5.18/block: (96 commits)
  block: remove bio_devname
  ext4: stop using bio_devname
  raid5-ppl: stop using bio_devname
  raid1: stop using bio_devname
  md-multipath: stop using bio_devname
  dm-integrity: stop using bio_devname
  dm-crypt: stop using bio_devname
  pktcdvd: remove a pointless debug check in pkt_submit_bio
  block: remove handle_bad_sector
  block: fix and cleanup bio_check_ro
  bfq: fix use-after-free in bfq_dispatch_request
  blk-crypto: show crypto capabilities in sysfs
  block: don't delete queue kobject before its children
  block: simplify calling convention of elv_unregister_queue()
  block: remove redundant semicolon
  block: default BLOCK_LEGACY_AUTOLOAD to y
  block: update io_ticks when io hang
  block, bfq: don't move oom_bfqq
  block, bfq: avoid moving bfqq to it's parent bfqg
  block, bfq: cleanup bfq_bfqq_to_bfqg()
  ...
parents ffb217a1 97939610

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
@@ -3440,6 +3440,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