TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nexthop-various-fixes'

Browse Source 
Ido Schimmel says:

====================
nexthop: Various fixes

Patch #1 fixes a NPD that was recently reported by syzbot.

Patch #2 fixes an issue in the existing FIB nexthop selftest.

Patch #3 extends the selftest with test cases for the bug that was fixed
in the first patch.
====================

Link: https://patch.msgid.link/20250921150824.149157-1-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-09-23 17:01:08 -07:00
parent ca9f9cdc4d 00af023d90
commit 0efdfbba2e
2 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ipv4/nexthop.c
+7
View File
@@ -2399,6 +2399,13 @@ static int replace_nexthop_single(struct net *net, struct nexthop *old,
return -EINVAL;
}
if (!list_empty(&old->grp_list) &&
rtnl_dereference(new->nh_info)->fdb_nh !=
rtnl_dereference(old->nh_info)->fdb_nh) {
NL_SET_ERR_MSG(extack, "Cannot change nexthop FDB status while in a group");
return -EINVAL;
}
err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, new, extack);
if (err)
return err;
tools/testing/selftests/net/fib_nexthops.sh
+46 -6
View File
@@ -467,8 +467,8 @@ ipv6_fdb_grp_fcnal()
log_test $? 0 "Get Fdb nexthop group by id"
# fdb nexthop group can only contain fdb nexthops
run_cmd "$IP nexthop add id 63 via 2001:db8:91::4"
run_cmd "$IP nexthop add id 64 via 2001:db8:91::5"
run_cmd "$IP nexthop add id 63 via 2001:db8:91::4 dev veth1"
run_cmd "$IP nexthop add id 64 via 2001:db8:91::5 dev veth1"
run_cmd "$IP nexthop add id 103 group 63/64 fdb"
log_test $? 2 "Fdb Nexthop group with non-fdb nexthops"
@@ -494,6 +494,26 @@ ipv6_fdb_grp_fcnal()
run_cmd "$IP nexthop add id 69 encap mpls 101 via 2001:db8:91::8 dev veth1 fdb"
log_test $? 2 "Fdb Nexthop with encap"
# Replace FDB nexthop to non-FDB and vice versa
run_cmd "$IP nexthop add id 70 via 2001:db8:91::2 fdb"
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::2 dev veth1"
log_test $? 0 "Replace FDB nexthop to non-FDB nexthop"
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::2 fdb"
log_test $? 0 "Replace non-FDB nexthop to FDB nexthop"
# Replace FDB nexthop address while in a group
run_cmd "$IP nexthop add id 71 group 70 fdb"
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::3 fdb"
log_test $? 0 "Replace FDB nexthop address while in a group"
# Cannot replace FDB nexthop to non-FDB and vice versa while in a group
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::2 dev veth1"
log_test $? 2 "Replace FDB nexthop to non-FDB nexthop while in a group"
run_cmd "$IP nexthop add id 72 via 2001:db8:91::2 dev veth1"
run_cmd "$IP nexthop add id 73 group 72"
run_cmd "$IP nexthop replace id 72 via 2001:db8:91::2 fdb"
log_test $? 2 "Replace non-FDB nexthop to FDB nexthop while in a group"
run_cmd "$IP link add name vx10 type vxlan id 1010 local 2001:db8:91::9 remote 2001:db8:91::10 dstport 4789 nolearning noudpcsum tos inherit ttl 100"
run_cmd "$BRIDGE fdb add 02:02:00:00:00:13 dev vx10 nhid 102 self"
log_test $? 0 "Fdb mac add with nexthop group"
@@ -547,15 +567,15 @@ ipv4_fdb_grp_fcnal()
log_test $? 0 "Get Fdb nexthop group by id"
# fdb nexthop group can only contain fdb nexthops
run_cmd "$IP nexthop add id 14 via 172.16.1.2"
run_cmd "$IP nexthop add id 15 via 172.16.1.3"
run_cmd "$IP nexthop add id 14 via 172.16.1.2 dev veth1"
run_cmd "$IP nexthop add id 15 via 172.16.1.3 dev veth1"
run_cmd "$IP nexthop add id 103 group 14/15 fdb"
log_test $? 2 "Fdb Nexthop group with non-fdb nexthops"
# Non fdb nexthop group can not contain fdb nexthops
run_cmd "$IP nexthop add id 16 via 172.16.1.2 fdb"
run_cmd "$IP nexthop add id 17 via 172.16.1.3 fdb"
run_cmd "$IP nexthop add id 104 group 14/15"
run_cmd "$IP nexthop add id 104 group 16/17"
log_test $? 2 "Non-Fdb Nexthop group with fdb nexthops"
# fdb nexthop cannot have blackhole
@@ -574,6 +594,26 @@ ipv4_fdb_grp_fcnal()
run_cmd "$IP nexthop add id 17 encap mpls 101 via 172.16.1.2 dev veth1 fdb"
log_test $? 2 "Fdb Nexthop with encap"
# Replace FDB nexthop to non-FDB and vice versa
run_cmd "$IP nexthop add id 18 via 172.16.1.2 fdb"
run_cmd "$IP nexthop replace id 18 via 172.16.1.2 dev veth1"
log_test $? 0 "Replace FDB nexthop to non-FDB nexthop"
run_cmd "$IP nexthop replace id 18 via 172.16.1.2 fdb"
log_test $? 0 "Replace non-FDB nexthop to FDB nexthop"
# Replace FDB nexthop address while in a group
run_cmd "$IP nexthop add id 19 group 18 fdb"
run_cmd "$IP nexthop replace id 18 via 172.16.1.3 fdb"
log_test $? 0 "Replace FDB nexthop address while in a group"
# Cannot replace FDB nexthop to non-FDB and vice versa while in a group
run_cmd "$IP nexthop replace id 18 via 172.16.1.2 dev veth1"
log_test $? 2 "Replace FDB nexthop to non-FDB nexthop while in a group"
run_cmd "$IP nexthop add id 20 via 172.16.1.2 dev veth1"
run_cmd "$IP nexthop add id 21 group 20"
run_cmd "$IP nexthop replace id 20 via 172.16.1.2 fdb"
log_test $? 2 "Replace non-FDB nexthop to FDB nexthop while in a group"
run_cmd "$IP link add name vx10 type vxlan id 1010 local 10.0.0.1 remote 10.0.0.2 dstport 4789 nolearning noudpcsum tos inherit ttl 100"
run_cmd "$BRIDGE fdb add 02:02:00:00:00:13 dev vx10 nhid 102 self"
log_test $? 0 "Fdb mac add with nexthop group"
@@ -582,7 +622,7 @@ ipv4_fdb_grp_fcnal()
run_cmd "$BRIDGE fdb add 02:02:00:00:00:14 dev vx10 nhid 12 self"
log_test $? 255 "Fdb mac add with nexthop"
run_cmd "$IP ro add 172.16.0.0/22 nhid 15"
run_cmd "$IP ro add 172.16.0.0/22 nhid 16"
log_test $? 2 "Route add with fdb nexthop"
run_cmd "$IP ro add 172.16.0.0/22 nhid 103"