| Message ID | 20230808141503.4060661-11-idosch@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 23fb886a1ced6f885ddd541cc86d45c415ce705c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | selftests: forwarding: Various fixes | expand |
On Tue, Aug 08, 2023 at 05:14:56PM +0300, Ido Schimmel wrote: > MAC Merge cannot be tested with veth pairs, resulting in failures: > > # ./ethtool_mm.sh > [...] > TEST: Manual configuration with verification: swp1 to swp2 [FAIL] > Verification did not succeed > > Fix by skipping the test when the interfaces do not support MAC Merge. > > Fixes: e6991384ace5 ("selftests: forwarding: add a test for MAC Merge layer") > Reported-by: Mirsad Todorovac <mirsad.todorovac@alu.unizg.hr> > Closes: https://lore.kernel.org/netdev/adc5e40d-d040-a65e-eb26-edf47dac5b02@alu.unizg.hr/ > Signed-off-by: Ido Schimmel <idosch@nvidia.com> > --- > Cc: vladimir.oltean@nxp.com > v2: > Probe for MAC Merge support. > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
diff --git a/tools/testing/selftests/net/forwarding/ethtool_mm.sh b/tools/testing/selftests/net/forwarding/ethtool_mm.sh index c580ad623848..39e736f30322 100755 --- a/tools/testing/selftests/net/forwarding/ethtool_mm.sh +++ b/tools/testing/selftests/net/forwarding/ethtool_mm.sh @@ -258,11 +258,6 @@ h2_destroy() setup_prepare() { - check_ethtool_mm_support - check_tc_fp_support - require_command lldptool - bail_on_lldpad "autoconfigure the MAC Merge layer" "configure it manually" - h1=${NETIFS[p1]} h2=${NETIFS[p2]} @@ -278,6 +273,19 @@ cleanup() h1_destroy } +check_ethtool_mm_support +check_tc_fp_support +require_command lldptool +bail_on_lldpad "autoconfigure the MAC Merge layer" "configure it manually" + +for netif in ${NETIFS[@]}; do + ethtool --show-mm $netif 2>&1 &> /dev/null + if [[ $? -ne 0 ]]; then + echo "SKIP: $netif does not support MAC Merge" + exit $ksft_skip + fi +done + trap cleanup EXIT setup_prepare
MAC Merge cannot be tested with veth pairs, resulting in failures: # ./ethtool_mm.sh [...] TEST: Manual configuration with verification: swp1 to swp2 [FAIL] Verification did not succeed Fix by skipping the test when the interfaces do not support MAC Merge. Fixes: e6991384ace5 ("selftests: forwarding: add a test for MAC Merge layer") Reported-by: Mirsad Todorovac <mirsad.todorovac@alu.unizg.hr> Closes: https://lore.kernel.org/netdev/adc5e40d-d040-a65e-eb26-edf47dac5b02@alu.unizg.hr/ Signed-off-by: Ido Schimmel <idosch@nvidia.com> --- Cc: vladimir.oltean@nxp.com v2: Probe for MAC Merge support. --- .../selftests/net/forwarding/ethtool_mm.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)