Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177721868
D61726.1795130255.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D61726.1795130255.diff
View Options
diff --git a/tests/sys/net/bpf/bpf.sh b/tests/sys/net/bpf/bpf.sh
--- a/tests/sys/net/bpf/bpf.sh
+++ b/tests/sys/net/bpf/bpf.sh
@@ -40,7 +40,7 @@
ifconfig ${epair}a inet 192.0.2.1/24 up
vnet_mkjail alcatraz ${epair}b
- jexec alcatraz ifconfig ${epair}b inet 192.0.2.2/24 up
+ ifconfig -j alcatraz ${epair}b inet 192.0.2.2/24 up
atf_check -s exit:0 -o ignore \
ping -c 1 192.0.2.2
@@ -69,14 +69,17 @@
{
vnet_init
- if sysctl -q kern.features.rss >/dev/null; then
- atf_skip "This test is flaky with RSS"
- fi
-
epair=$(vnet_mkepair)
ifconfig ${epair}a inet 192.0.2.1/24 up
vnet_mkjail alcatraz ${epair}b
- jexec alcatraz ifconfig ${epair}b inet 192.0.2.2/24 up
+ ifconfig -j alcatraz ${epair}b inet 192.0.2.2/24 up
+ # Static ARP entries keep ARP out of the captures. With RSS the
+ # epair queues ARP frames apart from the IP flow and may deliver
+ # them out of order with it.
+ arp -s 192.0.2.2 $(ifconfig -j alcatraz ${epair}b ether | \
+ awk '/ether/{print $2}')
+ arp -j alcatraz -s 192.0.2.1 $(ifconfig ${epair}a ether | \
+ awk '/ether/{print $2}')
in=$(pwd)/$(mktemp in.pcap.XXXXXXXXXX)
in2=$(pwd)/$(mktemp in2.pcap.XXXXXXXXXX)
@@ -85,7 +88,7 @@
# write dump on jail side, with "in" direction
jexec alcatraz $(atf_get_srcdir)/pcap-test \
capture epair0b $in 3 in > out & pid=$!
- while ! jexec alcatraz netstat -B | grep -q epair0b.*pcap-test; do
+ while ! netstat -j alcatraz -B | grep -q epair0b.*pcap-test; do
sleep 0.01;
done
atf_check -s exit:0 -o ignore ping -c 3 -i 0.1 192.0.2.2
@@ -95,7 +98,7 @@
# inject dump on host side, recording on both sides
jexec alcatraz $(atf_get_srcdir)/pcap-test \
capture epair0b $in2 3 in > jout & jpid=$!
- while ! jexec alcatraz netstat -B | grep -q epair0b.*pcap-test; do
+ while ! netstat -j alcatraz -B | grep -q epair0b.*pcap-test; do
sleep 0.01;
done
$(atf_get_srcdir)/pcap-test \
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Nov 19, 11:17 PM (6 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41853205
Default Alt Text
D61726.1795130255.diff (1 KB)
Attached To
Mode
D61726: tests/net/bpf: run the bpf:inject test with RSS again
Attached
Detach File
Event Timeline