Commit 40e4996e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-cgroup: pass a gendisk to blkcg_{de,}activate_policy 



Prepare for storing the blkcg information in the gendisk instead of
the request_queue.

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-17-hch@lst.de


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

block/bfq-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node) 
{

	int ret;



	ret = blkcg_activate_policy(bfqd->queue, &blkcg_policy_bfq);

	ret = blkcg_activate_policy(bfqd->queue->disk, &blkcg_policy_bfq);

	if (ret)

		return NULL;

block/bfq-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -7146,7 +7146,7 @@ static void bfq_exit_queue(struct elevator_queue *e) 
	bfqg_and_blkg_put(bfqd->root_group);



#ifdef CONFIG_BFQ_GROUP_IOSCHED

	blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq);

	blkcg_deactivate_policy(bfqd->queue->disk, &blkcg_policy_bfq);

#else

	spin_lock_irq(&bfqd->lock);

	bfq_put_async_queues(bfqd, bfqd->root_group);

block/blk-cgroup.c

+11 −10
Original line number Diff line number Diff line
@@ -1390,14 +1390,14 @@ struct cgroup_subsys io_cgrp_subsys = { 
EXPORT_SYMBOL_GPL(io_cgrp_subsys);



/**

 * blkcg_activate_policy - activate a blkcg policy on a request_queue

 * @q: request_queue of interest

 * blkcg_activate_policy - activate a blkcg policy on a gendisk

 * @disk: gendisk of interest

 * @pol: blkcg policy to activate

 *

 * Activate @pol on @q.  Requires %GFP_KERNEL context.  @q goes through

 * Activate @pol on @disk.  Requires %GFP_KERNEL context.  @disk goes through

 * bypass mode to populate its blkgs with policy_data for @pol.

 *

 * Activation happens with @q bypassed, so nobody would be accessing blkgs

 * Activation happens with @disk bypassed, so nobody would be accessing blkgs

 * from IO path.  Update of each blkg is protected by both queue and blkcg

 * locks so that holding either lock and testing blkcg_policy_enabled() is

 * always enough for dereferencing policy data.
@@ -1405,9 +1405,9 @@ EXPORT_SYMBOL_GPL(io_cgrp_subsys); 
 * The caller is responsible for synchronizing [de]activations and policy

 * [un]registerations.  Returns 0 on success, -errno on failure.

 */

int blkcg_activate_policy(struct request_queue *q,

			  const struct blkcg_policy *pol)

int blkcg_activate_policy(struct gendisk *disk, const struct blkcg_policy *pol)

{

	struct request_queue *q = disk->queue;

	struct blkg_policy_data *pd_prealloc = NULL;

	struct blkcg_gq *blkg, *pinned_blkg = NULL;

	int ret;
@@ -1508,16 +1508,17 @@ int blkcg_activate_policy(struct request_queue *q, 
EXPORT_SYMBOL_GPL(blkcg_activate_policy);



/**

 * blkcg_deactivate_policy - deactivate a blkcg policy on a request_queue

 * @q: request_queue of interest

 * blkcg_deactivate_policy - deactivate a blkcg policy on a gendisk

 * @disk: gendisk of interest

 * @pol: blkcg policy to deactivate

 *

 * Deactivate @pol on @q.  Follows the same synchronization rules as

 * Deactivate @pol on @disk.  Follows the same synchronization rules as

 * blkcg_activate_policy().

 */

void blkcg_deactivate_policy(struct request_queue *q,

void blkcg_deactivate_policy(struct gendisk *disk,

			     const struct blkcg_policy *pol)

{

	struct request_queue *q = disk->queue;

	struct blkcg_gq *blkg;



	if (!blkcg_policy_enabled(q, pol))

block/blk-cgroup.h

+4 −5
Original line number Diff line number Diff line
@@ -194,9 +194,8 @@ void blkcg_exit_disk(struct gendisk *disk); 
/* Blkio controller policy registration */

int blkcg_policy_register(struct blkcg_policy *pol);

void blkcg_policy_unregister(struct blkcg_policy *pol);

int blkcg_activate_policy(struct request_queue *q,

			  const struct blkcg_policy *pol);

void blkcg_deactivate_policy(struct request_queue *q,

int blkcg_activate_policy(struct gendisk *disk, const struct blkcg_policy *pol);

void blkcg_deactivate_policy(struct gendisk *disk,

			     const struct blkcg_policy *pol);



const char *blkg_dev_name(struct blkcg_gq *blkg);
@@ -495,9 +494,9 @@ static inline int blkcg_init_disk(struct gendisk *disk) { return 0; } 
static inline void blkcg_exit_disk(struct gendisk *disk) { }

static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; }

static inline void blkcg_policy_unregister(struct blkcg_policy *pol) { }

static inline int blkcg_activate_policy(struct request_queue *q,

static inline int blkcg_activate_policy(struct gendisk *disk,

					const struct blkcg_policy *pol) { return 0; }

static inline void blkcg_deactivate_policy(struct request_queue *q,

static inline void blkcg_deactivate_policy(struct gendisk *disk,

					   const struct blkcg_policy *pol) { }



static inline struct blkg_policy_data *blkg_to_pd(struct blkcg_gq *blkg,

block/blk-iocost.c

+2 −2
Original line number Diff line number Diff line
@@ -2821,7 +2821,7 @@ static void ioc_rqos_exit(struct rq_qos *rqos) 
{

	struct ioc *ioc = rqos_to_ioc(rqos);



	blkcg_deactivate_policy(rqos->disk->queue, &blkcg_policy_iocost);

	blkcg_deactivate_policy(rqos->disk, &blkcg_policy_iocost);



	spin_lock_irq(&ioc->lock);

	ioc->running = IOC_STOP;
@@ -2893,7 +2893,7 @@ static int blk_iocost_init(struct gendisk *disk) 
	if (ret)

		goto err_free_ioc;



	ret = blkcg_activate_policy(disk->queue, &blkcg_policy_iocost);

	ret = blkcg_activate_policy(disk, &blkcg_policy_iocost);

	if (ret)

		goto err_del_qos;

	return 0;