Merge branch 'hsr-supervisor-frames'
Sebastian Andrzej Siewior says: ==================== net: hsr: Properly parse HSRv1 supervisor frames. this is a follow-up to https://lore.kernel.org/all/20230825153111.228768-1-lukma@denx.de/ replacing https://lore.kernel.org/all/20230914124731.1654059-1-lukma@denx.de/ by grabing/ adding tags and reposting with a commit message plus a missing __packed to a struct (#2) plus extending the testsuite to sover HSRv1 which is what broke here (#3-#5). HSRv0 is (was) not affected. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
af21b94b91
|
|
@ -288,13 +288,13 @@ void hsr_handle_sup_frame(struct hsr_frame_info *frame)
|
|||
|
||||
/* And leave the HSR tag. */
|
||||
if (ethhdr->h_proto == htons(ETH_P_HSR)) {
|
||||
pull_size = sizeof(struct ethhdr);
|
||||
pull_size = sizeof(struct hsr_tag);
|
||||
skb_pull(skb, pull_size);
|
||||
total_pull_size += pull_size;
|
||||
}
|
||||
|
||||
/* And leave the HSR sup tag. */
|
||||
pull_size = sizeof(struct hsr_tag);
|
||||
pull_size = sizeof(struct hsr_sup_tag);
|
||||
skb_pull(skb, pull_size);
|
||||
total_pull_size += pull_size;
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ struct hsr_vlan_ethhdr {
|
|||
struct hsr_sup_tlv {
|
||||
u8 HSR_TLV_type;
|
||||
u8 HSR_TLV_length;
|
||||
};
|
||||
} __packed;
|
||||
|
||||
/* HSR/PRP Supervision Frame data types.
|
||||
* Field names as defined in the IEC:2010 standard for HSR.
|
||||
|
|
|
|||
|
|
@ -41,61 +41,6 @@ cleanup()
|
|||
done
|
||||
}
|
||||
|
||||
ip -Version > /dev/null 2>&1
|
||||
if [ $? -ne 0 ];then
|
||||
echo "SKIP: Could not run test without ip tool"
|
||||
exit $ksft_skip
|
||||
fi
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
for i in "$ns1" "$ns2" "$ns3" ;do
|
||||
ip netns add $i || exit $ksft_skip
|
||||
ip -net $i link set lo up
|
||||
done
|
||||
|
||||
echo "INFO: preparing interfaces."
|
||||
# Three HSR nodes. Each node has one link to each of its neighbour, two links in total.
|
||||
#
|
||||
# ns1eth1 ----- ns2eth1
|
||||
# hsr1 hsr2
|
||||
# ns1eth2 ns2eth2
|
||||
# | |
|
||||
# ns3eth1 ns3eth2
|
||||
# \ /
|
||||
# hsr3
|
||||
#
|
||||
# Interfaces
|
||||
ip link add ns1eth1 netns "$ns1" type veth peer name ns2eth1 netns "$ns2"
|
||||
ip link add ns1eth2 netns "$ns1" type veth peer name ns3eth1 netns "$ns3"
|
||||
ip link add ns3eth2 netns "$ns3" type veth peer name ns2eth2 netns "$ns2"
|
||||
|
||||
# HSRv0.
|
||||
ip -net "$ns1" link add name hsr1 type hsr slave1 ns1eth1 slave2 ns1eth2 supervision 45 version 0 proto 0
|
||||
ip -net "$ns2" link add name hsr2 type hsr slave1 ns2eth1 slave2 ns2eth2 supervision 45 version 0 proto 0
|
||||
ip -net "$ns3" link add name hsr3 type hsr slave1 ns3eth1 slave2 ns3eth2 supervision 45 version 0 proto 0
|
||||
|
||||
# IP for HSR
|
||||
ip -net "$ns1" addr add 100.64.0.1/24 dev hsr1
|
||||
ip -net "$ns1" addr add dead:beef:1::1/64 dev hsr1 nodad
|
||||
ip -net "$ns2" addr add 100.64.0.2/24 dev hsr2
|
||||
ip -net "$ns2" addr add dead:beef:1::2/64 dev hsr2 nodad
|
||||
ip -net "$ns3" addr add 100.64.0.3/24 dev hsr3
|
||||
ip -net "$ns3" addr add dead:beef:1::3/64 dev hsr3 nodad
|
||||
|
||||
# All Links up
|
||||
ip -net "$ns1" link set ns1eth1 up
|
||||
ip -net "$ns1" link set ns1eth2 up
|
||||
ip -net "$ns1" link set hsr1 up
|
||||
|
||||
ip -net "$ns2" link set ns2eth1 up
|
||||
ip -net "$ns2" link set ns2eth2 up
|
||||
ip -net "$ns2" link set hsr2 up
|
||||
|
||||
ip -net "$ns3" link set ns3eth1 up
|
||||
ip -net "$ns3" link set ns3eth2 up
|
||||
ip -net "$ns3" link set hsr3 up
|
||||
|
||||
# $1: IP address
|
||||
is_v6()
|
||||
{
|
||||
|
|
@ -164,93 +109,168 @@ stop_if_error()
|
|||
fi
|
||||
}
|
||||
|
||||
do_complete_ping_test()
|
||||
{
|
||||
echo "INFO: Initial validation ping."
|
||||
# Each node has to be able each one.
|
||||
do_ping "$ns1" 100.64.0.2
|
||||
do_ping "$ns2" 100.64.0.1
|
||||
do_ping "$ns3" 100.64.0.1
|
||||
stop_if_error "Initial validation failed."
|
||||
|
||||
echo "INFO: Initial validation ping."
|
||||
# Each node has to be able each one.
|
||||
do_ping "$ns1" 100.64.0.2
|
||||
do_ping "$ns2" 100.64.0.1
|
||||
do_ping "$ns3" 100.64.0.1
|
||||
stop_if_error "Initial validation failed."
|
||||
do_ping "$ns1" 100.64.0.3
|
||||
do_ping "$ns2" 100.64.0.3
|
||||
do_ping "$ns3" 100.64.0.2
|
||||
|
||||
do_ping "$ns1" 100.64.0.3
|
||||
do_ping "$ns2" 100.64.0.3
|
||||
do_ping "$ns3" 100.64.0.2
|
||||
do_ping "$ns1" dead:beef:1::2
|
||||
do_ping "$ns1" dead:beef:1::3
|
||||
do_ping "$ns2" dead:beef:1::1
|
||||
do_ping "$ns2" dead:beef:1::2
|
||||
do_ping "$ns3" dead:beef:1::1
|
||||
do_ping "$ns3" dead:beef:1::2
|
||||
|
||||
do_ping "$ns1" dead:beef:1::2
|
||||
do_ping "$ns1" dead:beef:1::3
|
||||
do_ping "$ns2" dead:beef:1::1
|
||||
do_ping "$ns2" dead:beef:1::2
|
||||
do_ping "$ns3" dead:beef:1::1
|
||||
do_ping "$ns3" dead:beef:1::2
|
||||
|
||||
stop_if_error "Initial validation failed."
|
||||
stop_if_error "Initial validation failed."
|
||||
|
||||
# Wait until supervisor all supervision frames have been processed and the node
|
||||
# entries have been merged. Otherwise duplicate frames will be observed which is
|
||||
# valid at this stage.
|
||||
WAIT=5
|
||||
while [ ${WAIT} -gt 0 ]
|
||||
do
|
||||
grep 00:00:00:00:00:00 /sys/kernel/debug/hsr/hsr*/node_table
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
let WAIT = WAIT - 1
|
||||
done
|
||||
WAIT=5
|
||||
while [ ${WAIT} -gt 0 ]
|
||||
do
|
||||
grep 00:00:00:00:00:00 /sys/kernel/debug/hsr/hsr*/node_table
|
||||
if [ $? -ne 0 ]
|
||||
then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
let "WAIT = WAIT - 1"
|
||||
done
|
||||
|
||||
# Just a safety delay in case the above check didn't handle it.
|
||||
sleep 1
|
||||
sleep 1
|
||||
|
||||
echo "INFO: Longer ping test."
|
||||
do_ping_long "$ns1" 100.64.0.2
|
||||
do_ping_long "$ns1" dead:beef:1::2
|
||||
do_ping_long "$ns1" 100.64.0.3
|
||||
do_ping_long "$ns1" dead:beef:1::3
|
||||
echo "INFO: Longer ping test."
|
||||
do_ping_long "$ns1" 100.64.0.2
|
||||
do_ping_long "$ns1" dead:beef:1::2
|
||||
do_ping_long "$ns1" 100.64.0.3
|
||||
do_ping_long "$ns1" dead:beef:1::3
|
||||
|
||||
stop_if_error "Longer ping test failed."
|
||||
stop_if_error "Longer ping test failed."
|
||||
|
||||
do_ping_long "$ns2" 100.64.0.1
|
||||
do_ping_long "$ns2" dead:beef:1::1
|
||||
do_ping_long "$ns2" 100.64.0.3
|
||||
do_ping_long "$ns2" dead:beef:1::2
|
||||
stop_if_error "Longer ping test failed."
|
||||
do_ping_long "$ns2" 100.64.0.1
|
||||
do_ping_long "$ns2" dead:beef:1::1
|
||||
do_ping_long "$ns2" 100.64.0.3
|
||||
do_ping_long "$ns2" dead:beef:1::2
|
||||
stop_if_error "Longer ping test failed."
|
||||
|
||||
do_ping_long "$ns3" 100.64.0.1
|
||||
do_ping_long "$ns3" dead:beef:1::1
|
||||
do_ping_long "$ns3" 100.64.0.2
|
||||
do_ping_long "$ns3" dead:beef:1::2
|
||||
stop_if_error "Longer ping test failed."
|
||||
do_ping_long "$ns3" 100.64.0.1
|
||||
do_ping_long "$ns3" dead:beef:1::1
|
||||
do_ping_long "$ns3" 100.64.0.2
|
||||
do_ping_long "$ns3" dead:beef:1::2
|
||||
stop_if_error "Longer ping test failed."
|
||||
|
||||
echo "INFO: Cutting one link."
|
||||
do_ping_long "$ns1" 100.64.0.3 &
|
||||
echo "INFO: Cutting one link."
|
||||
do_ping_long "$ns1" 100.64.0.3 &
|
||||
|
||||
sleep 3
|
||||
ip -net "$ns3" link set ns3eth1 down
|
||||
wait
|
||||
sleep 3
|
||||
ip -net "$ns3" link set ns3eth1 down
|
||||
wait
|
||||
|
||||
ip -net "$ns3" link set ns3eth1 up
|
||||
ip -net "$ns3" link set ns3eth1 up
|
||||
|
||||
stop_if_error "Failed with one link down."
|
||||
stop_if_error "Failed with one link down."
|
||||
|
||||
echo "INFO: Delay the link and drop a few packages."
|
||||
tc -net "$ns3" qdisc add dev ns3eth1 root netem delay 50ms
|
||||
tc -net "$ns2" qdisc add dev ns2eth1 root netem delay 5ms loss 25%
|
||||
echo "INFO: Delay the link and drop a few packages."
|
||||
tc -net "$ns3" qdisc add dev ns3eth1 root netem delay 50ms
|
||||
tc -net "$ns2" qdisc add dev ns2eth1 root netem delay 5ms loss 25%
|
||||
|
||||
do_ping_long "$ns1" 100.64.0.2
|
||||
do_ping_long "$ns1" 100.64.0.3
|
||||
do_ping_long "$ns1" 100.64.0.2
|
||||
do_ping_long "$ns1" 100.64.0.3
|
||||
|
||||
stop_if_error "Failed with delay and packetloss."
|
||||
stop_if_error "Failed with delay and packetloss."
|
||||
|
||||
do_ping_long "$ns2" 100.64.0.1
|
||||
do_ping_long "$ns2" 100.64.0.3
|
||||
do_ping_long "$ns2" 100.64.0.1
|
||||
do_ping_long "$ns2" 100.64.0.3
|
||||
|
||||
stop_if_error "Failed with delay and packetloss."
|
||||
stop_if_error "Failed with delay and packetloss."
|
||||
|
||||
do_ping_long "$ns3" 100.64.0.1
|
||||
do_ping_long "$ns3" 100.64.0.2
|
||||
stop_if_error "Failed with delay and packetloss."
|
||||
do_ping_long "$ns3" 100.64.0.1
|
||||
do_ping_long "$ns3" 100.64.0.2
|
||||
stop_if_error "Failed with delay and packetloss."
|
||||
|
||||
echo "INFO: All good."
|
||||
}
|
||||
|
||||
setup_hsr_interfaces()
|
||||
{
|
||||
local HSRv="$1"
|
||||
|
||||
echo "INFO: preparing interfaces for HSRv${HSRv}."
|
||||
# Three HSR nodes. Each node has one link to each of its neighbour, two links in total.
|
||||
#
|
||||
# ns1eth1 ----- ns2eth1
|
||||
# hsr1 hsr2
|
||||
# ns1eth2 ns2eth2
|
||||
# | |
|
||||
# ns3eth1 ns3eth2
|
||||
# \ /
|
||||
# hsr3
|
||||
#
|
||||
# Interfaces
|
||||
ip link add ns1eth1 netns "$ns1" type veth peer name ns2eth1 netns "$ns2"
|
||||
ip link add ns1eth2 netns "$ns1" type veth peer name ns3eth1 netns "$ns3"
|
||||
ip link add ns3eth2 netns "$ns3" type veth peer name ns2eth2 netns "$ns2"
|
||||
|
||||
# HSRv0/1
|
||||
ip -net "$ns1" link add name hsr1 type hsr slave1 ns1eth1 slave2 ns1eth2 supervision 45 version $HSRv proto 0
|
||||
ip -net "$ns2" link add name hsr2 type hsr slave1 ns2eth1 slave2 ns2eth2 supervision 45 version $HSRv proto 0
|
||||
ip -net "$ns3" link add name hsr3 type hsr slave1 ns3eth1 slave2 ns3eth2 supervision 45 version $HSRv proto 0
|
||||
|
||||
# IP for HSR
|
||||
ip -net "$ns1" addr add 100.64.0.1/24 dev hsr1
|
||||
ip -net "$ns1" addr add dead:beef:1::1/64 dev hsr1 nodad
|
||||
ip -net "$ns2" addr add 100.64.0.2/24 dev hsr2
|
||||
ip -net "$ns2" addr add dead:beef:1::2/64 dev hsr2 nodad
|
||||
ip -net "$ns3" addr add 100.64.0.3/24 dev hsr3
|
||||
ip -net "$ns3" addr add dead:beef:1::3/64 dev hsr3 nodad
|
||||
|
||||
# All Links up
|
||||
ip -net "$ns1" link set ns1eth1 up
|
||||
ip -net "$ns1" link set ns1eth2 up
|
||||
ip -net "$ns1" link set hsr1 up
|
||||
|
||||
ip -net "$ns2" link set ns2eth1 up
|
||||
ip -net "$ns2" link set ns2eth2 up
|
||||
ip -net "$ns2" link set hsr2 up
|
||||
|
||||
ip -net "$ns3" link set ns3eth1 up
|
||||
ip -net "$ns3" link set ns3eth2 up
|
||||
ip -net "$ns3" link set hsr3 up
|
||||
}
|
||||
|
||||
ip -Version > /dev/null 2>&1
|
||||
if [ $? -ne 0 ];then
|
||||
echo "SKIP: Could not run test without ip tool"
|
||||
exit $ksft_skip
|
||||
fi
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
for i in "$ns1" "$ns2" "$ns3" ;do
|
||||
ip netns add $i || exit $ksft_skip
|
||||
ip -net $i link set lo up
|
||||
done
|
||||
|
||||
setup_hsr_interfaces 0
|
||||
do_complete_ping_test
|
||||
cleanup
|
||||
|
||||
for i in "$ns1" "$ns2" "$ns3" ;do
|
||||
ip netns add $i || exit $ksft_skip
|
||||
ip -net $i link set lo up
|
||||
done
|
||||
|
||||
setup_hsr_interfaces 1
|
||||
do_complete_ping_test
|
||||
|
||||
echo "INFO: All good."
|
||||
exit $ret
|
||||
|
|
|
|||
Loading…
Reference in New Issue