Commit ae23b55c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-miscellaneous-mptcp-fixes' 

Mat Martineau says:

====================
mptcp: Miscellaneous MPTCP fixes

This is a collection of small fixup and minor enhancement patches that
have accumulated in the MPTCP tree while net-next was closed. These are
prerequisites for larger changes we have queued up.

Patch 1 refines receive buffer autotuning.

Patches 2 and 4 are some minor locking and refactoring changes.

Patch 3 improves GRO and RX coalescing with MPTCP skbs.

Patches 5-7 add a sysctl for tuning ADD_ADDR retransmission timeout,
corresponding test code, and documentation.

v2: Add sysctl documentation and fix signoff tags.
====================

Link: https://lore.kernel.org/r/20201103190509.27416-1-mathew.j.martineau@linux.intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 82728b91 8d014eaa

Documentation/networking/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ Contents: 
   lapb-module

   mac80211-injection

   mpls-sysctl

   mptcp-sysctl

   multiqueue

   netconsole

   netdev-features

Documentation/networking/mptcp-sysctl.rst

0 → 100644
+26 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=====================

MPTCP Sysfs variables

=====================



/proc/sys/net/mptcp/* Variables

===============================



enabled - INTEGER

	Control whether MPTCP sockets can be created.



	MPTCP sockets can be created if the value is nonzero. This is

	a per-namespace sysctl.



	Default: 1



add_addr_timeout - INTEGER (seconds)

	Set the timeout after which an ADD_ADDR control message will be

	resent to an MPTCP peer that has not acknowledged a previous

	ADD_ADDR message.



	The default value matches TCP_RTO_MAX. This is a per-namespace

	sysctl.



	Default: 120

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12265,6 +12265,7 @@ L: mptcp@lists.01.org 
S:	Maintained

W:	https://github.com/multipath-tcp/mptcp_net-next/wiki

B:	https://github.com/multipath-tcp/mptcp_net-next/issues

F:	Documentation/networking/mptcp-sysctl.rst

F:	include/net/mptcp.h

F:	include/uapi/linux/mptcp.h

F:	net/mptcp/

include/net/mptcp.h

+20 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ struct mptcp_ext { 
			use_ack:1,

			ack64:1,

			mpc_map:1,

			__unused:2;

			frozen:1,

			__unused:1;

	/* one byte hole */

};
@@ -106,6 +107,19 @@ static inline void mptcp_skb_ext_move(struct sk_buff *to, 
	from->active_extensions = 0;

}



static inline void mptcp_skb_ext_copy(struct sk_buff *to,

				      struct sk_buff *from)

{

	struct mptcp_ext *from_ext;



	from_ext = skb_ext_find(from, SKB_EXT_MPTCP);

	if (!from_ext)

		return;



	from_ext->frozen = 1;

	skb_ext_copy(to, from);

}



static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext,

				     const struct mptcp_ext *from_ext)

{
@@ -193,6 +207,11 @@ static inline void mptcp_skb_ext_move(struct sk_buff *to, 
{

}



static inline void mptcp_skb_ext_copy(struct sk_buff *to,

				      struct sk_buff *from)

{

}



static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,

					  const struct sk_buff *from)

{

net/ipv4/tcp_output.c

+3 −0
Original line number Diff line number Diff line
@@ -1569,6 +1569,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, 
	if (!buff)

		return -ENOMEM; /* We'll just try again later. */

	skb_copy_decrypted(buff, skb);

	mptcp_skb_ext_copy(buff, skb);



	sk_wmem_queued_add(sk, buff->truesize);

	sk_mem_charge(sk, buff->truesize);
@@ -2123,6 +2124,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, 
	if (unlikely(!buff))

		return -ENOMEM;

	skb_copy_decrypted(buff, skb);

	mptcp_skb_ext_copy(buff, skb);



	sk_wmem_queued_add(sk, buff->truesize);

	sk_mem_charge(sk, buff->truesize);
@@ -2393,6 +2395,7 @@ static int tcp_mtu_probe(struct sock *sk) 


	skb = tcp_send_head(sk);

	skb_copy_decrypted(nskb, skb);

	mptcp_skb_ext_copy(nskb, skb);



	TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(skb)->seq;

	TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE