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

Commit 32e380ae authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

blkcg: make CONFIG_BLK_CGROUP bool 



Block cgroup core can be built as module; however, it isn't too useful
as blk-throttle can only be built-in and cfq-iosched is usually the
default built-in scheduler.  Scheduled blkcg cleanup requires calling
into blkcg from block core.  To simplify that, disallow building blkcg
as module by making CONFIG_BLK_CGROUP bool.

If building blkcg core as module really matters, which I doubt, we can
revisit it after blkcg API cleanup.

-v2: Vivek pointed out that IOSCHED_CFQ was incorrectly updated to
     depend on BLK_CGROUP.  Fixed.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b855b04a

block/Kconfig.iosched

+0 −4
Original line number Original line Diff line number Diff line
@@ -23,8 +23,6 @@ config IOSCHED_DEADLINE 




config IOSCHED_CFQ

config IOSCHED_CFQ

	tristate "CFQ I/O scheduler"

	tristate "CFQ I/O scheduler"

	# If BLK_CGROUP is a module, CFQ has to be built as module.

	depends on (BLK_CGROUP=m && m) || !BLK_CGROUP || BLK_CGROUP=y

	default y

	default y

	---help---

	---help---

	  The CFQ I/O scheduler tries to distribute bandwidth equally

	  The CFQ I/O scheduler tries to distribute bandwidth equally
@@ -34,8 +32,6 @@ config IOSCHED_CFQ 




	  This is the default I/O scheduler.

	  This is the default I/O scheduler.





	  Note: If BLK_CGROUP=m, then CFQ can be built only as module.



config CFQ_GROUP_IOSCHED

config CFQ_GROUP_IOSCHED

	bool "CFQ Group Scheduling support"

	bool "CFQ Group Scheduling support"

	depends on IOSCHED_CFQ && BLK_CGROUP

	depends on IOSCHED_CFQ && BLK_CGROUP

block/blk-cgroup.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -50,10 +50,7 @@ struct cgroup_subsys blkio_subsys = { 
	.attach = blkiocg_attach,

	.attach = blkiocg_attach,

	.destroy = blkiocg_destroy,

	.destroy = blkiocg_destroy,

	.populate = blkiocg_populate,

	.populate = blkiocg_populate,

#ifdef CONFIG_BLK_CGROUP

	/* note: blkio_subsys_id is otherwise defined in blk-cgroup.h */

	.subsys_id = blkio_subsys_id,

	.subsys_id = blkio_subsys_id,

#endif

	.use_id = 1,

	.use_id = 1,

	.module = THIS_MODULE,

	.module = THIS_MODULE,

};

};
@@ -1679,17 +1676,3 @@ void blkio_policy_unregister(struct blkio_policy_type *blkiop) 
	spin_unlock(&blkio_list_lock);

	spin_unlock(&blkio_list_lock);

}

}

EXPORT_SYMBOL_GPL(blkio_policy_unregister);
 
EXPORT_SYMBOL_GPL(blkio_policy_unregister);
 


static int __init init_cgroup_blkio(void)

{

	return cgroup_load_subsys(&blkio_subsys);

}



static void __exit exit_cgroup_blkio(void)

{

	cgroup_unload_subsys(&blkio_subsys);

}



module_init(init_cgroup_blkio);

module_exit(exit_cgroup_blkio);

MODULE_LICENSE("GPL");

block/blk-cgroup.h

+2 −8
Original line number Original line Diff line number Diff line
@@ -24,13 +24,7 @@ enum blkio_policy_id { 
/* Max limits for throttle policy */

/* Max limits for throttle policy */

#define THROTL_IOPS_MAX		UINT_MAX

#define THROTL_IOPS_MAX		UINT_MAX





#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)

#ifdef CONFIG_BLK_CGROUP



#ifndef CONFIG_BLK_CGROUP

/* When blk-cgroup is a module, its subsys_id isn't a compile-time constant */

extern struct cgroup_subsys blkio_subsys;

#define blkio_subsys_id blkio_subsys.subsys_id

#endif





enum stat_type {

enum stat_type {

	/* Total time spent (in ns) between request dispatch to the driver and

	/* Total time spent (in ns) between request dispatch to the driver and
@@ -303,7 +297,7 @@ static inline void blkiocg_update_idle_time_stats(struct blkio_group *blkg) {} 
static inline void blkiocg_set_start_empty_time(struct blkio_group *blkg) {}

static inline void blkiocg_set_start_empty_time(struct blkio_group *blkg) {}

#endif

#endif





#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)

#ifdef CONFIG_BLK_CGROUP

extern struct blkio_cgroup blkio_root_cgroup;

extern struct blkio_cgroup blkio_root_cgroup;

extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup);

extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup);

extern struct blkio_cgroup *task_blkio_cgroup(struct task_struct *tsk);

extern struct blkio_cgroup *task_blkio_cgroup(struct task_struct *tsk);

init/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -766,7 +766,7 @@ config RT_GROUP_SCHED 
endif #CGROUP_SCHED

endif #CGROUP_SCHED





config BLK_CGROUP

config BLK_CGROUP

	tristate "Block IO controller"

	bool "Block IO controller"

	depends on BLOCK

	depends on BLOCK

	default n

	default n

	---help---

	---help---