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

Commit 291d0e5d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'for-linus-20180929' of git://git.kernel.dk/linux-block 

Jens writes:
  "Block fixes for 4.19-rc6

   A set of fixes that should go into this release. This pull request
   contains:

   - A fix (hopefully) for the persistent grants for xen-blkfront. A
     previous fix from this series wasn't complete, hence reverted, and
     this one should hopefully be it. (Boris Ostrovsky)

   - Fix for an elevator drain warning with SMR devices, which is
     triggered when you switch schedulers (Damien)

   - bcache deadlock fix (Guoju Fang)

   - Fix for the block unplug tracepoint, which has had the
     timer/explicit flag reverted since 4.11 (Ilya)

   - Fix a regression in this series where the blk-mq timeout hook is
     invoked with the RCU read lock held, hence preventing it from
     blocking (Keith)

   - NVMe pull from Christoph, with a single multipath fix (Susobhan Dey)"

* tag 'for-linus-20180929' of git://git.kernel.dk/linux-block:
  xen/blkfront: correct purging of persistent grants
  Revert "xen/blkfront: When purging persistent grants, keep them in the buffer"
  blk-mq: I/O and timer unplugs are inverted in blktrace
  bcache: add separate workqueue for journal_write to avoid deadlock
  xen/blkfront: When purging persistent grants, keep them in the buffer
  block: fix deadline elevator drain for zoned block devices
  blk-mq: Allow blocking queue tag iter callbacks
  nvme: properly propagate errors in nvme_mpath_init
parents e7541773 133424a2

block/blk-mq-tag.c

+4 −9
Original line number Diff line number Diff line
@@ -322,16 +322,11 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, 


	/*

	 * __blk_mq_update_nr_hw_queues will update the nr_hw_queues and

	 * queue_hw_ctx after freeze the queue. So we could use q_usage_counter

	 * to avoid race with it. __blk_mq_update_nr_hw_queues will users

	 * synchronize_rcu to ensure all of the users go out of the critical

	 * section below and see zeroed q_usage_counter.

	 * queue_hw_ctx after freeze the queue, so we use q_usage_counter

	 * to avoid race with it.

	 */

	rcu_read_lock();

	if (percpu_ref_is_zero(&q->q_usage_counter)) {

		rcu_read_unlock();

	if (!percpu_ref_tryget(&q->q_usage_counter))

		return;

	}



	queue_for_each_hw_ctx(q, hctx, i) {

		struct blk_mq_tags *tags = hctx->tags;
@@ -347,7 +342,7 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, 
			bt_for_each(hctx, &tags->breserved_tags, fn, priv, true);

		bt_for_each(hctx, &tags->bitmap_tags, fn, priv, false);

	}

	rcu_read_unlock();

	blk_queue_exit(q);

}



static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth,

block/blk-mq.c

+2 −2
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule) 
		BUG_ON(!rq->q);

		if (rq->mq_ctx != this_ctx) {

			if (this_ctx) {

				trace_block_unplug(this_q, depth, from_schedule);

				trace_block_unplug(this_q, depth, !from_schedule);

				blk_mq_sched_insert_requests(this_q, this_ctx,

								&ctx_list,

								from_schedule);
@@ -1648,7 +1648,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule) 
	 * on 'ctx_list'. Do those.

	 */

	if (this_ctx) {

		trace_block_unplug(this_q, depth, from_schedule);

		trace_block_unplug(this_q, depth, !from_schedule);

		blk_mq_sched_insert_requests(this_q, this_ctx, &ctx_list,

						from_schedule);

	}

block/elevator.c

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ void elv_drain_elevator(struct request_queue *q) 


	while (e->type->ops.sq.elevator_dispatch_fn(q, 1))

		;

	if (q->nr_sorted && printed++ < 10) {

	if (q->nr_sorted && !blk_queue_is_zoned(q) && printed++ < 10 ) {

		printk(KERN_ERR "%s: forced dispatching is broken "

		       "(nr_sorted=%u), please report this\n",

		       q->elevator->type->elevator_name, q->nr_sorted);

drivers/block/xen-blkfront.c

+2 −2
Original line number Diff line number Diff line
@@ -2670,8 +2670,8 @@ static void purge_persistent_grants(struct blkfront_info *info) 
			list_del(&gnt_list_entry->node);

			gnttab_end_foreign_access(gnt_list_entry->gref, 0, 0UL);

			rinfo->persistent_gnts_c--;

			__free_page(gnt_list_entry->page);

			kfree(gnt_list_entry);

			gnt_list_entry->gref = GRANT_INVALID_REF;

			list_add_tail(&gnt_list_entry->node, &rinfo->grants);

		}



		spin_unlock_irqrestore(&rinfo->ring_lock, flags);

drivers/md/bcache/bcache.h

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ void bch_prio_write(struct cache *ca); 
void bch_write_bdev_super(struct cached_dev *dc, struct closure *parent);



extern struct workqueue_struct *bcache_wq;

extern struct workqueue_struct *bch_journal_wq;

extern struct mutex bch_register_lock;

extern struct list_head bch_cache_sets;