inet_diag: add cgroup id attribute
Subsystems (4)
PATCH v3 1/1 inet_diag: add cgroup id attribute
This patch adds cgroup v2 ID to common inet diag message attributes. Cgroup v2 ID is kernfs ID (ino or ino+gen). This attribute allows filter inet diag output by cgroup ID obtained by name_to_handle_at() syscall. When net_cls or net_prio cgroup is activated this ID is equal to 1 (root cgroup ID) for newly created sockets.
Some notes about this ID:
1) gets initialized in socket() syscall
2) incoming socket gets ID from listening socket (not during accept() syscall)
3) not changed when process get moved to another cgroup
4) can point to deleted cgroup (refcounting)
v2:
- use CONFIG_SOCK_CGROUP_DATA instead if CONFIG_CGROUPS
v3:
- fix attr size by using nla_total_size_64bit() (Eric Dumazet)
- more detailed commit message (Konstantin Khlebnikov)
--- include/linux/inet_diag.h | 6 +++++- include/uapi/linux/inet_diag.h | 1 + net/ipv4/inet_diag.c | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-)
include/linux/inet_diag.h +5 -1
@@ -66,7 +66,11 @@ static inline size_t inet_diag_msg_attrs_size(void) + nla_total_size(1) /* INET_DIAG_SKV6ONLY */ #endif + nla_total_size(4) /* INET_DIAG_MARK */ - +nla_total_size (4 );/* INET_DIAG_CLASS_ID */ + + nla_total_size(4) /* INET_DIAG_CLASS_ID */ +#ifdef CONFIG_SOCK_CGROUP_DATA + + nla_total_size_64bit(sizeof(u64)) /* INET_DIAG_CGROUP_ID */ +#endif + ; } int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, struct inet_diag_msg *r, int ext,
include/uapi/linux/inet_diag.h +1 -0
@@ -154,6 +154,7 @@ enum {INET_DIAG_CLASS_ID ,/* request as INET_DIAG_TCLASS */ INET_DIAG_MD5SIG ,INET_DIAG_ULP_INFO , +INET_DIAG_CGROUP_ID , __INET_DIAG_MAX, };
net/ipv4/inet_diag.c +7 -0
@@ -161,6 +161,13 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, goto errout; } +#ifdef CONFIG_SOCK_CGROUP_DATA +if (nla_put_u64_64bit (skb,INET_DIAG_CGROUP_ID , +cgroup_id (sock_cgroup_ptr (&sk->sk_cgrp_data)), +INET_DIAG_PAD )) + goto errout; +#endif + r->idiag_uid =from_kuid_munged (user_ns,sock_i_uid (sk)); r->idiag_inode =sock_i_ino (sk);
Signature · 1 line
2.7.4
Tejun Heo
maintainerQuoted 11 lines · Dmitry Yakunin
This patch adds cgroup v2 ID to common inet diag message attributes. Cgroup v2 ID is kernfs ID (ino or ino+gen). This attribute allows filter inet diag output by cgroup ID obtained by
name_to_handle_at()syscall. Whennet_clsornet_priocgroup is activated this ID is equal to 1 (root cgroup ID) for newly created sockets.Some notes about this ID:
1) gets initialized in
socket()syscall
2) incoming socket gets ID from listening socket
(not duringaccept()syscall)
How would this work with things like inetd? Would it make sense to associate the socket on the first actual send/recv?
Thanks.
Signature · 1 line
tejun
Tejun Heo
maintainerQuoted 7 lines · Tejun Heo
Quoted 6 lines · Dmitry Yakunin
This patch adds cgroup v2 ID to common inet diag message attributes. Cgroup v2 ID is kernfs ID (ino or ino+gen). This attribute allows filter inet diag output by cgroup ID obtained by
name_to_handle_at()syscall. Whennet_clsornet_priocgroup is activated this ID is equal to 1 (root cgroup ID) for newly created sockets.
Quoted 8 lines
Quoted 5 lines
Some notes about this ID:
1) gets initialized in
socket()syscall
2) incoming socket gets ID from listening socket
(not duringaccept()syscall)How would this work with things like inetd? Would it make sense to associate the socket on the first actual send/recv?
Oh, it's not a problem with your patch as you're just following the associated ptr, so we can have that discussion separately. Looks good to me from cgroup side. Please feel free to add my acked-by.
Thanks.
Signature · 1 line
tejun
Quoted 7 lines · Tejun Heo
Quoted 6 lines · Dmitry Yakunin
This patch adds cgroup v2 ID to common inet diag message attributes. Cgroup v2 ID is kernfs ID (ino or ino+gen). This attribute allows filter inet diag output by cgroup ID obtained by
name_to_handle_at()syscall. Whennet_clsornet_priocgroup is activated this ID is equal to 1 (root cgroup ID) for newly created sockets.
Quoted 8 lines
Quoted 5 lines
Some notes about this ID:
1) gets initialized in
socket()syscall
2) incoming socket gets ID from listening socket
(not duringaccept()syscall)How would this work with things like inetd? Would it make sense to associate the socket on the first actual send/recv?
First send/recv seems too intrusive.
Setsockopt to change association to current cgroup (or by id) seems more reasonable.
Systemd variant of inetd handles sockets as separate units and probably creates own cgroups for them.
Quoted 3 lines
Thanks.
Tejun Heo
maintainerQuoted 4 lines · Konstantin Khlebnikov
Quoted 2 lines
How would this work with things like inetd? Would it make sense to associate the socket on the first actual send/recv?
First send/recv seems too intrusive.
Intrusive in terms of?
Quoted 1 line
Setsockopt to change association to current cgroup (or by id) seems more reasonable.
I'm not sure about exposing it as an explicit interface.
Thanks.
Signature · 1 line
tejun
Quoted 7 lines · Tejun Heo
Quoted 4 lines · Konstantin Khlebnikov
Quoted 2 lines
How would this work with things like inetd? Would it make sense to associate the socket on the first actual send/recv?
First send/recv seems too intrusive.
Intrusive in terms of?
In term of adding more code to networking fast paths.
Quoted 4 lines
Quoted 2 lines
Setsockopt to change association to current cgroup (or by id) seems more reasonable.
I'm not sure about exposing it as an explicit interface.
Yep, it's better to create thing in right place from the beginning. Current behaviour isn't bad, just not obvious (and barely documented). That's why I've asked Dmitry to add these notes.
Quoted 3 lines
Thanks.
David Miller
maintainerFrom: Dmitry Yakunin <[email protected]>
Date: Fri, 3 Apr 2020 12:56:27 +0300
Quoted 17 lines
This patch adds cgroup v2 ID to common inet diag message attributes. Cgroup v2 ID is kernfs ID (ino or ino+gen). This attribute allows filter inet diag output by cgroup ID obtained by
name_to_handle_at()syscall. Whennet_clsornet_priocgroup is activated this ID is equal to 1 (root cgroup ID) for newly created sockets.Some notes about this ID:
1) gets initialized in
socket()syscall
2) incoming socket gets ID from listening socket (not duringaccept()syscall)
3) not changed when process get moved to another cgroup
4) can point to deleted cgroup (refcounting)v2:
- useCONFIG_SOCK_CGROUP_DATAinstead ifCONFIG_CGROUPS
Quoted 6 lines
v3:
- fix attr size by usingnla_total_size_64bit()(Eric Dumazet)
- more detailed commit message (Konstantin Khlebnikov)Signed-off-by Dmitry Yakunin <[email protected]>Reviewed-by Konstantin Khlebnikov <[email protected]>
As a new feature, this should be resubmitted when net-next opens back up. Thank you.