diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2019-02-09 13:35:52 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-12 13:35:57 -0500 |
commit | 1ec17dbd90f8b638f41ee650558609c1af63dfa0 (patch) | |
tree | 2803b2f52d171321ab90a37b174582b13abf9a3f /net/sctp/diag.c | |
parent | 4ffcbfac60642f63ae3d80891f573ba7e94a265c (diff) | |
download | linux-1ec17dbd90f8b638f41ee650558609c1af63dfa0.tar.gz linux-1ec17dbd90f8b638f41ee650558609c1af63dfa0.tar.bz2 linux-1ec17dbd90f8b638f41ee650558609c1af63dfa0.zip |
inet_diag: fix reporting cgroup classid and fallback to priority
Field idiag_ext in struct inet_diag_req_v2 used as bitmap of requested
extensions has only 8 bits. Thus extensions starting from DCTCPINFO
cannot be requested directly. Some of them included into response
unconditionally or hook into some of lower 8 bits.
Extension INET_DIAG_CLASS_ID has not way to request from the beginning.
This patch bundle it with INET_DIAG_TCLASS (ipv6 tos), fixes space
reservation, and documents behavior for other extensions.
Also this patch adds fallback to reporting socket priority. This filed
is more widely used for traffic classification because ipv4 sockets
automatically maps TOS to priority and default qdisc pfifo_fast knows
about that. But priority could be changed via setsockopt SO_PRIORITY so
INET_DIAG_TOS isn't enough for predicting class.
Also cgroup2 obsoletes net_cls classid (it always zero), but we cannot
reuse this field for reporting cgroup2 id because it is 64-bit (ino+gen).
So, after this patch INET_DIAG_CLASS_ID will report socket priority
for most common setup when net_cls isn't set and/or cgroup2 in use.
Fixes: 0888e372c37f ("net: inet: diag: expose sockets cgroup classid")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/diag.c')
-rw-r--r-- | net/sctp/diag.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 078f01a8d582..435847d98b51 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c @@ -256,6 +256,7 @@ static size_t inet_assoc_attr_size(struct sctp_association *asoc) + nla_total_size(1) /* INET_DIAG_TOS */ + nla_total_size(1) /* INET_DIAG_TCLASS */ + nla_total_size(4) /* INET_DIAG_MARK */ + + nla_total_size(4) /* INET_DIAG_CLASS_ID */ + nla_total_size(addrlen * asoc->peer.transport_count) + nla_total_size(addrlen * addrcnt) + nla_total_size(sizeof(struct inet_diag_meminfo)) |