Commit 979e9017 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mptcp-misc-fixes' 



Matthieu Baerts says:

====================
mptcp: misc. fixes for v6.7

Here are a few fixes related to MPTCP:

Patch 1 avoids skipping some subtests of the MPTCP Join selftest by
mistake when using older versions of GCC. This fixes a patch introduced
in v6.4, backported up to v6.1.

Patch 2 fixes an inconsistent state when using MPTCP + FastOpen. A fix
for v6.2.

Patch 3 adds a description for MPTCP Kunit test modules to avoid a
warning.

Patch 4 adds an entry to the mailmap file for Geliang's email addresses.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarMatthieu Baerts <matttbe@kernel.org>
parents b1dfc0f7 356c71c4

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ 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>

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>

net/mptcp/crypto_test.c

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ static struct kunit_suite mptcp_crypto_suite = { 
kunit_test_suite(mptcp_crypto_suite);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("KUnit tests for MPTCP Crypto");

net/mptcp/protocol.c

+3 −3
Original line number Diff line number Diff line
@@ -3402,12 +3402,12 @@ static void mptcp_release_cb(struct sock *sk) 
	if (__test_and_clear_bit(MPTCP_CLEAN_UNA, &msk->cb_flags))

		__mptcp_clean_una_wakeup(sk);

	if (unlikely(msk->cb_flags)) {

		/* be sure to set the current sk state before taking actions

		/* be sure to sync the msk state before taking actions

		 * depending on sk_state (MPTCP_ERROR_REPORT)

		 * On sk release avoid actions depending on the first subflow

		 */

		if (__test_and_clear_bit(MPTCP_CONNECTED, &msk->cb_flags) && msk->first)

			__mptcp_set_connected(sk);

		if (__test_and_clear_bit(MPTCP_SYNC_STATE, &msk->cb_flags) && msk->first)

			__mptcp_sync_state(sk, msk->pending_state);

		if (__test_and_clear_bit(MPTCP_ERROR_REPORT, &msk->cb_flags))

			__mptcp_error_report(sk);

		if (__test_and_clear_bit(MPTCP_SYNC_SNDBUF, &msk->cb_flags))

net/mptcp/protocol.h

+6 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
#define MPTCP_ERROR_REPORT	3

#define MPTCP_RETRANSMIT	4

#define MPTCP_FLUSH_JOIN_LIST	5

#define MPTCP_CONNECTED		6

#define MPTCP_SYNC_STATE	6

#define MPTCP_SYNC_SNDBUF	7



struct mptcp_skb_cb {
@@ -296,6 +296,9 @@ struct mptcp_sock { 
	bool		use_64bit_ack; /* Set when we received a 64-bit DSN */

	bool		csum_enabled;

	bool		allow_infinite_fallback;

	u8		pending_state; /* A subflow asked to set this sk_state,

					* protected by the msk data lock

					*/

	u8		mpc_endpoint_id;

	u8		recvmsg_inq:1,

			cork:1,
@@ -728,7 +731,7 @@ void mptcp_get_options(const struct sk_buff *skb, 
		       struct mptcp_options_received *mp_opt);



void mptcp_finish_connect(struct sock *sk);

void __mptcp_set_connected(struct sock *sk);

void __mptcp_sync_state(struct sock *sk, int state);

void mptcp_reset_tout_timer(struct mptcp_sock *msk, unsigned long fail_tout);



static inline void mptcp_stop_tout_timer(struct sock *sk)
@@ -1115,7 +1118,7 @@ static inline bool subflow_simultaneous_connect(struct sock *sk) 
{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);



	return sk->sk_state == TCP_ESTABLISHED &&

	return (1 << sk->sk_state) & (TCPF_ESTABLISHED | TCPF_FIN_WAIT1) &&

	       is_active_ssk(subflow) &&

	       !subflow->conn_finished;

}

net/mptcp/subflow.c

+17 −11
Original line number Diff line number Diff line
@@ -419,22 +419,28 @@ static bool subflow_use_different_dport(struct mptcp_sock *msk, const struct soc 
	return inet_sk(sk)->inet_dport != inet_sk((struct sock *)msk)->inet_dport;

}



void __mptcp_set_connected(struct sock *sk)

void __mptcp_sync_state(struct sock *sk, int state)

{

	__mptcp_propagate_sndbuf(sk, mptcp_sk(sk)->first);

	struct mptcp_sock *msk = mptcp_sk(sk);



	__mptcp_propagate_sndbuf(sk, msk->first);

	if (sk->sk_state == TCP_SYN_SENT) {

		inet_sk_state_store(sk, TCP_ESTABLISHED);

		inet_sk_state_store(sk, state);

		sk->sk_state_change(sk);

	}

}



static void mptcp_set_connected(struct sock *sk)

static void mptcp_propagate_state(struct sock *sk, struct sock *ssk)

{

	struct mptcp_sock *msk = mptcp_sk(sk);



	mptcp_data_lock(sk);

	if (!sock_owned_by_user(sk))

		__mptcp_set_connected(sk);

	else

		__set_bit(MPTCP_CONNECTED, &mptcp_sk(sk)->cb_flags);

	if (!sock_owned_by_user(sk)) {

		__mptcp_sync_state(sk, ssk->sk_state);

	} else {

		msk->pending_state = ssk->sk_state;

		__set_bit(MPTCP_SYNC_STATE, &msk->cb_flags);

	}

	mptcp_data_unlock(sk);

}
@@ -496,7 +502,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
		subflow_set_remote_key(msk, subflow, &mp_opt);

		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVEACK);

		mptcp_finish_connect(sk);

		mptcp_set_connected(parent);

		mptcp_propagate_state(parent, sk);

	} else if (subflow->request_join) {

		u8 hmac[SHA256_DIGEST_SIZE];
@@ -540,7 +546,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) 
	} else if (mptcp_check_fallback(sk)) {

fallback:

		mptcp_rcv_space_init(msk, sk);

		mptcp_set_connected(parent);

		mptcp_propagate_state(parent, sk);

	}

	return;
@@ -1740,7 +1746,7 @@ static void subflow_state_change(struct sock *sk) 
		mptcp_rcv_space_init(msk, sk);

		pr_fallback(msk);

		subflow->conn_finished = 1;

		mptcp_set_connected(parent);

		mptcp_propagate_state(parent, sk);

	}



	/* as recvmsg() does not acquire the subflow socket for ssk selection