22 Nov, 2012
1 commit
-
With priomap expansion no longer depending on knowing max id
allocated, netprio_cgroup can use cgroup->id insted of cs->prioidx.
Drop prioidx alloc/free logic and convert all uses to cgroup->id.* In cgrp_css_alloc(), parent->id test is moved above @cs allocation
to simplify error path.* In cgrp_css_free(), @cs assignment is made initialization.
Signed-off-by: Tejun Heo
Acked-by: Neil Horman
Tested-and-Acked-by: Daniel Wagner
Acked-by: David S. Miller
15 Sep, 2012
2 commits
-
WARNING: With this change it is impossible to load external built
controllers anymore.In case where CONFIG_NETPRIO_CGROUP=m and CONFIG_NET_CLS_CGROUP=m is
set, corresponding subsys_id should also be a constant. Up to now,
net_prio_subsys_id and net_cls_subsys_id would be of the type int and
the value would be assigned during runtime.By switching the macro definition IS_SUBSYS_ENABLED from IS_BUILTIN
to IS_ENABLED, all *_subsys_id will have constant value. That means we
need to remove all the code which assumes a value can be assigned to
net_prio_subsys_id and net_cls_subsys_id.A close look is necessary on the RCU part which was introduces by
following patch:commit f845172531fb7410c7fb7780b1a6e51ee6df7d52
Author: Herbert Xu Mon May 24 09:12:34 2010
Committer: David S. Miller Mon May 24 09:12:34 2010cls_cgroup: Store classid in struct sock
Tis code was added to init_cgroup_cls()
/* We can't use rcu_assign_pointer because this is an int. */
smp_wmb();
net_cls_subsys_id = net_cls_subsys.subsys_id;respectively to exit_cgroup_cls()
net_cls_subsys_id = -1;
synchronize_rcu();and in module version of task_cls_classid()
rcu_read_lock();
id = rcu_dereference(net_cls_subsys_id);
if (id >= 0)
classid = container_of(task_subsys_state(p, id),
struct cgroup_cls_state, css)->classid;
rcu_read_unlock();Without an explicit explaination why the RCU part is needed. (The
rcu_deference was fixed by exchanging it to rcu_derefence_index_check()
in a later commit, but that is a minor detail.)So here is my pondering why it was introduced and why it safe to
remove it now. Note that this code was copied over to net_prio the
reasoning holds for that subsystem too.The idea behind the RCU use for net_cls_subsys_id is to make sure we
get a valid pointer back from task_subsys_state(). task_subsys_state()
is just blindly accessing the subsys array and returning the
pointer. Obviously, passing in -1 as id into task_subsys_state()
returns an invalid value (out of lower bound).So this code makes sure that only after module is loaded and the
subsystem registered, the id is assigned.Before unregistering the module all old readers must have left the
critical section. This is done by assigning -1 to the id and issuing a
synchronized_rcu(). Any new readers wont call task_subsys_state()
anymore and therefore it is safe to unregister the subsystem.The new code relies on the same trick, but it looks at the subsys
pointer return by task_subsys_state() (remember the id is constant
and therefore we allways have a valid index into the subsys
array).No precautions need to be taken during module loading
module. Eventually, all CPUs will get a valid pointer back from
task_subsys_state() because rebind_subsystem() which is called after
the module init() function will assigned subsys[net_cls_subsys_id] the
newly loaded module subsystem pointer.When the subsystem is about to be removed, rebind_subsystem() will
called before the module exit() function. In this case,
rebind_subsys() will assign subsys[net_cls_subsys_id] a NULL pointer
and then it calls synchronize_rcu(). All old readers have left by then
the critical section. Any new reader wont access the subsystem
anymore. At this point we are safe to unregister the subsystem. No
synchronize_rcu() call is needed.Signed-off-by: Daniel Wagner
Signed-off-by: Tejun Heo
Acked-by: Li Zefan
Acked-by: Neil Horman
Cc: "David S. Miller"
Cc: "Paul E. McKenney"
Cc: Andrew Morton
Cc: Eric Dumazet
Cc: Gao feng
Cc: Glauber Costa
Cc: Herbert Xu
Cc: Jamal Hadi Salim
Cc: John Fastabend
Cc: Kamezawa Hiroyuki
Cc: netdev@vger.kernel.org
Cc: cgroups@vger.kernel.org -
task_netprioidx() should not be defined in case the configuration is
CONFIG_NETPRIO_CGROUP=n. The reason is that in a following patch the
net_prio_subsys_id will only be defined if CONFIG_NETPRIO_CGROUP!=n.
When net_prio is not built at all any callee should only get an empty
task_netprioidx() without any references to net_prio_subsys_id.Signed-off-by: Daniel Wagner
Signed-off-by: Tejun Heo
Acked-by: Li Zefan
Acked-by: Neil Horman
Cc: Gao feng
Cc: Jamal Hadi Salim
Cc: John Fastabend
Cc: netdev@vger.kernel.org
Cc: cgroups@vger.kernel.org
23 Jul, 2012
1 commit
-
Instead of updating the sk_cgrp_prioidx struct field on every send
this only updates the field when a task is moved via cgroup
infrastructure.This allows sockets that may be used by a kernel worker thread
to be managed. For example in the iscsi case today a user can
put iscsid in a netprio cgroup and control traffic will be sent
with the correct sk_cgrp_prioidx value set but as soon as data
is sent the kernel worker thread isssues a send and sk_cgrp_prioidx
is updated with the kernel worker threads value which is the
default case.It seems more correct to only update the field when the user
explicitly sets it via control group infrastructure. This allows
the users to manage sockets that may be used with other threads.Signed-off-by: John Fastabend
Acked-by: Neil Horman
Signed-off-by: David S. Miller
11 Feb, 2012
1 commit
-
When the netprio_cgroup module is not loaded, net_prio_subsys_id
is -1, and so sock_update_prioidx() accesses cgroup_subsys array
with negative index subsys[-1].Make the code resembles cls_cgroup code, which is bug free.
Origionally-authored-by: Li Zefan
Signed-off-by: Li Zefan
Signed-off-by: Neil Horman
CC: "David S. Miller"
Signed-off-by: David S. Miller
25 Jan, 2012
1 commit
-
A considerable effort was invested in wiping out module.h
from being present in all the other standard includes. This
one leaked back in, but once again isn't strictly necessary,
so remove it.Signed-off-by: Paul Gortmaker
Signed-off-by: David S. Miller
24 Nov, 2011
1 commit
-
I broke the build with the addition of netprio_cgroups if CONFIG_CGROUPS=n.
This patch corrects it by moving the offending struct into an ifdef
CONFIG_CGROUPS block. Also clean up a few needless defines and inline functions
that don't get called if CONFIG_CGROUPS isn't defined while Im at it.Signed-off-by: Neil Horman
Signed-off-by: David S. Miller
23 Nov, 2011
1 commit
-
This patch adds in the infrastructure code to create the network priority
cgroup. The cgroup, in addition to the standard processes file creates two
control files:1) prioidx - This is a read-only file that exports the index of this cgroup.
This is a value that is both arbitrary and unique to a cgroup in this subsystem,
and is used to index the per-device priority map2) priomap - This is a writeable file. On read it reports a table of 2-tuples
where name is the name of a network interface and priority is
indicates the priority assigned to frames egresessing on the named interface and
originating from a pid in this cgroupThis cgroup allows for skb priority to be set prior to a root qdisc getting
selected. This is benenficial for DCB enabled systems, in that it allows for any
application to use dcb configured priorities so without application modificationSigned-off-by: Neil Horman
Signed-off-by: John Fastabend
CC: Robert Love
CC: "David S. Miller"
Signed-off-by: David S. Miller