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

Merge tag 'block-5.19-2022-06-24' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Series fixing issues with sysfs locking and name reuse (Christoph)

 - NVMe pull request via Christoph:
      - Fix the mixed up CRIMS/CRWMS constants (Joel Granados)
      - Add another broken identifier quirk (Leo Savernik)
      - Fix up a quirk because Samsung reuses PCI IDs over different
        products (Christoph Hellwig)

 - Remove old WARN_ON() that doesn't apply anymore (Li)

 - Fix for using a stale cached request value for rq-qos throttling
   mechanisms that may schedule(), like iocost (me)

 - Remove unused parameter to blk_independent_access_range() (Damien)

* tag 'block-5.19-2022-06-24' of git://git.kernel.dk/linux-block:
  block: remove WARN_ON() from bd_link_disk_holder
  nvme: move the Samsung X5 quirk entry to the core quirks
  nvme: fix the CRIMS and CRWMS definitions to match the spec
  nvme: add a bogus subsystem NQN quirk for Micron MTFDKBA2T0TFH
  block: pop cached rq before potentially blocking rq_qos_throttle()
  block: remove queue from struct blk_independent_access_range
  block: freeze the queue earlier in del_gendisk
  block: remove per-disk debugfs files in blk_unregister_queue
  block: serialize all debugfs operations using q->debugfs_mutex
  block: disable the elevator int del_gendisk
parents 598f2404 e531485a

block/blk-core.c

+0 −13
Original line number Diff line number Diff line
@@ -322,19 +322,6 @@ void blk_cleanup_queue(struct request_queue *q) 
		blk_mq_exit_queue(q);

	}



	/*

	 * In theory, request pool of sched_tags belongs to request queue.

	 * However, the current implementation requires tag_set for freeing

	 * requests, so free the pool now.

	 *

	 * Queue has become frozen, there can't be any in-queue requests, so

	 * it is safe to free requests now.

	 */

	mutex_lock(&q->sysfs_lock);

	if (q->elevator)

		blk_mq_sched_free_rqs(q);

	mutex_unlock(&q->sysfs_lock);



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

	blk_put_queue(q);

}

block/blk-ia-ranges.c

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ int disk_register_independent_access_ranges(struct gendisk *disk, 
	}



	for (i = 0; i < iars->nr_ia_ranges; i++) {

		iars->ia_range[i].queue = q;

		ret = kobject_init_and_add(&iars->ia_range[i].kobj,

					   &blk_ia_range_ktype, &iars->kobj,

					   "%d", i);

block/blk-mq-debugfs.c

+18 −11
Original line number Diff line number Diff line
@@ -711,11 +711,6 @@ void blk_mq_debugfs_register(struct request_queue *q) 
	}

}



void blk_mq_debugfs_unregister(struct request_queue *q)

{

	q->sched_debugfs_dir = NULL;

}



static void blk_mq_debugfs_register_ctx(struct blk_mq_hw_ctx *hctx,

					struct blk_mq_ctx *ctx)

{
@@ -746,6 +741,8 @@ void blk_mq_debugfs_register_hctx(struct request_queue *q, 


void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx)

{

	if (!hctx->queue->debugfs_dir)

		return;

	debugfs_remove_recursive(hctx->debugfs_dir);

	hctx->sched_debugfs_dir = NULL;

	hctx->debugfs_dir = NULL;
@@ -773,6 +770,8 @@ void blk_mq_debugfs_register_sched(struct request_queue *q) 
{

	struct elevator_type *e = q->elevator->type;



	lockdep_assert_held(&q->debugfs_mutex);



	/*

	 * If the parent directory has not been created yet, return, we will be

	 * called again later on and the directory/files will be created then.
@@ -790,6 +789,8 @@ void blk_mq_debugfs_register_sched(struct request_queue *q) 


void blk_mq_debugfs_unregister_sched(struct request_queue *q)

{

	lockdep_assert_held(&q->debugfs_mutex);



	debugfs_remove_recursive(q->sched_debugfs_dir);

	q->sched_debugfs_dir = NULL;

}
@@ -811,6 +812,10 @@ static const char *rq_qos_id_to_name(enum rq_qos_id id) 


void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)

{

	lockdep_assert_held(&rqos->q->debugfs_mutex);



	if (!rqos->q->debugfs_dir)

		return;

	debugfs_remove_recursive(rqos->debugfs_dir);

	rqos->debugfs_dir = NULL;

}
@@ -820,6 +825,8 @@ void blk_mq_debugfs_register_rqos(struct rq_qos *rqos) 
	struct request_queue *q = rqos->q;

	const char *dir_name = rq_qos_id_to_name(rqos->id);



	lockdep_assert_held(&q->debugfs_mutex);



	if (rqos->debugfs_dir || !rqos->ops->debugfs_attrs)

		return;
@@ -833,17 +840,13 @@ void blk_mq_debugfs_register_rqos(struct rq_qos *rqos) 
	debugfs_create_files(rqos->debugfs_dir, rqos, rqos->ops->debugfs_attrs);

}



void blk_mq_debugfs_unregister_queue_rqos(struct request_queue *q)

{

	debugfs_remove_recursive(q->rqos_debugfs_dir);

	q->rqos_debugfs_dir = NULL;

}



void blk_mq_debugfs_register_sched_hctx(struct request_queue *q,

					struct blk_mq_hw_ctx *hctx)

{

	struct elevator_type *e = q->elevator->type;



	lockdep_assert_held(&q->debugfs_mutex);



	/*

	 * If the parent debugfs directory has not been created yet, return;

	 * We will be called again later on with appropriate parent debugfs
@@ -863,6 +866,10 @@ void blk_mq_debugfs_register_sched_hctx(struct request_queue *q, 


void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx)

{

	lockdep_assert_held(&hctx->queue->debugfs_mutex);



	if (!hctx->queue->debugfs_dir)

		return;

	debugfs_remove_recursive(hctx->sched_debugfs_dir);

	hctx->sched_debugfs_dir = NULL;

}

block/blk-mq-debugfs.h

+0 −10
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 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);



void blk_mq_debugfs_register(struct request_queue *q);

void blk_mq_debugfs_unregister(struct request_queue *q);

void 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);
@@ -36,16 +35,11 @@ void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx); 


void blk_mq_debugfs_register_rqos(struct rq_qos *rqos);

void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos);

void blk_mq_debugfs_unregister_queue_rqos(struct request_queue *q);

#else

static inline void blk_mq_debugfs_register(struct request_queue *q)

{

}



static inline void blk_mq_debugfs_unregister(struct request_queue *q)

{

}



static inline void blk_mq_debugfs_register_hctx(struct request_queue *q,

						struct blk_mq_hw_ctx *hctx)

{
@@ -87,10 +81,6 @@ static inline void blk_mq_debugfs_register_rqos(struct rq_qos *rqos) 
static inline void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)

{

}



static inline void blk_mq_debugfs_unregister_queue_rqos(struct request_queue *q)

{

}

#endif



#ifdef CONFIG_BLK_DEBUG_FS_ZONED

block/blk-mq-sched.c

+11 −0
Original line number Diff line number Diff line
@@ -594,7 +594,9 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
	if (ret)

		goto err_free_map_and_rqs;



	mutex_lock(&q->debugfs_mutex);

	blk_mq_debugfs_register_sched(q);

	mutex_unlock(&q->debugfs_mutex);



	queue_for_each_hw_ctx(q, hctx, i) {

		if (e->ops.init_hctx) {
@@ -607,7 +609,9 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
				return ret;

			}

		}

		mutex_lock(&q->debugfs_mutex);

		blk_mq_debugfs_register_sched_hctx(q, hctx);

		mutex_unlock(&q->debugfs_mutex);

	}



	return 0;
@@ -648,14 +652,21 @@ void blk_mq_exit_sched(struct request_queue *q, struct elevator_queue *e) 
	unsigned int flags = 0;



	queue_for_each_hw_ctx(q, hctx, i) {

		mutex_lock(&q->debugfs_mutex);

		blk_mq_debugfs_unregister_sched_hctx(hctx);

		mutex_unlock(&q->debugfs_mutex);



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

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

			hctx->sched_data = NULL;

		}

		flags = hctx->flags;

	}



	mutex_lock(&q->debugfs_mutex);

	blk_mq_debugfs_unregister_sched(q);

	mutex_unlock(&q->debugfs_mutex);



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

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

	blk_mq_sched_tags_teardown(q, flags);