| Message ID | 20250402121751.3108-1-ffmancera@riseup.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7ac6ea4a3e0898db76aecccd68fb2c403eb7d24e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] ipv6: fix omitted netlink attributes when using RTEXT_FILTER_SKIP_STATS | expand |
On Wed, Apr 02, 2025 at 02:17:51PM +0200, Fernando Fernandez Mancera wrote: > Using RTEXT_FILTER_SKIP_STATS is incorrectly skipping non-stats IPv6 > netlink attributes on link dump. This causes issues on userspace tools, > e.g iproute2 is not rendering address generation mode as it should due > to missing netlink attribute. > > Move the filling of IFLA_INET6_STATS and IFLA_INET6_ICMP6STATS to a > helper function guarded by a flag check to avoid hitting the same > situation in the future. > > Fixes: d5566fd72ec1 ("rtnetlink: RTEXT_FILTER_SKIP_STATS support to avoid dumping inet/inet6 stats") > Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 2 Apr 2025 14:17:51 +0200 you wrote: > Using RTEXT_FILTER_SKIP_STATS is incorrectly skipping non-stats IPv6 > netlink attributes on link dump. This causes issues on userspace tools, > e.g iproute2 is not rendering address generation mode as it should due > to missing netlink attribute. > > Move the filling of IFLA_INET6_STATS and IFLA_INET6_ICMP6STATS to a > helper function guarded by a flag check to avoid hitting the same > situation in the future. > > [...] Here is the summary with links: - [net,v2] ipv6: fix omitted netlink attributes when using RTEXT_FILTER_SKIP_STATS https://git.kernel.org/netdev/net/c/7ac6ea4a3e08 You are awesome, thank you!
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ac8cc1076536..54a8ea004da2 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5784,6 +5784,27 @@ static void snmp6_fill_stats(u64 *stats, struct inet6_dev *idev, int attrtype, } } +static int inet6_fill_ifla6_stats_attrs(struct sk_buff *skb, + struct inet6_dev *idev) +{ + struct nlattr *nla; + + nla = nla_reserve(skb, IFLA_INET6_STATS, IPSTATS_MIB_MAX * sizeof(u64)); + if (!nla) + goto nla_put_failure; + snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_STATS, nla_len(nla)); + + nla = nla_reserve(skb, IFLA_INET6_ICMP6STATS, ICMP6_MIB_MAX * sizeof(u64)); + if (!nla) + goto nla_put_failure; + snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_ICMP6STATS, nla_len(nla)); + + return 0; + +nla_put_failure: + return -EMSGSIZE; +} + static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev, u32 ext_filter_mask) { @@ -5806,18 +5827,10 @@ static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev, /* XXX - MC not implemented */ - if (ext_filter_mask & RTEXT_FILTER_SKIP_STATS) - return 0; - - nla = nla_reserve(skb, IFLA_INET6_STATS, IPSTATS_MIB_MAX * sizeof(u64)); - if (!nla) - goto nla_put_failure; - snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_STATS, nla_len(nla)); - - nla = nla_reserve(skb, IFLA_INET6_ICMP6STATS, ICMP6_MIB_MAX * sizeof(u64)); - if (!nla) - goto nla_put_failure; - snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_ICMP6STATS, nla_len(nla)); + if (!(ext_filter_mask & RTEXT_FILTER_SKIP_STATS)) { + if (inet6_fill_ifla6_stats_attrs(skb, idev) < 0) + goto nla_put_failure; + } nla = nla_reserve(skb, IFLA_INET6_TOKEN, sizeof(struct in6_addr)); if (!nla)
Using RTEXT_FILTER_SKIP_STATS is incorrectly skipping non-stats IPv6 netlink attributes on link dump. This causes issues on userspace tools, e.g iproute2 is not rendering address generation mode as it should due to missing netlink attribute. Move the filling of IFLA_INET6_STATS and IFLA_INET6_ICMP6STATS to a helper function guarded by a flag check to avoid hitting the same situation in the future. Fixes: d5566fd72ec1 ("rtnetlink: RTEXT_FILTER_SKIP_STATS support to avoid dumping inet/inet6 stats") Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net> --- net/ipv6/addrconf.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-)