diff options
author | John Fastabend <john.r.fastabend@intel.com> | 2012-07-20 10:39:25 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-22 12:44:01 -0700 |
commit | 406a3c638ce8b17d9704052c07955490f732c2b8 (patch) | |
tree | db759dfccc6c09196773d0cc1ec260a7a4e9db07 /net/core/sock.c | |
parent | 0690899b4d4501b3505be069b9a687e68ccbe15b (diff) | |
download | kernel_goldelico_gta04-406a3c638ce8b17d9704052c07955490f732c2b8.zip kernel_goldelico_gta04-406a3c638ce8b17d9704052c07955490f732c2b8.tar.gz kernel_goldelico_gta04-406a3c638ce8b17d9704052c07955490f732c2b8.tar.bz2 |
net: netprio_cgroup: rework update socket logic
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 <john.r.fastabend@intel.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 24039ac..2676a88 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1180,12 +1180,12 @@ void sock_update_classid(struct sock *sk) } EXPORT_SYMBOL(sock_update_classid); -void sock_update_netprioidx(struct sock *sk) +void sock_update_netprioidx(struct sock *sk, struct task_struct *task) { if (in_interrupt()) return; - sk->sk_cgrp_prioidx = task_netprioidx(current); + sk->sk_cgrp_prioidx = task_netprioidx(task); } EXPORT_SYMBOL_GPL(sock_update_netprioidx); #endif @@ -1215,7 +1215,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, atomic_set(&sk->sk_wmem_alloc, 1); sock_update_classid(sk); - sock_update_netprioidx(sk); + sock_update_netprioidx(sk, current); } return sk; |