diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-10-25 04:16:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-26 03:40:50 -0400 |
| commit | fd9a08a7b83074e34c13c6340f673f7a51f53489 (patch) | |
| tree | d4678a07c825bb6dbe84b129b82c4efa93d5a474 /net | |
| parent | 3ace03cc2a03eadf83a59eecada68b37bc1a46ae (diff) | |
cgroup: net_cls: Pass in task to sock_update_classid()
sock_update_classid() assumes that the update operation always are
applied on the current task. sock_update_classid() needs to know on
which tasks to work on in order to be able to migrate task between
cgroups using the struct cgroup_subsys attach() callback.
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Joe Perches <joe@perches.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: <netdev@vger.kernel.org>
Cc: <cgroups@vger.kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 6 | ||||
| -rw-r--r-- | net/socket.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 9fedbbfb070..0a023b8daa5 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1217,11 +1217,11 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) #ifdef CONFIG_CGROUPS #if IS_ENABLED(CONFIG_NET_CLS_CGROUP) -void sock_update_classid(struct sock *sk) +void sock_update_classid(struct sock *sk, struct task_struct *task) { u32 classid; - classid = task_cls_classid(current); + classid = task_cls_classid(task); if (classid != sk->sk_classid) sk->sk_classid = classid; } @@ -1264,7 +1264,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, sock_net_set(sk, get_net(net)); atomic_set(&sk->sk_wmem_alloc, 1); - sock_update_classid(sk); + sock_update_classid(sk, current); sock_update_netprioidx(sk, current); } diff --git a/net/socket.c b/net/socket.c index d92c490e66f..f1a481ab753 100644 --- a/net/socket.c +++ b/net/socket.c @@ -620,7 +620,7 @@ static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock, { struct sock_iocb *si = kiocb_to_siocb(iocb); - sock_update_classid(sock->sk); + sock_update_classid(sock->sk, current); si->sock = sock; si->scm = NULL; @@ -784,7 +784,7 @@ static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock, { struct sock_iocb *si = kiocb_to_siocb(iocb); - sock_update_classid(sock->sk); + sock_update_classid(sock->sk, current); si->sock = sock; si->scm = NULL; @@ -896,7 +896,7 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, if (unlikely(!sock->ops->splice_read)) return -EINVAL; - sock_update_classid(sock->sk); + sock_update_classid(sock->sk, current); return sock->ops->splice_read(sock, ppos, pipe, len, flags); } @@ -3437,7 +3437,7 @@ EXPORT_SYMBOL(kernel_setsockopt); int kernel_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags) { - sock_update_classid(sock->sk); + sock_update_classid(sock->sk, current); if (sock->ops->sendpage) return sock->ops->sendpage(sock, page, offset, size, flags); |