Commit 04aad37b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-wbt: pass a gendisk to wbt_{enable,disable}_default 



Pass a gendisk to wbt_enable_default and wbt_disable_default to
prepare for phasing out usage of the request_queue in the blk-cgroup
code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Herrmann <aherrmann@suse.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20230203150400.3199230-9-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f05837ed

block/bfq-iosched.c

+2 −2
Original line number Diff line number Diff line
@@ -7156,7 +7156,7 @@ static void bfq_exit_queue(struct elevator_queue *e) 


	blk_stat_disable_accounting(bfqd->queue);

	clear_bit(ELEVATOR_FLAG_DISABLE_WBT, &e->flags);

	wbt_enable_default(bfqd->queue);

	wbt_enable_default(bfqd->queue->disk);



	kfree(bfqd);

}
@@ -7344,7 +7344,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) 
	blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);



	set_bit(ELEVATOR_FLAG_DISABLE_WBT, &eq->flags);

	wbt_disable_default(q);

	wbt_disable_default(q->disk);

	blk_stat_enable_accounting(q);



	return 0;

block/blk-iocost.c

+2 −2
Original line number Diff line number Diff line
@@ -3285,11 +3285,11 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, 
		blk_stat_enable_accounting(disk->queue);

		blk_queue_flag_set(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue);

		ioc->enabled = true;

		wbt_disable_default(disk->queue);

		wbt_disable_default(disk);

	} else {

		blk_queue_flag_clear(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue);

		ioc->enabled = false;

		wbt_enable_default(disk->queue);

		wbt_enable_default(disk);

	}



	if (user) {

block/blk-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ int blk_register_queue(struct gendisk *disk) 
		goto out_elv_unregister;



	blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);

	wbt_enable_default(q);

	wbt_enable_default(disk);

	blk_throtl_register(disk);



	/* Now everything is ready and send out KOBJ_ADD uevent */

block/blk-wbt.c

+4 −3
Original line number Diff line number Diff line
@@ -650,8 +650,9 @@ void wbt_set_write_cache(struct request_queue *q, bool write_cache_on) 
/*

 * Enable wbt if defaults are configured that way

 */

void wbt_enable_default(struct request_queue *q)

void wbt_enable_default(struct gendisk *disk)

{

	struct request_queue *q = disk->queue;

	struct rq_qos *rqos;

	bool disable_flag = q->elevator &&

		    test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags);
@@ -718,9 +719,9 @@ static void wbt_exit(struct rq_qos *rqos) 
/*

 * Disable wbt, if enabled by default.

 */

void wbt_disable_default(struct request_queue *q)

void wbt_disable_default(struct gendisk *disk)

{

	struct rq_qos *rqos = wbt_rq_qos(q);

	struct rq_qos *rqos = wbt_rq_qos(disk->queue);

	struct rq_wb *rwb;

	if (!rqos)

		return;

block/blk-wbt.h

+4 −4
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb) 
#ifdef CONFIG_BLK_WBT



int wbt_init(struct request_queue *);

void wbt_disable_default(struct request_queue *);

void wbt_enable_default(struct request_queue *);

void wbt_disable_default(struct gendisk *disk);

void wbt_enable_default(struct gendisk *disk);



u64 wbt_get_min_lat(struct request_queue *q);

void wbt_set_min_lat(struct request_queue *q, u64 val);
@@ -108,10 +108,10 @@ static inline int wbt_init(struct request_queue *q) 
{

	return -EINVAL;

}

static inline void wbt_disable_default(struct request_queue *q)

static inline void wbt_disable_default(struct gendisk *disk)

{

}

static inline void wbt_enable_default(struct request_queue *q)

static inline void wbt_enable_default(struct gendisk *disk)

{

}

static inline void wbt_set_write_cache(struct request_queue *q, bool wc)