diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-30 12:54:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-30 12:54:02 -0700 |
| commit | 9f04960660bf5468caaf9da2752f6f35020e4679 (patch) | |
| tree | ed40e881e11b90220f724c91cce783800bb2d0d0 /include/linux | |
| parent | 8a769c65bb7a3cba0db01b0f46850862c9f5d7bf (diff) | |
| parent | b1f3e43dbfacfcd95296b0f80f84b186add9ef54 (diff) | |
| download | kernel_replicant_linux-9f04960660bf5468caaf9da2752f6f35020e4679.tar.gz kernel_replicant_linux-9f04960660bf5468caaf9da2752f6f35020e4679.tar.bz2 kernel_replicant_linux-9f04960660bf5468caaf9da2752f6f35020e4679.zip | |
Merge branch 'inet_diag-add-cgroup-attribute-and-filter'
Dmitry Yakunin says:
====================
inet_diag: add cgroup attribute and filter
This patch series extends inet diag with cgroup v2 ID attribute and
filter. Which allows investigate sockets on per cgroup basis. Patch for
ss is already sent to iproute2-next mailing list.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/inet_diag.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index ce9ed1c0602f..0ef2d800fda7 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h @@ -71,7 +71,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, |