korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

cgroup: make cftype->[un]register_event() deal with cgroup_subsys_state instead of cgroup

Browse Source 
cgroup is in the process of converting to css (cgroup_subsys_state)
from cgroup as the principal subsystem interface handle.  This is
mostly to prepare for the unified hierarchy support where css's will
be created and destroyed dynamically but also helps cleaning up
subsystem implementations as css is usually what they are interested
in anyway.

cftype->[un]register_event() is among the remaining couple interfaces
which still use struct cgroup.  Convert it to cgroup_subsys_state.
The conversion is mostly mechanical and removes the last users of
mem_cgroup_from_cont() and cg_to_vmpressure(), which are removed.

v2: indentation update as suggested by Li Zefan.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
This commit is contained in:
Tejun Heo 2013-08-08 20:11:26 -04:00
parent 72ec702993
commit 81eeaf0411
5 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/cgroup.h
View File

@ -506,16 +506,18 @@ struct cftype {
* you want to provide this functionality. Use eventfd_signal() * you want to provide this functionality. Use eventfd_signal()
* on eventfd to send notification to userspace. * on eventfd to send notification to userspace.
*/ */
int (*register_event)(struct cgroup *cgrp, struct cftype *cft, int (*register_event)(struct cgroup_subsys_state *css,
struct eventfd_ctx *eventfd, const char *args); struct cftype *cft, struct eventfd_ctx *eventfd,
const char *args);
/* /*
* unregister_event() callback will be called when userspace * unregister_event() callback will be called when userspace
* closes the eventfd or on cgroup removing. * closes the eventfd or on cgroup removing.
* This callback must be implemented, if you want provide * This callback must be implemented, if you want provide
* notification functionality. * notification functionality.
*/ */
void (*unregister_event)(struct cgroup *cgrp, struct cftype *cft, void (*unregister_event)(struct cgroup_subsys_state *css,
struct eventfd_ctx *eventfd); struct cftype *cft,
struct eventfd_ctx *eventfd);
}; };
/* /*

6
include/linux/vmpressure.h
View File

@ -33,10 +33,12 @@ extern void vmpressure_init(struct vmpressure *vmpr);
extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg); extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg);
extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr); extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr);
extern struct vmpressure *css_to_vmpressure(struct cgroup_subsys_state *css); extern struct vmpressure *css_to_vmpressure(struct cgroup_subsys_state *css);
extern int vmpressure_register_event(struct cgroup *cg, struct cftype *cft, extern int vmpressure_register_event(struct cgroup_subsys_state *css,
struct cftype *cft,
struct eventfd_ctx *eventfd, struct eventfd_ctx *eventfd,
const char *args); const char *args);
extern void vmpressure_unregister_event(struct cgroup *cg, struct cftype *cft, extern void vmpressure_unregister_event(struct cgroup_subsys_state *css,
struct cftype *cft,
struct eventfd_ctx *eventfd); struct eventfd_ctx *eventfd);
#else #else
static inline void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, static inline void vmpressure(gfp_t gfp, struct mem_cgroup *memcg,

15
kernel/cgroup.c
View File

@ -159,9 +159,9 @@ struct css_id {
*/ */
struct cgroup_event { struct cgroup_event {
/* /*
* Cgroup which the event belongs to. * css which the event belongs to.
*/ */
struct cgroup *cgrp; struct cgroup_subsys_state *css;
/* /*
* Control file which the event associated. * Control file which the event associated.
*/ */
@ -3955,11 +3955,12 @@ static void cgroup_event_remove(struct work_struct *work)
{ {
struct cgroup_event *event = container_of(work, struct cgroup_event, struct cgroup_event *event = container_of(work, struct cgroup_event,
remove); remove);
struct cgroup *cgrp = event->cgrp; struct cgroup_subsys_state *css = event->css;
struct cgroup *cgrp = css->cgroup;
remove_wait_queue(event->wqh, &event->wait); remove_wait_queue(event->wqh, &event->wait);
event->cft->unregister_event(cgrp, event->cft, event->eventfd); event->cft->unregister_event(css, event->cft, event->eventfd);
/* Notify userspace the event is going away. */ /* Notify userspace the event is going away. */
eventfd_signal(event->eventfd, 1); eventfd_signal(event->eventfd, 1);
@ -3979,7 +3980,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode,
{ {
struct cgroup_event *event = container_of(wait, struct cgroup_event *event = container_of(wait,
struct cgroup_event, wait); struct cgroup_event, wait);
struct cgroup *cgrp = event->cgrp; struct cgroup *cgrp = event->css->cgroup;
unsigned long flags = (unsigned long)key; unsigned long flags = (unsigned long)key;
if (flags & POLLHUP) { if (flags & POLLHUP) {
@ -4048,7 +4049,7 @@ static int cgroup_write_event_control(struct cgroup_subsys_state *css,
event = kzalloc(sizeof(*event), GFP_KERNEL); event = kzalloc(sizeof(*event), GFP_KERNEL);
if (!event) if (!event)
return -ENOMEM; return -ENOMEM;
event->cgrp = cgrp; event->css = css;
INIT_LIST_HEAD(&event->list); INIT_LIST_HEAD(&event->list);
init_poll_funcptr(&event->pt, cgroup_event_ptable_queue_proc); init_poll_funcptr(&event->pt, cgroup_event_ptable_queue_proc);
init_waitqueue_func_entry(&event->wait, cgroup_event_wake); init_waitqueue_func_entry(&event->wait, cgroup_event_wake);
@ -4099,7 +4100,7 @@ static int cgroup_write_event_control(struct cgroup_subsys_state *css,
goto out_put_cfile; goto out_put_cfile;
} }
ret = event->cft->register_event(cgrp, event->cft, ret = event->cft->register_event(css, event->cft,
event->eventfd, buffer); event->eventfd, buffer);
if (ret) if (ret)
goto out_put_cfile; goto out_put_cfile;

21
mm/memcontrol.c
View File

@ -1034,11 +1034,6 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
preempt_enable(); preempt_enable();
} }
static inline struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont)
{
return mem_cgroup_from_css(cgroup_css(cont, mem_cgroup_subsys_id));
}
struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p) struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p)
{ {
/* /*
@ -5620,10 +5615,10 @@ static void mem_cgroup_oom_notify(struct mem_cgroup *memcg)
mem_cgroup_oom_notify_cb(iter); mem_cgroup_oom_notify_cb(iter);
} }
static int mem_cgroup_usage_register_event(struct cgroup *cgrp, static int mem_cgroup_usage_register_event(struct cgroup_subsys_state *css,
struct cftype *cft, struct eventfd_ctx *eventfd, const char *args) struct cftype *cft, struct eventfd_ctx *eventfd, const char *args)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup_thresholds *thresholds; struct mem_cgroup_thresholds *thresholds;
struct mem_cgroup_threshold_ary *new; struct mem_cgroup_threshold_ary *new;
enum res_type type = MEMFILE_TYPE(cft->private); enum res_type type = MEMFILE_TYPE(cft->private);
@ -5703,10 +5698,10 @@ unlock:
return ret; return ret;
} }
static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp, static void mem_cgroup_usage_unregister_event(struct cgroup_subsys_state *css,
struct cftype *cft, struct eventfd_ctx *eventfd) struct cftype *cft, struct eventfd_ctx *eventfd)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup_thresholds *thresholds; struct mem_cgroup_thresholds *thresholds;
struct mem_cgroup_threshold_ary *new; struct mem_cgroup_threshold_ary *new;
enum res_type type = MEMFILE_TYPE(cft->private); enum res_type type = MEMFILE_TYPE(cft->private);
@ -5782,10 +5777,10 @@ unlock:
mutex_unlock(&memcg->thresholds_lock); mutex_unlock(&memcg->thresholds_lock);
} }
static int mem_cgroup_oom_register_event(struct cgroup *cgrp, static int mem_cgroup_oom_register_event(struct cgroup_subsys_state *css,
struct cftype *cft, struct eventfd_ctx *eventfd, const char *args) struct cftype *cft, struct eventfd_ctx *eventfd, const char *args)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup_eventfd_list *event; struct mem_cgroup_eventfd_list *event;
enum res_type type = MEMFILE_TYPE(cft->private); enum res_type type = MEMFILE_TYPE(cft->private);
@ -5807,10 +5802,10 @@ static int mem_cgroup_oom_register_event(struct cgroup *cgrp,
return 0; return 0;
} }
static void mem_cgroup_oom_unregister_event(struct cgroup *cgrp, static void mem_cgroup_oom_unregister_event(struct cgroup_subsys_state *css,
struct cftype *cft, struct eventfd_ctx *eventfd) struct cftype *cft, struct eventfd_ctx *eventfd)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup_eventfd_list *ev, *tmp; struct mem_cgroup_eventfd_list *ev, *tmp;
enum res_type type = MEMFILE_TYPE(cft->private); enum res_type type = MEMFILE_TYPE(cft->private);

21
mm/vmpressure.c
View File

@ -74,11 +74,6 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)
return container_of(work, struct vmpressure, work); return container_of(work, struct vmpressure, work);
} }
static struct vmpressure *cg_to_vmpressure(struct cgroup *cg)
{
return css_to_vmpressure(cgroup_css(cg, mem_cgroup_subsys_id));
}
static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr) static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr)
{ {
struct cgroup_subsys_state *css = vmpressure_to_css(vmpr); struct cgroup_subsys_state *css = vmpressure_to_css(vmpr);
@ -283,7 +278,7 @@ void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio)
/** /**
* vmpressure_register_event() - Bind vmpressure notifications to an eventfd * vmpressure_register_event() - Bind vmpressure notifications to an eventfd
* @cg: cgroup that is interested in vmpressure notifications * @css: css that is interested in vmpressure notifications
* @cft: cgroup control files handle * @cft: cgroup control files handle
* @eventfd: eventfd context to link notifications with * @eventfd: eventfd context to link notifications with
* @args: event arguments (used to set up a pressure level threshold) * @args: event arguments (used to set up a pressure level threshold)
@ -298,10 +293,11 @@ void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio)
* cftype).register_event, and then cgroup core will handle everything by * cftype).register_event, and then cgroup core will handle everything by
* itself. * itself.
*/ */
int vmpressure_register_event(struct cgroup *cg, struct cftype *cft, int vmpressure_register_event(struct cgroup_subsys_state *css,
struct eventfd_ctx *eventfd, const char *args) struct cftype *cft, struct eventfd_ctx *eventfd,
const char *args)
{ {
struct vmpressure *vmpr = cg_to_vmpressure(cg); struct vmpressure *vmpr = css_to_vmpressure(css);
struct vmpressure_event *ev; struct vmpressure_event *ev;
int level; int level;
@ -329,7 +325,7 @@ int vmpressure_register_event(struct cgroup *cg, struct cftype *cft,
/** /**
* vmpressure_unregister_event() - Unbind eventfd from vmpressure * vmpressure_unregister_event() - Unbind eventfd from vmpressure
* @cg: cgroup handle * @css: css handle
* @cft: cgroup control files handle * @cft: cgroup control files handle
* @eventfd: eventfd context that was used to link vmpressure with the @cg * @eventfd: eventfd context that was used to link vmpressure with the @cg
* *
@ -341,10 +337,11 @@ int vmpressure_register_event(struct cgroup *cg, struct cftype *cft,
* cftype).unregister_event, and then cgroup core will handle everything * cftype).unregister_event, and then cgroup core will handle everything
* by itself. * by itself.
*/ */
void vmpressure_unregister_event(struct cgroup *cg, struct cftype *cft, void vmpressure_unregister_event(struct cgroup_subsys_state *css,
struct cftype *cft,
struct eventfd_ctx *eventfd) struct eventfd_ctx *eventfd)
{ {
struct vmpressure *vmpr = cg_to_vmpressure(cg); struct vmpressure *vmpr = css_to_vmpressure(css);
struct vmpressure_event *ev; struct vmpressure_event *ev;
mutex_lock(&vmpr->events_lock); mutex_lock(&vmpr->events_lock);