selftests: net: kill smcrouted in the cleanup logic in amt.sh

The amt.sh requires smcrouted for multicasting routing.
So, it starts smcrouted before forwarding tests.
It must be stopped after all tests, but it isn't.

To fix this issue, it kills smcrouted in the cleanup logic.

Fixes: c08e8baea78e ("selftests: add amt interface selftest script")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/amt.sh b/tools/testing/selftests/net/amt.sh
index 5175a42cbe8a212e338b8e6242a36427c9d86113..7e7ed6c558da9ef2a025c1d5a38754c56fa4417c 100755 (executable)
--- a/tools/testing/selftests/net/amt.sh
+++ b/tools/testing/selftests/net/amt.sh
@@ -77,6 +77,7 @@ readonly LISTENER=$(mktemp -u listener-XXXXXXXX)
 readonly GATEWAY=$(mktemp -u gateway-XXXXXXXX)
 readonly RELAY=$(mktemp -u relay-XXXXXXXX)
 readonly SOURCE=$(mktemp -u source-XXXXXXXX)
+readonly SMCROUTEDIR="$(mktemp -d)"
 ERR=4
 err=0
 
@@ -85,6 +86,11 @@ exit_cleanup()
        for ns in "$@"; do
                ip netns delete "${ns}" 2>/dev/null || true
        done
+       if [ -f "$SMCROUTEDIR/amt.pid" ]; then
+               smcpid=$(< $SMCROUTEDIR/amt.pid)
+               kill $smcpid
+       fi
+       rm -rf $SMCROUTEDIR
 
        exit $ERR
 }
@@ -167,7 +173,7 @@ setup_iptables()
 
 setup_mcast_routing()
 {
-       ip netns exec "${RELAY}" smcrouted
+       ip netns exec "${RELAY}" smcrouted -P $SMCROUTEDIR/amt.pid
        ip netns exec "${RELAY}" smcroutectl a relay_src \
                172.17.0.2 239.0.0.1 amtr
        ip netns exec "${RELAY}" smcroutectl a relay_src \