[PATCH mptcp-next] docs: networking: mptcp: Add MPTCP sysctl entries
by Mat Martineau
Describe the two MPTCP sysctls, what the values mean, and the default
settings.
Signed-off-by: Mat Martineau <mathew.j.martineau(a)linux.intel.com>
---
Jakub requested sysctl documentation for the 'add_addr_timeout' setting,
and we didn't have our 'enabled' sysctl documented either.
If this looks good to everyone I can add it to v2 the miscellaneous
series on the netdev list.
Documentation/networking/index.rst | 1 +
Documentation/networking/mptcp-sysctl.rst | 24 +++++++++++++++++++++++
MAINTAINERS | 1 +
3 files changed, 26 insertions(+)
create mode 100644 Documentation/networking/mptcp-sysctl.rst
diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst
index 63ef386afd0a..70c71c9206e2 100644
--- a/Documentation/networking/index.rst
+++ b/Documentation/networking/index.rst
@@ -70,6 +70,7 @@ Contents:
lapb-module
mac80211-injection
mpls-sysctl
+ mptcp-sysctl
multiqueue
netconsole
netdev-features
diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst
new file mode 100644
index 000000000000..70c076eb361d
--- /dev/null
+++ b/Documentation/networking/mptcp-sysctl.rst
@@ -0,0 +1,24 @@
+.. 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.
+
+ 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.
+
+ Default: 120
diff --git a/MAINTAINERS b/MAINTAINERS
index 17f5571788c9..badaaa815aa3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12265,6 +12265,7 @@ L: mptcp(a)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/
--
2.29.2
1 year, 7 months
[PATCH net-next 0/6] mptcp: Miscellaneous MPTCP fixes
by Mat Martineau
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 and 6 add a sysctl for tuning ADD_ADDR retransmission timeout
and corresponding test code.
Florian Westphal (3):
mptcp: adjust mptcp receive buffer limit if subflow has larger one
mptcp: use _fast lock version in __mptcp_move_skbs
mptcp: split mptcp_clean_una function
Geliang Tang (2):
mptcp: add a new sysctl add_addr_timeout
selftests: mptcp: add ADD_ADDR timeout test case
Paolo Abeni (1):
tcp: propagate MPTCP skb extensions on xmit splits
include/net/mptcp.h | 21 ++++-
net/ipv4/tcp_output.c | 3 +
net/mptcp/ctrl.c | 14 +++
net/mptcp/pm_netlink.c | 8 +-
net/mptcp/protocol.c | 67 +++++++++----
net/mptcp/protocol.h | 1 +
tools/testing/selftests/net/mptcp/config | 10 ++
.../testing/selftests/net/mptcp/mptcp_join.sh | 94 ++++++++++++++-----
8 files changed, 171 insertions(+), 47 deletions(-)
base-commit: 1fb74191988fd1cc340c4b2fdaf4c47d2a7d1d17
--
2.29.2
1 year, 7 months