Commit 96c03d4b authored by Yu Kuai's avatar Yu Kuai
Browse files

blk-io-hierarchy: support new rq based stage mq-deadline 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/release-management/issues/IB4E8P


CVE: NA

--------------------------------

Like blk-throttle, following new debugfs entries will be created for
rq-based disk if mq-deadline is enabled:

/sys/kernel/debug/block/sda/blk_io_hierarchy/
|-- deadline
|   |-- io_dump
|   |-- stats
|   `-- threshold

User can use them to analyze how IO behaves in mq-deadline.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
parent 31487965

block/blk-io-hierarchy/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -79,4 +79,15 @@ config HIERARCHY_PLUG 


	If unsure, say N.



config HIERARCHY_DEADLINE

	bool "Enable hierarchy stats layer mq-deadline"

	default n

	depends on MQ_IOSCHED_DEADLINE

	help

	Enabling this lets blk hierarchy stats to record additional information

	for mq-deadline. Such information can be helpful to debug performance

	and problems like io hang.



	If unsure, say N.



endif

block/mq-deadline.c

+14 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "blk-mq.h"

#include "blk-mq-debugfs.h"

#include "blk-mq-sched.h"

#include "blk-io-hierarchy/stats.h"



/*

 * See Documentation/block/deadline-iosched.rst
@@ -103,6 +104,8 @@ struct deadline_data { 


	spinlock_t lock;

	spinlock_t zone_lock;



	struct request_queue *q;

};



/* Maps an I/O priority class to a deadline scheduler priority. */
@@ -618,6 +621,8 @@ static struct request *dd_dispatch_request(struct blk_mq_hw_ctx *hctx) 
unlock:

	spin_unlock(&dd->lock);



	if (rq)

		rq_hierarchy_end_io_acct(rq, STAGE_DEADLINE);

	return rq;

}
@@ -696,6 +701,7 @@ static void dd_exit_sched(struct elevator_queue *e) 
			  stats->dispatched, atomic_read(&stats->completed));

	}



	blk_mq_unregister_hierarchy(dd->q, STAGE_DEADLINE);

	kfree(dd);

}
@@ -735,6 +741,7 @@ static int dd_init_sched(struct request_queue *q, struct elevator_type *e) 
	dd->last_dir = DD_WRITE;

	dd->fifo_batch = fifo_batch;

	dd->prio_aging_expire = prio_aging_expire;

	dd->q = q;

	spin_lock_init(&dd->lock);

	spin_lock_init(&dd->zone_lock);
@@ -742,6 +749,7 @@ static int dd_init_sched(struct request_queue *q, struct elevator_type *e) 
	blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);



	q->elevator = eq;

	blk_mq_register_hierarchy(q, STAGE_DEADLINE);

	return 0;



put_eq:
@@ -796,8 +804,10 @@ static bool dd_bio_merge(struct request_queue *q, struct bio *bio, 
	ret = blk_mq_sched_try_merge(q, bio, nr_segs, &free);

	spin_unlock(&dd->lock);



	if (free)

	if (free) {

		rq_hierarchy_end_io_acct(free, STAGE_DEADLINE);

		blk_mq_free_request(free);

	}



	return ret;

}
@@ -882,6 +892,8 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx, 
	struct deadline_data *dd = q->elevator->elevator_data;

	LIST_HEAD(free);



	rq_list_hierarchy_start_io_acct(list, STAGE_DEADLINE);



	spin_lock(&dd->lock);

	while (!list_empty(list)) {

		struct request *rq;
@@ -892,6 +904,7 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *hctx, 
	}

	spin_unlock(&dd->lock);



	rq_list_hierarchy_end_io_acct(&free, STAGE_DEADLINE);

	blk_mq_free_requests(&free);

}

include/linux/blk_types.h

+3 −0
Original line number Diff line number Diff line
@@ -489,6 +489,9 @@ enum stage_group { 
	STAGE_GETTAG,

	NR_BIO_STAGE_GROUPS,

	STAGE_PLUG = NR_BIO_STAGE_GROUPS,

#if IS_ENABLED(CONFIG_MQ_IOSCHED_DEADLINE)

	STAGE_DEADLINE,

#endif

	NR_RQ_STAGE_GROUPS,

	STAGE_BIO = NR_RQ_STAGE_GROUPS,

	NR_STAGE_GROUPS,