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

Merge tag 'for-5.20/block-2022-07-29' of git://git.kernel.dk/linux-block 

Pull block updates from Jens Axboe:

 - Improve the type checking of request flags (Bart)

 - Ensure queue mapping for a single queues always picks the right queue
   (Bart)

 - Sanitize the io priority handling (Jan)

 - rq-qos race fix (Jinke)

 - Reserved tags handling improvements (John)

 - Separate memory alignment from file/disk offset aligment for O_DIRECT
   (Keith)

 - Add new ublk driver, userspace block driver using io_uring for
   communication with the userspace backend (Ming)

 - Use try_cmpxchg() to cleanup the code in various spots (Uros)

 - Finally remove bdevname() (Christoph)

 - Clean up the zoned device handling (Christoph)

 - Clean up independent access range support (Christoph)

 - Clean up and improve block sysfs handling (Christoph)

 - Clean up and improve teardown of block devices.

   This turns the usual two step process into something that is simpler
   to implement and handle in block drivers (Christoph)

 - Clean up chunk size handling (Christoph)

 - Misc cleanups and fixes (Bart, Bo, Dan, GuoYong, Jason, Keith, Liu,
   Ming, Sebastian, Yang, Ying)

* tag 'for-5.20/block-2022-07-29' of git://git.kernel.dk/linux-block: (178 commits)
  ublk_drv: fix double shift bug
  ublk_drv: make sure that correct flags(features) returned to userspace
  ublk_drv: fix error handling of ublk_add_dev
  ublk_drv: fix lockdep warning
  block: remove __blk_get_queue
  block: call blk_mq_exit_queue from disk_release for never added disks
  blk-mq: fix error handling in __blk_mq_alloc_disk
  ublk: defer disk allocation
  ublk: rewrite ublk_ctrl_get_queue_affinity to not rely on hctx->cpumask
  ublk: fold __ublk_create_dev into ublk_ctrl_add_dev
  ublk: cleanup ublk_ctrl_uring_cmd
  ublk: simplify ublk_ch_open and ublk_ch_release
  ublk: remove the empty open and release block device operations
  ublk: remove UBLK_IO_F_PREFLUSH
  ublk: add a MAINTAINERS entry
  block: don't allow the same type rq_qos add more than once
  mmc: fix disk/queue leak in case of adding disk failure
  ublk_drv: fix an IS_ERR() vs NULL check
  ublk: remove UBLK_IO_F_INTEGRITY
  ublk_drv: remove unneeded semicolon
  ...
parents 42df1cbf 8d9fdb60

Documentation/ABI/stable/sysfs-block

+9 −0
Original line number Diff line number Diff line
@@ -260,6 +260,15 @@ Description: 
		for discards, and don't read this file.





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

Date:		May 2022

Contact:	linux-block@vger.kernel.org

Description:

		Reports the alignment that user space addresses must have to be

		used for raw block device access with O_DIRECT and other driver

		specific passthrough mechanisms.





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

Date:		May 2018

Contact:	linux-block@vger.kernel.org

Documentation/scsi/scsi_eh.rst

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ with the command. 
1.2.2 Completing a scmd w/ timeout

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



The timeout handler is scsi_times_out().  When a timeout occurs, this

function

The timeout handler is scsi_timeout().  When a timeout occurs, this function



 1. invokes optional hostt->eh_timed_out() callback.  Return value can

    be one of

Documentation/scsi/scsi_mid_low_api.rst

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ Details:: 
    *      Notes: If 'no_async_abort' is defined this callback

    *  	will be invoked from scsi_eh thread. No other commands

    *	will then be queued on current host during eh.

    *	Otherwise it will be called whenever scsi_times_out()

    *	Otherwise it will be called whenever scsi_timeout()

    *      is called due to a command timeout.

    *

    *      Optionally defined in: LLD

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -20539,6 +20539,13 @@ F: Documentation/filesystems/ubifs-authentication.rst 
F:	Documentation/filesystems/ubifs.rst

F:	fs/ubifs/









UBLK USERSPACE BLOCK DRIVER









M:	Ming Lei <ming.lei@redhat.com>









L:	linux-block@vger.kernel.org









S:	Maintained









F:	drivers/block/ublk_drv.c









F:	include/uapi/linux/ublk_cmd.h

















UCLINUX (M68KNOMMU AND COLDFIRE)









M:	Greg Ungerer <gerg@linux-m68k.org>









L:	linux-m68k@lists.linux-m68k.org

























arch/m68k/emu/nfblock.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -138,7 +138,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)







	return 0;



















out_cleanup_disk:









	blk_cleanup_disk(dev->disk);









	put_disk(dev->disk);









free_dev:









	kfree(dev);









out:








@@ -180,7 +180,7 @@ static void __exit nfhd_exit(void)







	list_for_each_entry_safe(dev, next, &nfhd_list, list) {









		list_del(&dev->list);









		del_gendisk(dev->disk);









		blk_cleanup_disk(dev->disk);









		put_disk(dev->disk);









		kfree(dev);









	}









	unregister_blkdev(major_num, "nfhd");