From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 48BF7801A1 for ; Wed, 16 Sep 2026 12:19:09 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68GCHuCL014912; Wed, 16 Sep 2026 15:17:57 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68GCHuCL014912 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="e2D7b/wb" Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68GCHhEi014885 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Wed, 16 Sep 2026 15:17:44 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68GCHhEi014885 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-49e82768ac2so8779685e9.0 for ; Wed, 16 Sep 2026 05:17:44 -0700 (PDT) X-Gm-Message-State: AFuF++mwNau/zMjJEi6iVr/7N6bSp5rkV0Rar4kEw2kNtzbt0ItNmi9A 23JaJjpVgYWV3z6X5PokaMU9eX5VbO3KP7mmQSb9NYSWLxEBqYhV7WFADIq3DimsFUkvkcTzogI TmklyWVjAiQRwc1YE6oeBV1heBEF1gBr79DoIhilrK/yCzzaW3w3L1A== X-Gm-Gg: AYBFou2VwPbnHyonNyUP23f8/nPztbB8Ytv16aWOn/0jJjeRzKJZ1vJ9ORboKmF3eBi y+MZpdZjTU8KvlIH/fPyYztPKiQyrQBHqdtndZ3aErsCfiEDFi9hxQa4VL+jIh5O1KioAimnWtl Kt51SFyPXIOsKiSpDMzfJQnF9t6Lkrbss+n5VvG0ucpZem5qAa57QSrUD4VY6ySTHwI5iXd5/j4 n+BuJhaZfD278jupdOb59s61J9VLW11q2E8u+WdO9eg8KPxEbRyVub7Pc/u70/QbKrL3COZ5X7W UbhiNLKWEd1wL74waK+WoLTOnrAXyRWroAJ4Jsh37p6PqewKgkxs0qCnyVnqdiO03syVKIxmbeK e1pSSSXTbWX8CYrWIh82En9nwAg== X-Received: by 2002:a7b:cb82:0:b0:49c:f13d:ffe6 with SMTP id 5b1f17b1804b1-49e7d74cbebmr83560575e9.10.1789561063511; Wed, 16 Sep 2026 05:17:43 -0700 (PDT) X-Received: by 2002:a7b:cb82:0:b0:49c:f13d:ffe6 with SMTP id 5b1f17b1804b1-49e7d74cbebmr83560225e9.10.1789561062959; Wed, 16 Sep 2026 05:17:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1789561062; cv=none; d=google.com; s=arc-20260327; b=IEp5bz/sRfHa7wJcnUz9Vc8p9Z61qllzpDioj1YHjBukqETaCV5XaIE8qyk1jBNUoI OzPl2DZLp6v1qESK/kWGFAyk7VoysGDd5fHUs4CHOf6qrx1wQHGtrzHpQ75lt27gfnsv ntuGCnNI8iNXwK3BoEoQSZISmVoXvPvQnggeVnyXbmWbPLL+yoPlKROGdwHEKvsb+01w 6uEtv+dHKoVu5Y2XpHQvCxgLkI75aaR3/NAv1Tug+wHNr4KXkajo2qX2yAt52w6suISO pyJcm5Lxc9oimkwVQ2lxf2tlcCpR9vDWXE+oa9nFHJMHHUkZp0YlWsD2cXz8UTZfp+FO vVkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=otfkIDITxW9WzbiX9eT7Wicw5ovo1Vv8VCzRKpSUPGs=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=kuu/5NYPdTdj07hhrrbnZNi+zVL3e7kqzvbNILXBRpzJhhLDhvuGcbi14DVJ8i5nKV nCXsn3C5LjpAF9CoVK6oT/2ypp9Is5yzkCo6dN87kKb4xmY0BsyuI9gsAwesvrtVl0Nk ce05ZXg2dxT60LK4lVYYIA5gE6p3UW5Qa6gcB0eOKcwVaAw5g+jHbri7ZDXu72Jdtfyu vpwsughWXdjvwzWh3iI8bFjfeg4wP30bTAaQkFXJWIvnls5xfS01UXQdyVJBvyWleLub ONKSCvo6TNL+sxzI1e9esLHtUUKRtdzqtbPaNHp48mGe0nFoVBQp9yVm+5iHG0MKamzY dt5Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="e2D7b/wb"; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-4870bf2c30fsi4500439f8f.125.2026.09.16.05.17.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 05:17:42 -0700 (PDT) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="e2D7b/wb"; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=otfkIDITxW9WzbiX9eT7Wicw5ovo1Vv8VCzRKpSUPGs=; b=e2D7b/wbMzJa gGKkgeT6NpJriCNTT6PAI9gkbVhfDYpebdIg4dMJT8436WXV93oyWoZ06wfKrsOYs0sawnih6FK0X Wp7V1LfyNtHnhnV+8UwEkeaEZ2JxcrJxCMuqLHWQ5qbNryBfbAifryNM4wOEQA01yTZQF3FY6s4Pr acJl9upjp69YvQpkDc+AOEI2q0xeAD4xugJwvvq39xMLeTWwenuPuTVrlyAr3C8KzsAm1dG0mh4AD 1k3+BkOJ3+VAWjBpdH9QLw9WuTFL2xSJVPuafDMKtIVlSCDdqKxTN+sXdKnYZr3sFHBfikhyfKOwU caM+lpLQiuwjkiKtdF3c9Q==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x6oXM-002xNc-0y; Wed, 16 Sep 2026 14:17:42 +0200 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Wed, 16 Sep 2026 15:17:37 +0300 Message-ID: <20260916121740.796320-4-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260916121740.796320-1-eva.kurchatova@virtuozzo.com> References: <20260916121740.796320-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH vz10 4/4] ms/selftests: mptcp: join: properly kill background tasks X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: "Matthieu Baerts (NGI0)" The 'run_tests' function is executed in the background, but killing its associated PID would not kill the children tasks running in the background. To properly kill all background tasks, 'kill -- -PID' could be used, but this requires kill from procps-ng. Instead, all children tasks are listed using 'ps', and 'kill' is called with all PIDs of this group. Fixes: 31ee4ad86afd ("selftests: mptcp: join: stop transfer when check is done (part 1)") Cc: stable@vger.kernel.org Fixes: 04b57c9e096a ("selftests: mptcp: join: stop transfer when check is done (part 2)") Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-6-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 852b644acbce1529307a4bb283752c4e77b5cda7) https://virtuozzo.atlassian.net/browse/VSTOR-139651 Feature: fix selftests Signed-off-by: Eva Kurchatova --- .../testing/selftests/net/mptcp/mptcp_join.sh | 18 ++++++++-------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 21 +++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 1b95d7be6aed..43d1fe8a0857 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3632,7 +3632,7 @@ userspace_tests() chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 kill_events_pids - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid fi # userspace pm create destroy subflow @@ -3660,7 +3660,7 @@ userspace_tests() chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 kill_events_pids - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid fi # userspace pm create id 0 subflow @@ -3681,7 +3681,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 kill_events_pids - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid fi # userspace pm remove initial subflow @@ -3705,7 +3705,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 kill_events_pids - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid fi # userspace pm send RM_ADDR for ID 0 @@ -3731,7 +3731,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 kill_events_pids - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid fi } @@ -3761,7 +3761,7 @@ endpoint_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_check_endpoint "modif is allowed" \ $ns2 10.0.2.2 id 1 flags signal - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid fi if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2 REJECT OUTPUT && @@ -3816,7 +3816,7 @@ endpoint_tests() chk_mptcp_info subflows 3 subflows 3 done - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid kill_events_pids chk_evt_nr ns1 MPTCP_LIB_EVENT_LISTENER_CREATED 1 @@ -3889,7 +3889,7 @@ endpoint_tests() wait_mpj $ns2 chk_subflow_nr "after re-re-add ID 0" 3 chk_mptcp_info subflows 3 subflows 3 - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid kill_events_pids chk_evt_nr ns1 MPTCP_LIB_EVENT_LISTENER_CREATED 1 @@ -3937,7 +3937,7 @@ endpoint_tests() wait_mpj $ns2 pm_nl_add_endpoint $ns1 10.0.3.1 id 2 flags signal wait_mpj $ns2 - mptcp_lib_kill_wait $tests_pid + mptcp_lib_kill_group_wait $tests_pid join_syn_tx=3 join_connect_err=1 \ chk_join_nr 2 2 2 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh index 43112e1c8c59..f3d921b4e2b6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -327,6 +327,27 @@ mptcp_lib_kill_wait() { wait "${1}" 2>/dev/null } +# $1: PID +mptcp_lib_pid_list_children() { + local curr="${1}" + # evoke 'ps' only once + local pids="${2:-"$(ps o pid,ppid)"}" + + echo "${curr}" + + local pid + for pid in $(echo "${pids}" | awk "\$2 == ${curr} { print \$1 }"); do + mptcp_lib_pid_list_children "${pid}" "${pids}" + done +} + +# $1: PID +mptcp_lib_kill_group_wait() { + # Some users might not have procps-ng: cannot use "kill -- -PID" + mptcp_lib_pid_list_children "${1}" | xargs -r kill &>/dev/null + wait "${1}" 2>/dev/null +} + # $1: IP address mptcp_lib_is_v6() { [ -z "${1##*:*}" ] -- 2.55.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel