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

Commit 0a4b6e2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.16/block' of git://git.kernel.dk/linux-block 

Pull block updates from Jens Axboe:
 "This is the main pull request for block IO related changes for the
  4.16 kernel. Nothing major in this pull request, but a good amount of
  improvements and fixes all over the map. This contains:

   - BFQ improvements, fixes, and cleanups from Angelo, Chiara, and
     Paolo.

   - Support for SMR zones for deadline and mq-deadline from Damien and
     Christoph.

   - Set of fixes for bcache by way of Michael Lyle, including fixes
     from himself, Kent, Rui, Tang, and Coly.

   - Series from Matias for lightnvm with fixes from Hans Holmberg,
     Javier, and Matias. Mostly centered around pblk, and the removing
     rrpc 1.2 in preparation for supporting 2.0.

   - A couple of NVMe pull requests from Christoph. Nothing major in
     here, just fixes and cleanups, and support for command tracing from
     Johannes.

   - Support for blk-throttle for tracking reads and writes separately.
     From Joseph Qi. A few cleanups/fixes also for blk-throttle from
     Weiping.

   - Series from Mike Snitzer that enables dm to register its queue more
     logically, something that's alwways been problematic on dm since
     it's a stacked device.

   - Series from Ming cleaning up some of the bio accessor use, in
     preparation for supporting multipage bvecs.

   - Various fixes from Ming closing up holes around queue mapping and
     quiescing.

   - BSD partition fix from Richard Narron, fixing a problem where we
     can't mount newer (10/11) FreeBSD partitions.

   - Series from Tejun reworking blk-mq timeout handling. The previous
     scheme relied on atomic bits, but it had races where we would think
     a request had timed out if it to reused at the wrong time.

   - null_blk now supports faking timeouts, to enable us to better
     exercise and test that functionality separately. From me.

   - Kill the separate atomic poll bit in the request struct. After
     this, we don't use the atomic bits on blk-mq anymore at all. From
     me.

   - sgl_alloc/free helpers from Bart.

   - Heavily contended tag case scalability improvement from me.

   - Various little fixes and cleanups from Arnd, Bart, Corentin,
     Douglas, Eryu, Goldwyn, and myself"

* 'for-4.16/block' of git://git.kernel.dk/linux-block: (186 commits)
  block: remove smart1,2.h
  nvme: add tracepoint for nvme_complete_rq
  nvme: add tracepoint for nvme_setup_cmd
  nvme-pci: introduce RECONNECTING state to mark initializing procedure
  nvme-rdma: remove redundant boolean for inline_data
  nvme: don't free uuid pointer before printing it
  nvme-pci: Suspend queues after deleting them
  bsg: use pr_debug instead of hand crafted macros
  blk-mq-debugfs: don't allow write on attributes with seq_operations set
  nvme-pci: Fix queue double allocations
  block: Set BIO_TRACE_COMPLETION on new bio during split
  blk-throttle: use queue_is_rq_based
  block: Remove kblockd_schedule_delayed_work{,_on}()
  blk-mq: Avoid that blk_mq_delay_run_hw_queue() introduces unintended delays
  blk-mq: Rename blk_mq_request_direct_issue() into blk_mq_request_issue_directly()
  lib/scatterlist: Fix chaining support in sgl_alloc_order()
  blk-throttle: track read and write request individually
  block: add bdev_read_only() checks to common helpers
  block: fail op_is_write() requests to read-only partitions
  blk-throttle: export io_serviced_recursive, io_service_bytes_recursive
  ...
parents 9697e9da 796baeee

block/bfq-cgroup.c

+5 −2
Original line number Diff line number Diff line
@@ -775,10 +775,11 @@ static void bfq_pd_offline(struct blkg_policy_data *pd) 
	unsigned long flags;

	int i;



	spin_lock_irqsave(&bfqd->lock, flags);



	if (!entity) /* root group */

		return;

		goto put_async_queues;



	spin_lock_irqsave(&bfqd->lock, flags);

	/*

	 * Empty all service_trees belonging to this group before

	 * deactivating the group itself.
@@ -809,6 +810,8 @@ static void bfq_pd_offline(struct blkg_policy_data *pd) 
	}



	__bfq_deactivate_entity(entity, false);



put_async_queues:

	bfq_put_async_queues(bfqd, bfqg);



	spin_unlock_irqrestore(&bfqd->lock, flags);

block/bfq-iosched.c

+374 −155

File changed.

Preview size limit exceeded, changes collapsed.

block/bfq-iosched.h

+19 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ struct bfq_queue { 
	 * last transition from idle to backlogged.

	 */

	unsigned long service_from_backlogged;

	/*

	 * Cumulative service received from the @bfq_queue since its

	 * last transition to weight-raised state.

	 */

	unsigned long service_from_wr;



	/*

	 * Value of wr start time when switching to soft rt
@@ -344,6 +349,8 @@ struct bfq_queue { 
	unsigned long wr_start_at_switch_to_srt;



	unsigned long split_time; /* time of last split */



	unsigned long first_IO_time; /* time of first I/O for this queue */

};



/**
@@ -627,6 +634,18 @@ struct bfq_data { 
	struct bfq_io_cq *bio_bic;

	/* bfqq associated with the task issuing current bio for merging */

	struct bfq_queue *bio_bfqq;



	/*

	 * Cached sbitmap shift, used to compute depth limits in

	 * bfq_update_depths.

	 */

	unsigned int sb_shift;



	/*

	 * Depth limits used in bfq_limit_depth (see comments on the

	 * function)

	 */

	unsigned int word_depths[2][2];

};



enum bfqq_state_flags {

block/bfq-wf2q.c

+7 −0
Original line number Diff line number Diff line
@@ -835,6 +835,13 @@ void bfq_bfqq_served(struct bfq_queue *bfqq, int served) 
	struct bfq_entity *entity = &bfqq->entity;

	struct bfq_service_tree *st;



	if (!bfqq->service_from_backlogged)

		bfqq->first_IO_time = jiffies;



	if (bfqq->wr_coeff > 1)

		bfqq->service_from_wr += served;



	bfqq->service_from_backlogged += served;

	for_each_entity(entity) {

		st = bfq_entity_service_tree(entity);

block/bio-integrity.c

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ static void bio_integrity_verify_fn(struct work_struct *work) 
/**

 * __bio_integrity_endio - Integrity I/O completion function

 * @bio:	Protected bio

 * @error:	Pointer to errno

 *

 * Description: Completion for integrity I/O

 *