Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e959dd8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.4/post-2019-09-24' of git://git.kernel.dk/linux-block 

Pull more block updates from Jens Axboe:
 "Some later additions that weren't quite done for the first pull
  request, and also a few fixes that have arrived since.

  This contains:

   - Kill silly pktcdvd warning on attempting to register a non-scsi
     passthrough device (me)

   - Use symbolic constants for the block t10 protection types, and
     switch to handling it in core rather than in the drivers (Max)

   - libahci platform missing node put fix (Nishka)

   - Small series of fixes for BFQ (Paolo)

   - Fix possible nbd crash (Xiubo)"

* tag 'for-5.4/post-2019-09-24' of git://git.kernel.dk/linux-block:
  block: drop device references in bsg_queue_rq()
  block: t10-pi: fix -Wswitch warning
  pktcdvd: remove warning on attempting to register non-passthrough dev
  ata: libahci_platform: Add of_node_put() before loop exit
  nbd: fix possible page fault for nbd disk
  nbd: rename the runtime flags as NBD_RT_ prefixed
  block, bfq: push up injection only after setting service time
  block, bfq: increase update frequency of inject limit
  block, bfq: reduce upper bound for inject limit to max_rq_in_driver+1
  block, bfq: update inject limit only after injection occurred
  block: centralize PI remapping logic to the block layer
  block: use symbolic constants for t10_pi type
parents 9c9fa97a d46fe2cb

block/bfq-iosched.c

+26 −9
Original line number Diff line number Diff line
@@ -2016,7 +2016,7 @@ static void bfq_add_request(struct request *rq) 
		     (bfqq->last_serv_time_ns > 0 &&

		      bfqd->rqs_injected && bfqd->rq_in_driver > 0)) &&

		    time_is_before_eq_jiffies(bfqq->decrease_time_jif +

					      msecs_to_jiffies(100))) {

					      msecs_to_jiffies(10))) {

			bfqd->last_empty_occupied_ns = ktime_get_ns();

			/*

			 * Start the state machine for measuring the
@@ -2025,6 +2025,20 @@ static void bfq_add_request(struct request *rq) 
			 * be set when rq will be dispatched.

			 */

			bfqd->wait_dispatch = true;

			/*

			 * If there is no I/O in service in the drive,

			 * then possible injection occurred before the

			 * arrival of rq will not affect the total

			 * service time of rq. So the injection limit

			 * must not be updated as a function of such

			 * total service time, unless new injection

			 * occurs before rq is completed. To have the

			 * injection limit updated only in the latter

			 * case, reset rqs_injected here (rqs_injected

			 * will be set in case injection is performed

			 * on bfqq before rq is completed).

			 */

			if (bfqd->rq_in_driver == 0)

				bfqd->rqs_injected = false;

		}

	}
@@ -5784,14 +5798,14 @@ static void bfq_update_inject_limit(struct bfq_data *bfqd, 
	u64 tot_time_ns = ktime_get_ns() - bfqd->last_empty_occupied_ns;

	unsigned int old_limit = bfqq->inject_limit;



	if (bfqq->last_serv_time_ns > 0) {

	if (bfqq->last_serv_time_ns > 0 && bfqd->rqs_injected) {

		u64 threshold = (bfqq->last_serv_time_ns * 3)>>1;



		if (tot_time_ns >= threshold && old_limit > 0) {

			bfqq->inject_limit--;

			bfqq->decrease_time_jif = jiffies;

		} else if (tot_time_ns < threshold &&

			   old_limit < bfqd->max_rq_in_driver<<1)

			   old_limit <= bfqd->max_rq_in_driver)

			bfqq->inject_limit++;

	}
@@ -5809,12 +5823,14 @@ static void bfq_update_inject_limit(struct bfq_data *bfqd, 
	 */

	if ((bfqq->last_serv_time_ns == 0 && bfqd->rq_in_driver == 1) ||

	    tot_time_ns < bfqq->last_serv_time_ns) {

		bfqq->last_serv_time_ns = tot_time_ns;

		if (bfqq->last_serv_time_ns == 0) {

			/*

			 * Now we certainly have a base value: make sure we

			 * start trying injection.

			 */

			bfqq->inject_limit = max_t(unsigned int, 1, old_limit);

		}

		bfqq->last_serv_time_ns = tot_time_ns;

	} else if (!bfqd->rqs_injected && bfqd->rq_in_driver == 1)

		/*

		 * No I/O injected and no request still in service in
@@ -5830,6 +5846,7 @@ static void bfq_update_inject_limit(struct bfq_data *bfqd, 


	/* update complete, not waiting for any request completion any longer */

	bfqd->waited_rq = NULL;

	bfqd->rqs_injected = false;

}



/*

block/blk-core.c

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/ratelimit.h>

#include <linux/pm_runtime.h>

#include <linux/blk-cgroup.h>

#include <linux/t10-pi.h>

#include <linux/debugfs.h>

#include <linux/bpf.h>

#include <linux/psi.h>
@@ -1436,6 +1437,12 @@ bool blk_update_request(struct request *req, blk_status_t error, 
	if (!req->bio)

		return false;



#ifdef CONFIG_BLK_DEV_INTEGRITY

	if (blk_integrity_rq(req) && req_op(req) == REQ_OP_READ &&

	    error == BLK_STS_OK)

		req->q->integrity.profile->complete_fn(req, nr_bytes);

#endif



	if (unlikely(error && !blk_rq_is_passthrough(req) &&

		     !(req->rq_flags & RQF_QUIET)))

		print_req_error(req, error, __func__);

block/blk-integrity.c

+11 −0
Original line number Diff line number Diff line
@@ -368,10 +368,21 @@ static blk_status_t blk_integrity_nop_fn(struct blk_integrity_iter *iter) 
	return BLK_STS_OK;

}



static void blk_integrity_nop_prepare(struct request *rq)

{

}



static void blk_integrity_nop_complete(struct request *rq,

		unsigned int nr_bytes)

{

}



static const struct blk_integrity_profile nop_profile = {

	.name = "nop",

	.generate_fn = blk_integrity_nop_fn,

	.verify_fn = blk_integrity_nop_fn,

	.prepare_fn = blk_integrity_nop_prepare,

	.complete_fn = blk_integrity_nop_complete,

};



/**

block/blk-mq.c

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <trace/events/block.h>



#include <linux/blk-mq.h>

#include <linux/t10-pi.h>

#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-debugfs.h"
@@ -700,6 +701,11 @@ void blk_mq_start_request(struct request *rq) 
		 */

		rq->nr_phys_segments++;

	}



#ifdef CONFIG_BLK_DEV_INTEGRITY

	if (blk_integrity_rq(rq) && req_op(rq) == REQ_OP_WRITE)

		q->integrity.profile->prepare_fn(rq);

#endif

}

EXPORT_SYMBOL(blk_mq_start_request);

block/bsg-lib.c

+6 −4
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx, 
	struct request *req = bd->rq;

	struct bsg_set *bset =

		container_of(q->tag_set, struct bsg_set, tag_set);

	int sts = BLK_STS_IOERR;

	int ret;



	blk_mq_start_request(req);
@@ -274,14 +275,15 @@ static blk_status_t bsg_queue_rq(struct blk_mq_hw_ctx *hctx, 
		return BLK_STS_IOERR;



	if (!bsg_prepare_job(dev, req))

		return BLK_STS_IOERR;

		goto out;



	ret = bset->job_fn(blk_mq_rq_to_pdu(req));

	if (ret)

		return BLK_STS_IOERR;

	if (!ret)

		sts = BLK_STS_OK;



out:

	put_device(dev);

	return BLK_STS_OK;

	return sts;

}



/* called right after the request is allocated for the request_queue */