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

Merge tag 'block-5.17-2022-01-21' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Various little minor fixes that should go into this release:

   - Fix issue with cloned bios and IO accounting (Christoph)

   - Remove redundant assignments (Colin, GuoYong)

   - Fix an issue with the mq-deadline async_depth sysfs interface (me)

   - Fix brd module loading race (Tetsuo)

   - Shared tag map wakeup fix (Laibin)

   - End of bdev read fix (OGAWA)

   - srcu leak fix (Ming)"

* tag 'block-5.17-2022-01-21' of git://git.kernel.dk/linux-block:
  block: fix async_depth sysfs interface for mq-deadline
  block: Fix wrong offset in bio_truncate()
  block: assign bi_bdev for cloned bios in blk_rq_prep_clone
  block: cleanup q->srcu
  block: Remove unnecessary variable assignment
  brd: remove brd_devices_mutex mutex
  aoe: remove redundant assignment on variable n
  loop: remove redundant initialization of pointer node
  blk-mq: fix tag_get wait task can't be awakened
parents f3a78227 46cdc45a

block/bio.c

+2 −1
Original line number Diff line number Diff line
@@ -569,7 +569,8 @@ static void bio_truncate(struct bio *bio, unsigned new_size) 
				offset = new_size - done;

			else

				offset = 0;

			zero_user(bv.bv_page, offset, bv.bv_len - offset);

			zero_user(bv.bv_page, bv.bv_offset + offset,

				  bv.bv_len - offset);

			truncated = true;

		}

		done += bv.bv_len;

block/blk-mq-tag.c

+33 −7
Original line number Diff line number Diff line
@@ -16,6 +16,21 @@ 
#include "blk-mq-sched.h"

#include "blk-mq-tag.h"



/*

 * Recalculate wakeup batch when tag is shared by hctx.

 */

static void blk_mq_update_wake_batch(struct blk_mq_tags *tags,

		unsigned int users)

{

	if (!users)

		return;



	sbitmap_queue_recalculate_wake_batch(&tags->bitmap_tags,

			users);

	sbitmap_queue_recalculate_wake_batch(&tags->breserved_tags,

			users);

}



/*

 * If a previously inactive queue goes active, bump the active user count.

 * We need to do this before try to allocate driver tag, then even if fail
@@ -24,18 +39,26 @@ 
 */

bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)

{

	unsigned int users;



	if (blk_mq_is_shared_tags(hctx->flags)) {

		struct request_queue *q = hctx->queue;



		if (!test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags) &&

		    !test_and_set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags))

			atomic_inc(&hctx->tags->active_queues);

		if (test_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags) ||

		    test_and_set_bit(QUEUE_FLAG_HCTX_ACTIVE, &q->queue_flags)) {

			return true;

		}

	} else {

		if (!test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) &&

		    !test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state))

			atomic_inc(&hctx->tags->active_queues);

		if (test_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state) ||

		    test_and_set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state)) {

			return true;

		}

	}



	users = atomic_inc_return(&hctx->tags->active_queues);



	blk_mq_update_wake_batch(hctx->tags, users);



	return true;

}
@@ -56,6 +79,7 @@ void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool include_reserve) 
void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)

{

	struct blk_mq_tags *tags = hctx->tags;

	unsigned int users;



	if (blk_mq_is_shared_tags(hctx->flags)) {

		struct request_queue *q = hctx->queue;
@@ -68,7 +92,9 @@ void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx) 
			return;

	}



	atomic_dec(&tags->active_queues);

	users = atomic_dec_return(&tags->active_queues);



	blk_mq_update_wake_batch(tags, users);



	blk_mq_tag_wakeup_all(tags, false);

}

block/blk-mq.c

+1 −0
Original line number Diff line number Diff line
@@ -2976,6 +2976,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, 
		bio = bio_clone_fast(bio_src, gfp_mask, bs);

		if (!bio)

			goto free_and_out;

		bio->bi_bdev = rq->q->disk->part0;



		if (bio_ctr && bio_ctr(bio, bio_src, data))

			goto free_and_out;

block/blk-sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -811,6 +811,9 @@ static void blk_release_queue(struct kobject *kobj) 


	bioset_exit(&q->bio_split);



	if (blk_queue_has_srcu(q))

		cleanup_srcu_struct(q->srcu);



	ida_simple_remove(&blk_queue_ida, q->id);

	call_rcu(&q->rcu_head, blk_free_queue_rcu);

}
@@ -887,7 +890,6 @@ int blk_register_queue(struct gendisk *disk) 
		kobject_uevent(&q->elevator->kobj, KOBJ_ADD);

	mutex_unlock(&q->sysfs_lock);



	ret = 0;

unlock:

	mutex_unlock(&q->sysfs_dir_lock);

block/mq-deadline.c

+2 −2
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ SHOW_JIFFIES(deadline_write_expire_show, dd->fifo_expire[DD_WRITE]); 
SHOW_JIFFIES(deadline_prio_aging_expire_show, dd->prio_aging_expire);

SHOW_INT(deadline_writes_starved_show, dd->writes_starved);

SHOW_INT(deadline_front_merges_show, dd->front_merges);

SHOW_INT(deadline_async_depth_show, dd->front_merges);

SHOW_INT(deadline_async_depth_show, dd->async_depth);

SHOW_INT(deadline_fifo_batch_show, dd->fifo_batch);

#undef SHOW_INT

#undef SHOW_JIFFIES
@@ -895,7 +895,7 @@ STORE_JIFFIES(deadline_write_expire_store, &dd->fifo_expire[DD_WRITE], 0, INT_MA 
STORE_JIFFIES(deadline_prio_aging_expire_store, &dd->prio_aging_expire, 0, INT_MAX);

STORE_INT(deadline_writes_starved_store, &dd->writes_starved, INT_MIN, INT_MAX);

STORE_INT(deadline_front_merges_store, &dd->front_merges, 0, 1);

STORE_INT(deadline_async_depth_store, &dd->front_merges, 1, INT_MAX);

STORE_INT(deadline_async_depth_store, &dd->async_depth, 1, INT_MAX);

STORE_INT(deadline_fifo_batch_store, &dd->fifo_batch, 0, INT_MAX);

#undef STORE_FUNCTION

#undef STORE_INT