Commit 603604c8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mptcp-misc-fixes' 



Matthieu Baerts says:

====================
mptcp: locking cleanup & misc. fixes

Patches 1-4 are fixes for issues found by Paolo while working on adding
TCP_NOTSENT_LOWAT support. The latter will need to track more states
under the msk data lock. Since the locking msk locking schema is already
quite complex, do a long awaited clean-up step by moving several
confusing lockless initialization under the relevant locks. Note that it
is unlikely a real race could happen even prior to such patches as the
MPTCP-level state machine implicitly ensures proper serialization of the
write accesses, even lacking explicit lock. But still, simplification is
welcome and this will help for the maintenance. This can be backported
up to v5.6.

Patch 5 is a fix for the userspace PM, not to add new local address
entries if the address is already in the list. This behaviour can be
seen since v5.19.

Patch 6 fixes an issue when Fastopen is used. The issue can happen since
v6.2. A previous fix has already been applied, but not taking care of
all cases according to syzbot.

Patch 7 updates Geliang's email address in the MAINTAINERS file.
====================

Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bab091d5 68990d00

.mailmap

+5 −4
Original line number Diff line number Diff line
@@ -191,10 +191,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>

Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>

Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>

Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>

Geliang Tang <geliang@kernel.org> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -15324,7 +15324,7 @@ K: \bmdo_ 
NETWORKING [MPTCP]

M:	Matthieu Baerts <matttbe@kernel.org>

M:	Mat Martineau <martineau@kernel.org>

R:	Geliang Tang <geliang.tang@linux.dev>

R:	Geliang Tang <geliang@kernel.org>

L:	netdev@vger.kernel.org

L:	mptcp@lists.linux.dev

S:	Maintained

net/mptcp/fastopen.c

+2 −4
Original line number Diff line number Diff line
@@ -59,13 +59,12 @@ void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subf 
	mptcp_data_unlock(sk);

}



void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_subflow_context *subflow,

void __mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_subflow_context *subflow,

				     const struct mptcp_options_received *mp_opt)

{

	struct sock *sk = (struct sock *)msk;

	struct sk_buff *skb;



	mptcp_data_lock(sk);

	skb = skb_peek_tail(&sk->sk_receive_queue);

	if (skb) {

		WARN_ON_ONCE(MPTCP_SKB_CB(skb)->end_seq);
@@ -77,5 +76,4 @@ void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_subflow_ 
	}



	pr_debug("msk=%p ack_seq=%llx", msk, msk->ack_seq);

	mptcp_data_unlock(sk);

}

net/mptcp/options.c

+5 −4
Original line number Diff line number Diff line
@@ -962,9 +962,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, 
		/* subflows are fully established as soon as we get any

		 * additional ack, including ADD_ADDR.

		 */

		subflow->fully_established = 1;

		WRITE_ONCE(msk->fully_established, true);

		goto check_notify;

		goto set_fully_established;

	}



	/* If the first established packet does not contain MP_CAPABLE + data
@@ -986,7 +984,10 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, 
set_fully_established:

	if (unlikely(!READ_ONCE(msk->pm.server_side)))

		pr_warn_once("bogus mpc option on established client sk");

	mptcp_subflow_fully_established(subflow, mp_opt);



	mptcp_data_lock((struct sock *)msk);

	__mptcp_subflow_fully_established(msk, subflow, mp_opt);

	mptcp_data_unlock((struct sock *)msk);



check_notify:

	/* if the subflow is not already linked into the conn_list, we can't

net/mptcp/pm_userspace.c

+12 −1
Original line number Diff line number Diff line
@@ -130,10 +130,21 @@ int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, 
int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,

				    struct mptcp_addr_info *skc)

{

	struct mptcp_pm_addr_entry new_entry;

	struct mptcp_pm_addr_entry *entry = NULL, *e, new_entry;

	__be16 msk_sport =  ((struct inet_sock *)

			     inet_sk((struct sock *)msk))->inet_sport;



	spin_lock_bh(&msk->pm.lock);

	list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) {

		if (mptcp_addresses_equal(&e->addr, skc, false)) {

			entry = e;

			break;

		}

	}

	spin_unlock_bh(&msk->pm.lock);

	if (entry)

		return entry->addr.id;



	memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));

	new_entry.addr = *skc;

	new_entry.addr.id = 0;