test_cgrp2_sock.sh and test_cgrp2_sock2.sh tests keep the program
attached to cgroup even after completion.
Using detach functionality of test_cgrp2_sock in both scripts.

Signed-off-by: Prashant Bhole <bhole_prashant...@lab.ntt.co.jp>
---
 samples/bpf/test_cgrp2_sock.sh  | 1 +
 samples/bpf/test_cgrp2_sock2.sh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/samples/bpf/test_cgrp2_sock.sh b/samples/bpf/test_cgrp2_sock.sh
index 8ee0371a100a..9f6174236856 100755
--- a/samples/bpf/test_cgrp2_sock.sh
+++ b/samples/bpf/test_cgrp2_sock.sh
@@ -61,6 +61,7 @@ cleanup_and_exit()
 
        [ -n "$msg" ] && echo "ERROR: $msg"
 
+       test_cgrp2_sock -d ${CGRP_MNT}/sockopts
        ip li del cgrp2_sock
        umount ${CGRP_MNT}
 
diff --git a/samples/bpf/test_cgrp2_sock2.sh b/samples/bpf/test_cgrp2_sock2.sh
index fc4e64d00cb3..0f396a86e0cb 100755
--- a/samples/bpf/test_cgrp2_sock2.sh
+++ b/samples/bpf/test_cgrp2_sock2.sh
@@ -28,6 +28,9 @@ function attach_bpf {
 }
 
 function cleanup {
+       if [ -d /tmp/cgroupv2/foo ]; then
+               test_cgrp2_sock -d /tmp/cgroupv2/foo
+       fi
        ip link del veth0b
        ip netns delete at_ns0
        umount /tmp/cgroupv2
-- 
2.13.6


Reply via email to