From: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>
Hi,
Most notable changes are, that enabling/disabling of the jump labels
are not inside the cgroup_lock anymore (create/destroy cb). Instead
the corresponding functions will be called on module load or unload.
CGROUP_BUILTIN_SUBSYS_COUNT is also gone in this version. This time I
trade space for speed. Some extra cycles are spend to identify the
modules in the for loops, e.g.
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
struct cgroup_subsys_state *ss = cgrp->subsys[i];
/* at bootup time, we don't worry about modular subsystems */
if (!ss || (ss && ss->module))
continue;
[...]
}
CGROUP_SUBSYS_COUNT is currently 12 if all controllers are built. I
haven't found any other way to get rid of CGROUP_BUILTIN_SUBSYS_COUNT
without real dirty preprocessor tricks.
Finally, the two versions of task_cls_classid() and task_netprioidx()
are merged together.
cheers,
daniel
Original cover letter:
The patch #1 and #2 are there to be able to introduce (#3, #4) the
jump labels in task_cls_classid() and task_netprioidx(). The jump
labels are needed to know when it is safe to access the controller.
For example not safe means the module is not yet loaded.
All those patches are just preparation for the center piece (#5)
of these series. This one will remove the dynamic subsystem ID
generation and falls back to compile time generated IDs.
This is the first result from the discussion around on the
"cgroup cls & netprio 'cleanups'" patches.
This patches are against net-next
v2: - do not use dirty precompiler tricks:
use ss->module to identify modules in the loops.
- enable/disable jump labels in module load/unload functions
- merge builtin/module versions of task_cls_classid() and task_netprioidx
v1: - only use jump labels when built as module (#3, #4)
- get rid of the additional 'pointer' (#5)
v0: - initial version
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Eric Dumazet <edumazet@xxxxxxxxxx>
Cc: Gao feng <gaofeng@xxxxxxxxxxxxxx>
Cc: Glauber Costa <glommer@xxxxxxxxxxxxx>
Cc: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
Cc: John Fastabend <john.r.fastabend@xxxxxxxxx>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Li Zefan <lizefan@xxxxxxxxxx>
Cc: Neil Horman <nhorman@xxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
Cc: cgroups@xxxxxxxxxxxxxxx
Daniel Wagner (10):
cgroup: net_cls: Use empty task_cls_classid() when
!CONFIG_NET_CLS(_MODULE)
cgroup: net_cls: Move sock_update_classid() decleration to
cls_cgroup.h
cgroup: net_cls: Protect access to task_cls_classid() when built as
module
cgroup: net_prio: Protect access to task_netprioidx() when built as
module
cgroup: Remove CGROUP_BUILTIN_SUBSYS_COUNT
cgroup: Assign subsystem IDs during compile time
cgroup: net_cls: Simplify ifdef logic
cgroup: net_cls: Merge builtin and module version of
task_cls_classid()
cgroup: net_prio: Simplify ifdef logic
cgroup: net_prio: Merge builtin and module version of
task_netprioidx()
include/linux/cgroup.h | 30 ++++++++-----
include/linux/cgroup_subsys.h | 24 +++++------
include/net/cls_cgroup.h | 51 +++++++++++-----------
include/net/netprio_cgroup.h | 48 ++++++++-------------
include/net/sock.h | 8 ----
kernel/cgroup.c | 98 +++++++++++++++++++++++--------------------
net/core/netprio_cgroup.c | 14 +++----
net/core/sock.c | 16 ++++---
net/sched/cls_cgroup.c | 20 ++++-----
9 files changed, 151 insertions(+), 158 deletions(-)
--
1.7.12.rc1.16.g05a20c8
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
