Skip to content

nexthops: Fix 2 fundamental flaws with nexthop groups

David Ahern netdev 2 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 1 replyIn review
  2. v15 patches 10 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entrynet/ipv4/nexthop.c+13 -140 replies
2/5nexthops: don't modify published nexthop groupsinclude/net/nexthop.h net/ipv4/nexthop.c+59 -330 replies
3/5nexthop: Expand nexthop_is_multipath in a few placesinclude/net/nexthop.h+25 -160 replies
4/5ipv4: Refactor nhc evaluation in fib_table_lookupinclude/net/ip_fib.h include/net/nexthop.h net/ipv4/fib_trie.c+71 -150 replies
5/5ipv4: nexthop version of fib_info_nh_uses_devinclude/net/ip_fib.h include/net/nexthop.h net/ipv4/fib_frontend.c+45 -90 replies

Reviews trailers per patch

4 of 5 patches have a Reviewed-by or Acked-by.

PatchNikolay Aleksandrov
1/5A-b
2/5
3/5A-b
4/5A-b
5/5A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH net v2 0/5] nexthops: Fix 2 fundamental flaws with nexthop groups

Nik's torture tests have exposed 2 fundamental mistakes with the initial nexthop code for groups. First, the nexthops entries and num_nh in the nh_grp struct should not be modified once the struct is set under rcu. Doing so has major affects on the datapath seeing valid nexthop entries.

Second, the helpers in the header file were convenient for not repeating code, but they cause datapath walks to potentially see 2 different group structs after an rcu replace, disrupting a walk of the path objects. This second problem applies solely to IPv4 as I re-used too much of the existing code in walking legs of a multipath route.

Patches 1 is refactoring change to simplify the overhead of reviewing and understanding the change in patch 2 which fixes the update of nexthop groups when a compnent leg is removed.

Patches 3-5 address the second problem. Patch 3 inlines the multipath check such that the mpath lookup and subsequent calls all use the same nh_grp struct. Patches 4 and 5 fix datapath uses of fib_info_num_path with iterative calls to fib_info_nhc.

fib_info_num_path can be used in control plane path in a 'for loop' with subsequent fib_info_nhc calls to get each leg since the nh_grp struct is only changed while holding the rtnl; the combination can not be used in the data plane with external nexthops as it involves repeated dereferences of nh_grp struct which can change between calls.

Similarly, nexthop_is_multipath can be used for branching decisions in the datapath since the nexthop type can not be changed (a group can not be converted to standalone and vice versa).

Patch set developed in coordination with Nikolay Aleksandrov. He did a lot of work creating a good reproducer, discussing options to fix it and testing iterations.

I have adapted Nik's commands into additional tests in the nexthops selftest script which I will send against -next.

v2
- fixed whitespace errors

David Ahern (4):
nexthops: Move code from remove_nexthop_from_groups to
remove_nh_grp_entry
nexthop: Expand nexthop_is_multipath in a few places
ipv4: Refactor nhc evaluation in fib_table_lookup
ipv4: nexthop version of fib_info_nh_uses_dev

Nikolay Aleksandrov (1):
nexthops: don't modify published nexthop groups

 include/net/ip_fib.h    |  12 +++++
 include/net/nexthop.h   | 100 ++++++++++++++++++++++++++++++++-------
 net/ipv4/fib_frontend.c |  19 ++++----
 net/ipv4/fib_trie.c     |  51 ++++++++++++++------
 net/ipv4/nexthop.c      | 102 +++++++++++++++++++++++++---------------
 5 files changed, 205 insertions(+), 79 deletions(-)
Signature · 1 line
2.21.1 (Apple Git-122.3)