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

c013d0af · Linus Torvalds <[email protected]> · 2022-08-02 13:46:35 -07:00

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
  ...

Commit: c013d0af81f60cc7dbe357c4e2a925fb6738dbfe
Parents: 42df1cbf · 8d9fdb60

Merge commit. Changes below are compared with the first parent: 42df1cbf.

Changes

261 files changed · +3635 −2158

File	Status	Add	Del	Content
Documentation/ABI/stable/sysfs-block	modified	+9	−0	View file
Documentation/scsi/scsi_eh.rst	modified	+1	−2	View file
Documentation/scsi/scsi_mid_low_api.rst	modified	+1	−1	View file
MAINTAINERS	modified	+7	−0	View file
arch/m68k/emu/nfblock.c	modified	+2	−2	View file
arch/um/drivers/ubd_kern.c	modified	+4	−4	View file
arch/xtensa/platforms/iss/simdisk.c	modified	+2	−2	View file
block/Kconfig	modified	+0	−1	View file
block/bdev.c	modified	+4	−6	View file
block/bfq-cgroup.c	modified	+17	−17	View file
block/bfq-iosched.c	modified	+8	−8	View file
block/bfq-iosched.h	modified	+4	−4	View file
block/bfq-wf2q.c	modified	+2	−3	View file
block/bio.c	modified	+57	−69	View file
block/blk-cgroup-rwstat.h	modified	+4	−4	View file
block/blk-cgroup.c	modified	+40	−36	View file
block/blk-cgroup.h	modified	+4	−8	View file
block/blk-core.c	modified	+17	−63	View file
block/blk-flush.c	modified	+3	−3	View file
block/blk-ia-ranges.c	modified	+20	−45	View file
block/blk-ioc.c	modified	+2	−0	View file
block/blk-iocost.c	modified	+14	−8	View file
block/blk-iolatency.c	modified	+16	−14	View file
block/blk-ioprio.c	modified	+7	−50	View file
block/blk-ioprio.h	modified	+9	−0	View file
block/blk-lib.c	modified	+2	−4	View file
block/blk-merge.c	modified	+46	−33	View file
block/blk-mq-debugfs-zoned.c	modified	+3	−3	View file
block/blk-mq-debugfs.c	modified	+10	−9	View file
block/blk-mq-sysfs.c	modified	+22	−23	View file
block/blk-mq-tag.c	modified	+12	−19	View file
block/blk-mq-tag.h	modified	+4	−6	View file
block/blk-mq.c	modified	+78	−27	View file
block/blk-mq.h	modified	+19	−20	View file
block/blk-rq-qos.c	modified	+2	−8	View file
block/blk-rq-qos.h	modified	+10	−1	View file
block/blk-settings.c	modified	+6	−5	View file
block/blk-sysfs.c	modified	+23	−37	View file
block/blk-throttle.c	modified	+4	−3	View file
block/blk-wbt.c	modified	+20	−10	View file
block/blk-zoned.c	modified	+46	−46	View file
block/blk.h	modified	+23	−11	View file
block/bounce.c	modified	+10	−3	View file
block/bsg-lib.c	modified	+3	−3	View file
block/elevator.h	modified	+1	−1	View file
block/fops.c	modified	+16	−12	View file
block/genhd.c	modified	+32	−48	View file
block/ioctl.c	modified	+1	−1	View file
block/ioprio.c	modified	+50	−8	View file
block/kyber-iosched.c	modified	+4	−4	View file
block/mq-deadline.c	modified	+2	−2	View file
block/partitions/core.c	modified	+1	−2	View file
drivers/block/Kconfig	modified	+9	−0	View file
drivers/block/Makefile	modified	+2	−0	View file
drivers/block/amiflop.c	modified	+1	−1	View file
drivers/block/aoe/aoeblk.c	modified	+1	−1	View file
drivers/block/aoe/aoedev.c	modified	+1	−1	View file
drivers/block/ataflop.c	modified	+2	−3	View file
drivers/block/brd.c	modified	+4	−4	View file
drivers/block/drbd/drbd_actlog.c	modified	+5	−4	View file
drivers/block/drbd/drbd_bitmap.c	modified	+1	−1	View file
drivers/block/drbd/drbd_int.h	modified	+2	−3	View file
drivers/block/drbd/drbd_main.c	modified	+2	−2	View file
drivers/block/drbd/drbd_receiver.c	modified	+12	−12	View file
drivers/block/drbd/drbd_req.c	modified	+2	−4	View file
drivers/block/drbd/drbd_worker.c	modified	+1	−1	View file
drivers/block/floppy.c	modified	+4	−4	View file
drivers/block/loop.c	modified	+1	−2	View file
drivers/block/mtip32xx/mtip32xx.c	modified	+48	−259	View file
drivers/block/mtip32xx/mtip32xx.h	modified	+0	−5	View file
drivers/block/n64cart.c	modified	+1	−1	View file
drivers/block/nbd.c	modified	+4	−5	View file
drivers/block/null_blk/main.c	modified	+7	−8	View file
drivers/block/null_blk/null_blk.h	modified	+5	−7	View file
drivers/block/null_blk/trace.h	modified	+1	−1	View file
drivers/block/null_blk/zoned.c	modified	+6	−6	View file
drivers/block/paride/pcd.c	modified	+2	−2	View file
drivers/block/paride/pd.c	modified	+4	−2	View file
drivers/block/paride/pf.c	modified	+2	−2	View file
drivers/block/pktcdvd.c	modified	+5	−9	View file
drivers/block/ps3disk.c	modified	+2	−2	View file
drivers/block/ps3vram.c	modified	+2	−2	View file
drivers/block/rbd.c	modified	+1	−1	View file
drivers/block/rnbd/rnbd-clt.c	modified	+3	−3	View file
drivers/block/rnbd/rnbd-proto.h	modified	+4	−3	View file
drivers/block/rnbd/rnbd-srv-dev.c	modified	+0	−1	View file
drivers/block/rnbd/rnbd-srv-dev.h	modified	+0	−1	View file
drivers/block/rnbd/rnbd-srv-sysfs.c	modified	+2	−3	View file
drivers/block/rnbd/rnbd-srv.c	modified	+4	−5	View file
drivers/block/rnbd/rnbd-srv.h	modified	+1	−2	View file
drivers/block/sunvdc.c	modified	+2	−2	View file
drivers/block/swim.c	modified	+1	−1	View file
drivers/block/swim3.c	modified	+1	−1	View file
drivers/block/sx8.c	modified	+3	−3	View file
drivers/block/ublk_drv.c	added	+1545	−0	View file
drivers/block/virtio_blk.c	modified	+1	−2	View file
drivers/block/xen-blkback/blkback.c	modified	+3	−3	View file
drivers/block/xen-blkfront.c	modified	+2	−2	View file
drivers/block/z2ram.c	modified	+1	−2	View file
drivers/block/zram/zram_drv.c	modified	+4	−4	View file
drivers/cdrom/gdrom.c	modified	+1	−2	View file
drivers/infiniband/ulp/srp/ib_srp.c	modified	+1	−2	View file
drivers/md/bcache/super.c	modified	+13	−14	View file
drivers/md/dm-bufio.c	modified	+12	−14	View file
drivers/md/dm-ebs-target.c	modified	+8	−7	View file
drivers/md/dm-flakey.c	modified	+6	−2	View file
drivers/md/dm-integrity.c	modified	+38	−38	View file
drivers/md/dm-io.c	modified	+19	−19	View file
drivers/md/dm-kcopyd.c	modified	+13	−13	View file
drivers/md/dm-log.c	modified	+3	−5	View file
drivers/md/dm-raid.c	modified	+1	−1	View file
drivers/md/dm-raid1.c	modified	+5	−7	View file
drivers/md/dm-snap-persistent.c	modified	+12	−13	View file
drivers/md/dm-table.c	modified	+2	−4	View file
drivers/md/dm-writecache.c	modified	+4	−8	View file
drivers/md/dm-zone.c	modified	+43	−45	View file
drivers/md/dm-zoned-metadata.c	modified	+3	−2	View file
drivers/md/dm-zoned-target.c	modified	+12	−13	View file
drivers/md/dm-zoned.h	modified	+1	−1	View file
drivers/md/dm.c	modified	+15	−18	View file
drivers/md/md-bitmap.c	modified	+3	−3	View file
drivers/md/md.c	modified	+8	−8	View file
drivers/md/md.h	modified	+1	−2	View file
drivers/md/raid1.c	modified	+7	−7	View file
drivers/md/raid10.c	modified	+11	−11	View file
drivers/md/raid5-cache.c	modified	+6	−6	View file
drivers/md/raid5-ppl.c	modified	+6	−6	View file
drivers/md/raid5.c	modified	+2	−1	View file
drivers/memstick/core/ms_block.c	modified	+1	−2	View file
drivers/memstick/core/mspro_block.c	modified	+1	−2	View file
drivers/mmc/core/block.c	modified	+3	−3	View file
drivers/mmc/core/queue.c	modified	+1	−3	View file
drivers/mtd/mtd_blkdevs.c	modified	+2	−2	View file
drivers/mtd/ubi/block.c	modified	+2	−2	View file
drivers/nvdimm/btt.c	modified	+4	−4	View file
drivers/nvdimm/pmem.c	modified	+3	−3	View file
drivers/nvme/host/apple.c	modified	+2	−3	View file
drivers/nvme/host/core.c	modified	+2	−3	View file
drivers/nvme/host/fc.c	modified	+8	−10	View file
drivers/nvme/host/ioctl.c	modified	+2	−2	View file
drivers/nvme/host/multipath.c	modified	+2	−2	View file
drivers/nvme/host/nvme.h	modified	+2	−2	View file
drivers/nvme/host/pci.c	modified	+2	−2	View file
drivers/nvme/host/rdma.c	modified	+7	−8	View file
drivers/nvme/host/tcp.c	modified	+7	−8	View file
drivers/nvme/host/zns.c	modified	+3	−3	View file
drivers/nvme/target/io-cmd-bdev.c	modified	+9	−8	View file
drivers/nvme/target/loop.c	modified	+6	−6	View file
drivers/nvme/target/zns.c	modified	+12	−12	View file
drivers/s390/block/dasd.c	modified	+2	−2	View file
drivers/s390/block/dasd_genhd.c	modified	+2	−2	View file
drivers/s390/block/dasd_int.h	modified	+1	−1	View file
drivers/s390/block/dcssblk.c	modified	+4	−4	View file
drivers/s390/block/scm_blk.c	modified	+2	−2	View file
drivers/scsi/aacraid/comminit.c	modified	+1	−1	View file
drivers/scsi/aacraid/linit.c	modified	+1	−1	View file
drivers/scsi/device_handler/scsi_dh_alua.c	modified	+2	−2	View file
drivers/scsi/device_handler/scsi_dh_emc.c	modified	+1	−1	View file
drivers/scsi/device_handler/scsi_dh_hp_sw.c	modified	+2	−2	View file
drivers/scsi/device_handler/scsi_dh_rdac.c	modified	+1	−1	View file
drivers/scsi/fnic/fnic_scsi.c	modified	+4	−10	View file
drivers/scsi/hosts.c	modified	+6	−8	View file
drivers/scsi/mpi3mr/mpi3mr_os.c	modified	+4	−12	View file
drivers/scsi/scsi_error.c	modified	+11	−11	View file
drivers/scsi/scsi_lib.c	modified	+9	−17	View file
drivers/scsi/scsi_priv.h	modified	+2	−2	View file
drivers/scsi/scsi_sysfs.c	modified	+1	−1	View file
drivers/scsi/sd.c	modified	+5	−5	View file
drivers/scsi/sd_zbc.c	modified	+6	−6	View file
drivers/scsi/sr.c	modified	+2	−2	View file
drivers/target/target_core_iblock.c	modified	+2	−2	View file
drivers/ufs/core/ufshcd.c	modified	+2	−2	View file
drivers/ufs/core/ufshpb.c	modified	+3	−4	View file
fs/btrfs/check-integrity.c	modified	+2	−2	View file
fs/btrfs/compression.c	modified	+3	−3	View file
fs/btrfs/compression.h	modified	+1	−1	View file
fs/btrfs/extent_io.c	modified	+9	−9	View file
fs/btrfs/inode.c	modified	+2	−2	View file
fs/btrfs/raid56.c	modified	+2	−2	View file
fs/buffer.c	modified	+31	−30	View file
fs/direct-io.c	modified	+23	−17	View file
fs/ext4/ext4.h	modified	+4	−4	View file
fs/ext4/fast_commit.c	modified	+2	−2	View file
fs/ext4/mmp.c	modified	+6	−5	View file
fs/ext4/super.c	modified	+10	−10	View file
fs/f2fs/data.c	modified	+6	−5	View file
fs/f2fs/f2fs.h	modified	+3	−3	View file
fs/f2fs/node.c	modified	+1	−1	View file
fs/f2fs/segment.c	modified	+1	−1	View file
fs/gfs2/bmap.c	modified	+2	−3	View file
fs/gfs2/dir.c	modified	+2	−3	View file
fs/gfs2/log.c	modified	+2	−2	View file
fs/gfs2/log.h	modified	+1	−1	View file
fs/gfs2/lops.c	modified	+2	−2	View file
fs/gfs2/lops.h	modified	+1	−1	View file
fs/gfs2/meta_io.c	modified	+8	−10	View file
fs/gfs2/quota.c	modified	+1	−1	View file
fs/hfsplus/hfsplus_fs.h	modified	+1	−1	View file
fs/hfsplus/part_tbl.c	modified	+2	−3	View file
fs/hfsplus/super.c	modified	+2	−2	View file
fs/hfsplus/wrapper.c	modified	+6	−6	View file
fs/iomap/direct-io.c	modified	+6	−6	View file
fs/isofs/compress.c	modified	+1	−1	View file
fs/jbd2/commit.c	modified	+4	−4	View file
fs/jbd2/journal.c	modified	+14	−11	View file
fs/jbd2/recovery.c	modified	+2	−2	View file
fs/mpage.c	modified	+3	−3	View file
fs/nfs/blocklayout/blocklayout.c	modified	+6	−7	View file
fs/nilfs2/btnode.c	modified	+4	−4	View file
fs/nilfs2/btnode.h	modified	+2	−2	View file
fs/nilfs2/btree.c	modified	+3	−3	View file
fs/nilfs2/gcinode.c	modified	+3	−4	View file
fs/nilfs2/mdt.c	modified	+10	−9	View file
fs/ntfs/aops.c	modified	+3	−3	View file
fs/ntfs/compress.c	modified	+1	−1	View file
fs/ntfs/file.c	modified	+1	−1	View file
fs/ntfs/logfile.c	modified	+1	−1	View file
fs/ntfs/mft.c	modified	+2	−2	View file
fs/ntfs3/file.c	modified	+1	−1	View file
fs/ntfs3/fsntfs.c	modified	+1	−1	View file
fs/ntfs3/inode.c	modified	+1	−1	View file
fs/ntfs3/ntfs_fs.h	modified	+1	−1	View file
fs/ocfs2/aops.c	modified	+1	−1	View file
fs/ocfs2/buffer_head_io.c	modified	+4	−4	View file
fs/ocfs2/cluster/heartbeat.c	modified	+35	−40	View file
fs/ocfs2/super.c	modified	+1	−1	View file
fs/reiserfs/inode.c	modified	+2	−2	View file
fs/reiserfs/journal.c	modified	+6	−6	View file
fs/reiserfs/stree.c	modified	+2	−2	View file
fs/reiserfs/super.c	modified	+1	−1	View file
fs/udf/dir.c	modified	+1	−1	View file
fs/udf/directory.c	modified	+1	−1	View file
fs/udf/inode.c	modified	+1	−1	View file
fs/ufs/balloc.c	modified	+1	−1	View file
fs/xfs/xfs_bio_io.c	modified	+1	−1	View file
fs/xfs/xfs_buf.c	modified	+2	−2	View file
fs/xfs/xfs_linux.h	modified	+1	−1	View file
fs/xfs/xfs_log_recover.c	modified	+1	−1	View file
fs/zonefs/super.c	modified	+10	−12	View file
fs/zonefs/trace.h	modified	+2	−2	View file
include/linux/bio.h	modified	+5	−5	View file
include/linux/blk-mq.h	modified	+22	−12	View file
include/linux/blk_types.h	modified	+63	−56	View file
include/linux/blkdev.h	modified	+89	−135	View file
include/linux/blktrace_api.h	modified	+2	−11	View file
include/linux/buffer_head.h	modified	+5	−4	View file
include/linux/dm-io.h	modified	+2	−2	View file
include/linux/ioprio.h	modified	+10	−14	View file
include/linux/jbd2.h	modified	+1	−1	View file
include/linux/uio.h	modified	+2	−0	View file
include/linux/writeback.h	modified	+2	−2	View file
include/scsi/scsi_cmnd.h	modified	+2	−2	View file
include/scsi/scsi_device.h	modified	+1	−1	View file
include/scsi/scsi_host.h	modified	+1	−1	View file
include/trace/events/f2fs.h	modified	+11	−11	View file
include/trace/events/jbd2.h	modified	+6	−6	View file
include/trace/events/nilfs2.h	modified	+2	−2	View file
include/uapi/linux/ublk_cmd.h	added	+161	−0	View file
kernel/power/swap.c	modified	+13	−16	View file
kernel/trace/blktrace.c	modified	+30	−42	View file
lib/iov_iter.c	modified	+92	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/stable/sysfs-block

View file

diff --git a/Documentation/ABI/stable/sysfs-block b/Documentation/ABI/stable/sysfs-block
index e8797cd..cd14ecb 100644
--- a/Documentation/ABI/stable/sysfs-block
+++ b/Documentation/ABI/stable/sysfs-block
@@ -260,6 +260,15 @@ Description:
 		for discards, and don't read this file.
 
 
+What:		/sys/block/<disk>/queue/dma_alignment
+Date:		May 2022
+Contact:	[email protected]
+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:	[email protected]

Documentation/scsi/scsi_eh.rst

View file

diff --git a/Documentation/scsi/scsi_eh.rst b/Documentation/scsi/scsi_eh.rst
index 885395d..bad624f 100644
--- a/Documentation/scsi/scsi_eh.rst
+++ b/Documentation/scsi/scsi_eh.rst
@@ -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

View file

diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 63ddea2..a8c5bd1 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -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

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index b2e6ce3..44e966f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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 <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/block/ublk_drv.c
+F:	include/uapi/linux/ublk_cmd.h
+
 UCLINUX (M68KNOMMU AND COLDFIRE)
 M:	Greg Ungerer <[email protected]>
 L:	[email protected]

arch/m68k/emu/nfblock.c

View file

diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index 267b02c..a708fbd 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -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");

arch/um/drivers/ubd_kern.c

View file

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index c4344b6..eb2d2f0 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -925,7 +925,7 @@ static int ubd_add(int n, char **error_out)
 	return 0;
 
 out_cleanup_disk:
-	blk_cleanup_disk(disk);
+	put_disk(disk);
 out_cleanup_tags:
 	blk_mq_free_tag_set(&ubd_dev->tag_set);
 out:
@@ -1032,7 +1032,7 @@ static int ubd_remove(int n, char **error_out)
 	ubd_gendisk[n] = NULL;
 	if(disk != NULL){
 		del_gendisk(disk);
-		blk_cleanup_disk(disk);
+		put_disk(disk);
 	}
 
 	err = 0;
@@ -1262,7 +1262,7 @@ static void ubd_map_req(struct ubd *dev, struct io_thread_req *io_req,
 	struct req_iterator iter;
 	int i = 0;
 	unsigned long byte_offset = io_req->offset;
-	int op = req_op(req);
+	enum req_op op = req_op(req);
 
 	if (op == REQ_OP_WRITE_ZEROES || op == REQ_OP_DISCARD) {
 		io_req->io_desc[0].buffer = NULL;
@@ -1325,7 +1325,7 @@ static int ubd_submit_request(struct ubd *dev, struct request *req)
 	int segs = 0;
 	struct io_thread_req *io_req;
 	int ret;
-	int op = req_op(req);
+	enum req_op op = req_op(req);
 
 	if (op == REQ_OP_FLUSH)
 		segs = 0;

arch/xtensa/platforms/iss/simdisk.c

View file

diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index 4255b92..f50caaa 100644
--- a/arch/xtensa/platforms/iss/simdisk.c
+++ b/arch/xtensa/platforms/iss/simdisk.c
@@ -290,7 +290,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which,
 	return 0;
 
 out_cleanup_disk:
-	blk_cleanup_disk(dev->gd);
+	put_disk(dev->gd);
 out:
 	return err;
 }
@@ -344,7 +344,7 @@ static void simdisk_teardown(struct simdisk *dev, int which,
 	simdisk_detach(dev);
 	if (dev->gd) {
 		del_gendisk(dev->gd);
-		blk_cleanup_disk(dev->gd);
+		put_disk(dev->gd);
 	}
 	remove_proc_entry(tmp, procdir);
 }

block/Kconfig

View file

diff --git a/block/Kconfig b/block/Kconfig
index 50b17e2..444c5ab 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -147,7 +147,6 @@ config BLK_CGROUP_FC_APPID
 config BLK_CGROUP_IOCOST
 	bool "Enable support for cost model based cgroup IO controller"
 	depends on BLK_CGROUP
-	select BLK_RQ_IO_DATA_LEN
 	select BLK_RQ_ALLOC_TIME
 	help
 	Enabling this option enables the .weight interface for cost

block/bdev.c

View file

diff --git a/block/bdev.c b/block/bdev.c
index 5fe06c1..ce05175 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -54,12 +54,10 @@ static void bdev_write_inode(struct block_device *bdev)
 	while (inode->i_state & I_DIRTY) {
 		spin_unlock(&inode->i_lock);
 		ret = write_inode_now(inode, true);
-		if (ret) {
-			char name[BDEVNAME_SIZE];
-			pr_warn_ratelimited("VFS: Dirty inode writeback failed "
-					    "for block device %s (err=%d).\n",
-					    bdevname(bdev, name), ret);
-		}
+		if (ret)
+			pr_warn_ratelimited(
+	"VFS: Dirty inode writeback failed for block device %pg (err=%d).\n",
+				bdev, ret);
 		spin_lock(&inode->i_lock);
 	}
 	spin_unlock(&inode->i_lock);

block/bfq-cgroup.c

View file

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 09574af..30b15a9 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -220,46 +220,46 @@ void bfqg_stats_update_avg_queue_size(struct bfq_group *bfqg)
 }
 
 void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq,
-			      unsigned int op)
+			      blk_opf_t opf)
 {
-	blkg_rwstat_add(&bfqg->stats.queued, op, 1);
+	blkg_rwstat_add(&bfqg->stats.queued, opf, 1);
 	bfqg_stats_end_empty_time(&bfqg->stats);
 	if (!(bfqq == ((struct bfq_data *)bfqg->bfqd)->in_service_queue))
 		bfqg_stats_set_start_group_wait_time(bfqg, bfqq_group(bfqq));
 }
 
-void bfqg_stats_update_io_remove(struct bfq_group *bfqg, unsigned int op)
+void bfqg_stats_update_io_remove(struct bfq_group *bfqg, blk_opf_t opf)
 {
-	blkg_rwstat_add(&bfqg->stats.queued, op, -1);
+	blkg_rwstat_add(&bfqg->stats.queued, opf, -1);
 }
 
-void bfqg_stats_update_io_merged(struct bfq_group *bfqg, unsigned int op)
+void bfqg_stats_update_io_merged(struct bfq_group *bfqg, blk_opf_t opf)
 {
-	blkg_rwstat_add(&bfqg->stats.merged, op, 1);
+	blkg_rwstat_add(&bfqg->stats.merged, opf, 1);
 }
 
 void bfqg_stats_update_completion(struct bfq_group *bfqg, u64 start_time_ns,
-				  u64 io_start_time_ns, unsigned int op)
+				  u64 io_start_time_ns, blk_opf_t opf)
 {
 	struct bfqg_stats *stats = &bfqg->stats;
 	u64 now = ktime_get_ns();
 
 	if (now > io_start_time_ns)
-		blkg_rwstat_add(&stats->service_time, op,
+		blkg_rwstat_add(&stats->service_time, opf,
 				now - io_start_time_ns);
 	if (io_start_time_ns > start_time_ns)
-		blkg_rwstat_add(&stats->wait_time, op,
+		blkg_rwstat_add(&stats->wait_time, opf,
 				io_start_time_ns - start_time_ns);
 }
 
 #else /* CONFIG_BFQ_CGROUP_DEBUG */
 
 void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq,
-			      unsigned int op) { }
-void bfqg_stats_update_io_remove(struct bfq_group *bfqg, unsigned int op) { }
-void bfqg_stats_update_io_merged(struct bfq_group *bfqg, unsigned int op) { }
+			      blk_opf_t opf) { }
+void bfqg_stats_update_io_remove(struct bfq_group *bfqg, blk_opf_t opf) { }
+void bfqg_stats_update_io_merged(struct bfq_group *bfqg, blk_opf_t opf) { }
 void bfqg_stats_update_completion(struct bfq_group *bfqg, u64 start_time_ns,
-				  u64 io_start_time_ns, unsigned int op) { }
+				  u64 io_start_time_ns, blk_opf_t opf) { }
 void bfqg_stats_update_dequeue(struct bfq_group *bfqg) { }
 void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg) { }
 void bfqg_stats_update_idle_time(struct bfq_group *bfqg) { }
@@ -706,10 +706,10 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 }
 
 /**
- * __bfq_bic_change_cgroup - move @bic to @cgroup.
+ * __bfq_bic_change_cgroup - move @bic to @bfqg.
  * @bfqd: the queue descriptor.
  * @bic: the bic to move.
- * @blkcg: the blk-cgroup to move to.
+ * @bfqg: the group to move to.
  *
  * Move bic to blkcg, assuming that bfqd->lock is held; which makes
  * sure that the reference to cgroup is valid across the call (see
@@ -863,6 +863,7 @@ static void bfq_flush_idle_tree(struct bfq_service_tree *st)
  * @bfqd: the device data structure with the root group.
  * @entity: the entity to move, if entity is a leaf; or the parent entity
  *	    of an active leaf entity to move, if entity is not a leaf.
+ * @ioprio_class: I/O priority class to reparent.
  */
 static void bfq_reparent_leaf_entity(struct bfq_data *bfqd,
 				     struct bfq_entity *entity,
@@ -892,6 +893,7 @@ static void bfq_reparent_leaf_entity(struct bfq_data *bfqd,
  * @bfqd: the device data structure with the root group.
  * @bfqg: the group to move from.
  * @st: the service tree to start the search from.
+ * @ioprio_class: I/O priority class to reparent.
  */
 static void bfq_reparent_active_queues(struct bfq_data *bfqd,
 				       struct bfq_group *bfqg,
@@ -1471,8 +1473,6 @@ struct bfq_group *bfqq_group(struct bfq_queue *bfqq)
 	return bfqq->bfqd->root_group;
 }
 
-void bfqg_and_blkg_get(struct bfq_group *bfqg) {}
-
 void bfqg_and_blkg_put(struct bfq_group *bfqg) {}
 
 struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)

block/bfq-iosched.c

View file

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index e6d7e6b..c740b41 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -668,19 +668,19 @@ static bool bfqq_request_over_limit(struct bfq_queue *bfqq, int limit)
  * significantly affect service guarantees coming from the BFQ scheduling
  * algorithm.
  */
-static void bfq_limit_depth(unsigned int op, struct blk_mq_alloc_data *data)
+static void bfq_limit_depth(blk_opf_t opf, struct blk_mq_alloc_data *data)
 {
 	struct bfq_data *bfqd = data->q->elevator->elevator_data;
 	struct bfq_io_cq *bic = bfq_bic_lookup(data->q);
-	struct bfq_queue *bfqq = bic ? bic_to_bfqq(bic, op_is_sync(op)) : NULL;
+	struct bfq_queue *bfqq = bic ? bic_to_bfqq(bic, op_is_sync(opf)) : NULL;
 	int depth;
 	unsigned limit = data->q->nr_requests;
 
 	/* Sync reads have full depth available */
-	if (op_is_sync(op) && !op_is_write(op)) {
+	if (op_is_sync(opf) && !op_is_write(opf)) {
 		depth = 0;
 	} else {
-		depth = bfqd->word_depths[!!bfqd->wr_busy_queues][op_is_sync(op)];
+		depth = bfqd->word_depths[!!bfqd->wr_busy_queues][op_is_sync(opf)];
 		limit = (limit * depth) >> bfqd->full_depth_shift;
 	}
 
@@ -693,7 +693,7 @@ static void bfq_limit_depth(unsigned int op, struct blk_mq_alloc_data *data)
 		depth = 1;
 
 	bfq_log(bfqd, "[%s] wr_busy %d sync %d depth %u",
-		__func__, bfqd->wr_busy_queues, op_is_sync(op), depth);
+		__func__, bfqd->wr_busy_queues, op_is_sync(opf), depth);
 	if (depth)
 		data->shallow_depth = depth;
 }
@@ -6104,7 +6104,7 @@ static bool __bfq_insert_request(struct bfq_data *bfqd, struct request *rq)
 static void bfq_update_insert_stats(struct request_queue *q,
 				    struct bfq_queue *bfqq,
 				    bool idle_timer_disabled,
-				    unsigned int cmd_flags)
+				    blk_opf_t cmd_flags)
 {
 	if (!bfqq)
 		return;
@@ -6129,7 +6129,7 @@ static void bfq_update_insert_stats(struct request_queue *q,
 static inline void bfq_update_insert_stats(struct request_queue *q,
 					   struct bfq_queue *bfqq,
 					   bool idle_timer_disabled,
-					   unsigned int cmd_flags) {}
+					   blk_opf_t cmd_flags) {}
 #endif /* CONFIG_BFQ_CGROUP_DEBUG */
 
 static struct bfq_queue *bfq_init_rq(struct request *rq);
@@ -6141,7 +6141,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 	struct bfq_data *bfqd = q->elevator->elevator_data;
 	struct bfq_queue *bfqq;
 	bool idle_timer_disabled = false;
-	unsigned int cmd_flags;
+	blk_opf_t cmd_flags;
 	LIST_HEAD(free);
 
 #ifdef CONFIG_BFQ_GROUP_IOSCHED

block/bfq-iosched.h

View file

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index ca8177d..ad8e513 100644
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -994,11 +994,11 @@ void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);
 
 void bfqg_stats_update_legacy_io(struct request_queue *q, struct request *rq);
 void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq,
-			      unsigned int op);
-void bfqg_stats_update_io_remove(struct bfq_group *bfqg, unsigned int op);
-void bfqg_stats_update_io_merged(struct bfq_group *bfqg, unsigned int op);
+			      blk_opf_t opf);
+void bfqg_stats_update_io_remove(struct bfq_group *bfqg, blk_opf_t opf);
+void bfqg_stats_update_io_merged(struct bfq_group *bfqg, blk_opf_t opf);
 void bfqg_stats_update_completion(struct bfq_group *bfqg, u64 start_time_ns,
-				  u64 io_start_time_ns, unsigned int op);
+				  u64 io_start_time_ns, blk_opf_t opf);
 void bfqg_stats_update_dequeue(struct bfq_group *bfqg);
 void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg);
 void bfqg_stats_update_idle_time(struct bfq_group *bfqg);

block/bfq-wf2q.c

View file

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index f8eb340..983413c 100644
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -1360,6 +1360,8 @@ left:
 /**
  * __bfq_lookup_next_entity - return the first eligible entity in @st.
  * @st: the service tree.
+ * @in_service: whether or not there is an in-service entity for the sched_data
+ *	this active tree belongs to.
  *
  * If there is no in-service entity for the sched_data st belongs to,
  * then return the entity that will be set in service if:
@@ -1472,9 +1474,6 @@ static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd,
 			break;
 	}
 
-	if (!entity)
-		return NULL;
-
 	return entity;
 }
 

block/bio.c

View file

diff --git a/block/bio.c b/block/bio.c
index 51c99f2..6f9f883 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -239,7 +239,7 @@ static void bio_free(struct bio *bio)
  * when IO has completed, or when the bio is released.
  */
 void bio_init(struct bio *bio, struct block_device *bdev, struct bio_vec *table,
-	      unsigned short max_vecs, unsigned int opf)
+	      unsigned short max_vecs, blk_opf_t opf)
 {
 	bio->bi_next = NULL;
 	bio->bi_bdev = bdev;
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(bio_init);
  *   preserved are the ones that are initialized by bio_alloc_bioset(). See
  *   comment in struct bio.
  */
-void bio_reset(struct bio *bio, struct block_device *bdev, unsigned int opf)
+void bio_reset(struct bio *bio, struct block_device *bdev, blk_opf_t opf)
 {
 	bio_uninit(bio);
 	memset(bio, 0, BIO_RESET_BYTES);
@@ -341,7 +341,7 @@ void bio_chain(struct bio *bio, struct bio *parent)
 EXPORT_SYMBOL(bio_chain);
 
 struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev,
-		unsigned int nr_pages, unsigned int opf, gfp_t gfp)
+		unsigned int nr_pages, blk_opf_t opf, gfp_t gfp)
 {
 	struct bio *new = bio_alloc(bdev, nr_pages, opf, gfp);
 
@@ -409,7 +409,7 @@ static void punt_bios_to_rescuer(struct bio_set *bs)
 }
 
 static struct bio *bio_alloc_percpu_cache(struct block_device *bdev,
-		unsigned short nr_vecs, unsigned int opf, gfp_t gfp,
+		unsigned short nr_vecs, blk_opf_t opf, gfp_t gfp,
 		struct bio_set *bs)
 {
 	struct bio_alloc_cache *cache;
@@ -468,7 +468,7 @@ static struct bio *bio_alloc_percpu_cache(struct block_device *bdev,
  * Returns: Pointer to new bio on success, NULL on failure.
  */
 struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs,
-			     unsigned int opf, gfp_t gfp_mask,
+			     blk_opf_t opf, gfp_t gfp_mask,
 			     struct bio_set *bs)
 {
 	gfp_t saved_gfp = gfp_mask;
@@ -1033,7 +1033,7 @@ int bio_add_zone_append_page(struct bio *bio, struct page *page,
 	if (WARN_ON_ONCE(bio_op(bio) != REQ_OP_ZONE_APPEND))
 		return 0;
 
-	if (WARN_ON_ONCE(!blk_queue_is_zoned(q)))
+	if (WARN_ON_ONCE(!bdev_is_zoned(bio->bi_bdev)))
 		return 0;
 
 	return bio_add_hw_page(q, bio, page, len, offset,
@@ -1159,6 +1159,37 @@ static void bio_put_pages(struct page **pages, size_t size, size_t off)
 		put_page(pages[i]);
 }
 
+static int bio_iov_add_page(struct bio *bio, struct page *page,
+		unsigned int len, unsigned int offset)
+{
+	bool same_page = false;
+
+	if (!__bio_try_merge_page(bio, page, len, offset, &same_page)) {
+		if (WARN_ON_ONCE(bio_full(bio, len)))
+			return -EINVAL;
+		__bio_add_page(bio, page, len, offset);
+		return 0;
+	}
+
+	if (same_page)
+		put_page(page);
+	return 0;
+}
+
+static int bio_iov_add_zone_append_page(struct bio *bio, struct page *page,
+		unsigned int len, unsigned int offset)
+{
+	struct request_queue *q = bdev_get_queue(bio->bi_bdev);
+	bool same_page = false;
+
+	if (bio_add_hw_page(q, bio, page, len, offset,
+			queue_max_zone_append_sectors(q), &same_page) != len)
+		return -EINVAL;
+	if (same_page)
+		put_page(page);
+	return 0;
+}
+
 #define PAGE_PTRS_PER_BVEC     (sizeof(struct bio_vec) / sizeof(struct page *))
 
 /**
@@ -1177,7 +1208,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 	unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;
 	struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;
 	struct page **pages = (struct page **)bv;
-	bool same_page = false;
 	ssize_t size, left;
 	unsigned len, i;
 	size_t offset;
@@ -1186,82 +1216,43 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 	 * Move page array up in the allocated memory for the bio vecs as far as
 	 * possible so that we can start filling biovecs from the beginning
 	 * without overwriting the temporary page array.
-	*/
+	 */
 	BUILD_BUG_ON(PAGE_PTRS_PER_BVEC < 2);
 	pages += entries_left * (PAGE_PTRS_PER_BVEC - 1);
 
-	size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset);
-	if (unlikely(size <= 0))
-		return size ? size : -EFAULT;
-
-	for (left = size, i = 0; left > 0; left -= len, i++) {
-		struct page *page = pages[i];
-
-		len = min_t(size_t, PAGE_SIZE - offset, left);
-
-		if (__bio_try_merge_page(bio, page, len, offset, &same_page)) {
-			if (same_page)
-				put_page(page);
-		} else {
-			if (WARN_ON_ONCE(bio_full(bio, len))) {
-				bio_put_pages(pages + i, left, offset);
-				return -EINVAL;
-			}
-			__bio_add_page(bio, page, len, offset);
-		}
-		offset = 0;
-	}
-
-	iov_iter_advance(iter, size);
-	return 0;
-}
-
-static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter)
-{
-	unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt;
-	unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt;
-	struct request_queue *q = bdev_get_queue(bio->bi_bdev);
-	unsigned int max_append_sectors = queue_max_zone_append_sectors(q);
-	struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;
-	struct page **pages = (struct page **)bv;
-	ssize_t size, left;
-	unsigned len, i;
-	size_t offset;
-	int ret = 0;
-
-	if (WARN_ON_ONCE(!max_append_sectors))
-		return 0;
-
 	/*
-	 * Move page array up in the allocated memory for the bio vecs as far as
-	 * possible so that we can start filling biovecs from the beginning
-	 * without overwriting the temporary page array.
+	 * Each segment in the iov is required to be a block size multiple.
+	 * However, we may not be able to get the entire segment if it spans
+	 * more pages than bi_max_vecs allows, so we have to ALIGN_DOWN the
+	 * result to ensure the bio's total size is correct. The remainder of
+	 * the iov data will be picked up in the next bio iteration.
 	 */
-	BUILD_BUG_ON(PAGE_PTRS_PER_BVEC < 2);
-	pages += entries_left * (PAGE_PTRS_PER_BVEC - 1);
-
 	size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset);
+	if (size > 0)
+		size = ALIGN_DOWN(size, bdev_logical_block_size(bio->bi_bdev));
 	if (unlikely(size <= 0))
 		return size ? size : -EFAULT;
 
 	for (left = size, i = 0; left > 0; left -= len, i++) {
 		struct page *page = pages[i];
-		bool same_page = false;
+		int ret;
 
 		len = min_t(size_t, PAGE_SIZE - offset, left);
-		if (bio_add_hw_page(q, bio, page, len, offset,
-				max_append_sectors, &same_page) != len) {
+		if (bio_op(bio) == REQ_OP_ZONE_APPEND)
+			ret = bio_iov_add_zone_append_page(bio, page, len,
+					offset);
+		else
+			ret = bio_iov_add_page(bio, page, len, offset);
+
+		if (ret) {
 			bio_put_pages(pages + i, left, offset);
-			ret = -EINVAL;
-			break;
+			return ret;
 		}
-		if (same_page)
-			put_page(page);
 		offset = 0;
 	}
 
-	iov_iter_advance(iter, size - left);
-	return ret;
+	iov_iter_advance(iter, size);
+	return 0;
 }
 
 /**
@@ -1298,10 +1289,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 	}
 