Skip to content

ip6mr: No RTNL for RTNL_FAMILY_IP6MR rtnetlink.

Kuniyuki Iwashima netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest posting 2/215 patches 0 repliesApplied 15/15
  2. v3 posting 1/215 patches 3 repliesSuperseded

Changes in v3 from the cover letter

Patch 1 : Use XFAIL_ADD()

Patches in v3 posting 2/2 All 15 applied

#Subject and filesSizeRepliesApplied
1/15selftest: net: Extend ipmr.c for IP6MR.tools/testing/selftests/net/forwarding/ipmr.c+122 -670 repliesApplied
2/15ip6mr: Annotate access to mrt->mroute_do_{pim,assert,wrvifwhole}.net/ipv6/ip6mr.c+9 -90 repliesApplied
3/15ip6mr: Use MAXMIFS in mr6_msgsize().net/ipv6/ip6mr.c+4 -50 repliesApplied
4/15ip6mr: Allocate skb earlier in ip6mr_rtm_getroute().net/ipv6/ip6mr.c+14 -100 repliesApplied
5/15ip6mr: Convert ip6mr_rtm_getroute() to RCU.net/ipv6/ip6mr.c+7 -40 repliesApplied
6/15ip6mr: Convert ip6mr_rtm_dumproute() to RCU.net/ipv6/ip6mr.c+20 -90 repliesApplied
7/15net: Remove rtnl_held of struct fib_dump_filter.include/net/ip_fib.h net/ipv4/fib_frontend.c net/ipv4/ipmr.c +3 more+10 -250 repliesApplied
8/15ip6mr: Free mr_table after RCU grace period.net/ipv6/ip6mr.c+69 -520 repliesApplied
9/15ip6mr: Call fib_rules_unregister() without RTNL.net/ipv6/ip6mr.c+13 -30 repliesApplied
10/15ip6mr: Move unregister_netdevice_many() out of mroute_clean_tables().net/ipv6/ip6mr.c+17 -80 repliesApplied
11/15ip6mr: Move unregister_netdevice_many() out of ip6mr_free_table().net/ipv6/ip6mr.c+15 -80 repliesApplied
12/15ip6mr: Convert ip6mr_net_exit_batch() to ->exit_rtnl().net/ipv6/ip6mr.c+15 -180 repliesApplied
13/15ip6mr: Remove RTNL in ip6mr_rules_init() and ip6mr_net_init().net/ipv6/ip6mr.c+5 -100 repliesApplied
14/15ip6mr: Replace RTNL with a dedicated mutex for MFC.include/net/netns/ipv6.h net/ipv6/ip6mr.c+13 -50 repliesApplied
15/15ip6mr: Define net->ipv6.{ip6mr_notifier_ops,ipmr_seq} under CONFIG_IPV6_MROUTE.include/net/netns/ipv6.h+2 -20 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 net-next 00/15] ip6mr: No RTNL for RTNL_FAMILY_IP6MR rtnetlink.

This series is the IPv6 version of

https://lore.kernel.org/netdev/[email protected]/

and removes RTNL from ip6mr rtnetlink handlers.

After this series, there are a few RTNL left in net/ipv6/ip6mr.c and such users will be converted to per-netns RTNL in another series.

Patch 1 extends the ipmr selftest to exercise most of the RTNL
paths in net/ipv6/ipmr.c

Patch 2 - 6 converts RTM_GETROUTE handlers to RCU.

Patch 7 removes struct fib_dump_filter.rtnl_held.

Patch 8 use RCU for mr_table for CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=n
for ->exit_rtnl().

Patch 9 move fib_rules_unregister() to ->exit()

Patch 10 - 12 converts ->exit_batch() to ->exit_rtnl() to
save one RTNL in cleanup_net().

Patch 13 removes unnecessary RTNL during setup_net() failure.

Patch 14 drops RTNL for MRT6_(ADD|DEL)_MFC(_PROXY)?.

Patch 15 misc clean up

Changes:
v3:
Patch 1 : Use XFAIL_ADD()

v2: https://lore.kernel.org/netdev/[email protected]/
Add patch 8 & 9 for ->exit_rtnl() conversion and
drop 2 trivial patches (patch 2 & 14 in v1)

v1: https://lore.kernel.org/netdev/[email protected]/

Kuniyuki Iwashima (15):
selftest: net: Extend ipmr.c for IP6MR.
ip6mr: Annotate access to mrt->mroute_do_{pim,assert,wrvifwhole}.
ip6mr: Use MAXMIFS in mr6_msgsize().
ip6mr: Allocate skb earlier in ip6mr_rtm_getroute().
ip6mr: Convert ip6mr_rtm_getroute() to RCU.
ip6mr: Convert ip6mr_rtm_dumproute() to RCU.
net: Remove rtnl_held of struct fib_dump_filter.
ip6mr: Free mr_table after RCU grace period.
ip6mr: Call fib_rules_unregister() without RTNL.
ip6mr: Move unregister_netdevice_many() out of mroute_clean_tables().
ip6mr: Move unregister_netdevice_many() out of ip6mr_free_table().
ip6mr: Convert ip6mr_net_exit_batch() to ->exit_rtnl().
ip6mr: Remove RTNL in ip6mr_rules_init() and ip6mr_net_init().
ip6mr: Replace RTNL with a dedicated mutex for MFC.
ip6mr: Define net->ipv6.{ip6mr_notifier_ops,ipmr_seq} under
CONFIG_IPV6_MROUTE.

 include/net/ip_fib.h                          |   1 -
 include/net/netns/ipv6.h                      |   5 +-
 net/ipv4/fib_frontend.c                       |  19 +-
 net/ipv4/ipmr.c                               |   4 +-
 net/ipv6/ip6_fib.c                            |   1 -
 net/ipv6/ip6mr.c                              | 299 +++++++++++-------
 net/mpls/af_mpls.c                            |   6 +-
 tools/testing/selftests/net/forwarding/ipmr.c | 189 +++++++----
 8 files changed, 312 insertions(+), 212 deletions(-)
Signature · 1 line
2.54.0.1032.g2f8565e1d1-goog