| Message ID | 20240518132052.1293474-1-ap420073@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cc563e749810f5636451d4b833fbd689899ecdb9 |
| Headers | show |
| Series | [net,v3] selftests: net: kill smcrouted in the cleanup logic in amt.sh | expand |
On Sat, May 18, 2024 at 01:20:52PM +0000, Taehee Yoo wrote: > 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> Thanks for the updates. Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Sat, 18 May 2024 13:20:52 +0000 you wrote: > 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> > > [...] Here is the summary with links: - [net,v3] selftests: net: kill smcrouted in the cleanup logic in amt.sh https://git.kernel.org/netdev/net/c/cc563e749810 You are awesome, thank you!
diff --git a/tools/testing/selftests/net/amt.sh b/tools/testing/selftests/net/amt.sh index 5175a42cbe8a..7e7ed6c558da 100755 --- 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 \
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> --- The v1 patch is here: https://lore.kernel.org/netdev/20240508040643.229383-1-ap420073@gmail.com/ v3 - Do not change shebang. v2 - Headline change. - Kill smcrouted process only if amt.pid exists. - Do not remove the return value. - Remove timeout logic because it was already fixed by following commit 4c639b6a7b9d ("selftests: net: move amt to socat for better compatibility") - Fix shebang. tools/testing/selftests/net/amt.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)