Commit 6a09788c authored by YonglongLi's avatar YonglongLi Committed by Jakub Kicinski
Browse files

mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID 



The RmAddr MIB counter is supposed to be incremented once when a valid
RM_ADDR has been received. Before this patch, it could have been
incremented as many times as the number of subflows connected to the
linked address ID, so it could have been 0, 1 or more than 1.

The "RmSubflow" is incremented after a local operation. In this case,
it is normal to tied it with the number of subflows that have been
actually removed.

The "remove invalid addresses" MP Join subtest has been modified to
validate this case. A broadcast IP address is now used instead: the
client will not be able to create a subflow to this address. The
consequence is that when receiving the RM_ADDR with the ID attached to
this broadcast IP address, no subflow linked to this ID will be found.

Fixes: 7a7e52e3 ("mptcp: add RM_ADDR related mibs")
Cc: stable@vger.kernel.org
Co-developed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarYonglongLi <liyonglong@chinatelecom.cn>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240607-upstream-net-20240607-misc-fixes-v1-2-1ab9ddfa3d00@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8031b58c

net/mptcp/pm_netlink.c

+4 −1
Original line number Diff line number Diff line
@@ -814,10 +814,13 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
			spin_lock_bh(&msk->pm.lock);



			removed = true;

			if (rm_type == MPTCP_MIB_RMSUBFLOW)

				__MPTCP_INC_STATS(sock_net(sk), rm_type);

		}

		if (rm_type == MPTCP_MIB_RMSUBFLOW)

			__set_bit(rm_id ? rm_id : msk->mpc_endpoint_id, msk->pm.id_avail_bitmap);

		else if (rm_type == MPTCP_MIB_RMADDR)

			__MPTCP_INC_STATS(sock_net(sk), rm_type);

		if (!removed)

			continue;

tools/testing/selftests/net/mptcp/mptcp_join.sh

+2 −1
Original line number Diff line number Diff line
@@ -2250,7 +2250,8 @@ remove_tests() 
		pm_nl_set_limits $ns1 3 3

		pm_nl_add_endpoint $ns1 10.0.12.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.14.1 flags signal

		# broadcast IP: no packet for this address will be received on ns1

		pm_nl_add_endpoint $ns1 224.0.0.1 flags signal

		pm_nl_set_limits $ns2 3 3

		addr_nr_ns1=-3 speed=10 \

			run_tests $ns1 $ns2 10.0.1.1