Commit 3ad11d7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block 

Pull block updates from Jens Axboe:

 - Series of merge handling cleanups (Baolin, Christoph)

 - Series of blk-throttle fixes and cleanups (Baolin)

 - Series cleaning up BDI, seperating the block device from the
   backing_dev_info (Christoph)

 - Removal of bdget() as a generic API (Christoph)

 - Removal of blkdev_get() as a generic API (Christoph)

 - Cleanup of is-partition checks (Christoph)

 - Series reworking disk revalidation (Christoph)

 - Series cleaning up bio flags (Christoph)

 - bio crypt fixes (Eric)

 - IO stats inflight tweak (Gabriel)

 - blk-mq tags fixes (Hannes)

 - Buffer invalidation fixes (Jan)

 - Allow soft limits for zone append (Johannes)

 - Shared tag set improvements (John, Kashyap)

 - Allow IOPRIO_CLASS_RT for CAP_SYS_NICE (Khazhismel)

 - DM no-wait support (Mike, Konstantin)

 - Request allocation improvements (Ming)

 - Allow md/dm/bcache to use IO stat helpers (Song)

 - Series improving blk-iocost (Tejun)

 - Various cleanups (Geert, Damien, Danny, Julia, Tetsuo, Tian, Wang,
   Xianting, Yang, Yufen, yangerkun)

* tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block: (191 commits)
  block: fix uapi blkzoned.h comments
  blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
  blk-mq: get rid of the dead flush handle code path
  block: get rid of unnecessary local variable
  block: fix comment and add lockdep assert
  blk-mq: use helper function to test hw stopped
  block: use helper function to test queue register
  block: remove redundant mq check
  block: invoke blk_mq_exit_sched no matter whether have .exit_sched
  percpu_ref: don't refer to ref->data if it isn't allocated
  block: ratelimit handle_bad_sector() message
  blk-throttle: Re-use the throtl_set_slice_end()
  blk-throttle: Open code __throtl_de/enqueue_tg()
  blk-throttle: Move service tree validation out of the throtl_rb_first()
  blk-throttle: Move the list operation after list validation
  blk-throttle: Fix IO hang for a corner case
  blk-throttle: Avoid tracking latency if low limit is invalid
  blk-throttle: Avoid getting the current time if tg->last_finish_time is 0
  blk-throttle: Remove a meaningless parameter for throtl_downgrade_state()
  block: Remove redundant 'return' statement
  ...
parents 857d6448 8858e8d9

Documentation/filesystems/locking.rst

+0 −3
Original line number Diff line number Diff line
@@ -488,9 +488,6 @@ getgeo: no 
swap_slot_free_notify:	no	(see below)

======================= ===================



unlock_native_capacity and revalidate_disk are called only from

check_disk_change().



swap_slot_free_notify is called with swap_lock and sometimes the page lock

held.

Documentation/userspace-api/ioctl/hdio.rst

+12 −12
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ HDIO_SET_UNMASKINTR 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 1]

	  - EBUSY	Controller busy
@@ -231,7 +231,7 @@ HDIO_SET_MULTCOUNT 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range supported by disk.

	  - EBUSY	Controller busy or blockmode already set.
@@ -295,7 +295,7 @@ HDIO_GET_IDENTITY 
		the ATA specification.



	error returns:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - ENOMSG	IDENTIFY DEVICE information not available



	notes:
@@ -355,7 +355,7 @@ HDIO_SET_KEEPSETTINGS 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 1]

	  - EBUSY		Controller busy
@@ -1055,7 +1055,7 @@ HDIO_SET_32BIT 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 3]

	  - EBUSY	Controller busy
@@ -1085,7 +1085,7 @@ HDIO_SET_NOWERR 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 1]

	  - EBUSY		Controller busy
@@ -1113,7 +1113,7 @@ HDIO_SET_DMA 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 1]

	  - EBUSY	Controller busy
@@ -1141,7 +1141,7 @@ HDIO_SET_PIO_MODE 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 255]

	  - EBUSY	Controller busy
@@ -1237,7 +1237,7 @@ HDIO_SET_WCACHE 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 1]

	  - EBUSY	Controller busy
@@ -1265,7 +1265,7 @@ HDIO_SET_ACOUSTIC 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 254]

	  - EBUSY	Controller busy
@@ -1305,7 +1305,7 @@ HDIO_SET_ADDRESS 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 2]

	  - EBUSY		Controller busy
@@ -1331,7 +1331,7 @@ HDIO_SET_IDE_SCSI 




	error return:

	  - EINVAL	(bdev != bdev->bd_contains) (not sure what this means)

	  - EINVAL	Called on a partition instead of the whole disk device

	  - EACCES	Access denied:  requires CAP_SYS_ADMIN

	  - EINVAL	value out of range [0 1]

	  - EBUSY	Controller busy

block/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ config BLK_WBT_MQ 
	depends on BLK_WBT

	help

	Enable writeback throttling by default on multiqueue devices.

	Multiqueue currently doesn't have support for IO scheduling,

	enabling this option is recommended.



config BLK_DEBUG_FS

	bool "Block layer debugging information in debugfs"

block/bfq-iosched.c

+7 −2
Original line number Diff line number Diff line
@@ -4640,6 +4640,9 @@ static bool bfq_has_work(struct blk_mq_hw_ctx *hctx) 
{

	struct bfq_data *bfqd = hctx->queue->elevator->elevator_data;



	if (!atomic_read(&hctx->elevator_queued))

		return false;



	/*

	 * Avoiding lock: a race on bfqd->busy_queues should cause at

	 * most a call to dispatch for nothing
@@ -5554,6 +5557,7 @@ static void bfq_insert_requests(struct blk_mq_hw_ctx *hctx, 
		rq = list_first_entry(list, struct request, queuelist);

		list_del_init(&rq->queuelist);

		bfq_insert_request(hctx, rq, at_head);

		atomic_inc(&hctx->elevator_queued);

	}

}
@@ -5921,6 +5925,7 @@ static void bfq_finish_requeue_request(struct request *rq) 


		bfq_completed_request(bfqq, bfqd);

		bfq_finish_requeue_request_body(bfqq);

		atomic_dec(&rq->mq_hctx->elevator_queued);



		spin_unlock_irqrestore(&bfqd->lock, flags);

	} else {
@@ -6360,8 +6365,8 @@ static void bfq_depth_updated(struct blk_mq_hw_ctx *hctx) 
	struct blk_mq_tags *tags = hctx->sched_tags;

	unsigned int min_shallow;



	min_shallow = bfq_update_depths(bfqd, &tags->bitmap_tags);

	sbitmap_queue_min_shallow_depth(&tags->bitmap_tags, min_shallow);

	min_shallow = bfq_update_depths(bfqd, tags->bitmap_tags);

	sbitmap_queue_min_shallow_depth(tags->bitmap_tags, min_shallow);

}



static int bfq_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int index)

block/bio.c

+9 −11
Original line number Diff line number Diff line
@@ -713,21 +713,19 @@ struct bio *bio_clone_fast(struct bio *bio, gfp_t gfp_mask, struct bio_set *bs) 


	__bio_clone_fast(b, bio);



	bio_crypt_clone(b, bio, gfp_mask);

	if (bio_crypt_clone(b, bio, gfp_mask) < 0)

		goto err_put;



	if (bio_integrity(bio)) {

		int ret;

	if (bio_integrity(bio) &&

	    bio_integrity_clone(b, bio, gfp_mask) < 0)

		goto err_put;



		ret = bio_integrity_clone(b, bio, gfp_mask);

	return b;



		if (ret < 0) {

err_put:

	bio_put(b);

	return NULL;

}

	}



	return b;

}

EXPORT_SYMBOL(bio_clone_fast);



const char *bio_devname(struct bio *bio, char *buf)

CRA Git | Maintained and supported by SUSTech CRA and CCSE