Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'ipv6-allow-for-nexthop-device-mismatch-with-onlink'
Ido Schimmel says:
====================
ipv6: Allow for nexthop device mismatch with "onlink"
This patchset aligns IPv6 with IPv4 with respect to the "onlink" keyword
and allows IPv6 routes to be configured with a gateway address that is
resolved out of a different interface than the one specified.
Patches #1-#3 are small preparations in the existing "onlink" selftest.
Patch #4 is the actual change. See the commit message for detailed
description and motivation.
Patch #5 adds test cases for both address families, to make sure that
this use case does not regress.
====================
Link: https://patch.msgid.link/20260111120813.159799-1-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+16
-19
+2
-5
net/ipv6/route.c
+2
-5
net/ipv6/route.c
···
3419
3419
3420
3420
err = ip6_nh_lookup_table(net, cfg, gw_addr, tbid, 0, &res);
3421
3421
if (!err && !(res.fib6_flags & RTF_REJECT) &&
3422
-
/* ignore match if it is the default route */
3423
-
!ipv6_addr_any(&res.f6i->fib6_dst.addr) &&
3424
-
(res.fib6_type != RTN_UNICAST || dev != res.nh->fib_nh_dev)) {
3425
-
NL_SET_ERR_MSG(extack,
3426
-
"Nexthop has invalid gateway or device mismatch");
3422
+
res.fib6_type != RTN_UNICAST) {
3423
+
NL_SET_ERR_MSG(extack, "Nexthop has invalid gateway");
3427
3424
err = -EINVAL;
3428
3425
}
3429
3426
+14
-14
tools/testing/selftests/net/fib-onlink-tests.sh
+14
-14
tools/testing/selftests/net/fib-onlink-tests.sh
···
72
72
TEST_NET4IN6[1]=10.1.1.254
73
73
TEST_NET4IN6[2]=10.2.1.254
74
74
75
-
# mcast address
75
+
# mcast addresses
76
+
MCAST4=233.252.0.1
76
77
MCAST6=ff02::1
77
78
78
79
VRF=lisa
···
271
270
272
271
run_ip 254 ${TEST_NET4[1]}.1 ${CONGW[1]} ${NETIFS[p1]} 0 "unicast connected"
273
272
run_ip 254 ${TEST_NET4[1]}.2 ${RECGW4[1]} ${NETIFS[p1]} 0 "unicast recursive"
273
+
run_ip 254 ${TEST_NET4[1]}.9 ${CONGW[1]} ${NETIFS[p3]} 0 \
274
+
"nexthop device mismatch"
274
275
275
276
log_subsection "VRF ${VRF}"
276
277
277
278
run_ip ${VRF_TABLE} ${TEST_NET4[2]}.1 ${CONGW[3]} ${NETIFS[p5]} 0 "unicast connected"
278
279
run_ip ${VRF_TABLE} ${TEST_NET4[2]}.2 ${RECGW4[2]} ${NETIFS[p5]} 0 "unicast recursive"
280
+
run_ip ${VRF_TABLE} ${TEST_NET4[2]}.10 ${CONGW[3]} ${NETIFS[p7]} 0 \
281
+
"nexthop device mismatch"
279
282
280
283
log_subsection "VRF device, PBR table"
281
284
···
315
310
{
316
311
run_ip 254 ${TEST_NET4[1]}.11 ${V4ADDRS[p1]} ${NETIFS[p1]} 2 \
317
312
"Invalid gw - local unicast address"
313
+
run_ip 254 ${TEST_NET4[1]}.12 ${MCAST4} ${NETIFS[p1]} 2 \
314
+
"Invalid gw - multicast address"
318
315
319
316
run_ip ${VRF_TABLE} ${TEST_NET4[2]}.11 ${V4ADDRS[p5]} ${NETIFS[p5]} 2 \
320
317
"Invalid gw - local unicast address, VRF"
318
+
run_ip ${VRF_TABLE} ${TEST_NET4[2]}.12 ${MCAST4} ${NETIFS[p5]} 2 \
319
+
"Invalid gw - multicast address, VRF"
321
320
322
321
run_ip 254 ${TEST_NET4[1]}.101 ${V4ADDRS[p1]} "" 2 "No nexthop device given"
323
-
324
-
run_ip 254 ${TEST_NET4[1]}.102 ${V4ADDRS[p3]} ${NETIFS[p1]} 2 \
325
-
"Gateway resolves to wrong nexthop device"
326
-
327
-
run_ip ${VRF_TABLE} ${TEST_NET4[2]}.103 ${V4ADDRS[p7]} ${NETIFS[p5]} 2 \
328
-
"Gateway resolves to wrong nexthop device - VRF"
329
322
}
330
323
331
324
################################################################################
···
370
367
run_ip6 254 ${TEST_NET6[1]}::1 ${V6ADDRS[p1]/::*}::64 ${NETIFS[p1]} 0 "unicast connected"
371
368
run_ip6 254 ${TEST_NET6[1]}::2 ${RECGW6[1]} ${NETIFS[p1]} 0 "unicast recursive"
372
369
run_ip6 254 ${TEST_NET6[1]}::3 ::ffff:${TEST_NET4IN6[1]} ${NETIFS[p1]} 0 "v4-mapped"
370
+
run_ip6 254 ${TEST_NET6[1]}::a ${V6ADDRS[p1]/::*}::64 ${NETIFS[p3]} 0 \
371
+
"nexthop device mismatch"
373
372
374
373
log_subsection "VRF ${VRF}"
375
374
376
375
run_ip6 ${VRF_TABLE} ${TEST_NET6[2]}::1 ${V6ADDRS[p5]/::*}::64 ${NETIFS[p5]} 0 "unicast connected"
377
376
run_ip6 ${VRF_TABLE} ${TEST_NET6[2]}::2 ${RECGW6[2]} ${NETIFS[p5]} 0 "unicast recursive"
378
377
run_ip6 ${VRF_TABLE} ${TEST_NET6[2]}::3 ::ffff:${TEST_NET4IN6[2]} ${NETIFS[p5]} 0 "v4-mapped"
378
+
run_ip6 ${VRF_TABLE} ${TEST_NET6[2]}::b ${V6ADDRS[p5]/::*}::64 \
379
+
${NETIFS[p7]} 0 "nexthop device mismatch"
379
380
380
381
log_subsection "VRF device, PBR table"
381
382
···
445
438
446
439
run_ip6 254 ${TEST_NET6[1]}::101 ${V6ADDRS[p1]} "" 2 \
447
440
"No nexthop device given"
448
-
449
-
# default VRF validation is done against LOCAL table
450
-
# run_ip6 254 ${TEST_NET6[1]}::102 ${V6ADDRS[p3]/::[0-9]/::64} ${NETIFS[p1]} 2 \
451
-
# "Gateway resolves to wrong nexthop device"
452
-
453
-
run_ip6 ${VRF_TABLE} ${TEST_NET6[2]}::103 ${V6ADDRS[p7]/::[0-9]/::64} ${NETIFS[p5]} 2 \
454
-
"Gateway resolves to wrong nexthop device - VRF"
455
441
}
456
442
457
443
run_onlink_tests()