bonding: fix ns validation on backup slaves
Subsystems (4)
v2 cover bonding: fix ns validation on backup slaves
The first patch fixed a ns validation issue on backup slaves. The second patch re-format the bond option test and add a test lib file. The third patch add the arp validate regression test for the kernel patch.
Here is the new bonding option test without the kernel fix:
]# ./bond_options.sh
TEST: prio (active-backup miimon primary_reselect 0) [ OK ]
TEST: prio (active-backup miimon primary_reselect 1) [ OK ]
TEST: prio (active-backup miimon primary_reselect 2) [ OK ]
TEST: prio (active-backup arp_ip_target primary_reselect 0) [ OK ]
TEST: prio (active-backup arp_ip_target primary_reselect 1) [ OK ]
TEST: prio (active-backup arp_ip_target primary_reselect 2) [ OK ]
TEST: prio (active-backup ns_ip6_target primary_reselect 0) [ OK ]
TEST: prio (active-backup ns_ip6_target primary_reselect 1) [ OK ]
TEST: prio (active-backup ns_ip6_target primary_reselect 2) [ OK ]
TEST: prio (balance-tlb miimon primary_reselect 0) [ OK ]
TEST: prio (balance-tlb miimon primary_reselect 1) [ OK ]
TEST: prio (balance-tlb miimon primary_reselect 2) [ OK ]
TEST: prio (balance-tlb arp_ip_target primary_reselect 0) [ OK ]
TEST: prio (balance-tlb arp_ip_target primary_reselect 1) [ OK ]
TEST: prio (balance-tlb arp_ip_target primary_reselect 2) [ OK ]
TEST: prio (balance-tlb ns_ip6_target primary_reselect 0) [ OK ]
TEST: prio (balance-tlb ns_ip6_target primary_reselect 1) [ OK ]
TEST: prio (balance-tlb ns_ip6_target primary_reselect 2) [ OK ]
TEST: prio (balance-alb miimon primary_reselect 0) [ OK ]
TEST: prio (balance-alb miimon primary_reselect 1) [ OK ]
TEST: prio (balance-alb miimon primary_reselect 2) [ OK ]
TEST: prio (balance-alb arp_ip_target primary_reselect 0) [ OK ]
TEST: prio (balance-alb arp_ip_target primary_reselect 1) [ OK ]
TEST: prio (balance-alb arp_ip_target primary_reselect 2) [ OK ]
TEST: prio (balance-alb ns_ip6_target primary_reselect 0) [ OK ]
TEST: prio (balance-alb ns_ip6_target primary_reselect 1) [ OK ]
TEST: prio (balance-alb ns_ip6_target primary_reselect 2) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 0) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 1) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 2) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 3) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 4) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 5) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 6) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 0) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 1) [ OK ]
TEST: arp_validate (interface eth1 mii_status DOWN) [FAIL]
TEST: arp_validate (interface eth2 mii_status DOWN) [FAIL]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 2) [FAIL]
TEST: arp_validate (interface eth1 mii_status DOWN) [FAIL]
TEST: arp_validate (interface eth2 mii_status DOWN) [FAIL]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 3) [FAIL]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 4) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 5) [ OK ]
TEST: arp_validate (interface eth1 mii_status DOWN) [FAIL]
TEST: arp_validate (interface eth2 mii_status DOWN) [FAIL]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 6) [FAIL]
Here is the test result after the kernel fix:
TEST: arp_validate (active-backup arp_ip_target arp_validate 0) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 1) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 2) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 3) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 4) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 5) [ OK ]
TEST: arp_validate (active-backup arp_ip_target arp_validate 6) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 0) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 1) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 2) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 3) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 4) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 5) [ OK ]
TEST: arp_validate (active-backup ns_ip6_target arp_validate 6) [ OK ]
Hangbin Liu (3):
bonding: fix ns validation on backup slaves
selftests: bonding: re-format bond option tests
selftests: bonding: add arp validate test
drivers/net/bonding/bond_main.c | 5 +- include/net/bonding.h | 8 +- .../selftests/drivers/net/bonding/Makefile | 3 +- .../drivers/net/bonding/bond_options.sh | 264 ++++++++++++++++++ .../drivers/net/bonding/bond_topo_3d1c.sh | 143 ++++++++++ .../drivers/net/bonding/option_prio.sh | 245 ---------------- 6 files changed, 418 insertions(+), 250 deletions(-) create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_options.sh create mode 100644 tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh delete mode 100755 tools/testing/selftests/drivers/net/bonding/option_prio.sh
Signature · 1 line
2.38.1
PATCH v2 1/3 bonding: fix ns validation on backup slaves
When arp_validate is set to 2, 3, or 6, validation is performed for backup slaves as well. As stated in the bond documentation, validation involves checking the broadcast ARP request sent out via the active slave. This helps determine which slaves are more likely to function in the event of an active slave failure.
However, when the target is an IPv6 address, the NS message sent from the active interface is not checked on backup slaves. Additionally, based on the bond_arp_rcv() rule b, we must reverse the saddr and daddr when checking the NS message.
Note that when checking the NS message, the destination address is a multicast address. Therefore, we must convert the target address to solicited multicast in the bond_get_targets_ip6() function.
Prior to the fix, the backup slaves had a mii status of "down", but after the fix, all of the slaves' mii status was updated to "UP".
---
v2: no update
--- drivers/net/bonding/bond_main.c | 5 +++-- include/net/bonding.h | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/net/bonding/bond_main.c +3 -2
@@ -3269,7 +3269,8 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond, combined =skb_header_pointer (skb,0 ,sizeof (_combined), &_combined);if (!combined || combined->ip6.nexthdr !=NEXTHDR_ICMP || - combined->icmp6.icmp6_type !=NDISC_NEIGHBOUR_ADVERTISEMENT ) + (combined->icmp6.icmp6_type !=NDISC_NEIGHBOUR_SOLICITATION && + combined->icmp6.icmp6_type !=NDISC_NEIGHBOUR_ADVERTISEMENT )) goto out; saddr = &combined->ip6.saddr;
@@ -3291,7 +3292,7 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond,else if (curr_active_slave &&time_after (slave_last_rx (bond, curr_active_slave), curr_active_slave->last_link_up)) -bond_validate_na (bond, slave, saddr, daddr); +bond_validate_na (bond, slave, daddr, saddr);else if (curr_arp_slave &&bond_time_in_interval (bond,slave_last_tx (curr_arp_slave),1 ))bond_validate_na (bond, slave, saddr, daddr);
include/net/bonding.h +6 -2
@@ -761,13 +761,17 @@ static inline int bond_get_targets_ip(__be32 *targets, __be32 ip)#if IS_ENABLED (CONFIG_IPV6 )static inline int bond_get_targets_ip6 (struct in6_addr *targets,struct in6_addr *ip) { +struct in6_addr mcaddr;int i; -for (i =0 ; i <BOND_MAX_NS_TARGETS ; i++) -if (ipv6_addr_equal (&targets[i], ip)) +for (i =0 ; i <BOND_MAX_NS_TARGETS ; i++) { +addrconf_addr_solict_mult (&targets[i], &mcaddr); +if ((ipv6_addr_equal (&targets[i], ip)) || + (ipv6_addr_equal (&mcaddr, ip)))return i;else if (ipv6_addr_any (&targets[i]))break ; + }return -1 ; }
Signature · 1 line
2.38.1
PATCH v2 2/3 selftests: bonding: re-format bond option tests
In reply to Hangbin LiuTo improve the testing process for bond options, A new bond topology lib is added to our testing setup. The current option_prio.sh file will be renamed to bond_options.sh so that all bonding options can be tested here. Specifically, for priority testing, we will run all tests using modes 1, 5, and 6. These changes will help us streamline the testing process and ensure that our bond options are rigorously evaluated.
---
v2: fix some typos. Rename the bond_lib.sh to bond_topo_3d1c.sh and simplify the topo with 3 slaves and 1 client. I use 3 slaves because the prio test need that. I do not add bond_lib.sh this time as I think there is no common functions yet. We can add the the bond_lib.sh in future if needed.
--- .../selftests/drivers/net/bonding/Makefile | 3 +- .../drivers/net/bonding/bond_options.sh | 209 +++++++++++++++ .../drivers/net/bonding/bond_topo_3d1c.sh | 143 ++++++++++ .../drivers/net/bonding/option_prio.sh | 245 ------------------ 4 files changed, 354 insertions(+), 246 deletions(-) create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_options.sh create mode 100644 tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh delete mode 100755 tools/testing/selftests/drivers/net/bonding/option_prio.sh
tools/testing/selftests/drivers/net/bonding/Makefile +2 -1
@@ -8,11 +8,12 @@ TEST_PROGS := \ dev_addr_lists.sh \ mode-1-recovery-updelay.sh \ mode-2-recovery-updelay.sh \ - option_prio.sh \ + bond_options.sh \ bond-eth-type-change.sh TEST_FILES := \ lag_lib.sh \ + bond_topo_3d1c.sh \ net_forwarding_lib.sh include ../../../lib.mk
tools/testing/selftests/drivers/net/bonding/bond_options.sh new file +209 -0
209 lines not on this page · raw message
tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh new file +143 -0
143 lines not on this page · raw message
tools/testing/selftests/drivers/net/bonding/option_prio.sh deleted +0 -245
245 lines not on this page · raw message
Signature · 1 line
2.38.1
Re: [PATCHv2 net 2/3] selftests: bonding: re-format bond option tests
Quoted 9 lines · Hangbin Liu
To improve the testing process for bond options, A new bond topology lib is added to our testing setup. The current
option_prio.shfile will be renamed tobond_options.shso that all bonding options can be tested here. Specifically, for priority testing, we will run all tests using modes 1, 5, and 6. These changes will help us streamline the testing process and ensure that our bond options are rigorously evaluated.Acked-by Jay Vosburgh <[email protected]>Signed-off-by Hangbin Liu <[email protected]>
PATCH v2 3/3 selftests: bonding: add arp validate test
In reply to Hangbin LiuThis patch add bonding arp validate tests with mode active backup, monitor arp_ip_target and ns_ip6_target. It also checks mii_status to make sure all slaves are UP.
---
v2: no update
--- .../drivers/net/bonding/bond_options.sh | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+)
tools/testing/selftests/drivers/net/bonding/bond_options.sh +55 -0
@@ -5,6 +5,7 @@ ALL_TESTS=" prio + arp_validate " REQUIRE_MZ=no
@@ -200,6 +201,60 @@ prio() done } +arp_validate_test() +{ + local param="$1" + RET=0 + + # create bond + bond_reset "${param}" + + bond_check_connection + [ $RET -ne 0 ] && log_test "arp_validate" "$retmsg" + + # wait for a while to make sure the mii status stable + sleep 5 + for i in $(seq 0 2); do + mii_status=$(cmd_jq "ip -n ${s_ns} -j -d link show eth$i" ".[].linkinfo.info_slave_data.mii_status") + if [ ${mii_status} != "UP" ]; then + RET=1 + log_test "arp_validate" "interface eth$i mii_status $mii_status" + fi + done +} + +arp_validate_arp() +{ + local mode=$1 + local val + for val in $(seq 0 6); do + arp_validate_test "mode $mode arp_interval 100 arp_ip_target ${g_ip4} arp_validate $val" + log_test "arp_validate" "$mode arp_ip_target arp_validate $val" + done +} + +arp_validate_ns() +{ + local mode=$1 + local val + + if skip_ns; then + log_test_skip "arp_validate ns" "Current iproute or kernel doesn't support bond option 'ns_ip6_target'." + return 0 + fi + + for val in $(seq 0 6); do + arp_validate_test "mode $mode arp_interval 100 ns_ip6_target ${g_ip6} arp_validate $val" + log_test "arp_validate" "$mode ns_ip6_target arp_validate $val" + done +} + +arp_validate() +{ + arp_validate_arp "active-backup" + arp_validate_ns "active-backup" +} + trap cleanup EXIT setup_prepare
Signature · 1 line
2.38.1
This series was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 55 lines · On Thu, 6 Apr 2023 16:23:49 +0800 you wrote:
The first patch fixed a ns validation issue on backup slaves. The second patch re-format the bond option test and add a test lib file. The third patch add the arp validate regression test for the kernel patch.
Here is the new bonding option test without the kernel fix:
]# ./bond_options.sh
TEST: prio (active-backup miimonprimary_reselect0) [ OK ]
TEST: prio (active-backup miimonprimary_reselect1) [ OK ]
TEST: prio (active-backup miimonprimary_reselect2) [ OK ]
TEST: prio (active-backuparp_ip_targetprimary_reselect0) [ OK ]
TEST: prio (active-backuparp_ip_targetprimary_reselect1) [ OK ]
TEST: prio (active-backuparp_ip_targetprimary_reselect2) [ OK ]
TEST: prio (active-backupns_ip6_targetprimary_reselect0) [ OK ]
TEST: prio (active-backupns_ip6_targetprimary_reselect1) [ OK ]
TEST: prio (active-backupns_ip6_targetprimary_reselect2) [ OK ]
TEST: prio (balance-tlb miimonprimary_reselect0) [ OK ]
TEST: prio (balance-tlb miimonprimary_reselect1) [ OK ]
TEST: prio (balance-tlb miimonprimary_reselect2) [ OK ]
TEST: prio (balance-tlbarp_ip_targetprimary_reselect0) [ OK ]
TEST: prio (balance-tlbarp_ip_targetprimary_reselect1) [ OK ]
TEST: prio (balance-tlbarp_ip_targetprimary_reselect2) [ OK ]
TEST: prio (balance-tlbns_ip6_targetprimary_reselect0) [ OK ]
TEST: prio (balance-tlbns_ip6_targetprimary_reselect1) [ OK ]
TEST: prio (balance-tlbns_ip6_targetprimary_reselect2) [ OK ]
TEST: prio (balance-alb miimonprimary_reselect0) [ OK ]
TEST: prio (balance-alb miimonprimary_reselect1) [ OK ]
TEST: prio (balance-alb miimonprimary_reselect2) [ OK ]
TEST: prio (balance-albarp_ip_targetprimary_reselect0) [ OK ]
TEST: prio (balance-albarp_ip_targetprimary_reselect1) [ OK ]
TEST: prio (balance-albarp_ip_targetprimary_reselect2) [ OK ]
TEST: prio (balance-albns_ip6_targetprimary_reselect0) [ OK ]
TEST: prio (balance-albns_ip6_targetprimary_reselect1) [ OK ]
TEST: prio (balance-albns_ip6_targetprimary_reselect2) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate0) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate1) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate2) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate3) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate4) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate5) [ OK ]
TEST:arp_validate(active-backuparp_ip_targetarp_validate6) [ OK ]
TEST:arp_validate(active-backupns_ip6_targetarp_validate0) [ OK ]
TEST:arp_validate(active-backupns_ip6_targetarp_validate1) [ OK ]
TEST:arp_validate(interface eth1mii_statusDOWN) [FAIL]
TEST:arp_validate(interface eth2mii_statusDOWN) [FAIL]
TEST:arp_validate(active-backupns_ip6_targetarp_validate2) [FAIL]
TEST:arp_validate(interface eth1mii_statusDOWN) [FAIL]
TEST:arp_validate(interface eth2mii_statusDOWN) [FAIL]
TEST:arp_validate(active-backupns_ip6_targetarp_validate3) [FAIL]
TEST:arp_validate(active-backupns_ip6_targetarp_validate4) [ OK ]
TEST:arp_validate(active-backupns_ip6_targetarp_validate5) [ OK ]
TEST:arp_validate(interface eth1mii_statusDOWN) [FAIL]
TEST:arp_validate(interface eth2mii_statusDOWN) [FAIL]
TEST:arp_validate(active-backupns_ip6_targetarp_validate6) [FAIL]
Quoted 1 line
[...]
Here is the summary with links:
- [PATCHv2,net,1/3] bonding: fix ns validation on backup slaves
https://git.kernel.org/netdev/net/c/4598380f9c54 - [PATCHv2,net,2/3] selftests: bonding: re-format bond option tests https://git.kernel.org/netdev/net/c/481b56e0391e - [PATCHv2,net,3/3] selftests: bonding: add arp validate test https://git.kernel.org/netdev/net/c/2e825f8accb4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html