Commit 6bbc0c64 authored by Ming Lei's avatar Ming Lei Committed by Zheng Qixing
Browse files

scsi: blk-mq: Add callbacks for storing & retrieving budget token 

mainline inclusion
from mainline-v5.13-rc1
commit d022d18c
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=d022d18c045fc2ccf92d0f14cf80f98eb0a8e119

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

Since SCSI is the only driver which requires dispatch budget move the token
from struct request to struct scsi_cmnd.

Link: https://lore.kernel.org/r/20210122023317.687987-8-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>
Cc: Hannes Reinecke <hare@suse.de>
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>
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent f4679647

drivers/scsi/scsi_lib.c

+18 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,20 @@ static bool scsi_mq_get_budget(struct request_queue *q) 
	return false;

}



static void scsi_mq_set_rq_budget_token(struct request *req, int token)

{

	struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(req);



	cmd->budget_token = token;

}



static int scsi_mq_get_rq_budget_token(struct request *req)

{

	struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(req);



	return cmd->budget_token;

}



static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,

			 const struct blk_mq_queue_data *bd)

{
@@ -1854,6 +1868,8 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit = { 
	.cleanup_rq	= scsi_cleanup_rq,

	.busy		= scsi_mq_lld_busy,

	.map_queues	= scsi_map_queues,

	.set_rq_budget_token = scsi_mq_set_rq_budget_token,

	.get_rq_budget_token = scsi_mq_get_rq_budget_token,

};
@@ -1882,6 +1898,8 @@ static const struct blk_mq_ops scsi_mq_ops = { 
	.cleanup_rq	= scsi_cleanup_rq,

	.busy		= scsi_mq_lld_busy,

	.map_queues	= scsi_map_queues,

	.set_rq_budget_token = scsi_mq_set_rq_budget_token,

	.get_rq_budget_token = scsi_mq_get_rq_budget_token,

};



struct request_queue *scsi_mq_alloc_queue(struct scsi_device *sdev)

include/linux/blk-mq.h

+9 −0
Original line number Diff line number Diff line
@@ -340,6 +340,15 @@ struct blk_mq_ops { 
	 */

	void (*put_budget)(struct request_queue *);



	/*

	 * @set_rq_budget_toekn: store rq's budget token

	 */

	void (*set_rq_budget_token)(struct request *, int);

	/*

	 * @get_rq_budget_toekn: retrieve rq's budget token

	 */

	int (*get_rq_budget_token)(struct request *);



	/**

	 * @timeout: Called on request timeout.

	 */

include/scsi/scsi_cmnd.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ struct scsi_cmnd { 


	int eh_eflags;		/* Used by error handlr */



	int budget_token;



	/*

	 * This is set to jiffies as it was when the command was first

	 * allocated.  It is used to time how long the command has