From nobody Thu Dec 5 02:30:35 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 F02B04D133; Mon, 4 Mar 2024 16:44:44 +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=1709570685; cv=none; b=c0UDp7WP+lnQTntIAaN7swwj5jHedSgP/MdkKV3IZQVR0VMWZ3dz9qpvi8XD3klOkM76Njtw2dRg/DkMG2taYzoXehg5FzrLErB70fYARET+jDDIW1uoEbiSXIxyBQbW3P8t921+DCGoUm2LZ/FTngkyGTbXi6tNRsU85OPbET4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709570685; c=relaxed/simple; bh=ZAweL+bn3SBspIL31xxqKcVcloh96kh+Bjz1BwuGU8g=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=G8s7C7ivjnWW0STRDma1ZGfiydPOAivYd2lNx0UbecUY8ZLo3bFzgrsRaUCsfzKe5Rn8yfDhE3LZC/XQQjDyzYC9DBHU+tr4aQvL2Eai2fMUsqINjmVbpWNILgaeVj09x9PoNqH99m8jl/+6UVMovmb/TcApnYmA8G5po/RQMjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=svoZtxYD; 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="svoZtxYD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17E84C433C7; Mon, 4 Mar 2024 16:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709570684; bh=ZAweL+bn3SBspIL31xxqKcVcloh96kh+Bjz1BwuGU8g=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=svoZtxYDQgR2lEPhK74EaqP+HakGl1SDZg64Gc+iNifrHieJMgTEPHxNlIifR39Fz D/Xb8PxU+cWNw2/yeEGFG636auB+/DintlS7ElEW5UsZ4WuQWOWpOtE0gAjKpbxfcN w/ZO1+k3v68vigq6F6LNXkfvXY5ZePUqf5xjdLoQ= Subject: Patch "selftests: mptcp: add mptcp_lib_is_v6" has been added to the 6.6-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:26 +0100 In-Reply-To: <20240304142508.2086803-11-matttbe@kernel.org> Message-ID: <2024030426-surpass-frigidly-6965@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 mptcp_lib_is_v6 to the 6.6-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-mptcp_lib_is_v6.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From matttbe@kernel.org Mon Mar 4 15:25:28 2024 From: "Matthieu Baerts (NGI0)" Date: Mon, 4 Mar 2024 15:25:13 +0100 Subject: selftests: mptcp: add mptcp_lib_is_v6 To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Geliang Tang , Matthieu Baerts , Mat Martineau , Jakub Kicinski Message-ID: <20240304142508.2086803-11-matttbe@kernel.org> From: Geliang Tang commit b850f2c7dd85ecd14a333685c4ffd23f12665e94 upstream. To avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. is_v6() helper is defined in mptcp_connect.sh, mptcp_join.sh and mptcp_sockopt.sh, so export it into mptcp_lib.sh and rename it as mptcp_lib_is_v6(). Use this new helper in all scripts. 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-10-8d6b94= 150f6b@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_connect.sh | 16 +++++----------- tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++---------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 5 +++++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 8 +------- 4 files changed, 15 insertions(+), 28 deletions(-) --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -310,12 +310,6 @@ check_mptcp_disabled() return 0 } =20 -# $1: IP address -is_v6() -{ - [ -z "${1##*:*}" ] -} - do_ping() { local listener_ns=3D"$1" @@ -324,7 +318,7 @@ do_ping() local ping_args=3D"-q -c 1" local rc=3D0 =20 - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then $ipv6 || return 0 ping_args=3D"${ping_args} -6" fi @@ -620,12 +614,12 @@ run_tests_lo() fi =20 # skip if we don't want v6 - if ! $ipv6 && is_v6 "${connect_addr}"; then + if ! $ipv6 && mptcp_lib_is_v6 "${connect_addr}"; then return 0 fi =20 local local_addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then local_addr=3D"::" else local_addr=3D"0.0.0.0" @@ -693,7 +687,7 @@ run_test_transparent() TEST_GROUP=3D"${msg}" =20 # skip if we don't want v6 - if ! $ipv6 && is_v6 "${connect_addr}"; then + if ! $ipv6 && mptcp_lib_is_v6 "${connect_addr}"; then return 0 fi =20 @@ -726,7 +720,7 @@ EOF fi =20 local local_addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then local_addr=3D"::" r6flag=3D"-6" else --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -592,12 +592,6 @@ link_failure() done } =20 -# $1: IP address -is_v6() -{ - [ -z "${1##*:*}" ] -} - # $1: ns, $2: port wait_local_port_listen() { @@ -877,7 +871,7 @@ pm_nl_set_endpoint() local id=3D10 while [ $add_nr_ns1 -gt 0 ]; do local addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then addr=3D"dead:beef:$counter::1" else addr=3D"10.0.$counter.1" @@ -929,7 +923,7 @@ pm_nl_set_endpoint() local id=3D20 while [ $add_nr_ns2 -gt 0 ]; do local addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then addr=3D"dead:beef:$counter::2" else addr=3D"10.0.$counter.2" @@ -971,7 +965,7 @@ pm_nl_set_endpoint() pm_nl_flush_endpoint ${connector_ns} elif [ $rm_nr_ns2 -eq 9 ]; then local addr - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then addr=3D"dead:beef:1::2" else addr=3D"10.0.1.2" @@ -3336,7 +3330,7 @@ userspace_pm_rm_sf() local cnt =20 [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 - if is_v6 $2; then ip=3D6; fi + if mptcp_lib_is_v6 $2; then ip=3D6; fi tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) dp=3D$(mptcp_lib_evts_get_info dport "$evts" $t) --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -227,6 +227,11 @@ mptcp_lib_kill_wait() { wait "${1}" 2>/dev/null } =20 +# $1: IP address +mptcp_lib_is_v6() { + [ -z "${1##*:*}" ] +} + # $1: ns, $2: MIB counter mptcp_lib_get_counter() { local ns=3D"${1}" --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -162,12 +162,6 @@ check_transfer() return 0 } =20 -# $1: IP address -is_v6() -{ - [ -z "${1##*:*}" ] -} - do_transfer() { local listener_ns=3D"$1" @@ -184,7 +178,7 @@ do_transfer() local mptcp_connect=3D"./mptcp_connect -r 20" =20 local local_addr ip - if is_v6 "${connect_addr}"; then + if mptcp_lib_is_v6 "${connect_addr}"; then local_addr=3D"::" ip=3Dipv6 else Patches currently in stable-queue which might be from matttbe@kernel.org are queue-6.6/selftests-mptcp-add-mptcp_lib_is_v6.patch queue-6.6/mptcp-push-at-dss-boundaries.patch queue-6.6/mptcp-fix-double-free-on-socket-dismantle.patch queue-6.6/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch queue-6.6/selftests-mptcp-rm-subflow-with-v4-v4mapped-addr.patch queue-6.6/selftests-mptcp-update-userspace-pm-test-helpers.patch queue-6.6/mptcp-map-v4-address-to-v6-when-destroying-subflow.patch queue-6.6/selftests-mptcp-add-evts_get_info-helper.patch queue-6.6/mptcp-fix-potential-wake-up-event-loss.patch queue-6.6/selftests-mptcp-join-add-ss-mptcp-support-check.patch queue-6.6/mptcp-fix-possible-deadlock-in-subflow-diag.patch queue-6.6/mptcp-avoid-printing-warning-once-on-client-side.patch queue-6.6/selftests-mptcp-add-chk_subflows_total-helper.patch