Commit 2b9574d1 authored by Ming Lei's avatar Ming Lei Committed by Zheng Qixing
Browse files

scsi: blk-mq: Return budget token from .get_budget callback 

mainline inclusion
from mainline-v5.13-rc1
commit 2a5a24aa
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB4C27

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2a5a24aa83382a88c43d18a901fab66e6ffe1199

-------------------------------------------

SCSI uses a global atomic variable to track queue depth for each
LUN/request queue.

This doesn't scale well when there are lots of CPU cores and the disk is
very fast. It has been observed that IOPS is affected a lot by tracking
queue depth via sdev->device_busy in the I/O path.

Return budget token from .get_budget callback. The budget token can be
passed to driver so that we can replace the atomic variable with
sbitmap_queue and alleviate the scaling problems that way.

Link: https://lore.kernel.org/r/20210122023317.687987-9-ming.lei@redhat.com


Cc: Omar Sandoval <osandov@fb.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Sumanesh Samanta <sumanesh.samanta@broadcom.com>
Cc: Ewan D. Milne <emilne@redhat.com>
Tested-by: default avatarSumanesh Samanta <sumanesh.samanta@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Conflicts:
          block/blk-mq.c
[The conflict here is due to inconsistencies in the context caused by
65267b13 ("blk-mq: Fix potential io hung for shared sbitmap per
tagset").]
          block/blk-mq.h
[The conflict here is due to inconsistencies in the context caused by
badcb143 ("block: update nsecs[] in part_") and 2ed9d17c ("block
: don't use cmpxchg64() on").]
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent 6bbc0c64

block/blk-mq-sched.c

+13 −4
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static int __blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) 


	do {

		struct request *rq;

		int budget_token;



		if (e->type->ops.has_work && !e->type->ops.has_work(hctx))

			break;
@@ -140,12 +141,13 @@ static int __blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) 
			break;

		}



		if (!blk_mq_get_dispatch_budget(q))

		budget_token = blk_mq_get_dispatch_budget(q);

		if (budget_token < 0)

			break;



		rq = e->type->ops.dispatch_request(hctx);

		if (!rq) {

			blk_mq_put_dispatch_budget(q);

			blk_mq_put_dispatch_budget(q, budget_token);

			/*

			 * We're releasing without dispatching. Holding the

			 * budget could have blocked any "hctx"s with the
@@ -157,6 +159,8 @@ static int __blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) 
			break;

		}



		blk_mq_set_rq_budget_token(rq, budget_token);



		/*

		 * Now this rq owns the budget which has to be released

		 * if this rq won't be queued to driver via .queue_rq()
@@ -237,6 +241,8 @@ static int blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx) 
	struct request *rq;



	do {

		int budget_token;



		if (!list_empty_careful(&hctx->dispatch)) {

			ret = -EAGAIN;

			break;
@@ -245,12 +251,13 @@ static int blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx) 
		if (!sbitmap_any_bit_set(&hctx->ctx_map))

			break;



		if (!blk_mq_get_dispatch_budget(q))

		budget_token = blk_mq_get_dispatch_budget(q);

		if (budget_token < 0)

			break;



		rq = blk_mq_dequeue_from_ctx(hctx, ctx);

		if (!rq) {

			blk_mq_put_dispatch_budget(q);

			blk_mq_put_dispatch_budget(q, budget_token);

			/*

			 * We're releasing without dispatching. Holding the

			 * budget could have blocked any "hctx"s with the
@@ -262,6 +269,8 @@ static int blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx) 
			break;

		}



		blk_mq_set_rq_budget_token(rq, budget_token);



		/*

		 * Now this rq owns the budget which has to be released

		 * if this rq won't be queued to driver via .queue_rq()

block/blk-mq.c

+25 −11
Original line number Diff line number Diff line
@@ -1391,11 +1391,16 @@ static enum prep_dispatch blk_mq_prep_dispatch_rq(struct request *rq, 
						  bool need_budget)

{

	struct blk_mq_hw_ctx *hctx = rq->mq_hctx;

	int budget_token = -1;



	if (need_budget && !blk_mq_get_dispatch_budget(rq->q)) {

	if (need_budget) {

		budget_token = blk_mq_get_dispatch_budget(rq->q);

		if (budget_token < 0) {

			blk_mq_put_driver_tag(rq);

			return PREP_DISPATCH_NO_BUDGET;

		}

		blk_mq_set_rq_budget_token(rq, budget_token);

	}



	if (!blk_mq_get_driver_tag(rq)) {

		/*
@@ -1411,7 +1416,7 @@ static enum prep_dispatch blk_mq_prep_dispatch_rq(struct request *rq, 
			 * together during handling partial dispatch

			 */

			if (need_budget)

				blk_mq_put_dispatch_budget(rq->q);

				blk_mq_put_dispatch_budget(rq->q, budget_token);

			return PREP_DISPATCH_NO_TAG;

		}

	}
@@ -1421,12 +1426,16 @@ static enum prep_dispatch blk_mq_prep_dispatch_rq(struct request *rq, 


/* release all allocated budgets before calling to blk_mq_dispatch_rq_list */

static void blk_mq_release_budgets(struct request_queue *q,

		unsigned int nr_budgets)

		struct list_head *list)

{

	int i;

	struct request *rq;



	for (i = 0; i < nr_budgets; i++)

		blk_mq_put_dispatch_budget(q);

	list_for_each_entry(rq, list, queuelist) {

		int budget_token = blk_mq_get_rq_budget_token(rq);



		if (budget_token >= 0)

			blk_mq_put_dispatch_budget(q, budget_token);

	}

}



/*
@@ -1529,7 +1538,8 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list, 
			((hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED) ||

			blk_mq_is_sbitmap_shared(hctx->flags));



		blk_mq_release_budgets(q, nr_budgets);

		if (nr_budgets)

			blk_mq_release_budgets(q, list);



		spin_lock(&hctx->lock);

		list_splice_tail_init(list, &hctx->dispatch);
@@ -2179,6 +2189,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, 
{

	struct request_queue *q = rq->q;

	bool run_queue = true;

	int budget_token;



	/*

	 * RCU or SRCU read lock is needed before checking quiesced flag.
@@ -2196,11 +2207,14 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, 
	if (q->elevator && !bypass_insert)

		goto insert;



	if (!blk_mq_get_dispatch_budget(q))

	budget_token = blk_mq_get_dispatch_budget(q);

	if (budget_token < 0)

		goto insert;



	blk_mq_set_rq_budget_token(rq, budget_token);



	if (!blk_mq_get_driver_tag(rq)) {

		blk_mq_put_dispatch_budget(q);

		blk_mq_put_dispatch_budget(q, budget_token);

		goto insert;

	}

block/blk-mq.h

+21 −4
Original line number Diff line number Diff line
@@ -203,17 +203,34 @@ unsigned int blk_mq_in_flight_with_stat(struct request_queue *q, 
					struct hd_struct *part);

#endif



static inline void blk_mq_put_dispatch_budget(struct request_queue *q)

static inline void blk_mq_put_dispatch_budget(struct request_queue *q,

					      int budget_token)

{

	if (q->mq_ops->put_budget)

		q->mq_ops->put_budget(q);

		q->mq_ops->put_budget(q, budget_token);

}



static inline bool blk_mq_get_dispatch_budget(struct request_queue *q)

static inline int blk_mq_get_dispatch_budget(struct request_queue *q)

{

	if (q->mq_ops->get_budget)

		return q->mq_ops->get_budget(q);

	return true;

	return 0;

}



static inline void blk_mq_set_rq_budget_token(struct request *rq, int token)

{

	if (token < 0)

		return;



	if (rq->q->mq_ops->set_rq_budget_token)

		rq->q->mq_ops->set_rq_budget_token(rq, token);

}



static inline int blk_mq_get_rq_budget_token(struct request *rq)

{

	if (rq->q->mq_ops->get_rq_budget_token)

		return rq->q->mq_ops->get_rq_budget_token(rq);

	return -1;

}



static inline void __blk_mq_inc_active_requests(struct blk_mq_hw_ctx *hctx)

drivers/scsi/scsi_lib.c

+11 −5
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ void scsi_device_unbusy(struct scsi_device *sdev, struct scsi_cmnd *cmd) 
		atomic_dec(&starget->target_busy);



	atomic_dec(&sdev->device_busy);

	cmd->budget_token = -1;

}



static void scsi_kick_queue(struct request_queue *q)
@@ -1145,6 +1146,7 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) 
	unsigned long jiffies_at_alloc;

	int retries, to_clear;

	bool in_flight;

	int budget_token = cmd->budget_token;



	if (!blk_rq_is_scsi(rq) && !(flags & SCMD_INITIALIZED)) {

		flags |= SCMD_INITIALIZED;
@@ -1174,6 +1176,7 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd) 
	cmd->retries = retries;

	if (in_flight)

		__set_bit(SCMD_STATE_INFLIGHT, &cmd->state);

	cmd->budget_token = budget_token;



}
@@ -1608,19 +1611,19 @@ static void scsi_mq_done(struct scsi_cmnd *cmd) 
	blk_mq_complete_request(cmd->request);

}



static void scsi_mq_put_budget(struct request_queue *q)

static void scsi_mq_put_budget(struct request_queue *q, int budget_token)

{

	struct scsi_device *sdev = q->queuedata;



	atomic_dec(&sdev->device_busy);

}



static bool scsi_mq_get_budget(struct request_queue *q)

static int scsi_mq_get_budget(struct request_queue *q)

{

	struct scsi_device *sdev = q->queuedata;



	if (scsi_dev_queue_ready(q, sdev))

		return true;

		return 0;



	atomic_inc(&sdev->restarts);
@@ -1642,7 +1645,7 @@ static bool scsi_mq_get_budget(struct request_queue *q) 
	if (unlikely(atomic_read(&sdev->device_busy) == 0 &&

				!scsi_device_blocked(sdev)))

		blk_mq_delay_run_hw_queues(sdev->request_queue, SCSI_QUEUE_DELAY);

	return false;

	return -1;

}



static void scsi_mq_set_rq_budget_token(struct request *req, int token)
@@ -1670,6 +1673,8 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, 
	blk_status_t ret;

	int reason;



	WARN_ON_ONCE(cmd->budget_token < 0);



	/*

	 * If the device is not in running state we will reject some or all

	 * commands.
@@ -1721,7 +1726,8 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, 
	if (scsi_target(sdev)->can_queue > 0)

		atomic_dec(&scsi_target(sdev)->target_busy);

out_put_budget:

	scsi_mq_put_budget(q);

	scsi_mq_put_budget(q, cmd->budget_token);

	cmd->budget_token = -1;

	switch (ret) {

	case BLK_STS_OK:

		break;

include/linux/blk-mq.h

+2 −2
Original line number Diff line number Diff line
@@ -333,12 +333,12 @@ struct blk_mq_ops { 
	 * reserved budget. Also we have to handle failure case

	 * of .get_budget for avoiding I/O deadlock.

	 */

	bool (*get_budget)(struct request_queue *);

	int (*get_budget)(struct request_queue *);



	/**

	 * @put_budget: Release the reserved budget.

	 */

	void (*put_budget)(struct request_queue *);

	void (*put_budget)(struct request_queue *, int);



	/*

	 * @set_rq_budget_toekn: store rq's budget token