Commit d72cd4ad authored Apr 28, 2021 by Linus Torvalds

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This consists of the usual driver updates (ufs, target, tcmu,
  smartpqi, lpfc, zfcp, qla2xxx, mpt3sas, pm80xx).

  The major core change is using a sbitmap instead of an atomic for
  queue tracking"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (412 commits)
  scsi: target: tcm_fc: Fix a kernel-doc header
  scsi: target: Shorten ALUA error messages
  scsi: target: Fix two format specifiers
  scsi: target: Compare explicitly with SAM_STAT_GOOD
  scsi: sd: Introduce a new local variable in sd_check_events()
  scsi: dc395x: Open-code status_byte(u8) calls
  scsi: 53c700: Open-code status_byte(u8) calls
  scsi: smartpqi: Remove unused functions
  scsi: qla4xxx: Remove an unused function
  scsi: myrs: Remove unused functions
  scsi: myrb: Remove unused functions
  scsi: mpt3sas: Fix two kernel-doc headers
  scsi: fcoe: Suppress a compiler warning
  scsi: libfc: Fix a format specifier
  scsi: aacraid: Remove an unused function
  scsi: core: Introduce enum scsi_disposition
  scsi: core: Modify the scsi_send_eh_cmnd() return value for the SDEV_BLOCK case
  scsi: core: Rename scsi_softirq_done() into scsi_complete()
  scsi: core: Remove an incorrect comment
  scsi: core: Make the scsi_alloc_sgtables() documentation more accurate
  ...

parents 238da4d0 7a3beeae

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@ Required properties:
		"qcom,msm8998-ufshc", "qcom,ufshc", "jedec,ufs-2.0"
		"qcom,sdm845-ufshc", "qcom,ufshc", "jedec,ufs-2.0"
		"qcom,sm8150-ufshc", "qcom,ufshc", "jedec,ufs-2.0"
		"qcom,sm8250-ufshc", "qcom,ufshc", "jedec,ufs-2.0"
		"qcom,sm8350-ufshc", "qcom,ufshc", "jedec,ufs-2.0"
		- interrupts : <interrupt mapping for UFS host controller IRQ>
		- reg : <registers mapping>

block/blk-mq-sched.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -132,6 +132,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;
		@@ -141,12 +142,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
		@@ -158,6 +160,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()
		@@ -231,6 +235,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;
		@@ -239,12 +245,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
		@@ -256,6 +263,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

+26 −12

Original line number	Diff line number	Diff line
		@@ -1278,11 +1278,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)) {
		/*
		@@ -1298,7 +1303,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;
		}
		}
		@@ -1308,12 +1313,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);
		}
		}

		/*
		@@ -1411,7 +1420,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);
		bool no_budget_avail = prep == PREP_DISPATCH_NO_BUDGET;

		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);
		@@ -2011,6 +2021,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.
		@@ -2028,11 +2039,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;
		}

		@@ -2704,7 +2718,7 @@ blk_mq_alloc_hctx(struct request_queue q, struct blk_mq_tag_set set,
		goto free_cpumask;

		if (sbitmap_init_node(&hctx->ctx_map, nr_cpu_ids, ilog2(8),
		gfp, node))
		gfp, node, false, false))
		goto free_ctxs;
		hctx->nr_ctx = 0;

block/blk-mq.h

+21 −4

Original line number	Diff line number	Diff line
		@@ -187,17 +187,34 @@ unsigned int blk_mq_in_flight(struct request_queue *q,
		void blk_mq_in_flight_rw(struct request_queue q, struct block_device part,
		unsigned int inflight[2]);

		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)

block/kyber-iosched.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,8 @@ static int kyber_init_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx)

		for (i = 0; i < KYBER_NUM_DOMAINS; i++) {
		if (sbitmap_init_node(&khd->kcq_map[i], hctx->nr_ctx,
		ilog2(8), GFP_KERNEL, hctx->numa_node)) {
		ilog2(8), GFP_KERNEL, hctx->numa_node,
		false, false)) {
		while (--i >= 0)
		sbitmap_free(&khd->kcq_map[i]);
		goto err_kcqs;