lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.12 082/160] selftests: Clean forgotten resources as part of cleanup()
    Date
    From: Amit Cohen <amcohen@nvidia.com>

    [ Upstream commit e67dfb8d15deb33c425d0b0ee22f2e5eef54c162 ]

    Several tests do not set some ports down as part of their cleanup(),
    resulting in IPv6 link-local addresses and associated routes not being
    deleted.

    These leaks were found using a BPF tool that monitors ASIC resources.

    Solve this by setting the ports down at the end of the tests.

    Signed-off-by: Amit Cohen <amcohen@nvidia.com>
    Reviewed-by: Petr Machata <petrm@nvidia.com>
    Signed-off-by: Ido Schimmel <idosch@nvidia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh | 3 +++
    .../selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh | 3 +++
    tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 2 ++
    tools/testing/selftests/net/forwarding/pedit_dsfield.sh | 2 ++
    tools/testing/selftests/net/forwarding/pedit_l4port.sh | 2 ++
    tools/testing/selftests/net/forwarding/skbedit_priority.sh | 2 ++
    6 files changed, 14 insertions(+)

    diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh
    index 4029833f7e27..160891dcb4bc 100755
    --- a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh
    +++ b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_drops.sh
    @@ -109,6 +109,9 @@ router_destroy()
    __addr_add_del $rp1 del 192.0.2.2/24 2001:db8:1::2/64

    tc qdisc del dev $rp2 clsact
    +
    + ip link set dev $rp2 down
    + ip link set dev $rp1 down
    }

    setup_prepare()
    diff --git a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh
    index 1fedfc9da434..1d157b1bd838 100755
    --- a/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh
    +++ b/tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l3_exceptions.sh
    @@ -111,6 +111,9 @@ router_destroy()
    __addr_add_del $rp1 del 192.0.2.2/24 2001:db8:1::2/64

    tc qdisc del dev $rp2 clsact
    +
    + ip link set dev $rp2 down
    + ip link set dev $rp1 down
    }

    setup_prepare()
    diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh
    index 5cbff8038f84..28a570006d4d 100755
    --- a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh
    +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh
    @@ -93,7 +93,9 @@ switch_destroy()
    lldptool -T -i $swp1 -V APP -d $(dscp_map 10) >/dev/null
    lldpad_app_wait_del

    + ip link set dev $swp2 down
    ip link set dev $swp2 nomaster
    + ip link set dev $swp1 down
    ip link set dev $swp1 nomaster
    ip link del dev br1
    }
    diff --git a/tools/testing/selftests/net/forwarding/pedit_dsfield.sh b/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
    index 55eeacf59241..64fbd211d907 100755
    --- a/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
    +++ b/tools/testing/selftests/net/forwarding/pedit_dsfield.sh
    @@ -75,7 +75,9 @@ switch_destroy()
    tc qdisc del dev $swp2 clsact
    tc qdisc del dev $swp1 clsact

    + ip link set dev $swp2 down
    ip link set dev $swp2 nomaster
    + ip link set dev $swp1 down
    ip link set dev $swp1 nomaster
    ip link del dev br1
    }
    diff --git a/tools/testing/selftests/net/forwarding/pedit_l4port.sh b/tools/testing/selftests/net/forwarding/pedit_l4port.sh
    index 5f20d289ee43..10e594c55117 100755
    --- a/tools/testing/selftests/net/forwarding/pedit_l4port.sh
    +++ b/tools/testing/selftests/net/forwarding/pedit_l4port.sh
    @@ -71,7 +71,9 @@ switch_destroy()
    tc qdisc del dev $swp2 clsact
    tc qdisc del dev $swp1 clsact

    + ip link set dev $swp2 down
    ip link set dev $swp2 nomaster
    + ip link set dev $swp1 down
    ip link set dev $swp1 nomaster
    ip link del dev br1
    }
    diff --git a/tools/testing/selftests/net/forwarding/skbedit_priority.sh b/tools/testing/selftests/net/forwarding/skbedit_priority.sh
    index e3bd8a6bb8b4..bde11dc27873 100755
    --- a/tools/testing/selftests/net/forwarding/skbedit_priority.sh
    +++ b/tools/testing/selftests/net/forwarding/skbedit_priority.sh
    @@ -72,7 +72,9 @@ switch_destroy()
    tc qdisc del dev $swp2 clsact
    tc qdisc del dev $swp1 clsact

    + ip link set dev $swp2 down
    ip link set dev $swp2 nomaster
    + ip link set dev $swp1 down
    ip link set dev $swp1 nomaster
    ip link del dev br1
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 14:11    [W:8.347 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site