From nobody Wed Dec 4 18:51:27 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59FA11DDE9; Mon, 4 Mar 2024 16:45:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709570702; cv=none; b=meUXVLxlvtGXt3WygTneWVOUnbIDlKYSnFE4MSyp/pYoyb0ELGYdDH1sf6rwyen9Gk0EFMHFRA4tdLpScFjTFffLwKt0wv6WiV87q/MpPivJrkMbg57eIrFTbvQHE+nKIV4L0Jik4qo8a6W6ftdfbdr+7YI2Hrj/sUWix8y7C7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709570702; c=relaxed/simple; bh=skbgPlf5acYbYIVyGx0Q2autSF+guynXl4UaRX3dDxc=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=WQYbzdl2aflCt34GYCBkiOgfIsYRAfciEizBPMpt89rD/bLwhG6Akm9jlfO97XBbGYv/RUqowEvVhhfeKaD+ac+Q9tedunejNupCnasHXwFXbZpbzA0M3NFIjVodkbEAvxWy+KpBAxcrCuw+gA9nr5SrzObGHQ2Pv30cD+oygsg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rp+G3jBg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rp+G3jBg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AF8FC433C7; Mon, 4 Mar 2024 16:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709570701; bh=skbgPlf5acYbYIVyGx0Q2autSF+guynXl4UaRX3dDxc=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=rp+G3jBg6kBg8lwsSGsdRXVPx8jDBQoWdB9w0EXCtHO+SVQRG5/zAFo1VWqAA1YWi qKv8IyGzWow6waDLfgDF/t37Ro2qZG3Mxqp9aOvQO9LQkjnCQyRyKUgY0WoTtuEJTK nm9OiW/YQT4jn0g+3nhBNTtgtDf5l9DuFkJmtN3s= Subject: Patch "selftests: mptcp: add chk_subflows_total helper" has been added to the 6.7-stable tree To: geliang.tang@suse.com,gregkh@linuxfoundation.org,kuba@kernel.org,martineau@kernel.org,matttbe@kernel.org,mptcp@lists.linux.dev Cc: From: Date: Mon, 04 Mar 2024 17:44:55 +0100 In-Reply-To: <20240304133827.1989736-9-matttbe@kernel.org> Message-ID: <2024030454-flame-reach-5b95@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-stable: commit X-Patchwork-Hint: ignore Content-Type: text/plain; charset="utf-8" This is a note to let you know that I've just added the patch titled selftests: mptcp: add chk_subflows_total helper to the 6.7-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.git= ;a=3Dsummary The filename of the patch is: selftests-mptcp-add-chk_subflows_total-helper.patch and it can be found in the queue-6.7 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From stable+bounces-25927-greg=3Dkroah.com@vger.kernel.org Mon Mar 4 14:39= :52 2024 From: "Matthieu Baerts (NGI0)" Date: Mon, 4 Mar 2024 14:38:30 +0100 Subject: selftests: mptcp: add chk_subflows_total helper To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Geliang Tang , Matthieu Baerts , Mat Martineau , Jakub Kicinski Message-ID: <20240304133827.1989736-9-matttbe@kernel.org> From: Geliang Tang commit 80775412882e273b8ef62124fae861cde8e6fb3d upstream. This patch adds a new helper chk_subflows_total(), in it use the newly added counter mptcpi_subflows_total to get the "correct" amount of subflows, including the initial one. To be compatible with old 'ss' or kernel versions not supporting this counter, get the total subflows by listing TCP connections that are MPTCP subflows: ss -ti state state established state syn-sent state syn-recv | grep -c tcp-ulp-mptcp. Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-3-8d6b941= 50f6b@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 42 +++++++++++++++++++= ++++- 1 file changed, 41 insertions(+), 1 deletion(-) --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1843,7 +1843,7 @@ chk_mptcp_info() local cnt2 local dump_stats =20 - print_check "mptcp_info ${info1:0:8}=3D$exp1:$exp2" + print_check "mptcp_info ${info1:0:15}=3D$exp1:$exp2" =20 cnt1=3D$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1") cnt2=3D$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2") @@ -1864,6 +1864,42 @@ chk_mptcp_info() fi } =20 +# $1: subflows in ns1 ; $2: subflows in ns2 +# number of all subflows, including the initial subflow. +chk_subflows_total() +{ + local cnt1 + local cnt2 + local info=3D"subflows_total" + local dump_stats + + # if subflows_total counter is supported, use it: + if [ -n "$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value $info $info)" ]; = then + chk_mptcp_info $info $1 $info $2 + return + fi + + print_check "$info $1:$2" + + # if not, count the TCP connections that are in fact MPTCP subflows + cnt1=3D$(ss -N $ns1 -ti state established state syn-sent state syn-recv | + grep -c tcp-ulp-mptcp) + cnt2=3D$(ss -N $ns2 -ti state established state syn-sent state syn-recv | + grep -c tcp-ulp-mptcp) + + if [ "$1" !=3D "$cnt1" ] || [ "$2" !=3D "$cnt2" ]; then + fail_test "got subflows $cnt1:$cnt2 expected $1:$2" + dump_stats=3D1 + else + print_ok + fi + + if [ "$dump_stats" =3D 1 ]; then + ss -N $ns1 -ti + ss -N $ns2 -ti + fi +} + chk_link_usage() { local ns=3D$1 @@ -3407,10 +3443,12 @@ userspace_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_sf_addr_ns1 10.0.2.1 10 chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 kill_events_pids mptcp_lib_kill_wait $tests_pid fi @@ -3427,9 +3465,11 @@ userspace_tests() userspace_pm_add_sf 10.0.3.2 20 chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 userspace_pm_rm_sf_addr_ns2 10.0.3.2 20 chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 kill_events_pids mptcp_lib_kill_wait $tests_pid fi Patches currently in stable-queue which might be from kroah.com@vger.kernel= .org are queue-6.7/selftests-mptcp-add-mptcp_lib_is_v6.patch queue-6.7/x86-bugs-use-alternative-instead-of-mds_user_clear-static-key.pat= ch queue-6.7/kvm-vmx-move-verw-closer-to-vmentry-for-mds-mitigation.patch queue-6.7/selftests-mptcp-rm-subflow-with-v4-v4mapped-addr.patch queue-6.7/x86-entry_32-add-verw-just-before-userspace-transition.patch queue-6.7/x86-entry_64-add-verw-just-before-userspace-transition.patch queue-6.7/selftests-mptcp-update-userspace-pm-test-helpers.patch queue-6.7/selftests-mptcp-add-evts_get_info-helper.patch queue-6.7/kvm-vmx-use-bt-jnc-i.e.-eflags.cf-to-select-vmresume-vs.-vmlaunch= .patch queue-6.7/selftests-mptcp-add-chk_subflows_total-helper.patch