forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net: net_cls: move cgroupfs classid handling into core
Zefan Li requested [1] to perform the following cleanup/refactoring:
- Split cgroupfs classid handling into net core to better express a
possible more generic use.
- Disable module support for cgroupfs bits as the majority of other
cgroupfs subsystems do not have that, and seems to be not wished
from cgroup side. Zefan probably might want to follow-up for netprio
later on.
- By this, code can be further reduced which previously took care of
functionality built when compiled as module.
cgroupfs bits are being placed under net/core/netclassid_cgroup.c, so
that we are consistent with {netclassid,netprio}_cgroup naming that is
under net/core/ as suggested by Zefan.
No change in functionality, but only code refactoring that is being
done here.
[1] http://patchwork.ozlabs.org/patch/304825/
Suggested-by: Li Zefan <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
Cc: Zefan Li <[email protected]>
Cc: Thomas Graf <[email protected]>
Cc: [email protected]
Acked-by: Li Zefan <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>- Loading branch information
Showing
8 changed files
with
143 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * net/core/netclassid_cgroup.c Classid Cgroupfs Handling | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version | ||
| * 2 of the License, or (at your option) any later version. | ||
| * | ||
| * Authors: Thomas Graf <[email protected]> | ||
| */ | ||
|
|
||
| #include <linux/module.h> | ||
| #include <linux/slab.h> | ||
| #include <linux/cgroup.h> | ||
| #include <linux/fdtable.h> | ||
| #include <net/cls_cgroup.h> | ||
| #include <net/sock.h> | ||
|
|
||
| static inline struct cgroup_cls_state *css_cls_state(struct cgroup_subsys_state *css) | ||
| { | ||
| return css ? container_of(css, struct cgroup_cls_state, css) : NULL; | ||
| } | ||
|
|
||
| struct cgroup_cls_state *task_cls_state(struct task_struct *p) | ||
| { | ||
| return css_cls_state(task_css(p, net_cls_subsys_id)); | ||
| } | ||
| EXPORT_SYMBOL_GPL(task_cls_state); | ||
|
|
||
| static struct cgroup_subsys_state * | ||
| cgrp_css_alloc(struct cgroup_subsys_state *parent_css) | ||
| { | ||
| struct cgroup_cls_state *cs; | ||
|
|
||
| cs = kzalloc(sizeof(*cs), GFP_KERNEL); | ||
| if (!cs) | ||
| return ERR_PTR(-ENOMEM); | ||
|
|
||
| return &cs->css; | ||
| } | ||
|
|
||
| static int cgrp_css_online(struct cgroup_subsys_state *css) | ||
| { | ||
| struct cgroup_cls_state *cs = css_cls_state(css); | ||
| struct cgroup_cls_state *parent = css_cls_state(css_parent(css)); | ||
|
|
||
| if (parent) | ||
| cs->classid = parent->classid; | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static void cgrp_css_free(struct cgroup_subsys_state *css) | ||
| { | ||
| kfree(css_cls_state(css)); | ||
| } | ||
|
|
||
| static int update_classid(const void *v, struct file *file, unsigned n) | ||
| { | ||
| int err; | ||
| struct socket *sock = sock_from_file(file, &err); | ||
|
|
||
| if (sock) | ||
| sock->sk->sk_classid = (u32)(unsigned long)v; | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static void cgrp_attach(struct cgroup_subsys_state *css, | ||
| struct cgroup_taskset *tset) | ||
| { | ||
| struct cgroup_cls_state *cs = css_cls_state(css); | ||
| void *v = (void *)(unsigned long)cs->classid; | ||
| struct task_struct *p; | ||
|
|
||
| cgroup_taskset_for_each(p, css, tset) { | ||
| task_lock(p); | ||
| iterate_fd(p->files, 0, update_classid, v); | ||
| task_unlock(p); | ||
| } | ||
| } | ||
|
|
||
| static u64 read_classid(struct cgroup_subsys_state *css, struct cftype *cft) | ||
| { | ||
| return css_cls_state(css)->classid; | ||
| } | ||
|
|
||
| static int write_classid(struct cgroup_subsys_state *css, struct cftype *cft, | ||
| u64 value) | ||
| { | ||
| css_cls_state(css)->classid = (u32) value; | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static struct cftype ss_files[] = { | ||
| { | ||
| .name = "classid", | ||
| .read_u64 = read_classid, | ||
| .write_u64 = write_classid, | ||
| }, | ||
| { } /* terminate */ | ||
| }; | ||
|
|
||
| struct cgroup_subsys net_cls_subsys = { | ||
| .name = "net_cls", | ||
| .css_alloc = cgrp_css_alloc, | ||
| .css_online = cgrp_css_online, | ||
| .css_free = cgrp_css_free, | ||
| .attach = cgrp_attach, | ||
| .subsys_id = net_cls_subsys_id, | ||
| .base_cftypes = ss_files, | ||
| .module = THIS_MODULE, | ||
| }; | ||
|
|
||
| static int __init init_netclassid_cgroup(void) | ||
| { | ||
| return cgroup_load_subsys(&net_cls_subsys); | ||
| } | ||
| __initcall(init_netclassid_cgroup); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters