Skip to content

Commit eda0cf1

Browse files
Florian Westphalummakynes
authored andcommitted
selftests: nft_concat_range: add test for reload with no element add/del
Add a specific test for the reload issue fixed with commit 23c5426 ("netfilter: nft_set_pipapo: allocate pcpu scratch maps on clone"). Add to set, then flush set content + restore without other add/remove in the transaction. On kernels before the fix, this test case fails: net,mac with reload [FAIL] Signed-off-by: Florian Westphal <fw@strlen.de> Reviewed-by: Stefano Brivio <sbrivio@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent f459bfd commit eda0cf1

File tree

1 file changed

+71
-1
lines changed

1 file changed

+71
-1
lines changed

tools/testing/selftests/netfilter/nft_concat_range.sh

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TYPES="net_port port_net net6_port port_proto net6_port_mac net6_port_mac_proto
2727
net6_port_net6_port net_port_mac_proto_net"
2828

2929
# Reported bugs, also described by TYPE_ variables below
30-
BUGS="flush_remove_add"
30+
BUGS="flush_remove_add reload"
3131

3232
# List of possible paths to pktgen script from kernel tree for performance tests
3333
PKTGEN_SCRIPT_PATHS="
@@ -354,6 +354,23 @@ TYPE_flush_remove_add="
354354
display Add two elements, flush, re-add
355355
"
356356

357+
TYPE_reload="
358+
display net,mac with reload
359+
type_spec ipv4_addr . ether_addr
360+
chain_spec ip daddr . ether saddr
361+
dst addr4
362+
src mac
363+
start 1
364+
count 1
365+
src_delta 2000
366+
tools sendip nc bash
367+
proto udp
368+
369+
race_repeat 0
370+
371+
perf_duration 0
372+
"
373+
357374
# Set template for all tests, types and rules are filled in depending on test
358375
set_template='
359376
flush ruleset
@@ -1473,6 +1490,59 @@ test_bug_flush_remove_add() {
14731490
nft flush ruleset
14741491
}
14751492

1493+
# - add ranged element, check that packets match it
1494+
# - reload the set, check packets still match
1495+
test_bug_reload() {
1496+
setup veth send_"${proto}" set || return ${KSELFTEST_SKIP}
1497+
rstart=${start}
1498+
1499+
range_size=1
1500+
for i in $(seq "${start}" $((start + count))); do
1501+
end=$((start + range_size))
1502+
1503+
# Avoid negative or zero-sized port ranges
1504+
if [ $((end / 65534)) -gt $((start / 65534)) ]; then
1505+
start=${end}
1506+
end=$((end + 1))
1507+
fi
1508+
srcstart=$((start + src_delta))
1509+
srcend=$((end + src_delta))
1510+
1511+
add "$(format)" || return 1
1512+
range_size=$((range_size + 1))
1513+
start=$((end + range_size))
1514+
done
1515+
1516+
# check kernel does allocate pcpu sctrach map
1517+
# for reload with no elemet add/delete
1518+
( echo flush set inet filter test ;
1519+
nft list set inet filter test ) | nft -f -
1520+
1521+
start=${rstart}
1522+
range_size=1
1523+
1524+
for i in $(seq "${start}" $((start + count))); do
1525+
end=$((start + range_size))
1526+
1527+
# Avoid negative or zero-sized port ranges
1528+
if [ $((end / 65534)) -gt $((start / 65534)) ]; then
1529+
start=${end}
1530+
end=$((end + 1))
1531+
fi
1532+
srcstart=$((start + src_delta))
1533+
srcend=$((end + src_delta))
1534+
1535+
for j in $(seq ${start} $((range_size / 2 + 1)) ${end}); do
1536+
send_match "${j}" $((j + src_delta)) || return 1
1537+
done
1538+
1539+
range_size=$((range_size + 1))
1540+
start=$((end + range_size))
1541+
done
1542+
1543+
nft flush ruleset
1544+
}
1545+
14761546
test_reported_issues() {
14771547
eval test_bug_"${subtest}"
14781548
}

0 commit comments

Comments
 (0)