Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'selftests-forwarding-fix-br_netfilter-related-test-failures'
Aleksei Oladko says:
====================
selftests: forwarding: fix br_netfilter related test failures
This patch series fixes kselftests that fail when the br_nefilter
module is loaded. The failures occur because the tests generate
packets that are either modified or encapsulated, but their IP
headers are not fully correct for sanity checks performed by
be_netfilter.
Signed-off-by: Aleksei Oladko <aleksey.oladko@virtuozzo.com>
====================
Link: https://patch.msgid.link/20260213131907.43351-1-aleksey.oladko@virtuozzo.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+33
-11
+8
tools/testing/selftests/net/forwarding/pedit_dsfield.sh
+8
tools/testing/selftests/net/forwarding/pedit_dsfield.sh
···
98
98
h1_create
99
99
h2_create
100
100
switch_create
101
+
102
+
if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
103
+
sysctl_set net.bridge.bridge-nf-call-iptables 0
104
+
fi
101
105
}
102
106
103
107
cleanup()
104
108
{
105
109
pre_cleanup
110
+
111
+
if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
112
+
sysctl_restore net.bridge.bridge-nf-call-iptables
113
+
fi
106
114
107
115
switch_destroy
108
116
h2_destroy
+8
tools/testing/selftests/net/forwarding/pedit_ip.sh
+8
tools/testing/selftests/net/forwarding/pedit_ip.sh
···
91
91
h1_create
92
92
h2_create
93
93
switch_create
94
+
95
+
if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
96
+
sysctl_set net.bridge.bridge-nf-call-iptables 0
97
+
fi
94
98
}
95
99
96
100
cleanup()
97
101
{
98
102
pre_cleanup
103
+
104
+
if [ -f /proc/sys/net/bridge/bridge-nf-call-iptables ]; then
105
+
sysctl_restore net.bridge.bridge-nf-call-iptables
106
+
fi
99
107
100
108
switch_destroy
101
109
h2_destroy
+16
-10
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
+16
-10
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
···
567
567
local inner_tos=$1; shift
568
568
local outer_tos=$1; shift
569
569
570
+
local ipv4hdr=$(:
571
+
)"45:"$( : IP version + IHL
572
+
)"$inner_tos:"$( : IP TOS
573
+
)"00:54:"$( : IP total length
574
+
)"99:83:"$( : IP identification
575
+
)"40:00:"$( : IP flags + frag off
576
+
)"40:"$( : IP TTL
577
+
)"01:"$( : IP proto
578
+
)"CHECKSUM:"$( : IP header csum
579
+
)"c0:00:02:03:"$( : IP saddr: 192.0.2.3
580
+
)"c0:00:02:01"$( : IP daddr: 192.0.2.1
581
+
)
582
+
local checksum=$(payload_template_calc_checksum "$ipv4hdr")
583
+
ipv4hdr=$(payload_template_expand_checksum "$ipv4hdr" $checksum)
584
+
570
585
$MZ $dev -c $count -d 100msec -q \
571
586
-b $next_hop_mac -B $dest_ip \
572
587
-t udp tos=$outer_tos,sp=23456,dp=$VXPORT,p=$(:
···
592
577
)"$dest_mac:"$( : ETH daddr
593
578
)"$(mac_get w2):"$( : ETH saddr
594
579
)"08:00:"$( : ETH type
595
-
)"45:"$( : IP version + IHL
596
-
)"$inner_tos:"$( : IP TOS
597
-
)"00:54:"$( : IP total length
598
-
)"99:83:"$( : IP identification
599
-
)"40:00:"$( : IP flags + frag off
600
-
)"40:"$( : IP TTL
601
-
)"01:"$( : IP proto
602
-
)"00:00:"$( : IP header csum
603
-
)"c0:00:02:03:"$( : IP saddr: 192.0.2.3
604
-
)"c0:00:02:01:"$( : IP daddr: 192.0.2.1
580
+
)"$ipv4hdr:"$( : IPv4 header
605
581
)"08:"$( : ICMP type
606
582
)"00:"$( : ICMP code
607
583
)"8b:f2:"$( : ICMP csum
+1
-1
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh
+1
-1
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh