From nobody Mon May 20 05:31:29 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 663A04C61D; Mon, 4 Mar 2024 16:44:50 +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=1709570690; cv=none; b=HXpstkhHzFjyOZgRKTfeUf+v5zyRPC2ZQ+3PEGLviQ+LUh3IhJnC+hB5lA/uJmMInVOkoJNDxAMyVnYWU5ywLC3cPq54zpROQ9GJogv74ig/NIhVEyEP2Bigbo82WDiE8xHwnfNw03z5olCLJglBinEwUgdQtA6MmZv7EM1hW0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709570690; c=relaxed/simple; bh=e/zoLMtRJahcTq70K4FCxnXfMZJ9d2WIfkh+hmYc330=; h=Subject:To:Cc:From:Date:In-Reply-To:Message-ID:MIME-Version: Content-Type; b=qzyuULWTEee2n1atkhBaKpZA+Sw9id3VdBtEDijUG7DjRBNWhqYfGiPrQyOj381OOYU8rQx+CMGs3ht0Tdn/rfJUZ4zJdQThOnovMG+MZCZTstqYXV0kav7pc9kKqrOJr8m0PqoJWk2pJqMaWnS+mwvYZC3cXZpxri7lCDiI21U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=im3wSBR3; 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="im3wSBR3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CB88C433F1; Mon, 4 Mar 2024 16:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709570689; bh=e/zoLMtRJahcTq70K4FCxnXfMZJ9d2WIfkh+hmYc330=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=im3wSBR3PjjvIBJh3IrV51JXBQR0+hH/m8UQyJu4JLsPveT4eL5Ar8gjy9w1uWfVX H6NX/jL6MBvKcD02VQy25URb3sUAevQvLpqZRK0s+b0XxSu8yEde7WSj3iNrFqzk3Z lSKmxD+G6EDG+WfyqEBaXhsR833hb0i9l61dF5B0= Subject: Patch "selftests: mptcp: rm subflow with v4/v4mapped addr" has been added to the 6.6-stable tree To: gregkh@linuxfoundation.org,kuba@kernel.org,martineau@kernel.org,matttbe@kernel.org,mptcp@lists.linux.dev,tanggeliang@kylinos.cn Cc: From: Date: Mon, 04 Mar 2024 17:44:26 +0100 In-Reply-To: <20240304142508.2086803-12-matttbe@kernel.org> Message-ID: <2024030426-census-mop-1343@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: rm subflow with v4/v4mapped addr 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-rm-subflow-with-v4-v4mapped-addr.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:32 2024 From: "Matthieu Baerts (NGI0)" Date: Mon, 4 Mar 2024 15:25:14 +0100 Subject: selftests: mptcp: rm subflow with v4/v4mapped addr To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Geliang Tang , Mat Martineau , Matthieu Baerts , Jakub Kicinski Message-ID: <20240304142508.2086803-12-matttbe@kernel.org> From: Geliang Tang commit 7092dbee23282b6fcf1313fc64e2b92649ee16e8 upstream. Now both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds a second subflow to "userspace pm add & remove address" test, and two subflows could be removed two different ways, one with the v4mapped and one with v4. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/387 Fixes: 48d73f609dcc ("selftests: mptcp: update userspace pm addr tests") Cc: stable@vger.kernel.org Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v= 1-2-162e87e48497@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 | 28 +++++++++++++------= ----- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 4 +-- 2 files changed, 18 insertions(+), 14 deletions(-) --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3325,16 +3325,17 @@ userspace_pm_rm_sf() { local evts=3D$evts_ns1 local t=3D${3:-1} - local ip=3D4 + local ip local tk da dp sp local cnt =20 [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 - if mptcp_lib_is_v6 $2; then ip=3D6; fi + [ -n "$(mptcp_lib_evts_get_info "saddr4" "$evts" $t)" ] && ip=3D4 + [ -n "$(mptcp_lib_evts_get_info "saddr6" "$evts" $t)" ] && ip=3D6 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) - sp=3D$(mptcp_lib_evts_get_info sport "$evts" $t) + da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t $2) + dp=3D$(mptcp_lib_evts_get_info dport "$evts" $t $2) + sp=3D$(mptcp_lib_evts_get_info sport "$evts" $t $2) =20 cnt=3D$(rm_sf_count ${1}) ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \ @@ -3421,20 +3422,23 @@ userspace_tests() if reset_with_events "userspace pm add & remove address" && continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 - pm_nl_set_limits $ns2 1 1 + pm_nl_set_limits $ns2 2 2 speed=3D5 \ run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr $ns1 10.0.2.1 10 - 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_add_addr $ns1 10.0.3.1 20 + chk_join_nr 2 2 2 + chk_add_nr 2 2 + chk_mptcp_info subflows 2 subflows 2 + chk_subflows_total 3 3 + chk_mptcp_info add_addr_signal 2 add_addr_accepted 2 userspace_pm_rm_addr $ns1 10 userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED - chk_rm_nr 1 1 invert + userspace_pm_rm_addr $ns1 20 + userspace_pm_rm_sf $ns1 10.0.3.1 $SUB_ESTABLISHED + chk_rm_nr 2 2 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 kill_events_pids --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -213,9 +213,9 @@ mptcp_lib_get_info_value() { grep "${2}" | sed -n 's/.*\('"${1}"':\)\([0-9a-f:.]*\).*$/\2/p;q' } =20 -# $1: info name ; $2: evts_ns ; $3: event type +# $1: info name ; $2: evts_ns ; [$3: event type; [$4: addr]] mptcp_lib_evts_get_info() { - mptcp_lib_get_info_value "${1}" "^type:${3:-1}," < "${2}" + grep "${4:-}" "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1}," } =20 # $1: PID 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