Commit e0d07225 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block layer fixes from Jens Axboe:
 "A collection of fixes for this merge window, either fixes for existing
  issues, or parts that were waiting for acks to come in. This pull
  request contains:

   - Allocation of nvme queues on the right node from Shaohua.

     This was ready long before the merge window, but waiting on an ack
     from Bjorn on the PCI bit. Now that we have that, the three patches
     can go in.

   - Two fixes for blk-mq-sched with nvmeof, which uses hctx specific
     request allocations. This caused an oops. One part from Sagi, one
     part from Omar.

   - A loop partition scan deadlock fix from Omar, fixing a regression
     in this merge window.

   - A three-patch series from Keith, closing up a hole on clearing out
     requests on shutdown/resume.

   - A stable fix for nbd from Josef, fixing a leak of sockets.

   - Two fixes for a regression in this window from Jan, fixing a
     problem with one of his earlier patches dealing with queue vs bdi
     life times.

   - A fix for a regression with virtio-blk, causing an IO stall if
     scheduling is used. From me.

   - A fix for an io context lock ordering problem. From me"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: Move bdi_unregister() to del_gendisk()
  blk-mq: ensure that bd->last is always set correctly
  block: don't call ioc_exit_icq() with the queue lock held for blk-mq
  block: Initialize bd_bdi on inode initialization
  loop: fix LO_FLAGS_PARTSCAN hang
  nvme: Complete all stuck requests
  blk-mq: Provide freeze queue timeout
  blk-mq: Export blk_mq_freeze_queue_wait
  nbd: stop leaking sockets
  blk-mq: move update of tags->rqs to __blk_mq_alloc_request()
  blk-mq: kill blk_mq_set_alloc_data()
  blk-mq: make blk_mq_alloc_request_hctx() allocate a scheduler request
  blk-mq-sched: Allocate sched reserved tags as specified in the original queue tagset
  nvme: allocate nvme_queue in correct node
  PCI: add an API to get node from vector
  blk-mq: allocate blk_mq_tags and requests in correct node
parents 1827adb1 165a5e22

block/blk-core.c

+0 −1
Original line number Diff line number Diff line
@@ -578,7 +578,6 @@ void blk_cleanup_queue(struct request_queue *q) 
		q->queue_lock = &q->__queue_lock;

	spin_unlock_irq(lock);



	bdi_unregister(q->backing_dev_info);

	put_disk_devt(q->disk_devt);



	/* @q is and will stay empty, shutdown and put */

block/blk-ioc.c

+31 −13
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ static void icq_free_icq_rcu(struct rcu_head *head) 
}



/*

 * Exit an icq. Called with both ioc and q locked for sq, only ioc locked for

 * mq.

 * Exit an icq. Called with ioc locked for blk-mq, and with both ioc

 * and queue locked for legacy.

 */

static void ioc_exit_icq(struct io_cq *icq)

{
@@ -55,7 +55,10 @@ static void ioc_exit_icq(struct io_cq *icq) 
	icq->flags |= ICQ_EXITED;

}



/* Release an icq.  Called with both ioc and q locked. */

/*

 * Release an icq. Called with ioc locked for blk-mq, and with both ioc

 * and queue locked for legacy.

 */

static void ioc_destroy_icq(struct io_cq *icq)

{

	struct io_context *ioc = icq->ioc;
@@ -63,7 +66,6 @@ static void ioc_destroy_icq(struct io_cq *icq) 
	struct elevator_type *et = q->elevator->type;



	lockdep_assert_held(&ioc->lock);

	lockdep_assert_held(q->queue_lock);



	radix_tree_delete(&ioc->icq_tree, icq->q->id);

	hlist_del_init(&icq->ioc_node);
@@ -223,24 +225,40 @@ void exit_io_context(struct task_struct *task) 
	put_io_context_active(ioc);

}



static void __ioc_clear_queue(struct list_head *icq_list)

{

	unsigned long flags;



	while (!list_empty(icq_list)) {

		struct io_cq *icq = list_entry(icq_list->next,

					       struct io_cq, q_node);

		struct io_context *ioc = icq->ioc;



		spin_lock_irqsave(&ioc->lock, flags);

		ioc_destroy_icq(icq);

		spin_unlock_irqrestore(&ioc->lock, flags);

	}

}



/**

 * ioc_clear_queue - break any ioc association with the specified queue

 * @q: request_queue being cleared

 *

 * Walk @q->icq_list and exit all io_cq's.  Must be called with @q locked.

 * Walk @q->icq_list and exit all io_cq's.

 */

void ioc_clear_queue(struct request_queue *q)

{

	lockdep_assert_held(q->queue_lock);

	LIST_HEAD(icq_list);



	while (!list_empty(&q->icq_list)) {

		struct io_cq *icq = list_entry(q->icq_list.next,

					       struct io_cq, q_node);

		struct io_context *ioc = icq->ioc;

	spin_lock_irq(q->queue_lock);

	list_splice_init(&q->icq_list, &icq_list);



		spin_lock(&ioc->lock);

		ioc_destroy_icq(icq);

		spin_unlock(&ioc->lock);

	if (q->mq_ops) {

		spin_unlock_irq(q->queue_lock);

		__ioc_clear_queue(&icq_list);

	} else {

		__ioc_clear_queue(&icq_list);

		spin_unlock_irq(q->queue_lock);

	}

}

block/blk-mq-sched.c

+7 −9
Original line number Diff line number Diff line
@@ -110,15 +110,14 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, 
					 struct blk_mq_alloc_data *data)

{

	struct elevator_queue *e = q->elevator;

	struct blk_mq_hw_ctx *hctx;

	struct blk_mq_ctx *ctx;

	struct request *rq;



	blk_queue_enter_live(q);

	ctx = blk_mq_get_ctx(q);

	hctx = blk_mq_map_queue(q, ctx->cpu);



	blk_mq_set_alloc_data(data, q, data->flags, ctx, hctx);

	data->q = q;

	if (likely(!data->ctx))

		data->ctx = blk_mq_get_ctx(q);

	if (likely(!data->hctx))

		data->hctx = blk_mq_map_queue(q, data->ctx->cpu);



	if (e) {

		data->flags |= BLK_MQ_REQ_INTERNAL;
@@ -135,8 +134,6 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, 
			rq = __blk_mq_alloc_request(data, op);

	} else {

		rq = __blk_mq_alloc_request(data, op);

		if (rq)

			data->hctx->tags->rqs[rq->tag] = rq;

	}



	if (rq) {
@@ -454,7 +451,8 @@ int blk_mq_sched_setup(struct request_queue *q) 
	 */

	ret = 0;

	queue_for_each_hw_ctx(q, hctx, i) {

		hctx->sched_tags = blk_mq_alloc_rq_map(set, i, q->nr_requests, 0);

		hctx->sched_tags = blk_mq_alloc_rq_map(set, i,

				q->nr_requests, set->reserved_tags);

		if (!hctx->sched_tags) {

			ret = -ENOMEM;

			break;

block/blk-mq-tag.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ found_tag: 
void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, struct blk_mq_tags *tags,

		    struct blk_mq_ctx *ctx, unsigned int tag)

{

	if (tag >= tags->nr_reserved_tags) {

	if (!blk_mq_tag_is_reserved(tags, tag)) {

		const int real_tag = tag - tags->nr_reserved_tags;



		BUG_ON(real_tag >= tags->nr_tags);

block/blk-mq-tag.h

+6 −0
Original line number Diff line number Diff line
@@ -85,4 +85,10 @@ static inline void blk_mq_tag_set_rq(struct blk_mq_hw_ctx *hctx, 
	hctx->tags->rqs[tag] = rq;

}



static inline bool blk_mq_tag_is_reserved(struct blk_mq_tags *tags,

					  unsigned int tag)

{

	return tag < tags->nr_reserved_tags;

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE