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

Commit 044f1daa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes and updates from Jens Axboe:
 "Some fixes and followup features/changes that should go in, in this
  merge window. This contains:

   - Two fixes for lightnvm from Javier, fixing problems in the new code
     merge previously in this merge window.

   - A fix from Jan for the backing device changes, fixing an issue in
     NFS that causes a failure to mount on certain setups.

   - A change from Christoph, cleaning up the blk-mq init and exit
     request paths.

   - Remove elevator_change(), which is now unused. From Bart.

   - A fix for queue operation invocation on a dead queue, from Bart.

   - A series fixing up mtip32xx for blk-mq scheduling, removing a
     bandaid we previously had in place for this. From me.

   - A regression fix for this series, fixing a case where we wait on
     workqueue flushing from an invalid (non-blocking) context. From me.

   - A fix/optimization from Ming, ensuring that we don't both quiesce
     and freeze a queue at the same time.

   - A fix from Peter on lock ordering for CPU hotplug. Not a real
     problem right now, but will be once the CPU hotplug rework goes in.

   - A series from Omar, cleaning up out blk-mq debugfs support, and
     adding support for exporting info from schedulers in debugfs as
     well. This is really useful in debugging stalls or livelocks. From
     Omar"

* 'for-linus' of git://git.kernel.dk/linux-block: (28 commits)
  mq-deadline: add debugfs attributes
  kyber: add debugfs attributes
  blk-mq-debugfs: allow schedulers to register debugfs attributes
  blk-mq: untangle debugfs and sysfs
  blk-mq: move debugfs declarations to a separate header file
  blk-mq: Do not invoke queue operations on a dead queue
  blk-mq-debugfs: get rid of a bunch of boilerplate
  blk-mq-debugfs: rename hw queue directories from <n> to hctx<n>
  blk-mq-debugfs: don't open code strstrip()
  blk-mq-debugfs: error on long write to queue "state" file
  blk-mq-debugfs: clean up flag definitions
  blk-mq-debugfs: separate flags with |
  nfs: Fix bdi handling for cloned superblocks
  block/mq: Cure cpu hotplug lock inversion
  lightnvm: fix bad back free on error path
  lightnvm: create cmd before allocating request
  blk-mq: don't use sync workqueue flushing from drivers
  mtip32xx: convert internal commands to regular block infrastructure
  mtip32xx: cleanup internal tag assumptions
  block: don't call blk_mq_quiesce_queue() after queue is frozen
  ...
parents d557d1b5 daaadb3e

block/blk-core.c

+2 −6
Original line number Diff line number Diff line
@@ -561,13 +561,9 @@ void blk_cleanup_queue(struct request_queue *q) 
	 * prevent that q->request_fn() gets invoked after draining finished.

	 */

	blk_freeze_queue(q);

	if (!q->mq_ops) {

	spin_lock_irq(lock);

	if (!q->mq_ops)

		__blk_drain_queue(q, true);

	} else {

		blk_mq_debugfs_unregister_mq(q);

		spin_lock_irq(lock);

	}

	queue_flag_set(QUEUE_FLAG_DEAD, q);

	spin_unlock_irq(lock);

block/blk-mq-debugfs.c

+391 −479

File changed.

Preview size limit exceeded, changes collapsed.

block/blk-mq-debugfs.h

0 → 100644
+82 −0
Original line number Diff line number Diff line 
#ifndef INT_BLK_MQ_DEBUGFS_H

#define INT_BLK_MQ_DEBUGFS_H



#ifdef CONFIG_BLK_DEBUG_FS



#include <linux/seq_file.h>



struct blk_mq_debugfs_attr {

	const char *name;

	umode_t mode;

	int (*show)(void *, struct seq_file *);

	ssize_t (*write)(void *, const char __user *, size_t, loff_t *);

	/* Set either .show or .seq_ops. */

	const struct seq_operations *seq_ops;

};



int __blk_mq_debugfs_rq_show(struct seq_file *m, struct request *rq);

int blk_mq_debugfs_rq_show(struct seq_file *m, void *v);



int blk_mq_debugfs_register(struct request_queue *q);

void blk_mq_debugfs_unregister(struct request_queue *q);

int blk_mq_debugfs_register_hctx(struct request_queue *q,

				 struct blk_mq_hw_ctx *hctx);

void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx);

int blk_mq_debugfs_register_hctxs(struct request_queue *q);

void blk_mq_debugfs_unregister_hctxs(struct request_queue *q);



int blk_mq_debugfs_register_sched(struct request_queue *q);

void blk_mq_debugfs_unregister_sched(struct request_queue *q);

int blk_mq_debugfs_register_sched_hctx(struct request_queue *q,

				       struct blk_mq_hw_ctx *hctx);

void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx);

#else

static inline int blk_mq_debugfs_register(struct request_queue *q)

{

	return 0;

}



static inline void blk_mq_debugfs_unregister(struct request_queue *q)

{

}



static inline int blk_mq_debugfs_register_hctx(struct request_queue *q,

					       struct blk_mq_hw_ctx *hctx)

{

	return 0;

}



static inline void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx)

{

}



static inline int blk_mq_debugfs_register_hctxs(struct request_queue *q)

{

	return 0;

}



static inline void blk_mq_debugfs_unregister_hctxs(struct request_queue *q)

{

}



static inline int blk_mq_debugfs_register_sched(struct request_queue *q)

{

	return 0;

}



static inline void blk_mq_debugfs_unregister_sched(struct request_queue *q)

{

}



static inline int blk_mq_debugfs_register_sched_hctx(struct request_queue *q,

						     struct blk_mq_hw_ctx *hctx)

{

	return 0;

}



static inline void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx)

{

}

#endif



#endif

block/blk-mq-sched.c

+17 −13
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-debugfs.h"

#include "blk-mq-sched.h"

#include "blk-mq-tag.h"

#include "blk-wbt.h"
@@ -82,11 +83,7 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, 
	if (likely(!data->hctx))

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



	/*

	 * For a reserved tag, allocate a normal request since we might

	 * have driver dependencies on the value of the internal tag.

	 */

	if (e && !(data->flags & BLK_MQ_REQ_RESERVED)) {

	if (e) {

		data->flags |= BLK_MQ_REQ_INTERNAL;



		/*
@@ -476,6 +473,8 @@ int blk_mq_sched_init_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, 
		}

	}



	blk_mq_debugfs_register_sched_hctx(q, hctx);



	return 0;

}
@@ -487,6 +486,8 @@ void blk_mq_sched_exit_hctx(struct request_queue *q, struct blk_mq_hw_ctx *hctx, 
	if (!e)

		return;



	blk_mq_debugfs_unregister_sched_hctx(hctx);



	if (e->type->ops.mq.exit_hctx && hctx->sched_data) {

		e->type->ops.mq.exit_hctx(hctx, hctx_idx);

		hctx->sched_data = NULL;
@@ -523,8 +524,10 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
	if (ret)

		goto err;



	if (e->ops.mq.init_hctx) {

	blk_mq_debugfs_register_sched(q);



	queue_for_each_hw_ctx(q, hctx, i) {

		if (e->ops.mq.init_hctx) {

			ret = e->ops.mq.init_hctx(hctx, i);

			if (ret) {

				eq = q->elevator;
@@ -533,6 +536,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
				return ret;

			}

		}

		blk_mq_debugfs_register_sched_hctx(q, hctx);

	}



	return 0;
@@ -548,14 +552,14 @@ void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e) 
	struct blk_mq_hw_ctx *hctx;

	unsigned int i;



	if (e->type->ops.mq.exit_hctx) {

	queue_for_each_hw_ctx(q, hctx, i) {

			if (hctx->sched_data) {

		blk_mq_debugfs_unregister_sched_hctx(hctx);

		if (e->type->ops.mq.exit_hctx && hctx->sched_data) {

			e->type->ops.mq.exit_hctx(hctx, i);

			hctx->sched_data = NULL;

		}

	}

	}

	blk_mq_debugfs_unregister_sched(q);

	if (e->type->ops.mq.exit_sched)

		e->type->ops.mq.exit_sched(e);

	blk_mq_sched_tags_teardown(q);

block/blk-mq-sysfs.c

+0 −10
Original line number Diff line number Diff line
@@ -258,8 +258,6 @@ static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q) 
	queue_for_each_hw_ctx(q, hctx, i)

		blk_mq_unregister_hctx(hctx);



	blk_mq_debugfs_unregister_mq(q);



	kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);

	kobject_del(&q->mq_kobj);

	kobject_put(&dev->kobj);
@@ -318,8 +316,6 @@ int __blk_mq_register_dev(struct device *dev, struct request_queue *q) 


	kobject_uevent(&q->mq_kobj, KOBJ_ADD);



	blk_mq_debugfs_register(q);



	queue_for_each_hw_ctx(q, hctx, i) {

		ret = blk_mq_register_hctx(hctx);

		if (ret)
@@ -335,8 +331,6 @@ int __blk_mq_register_dev(struct device *dev, struct request_queue *q) 
	while (--i >= 0)

		blk_mq_unregister_hctx(q->queue_hw_ctx[i]);



	blk_mq_debugfs_unregister_mq(q);



	kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);

	kobject_del(&q->mq_kobj);

	kobject_put(&dev->kobj);
@@ -364,8 +358,6 @@ void blk_mq_sysfs_unregister(struct request_queue *q) 
	if (!q->mq_sysfs_init_done)

		goto unlock;



	blk_mq_debugfs_unregister_mq(q);



	queue_for_each_hw_ctx(q, hctx, i)

		blk_mq_unregister_hctx(hctx);
@@ -382,8 +374,6 @@ int blk_mq_sysfs_register(struct request_queue *q) 
	if (!q->mq_sysfs_init_done)

		goto unlock;



	blk_mq_debugfs_register_mq(q);



	queue_for_each_hw_ctx(q, hctx, i) {

		ret = blk_mq_register_hctx(hctx);

		if (ret)