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

Merge branch 'mptcp-small-improvements-fix-and-clean-ups' 

Mat Martineau says:

====================
mptcp: small improvements, fix and clean-ups

This series contain mostly unrelated patches:

- The two first patches can be seen as "fixes". They are part of this
  series for -next because it looks like the last batch of fixes for
  v6.9 has already been sent. These fixes are not urgent, so they can
  wait if an unlikely v6.9-rc8 is published. About the two patches:
    - Patch 1 fixes getsockopt(SO_KEEPALIVE) support on MPTCP sockets
    - Patch 2 makes sure the full TCP keep-alive feature is supported,
      not just SO_KEEPALIVE.

- Patch 3 is a small optimisation when getsockopt(MPTCP_INFO) is used
  without buffer, just to check if MPTCP is still being used: no
  fallback to TCP.

- Patch 4 adds net.mptcp.available_schedulers sysctl knob to list packet
  schedulers, similar to net.ipv4.tcp_available_congestion_control.

- Patch 5 and 6 fix CheckPatch warnings: "prefer strscpy over strcpy"
  and "else is not generally useful after a break or return".

- Patch 7 and 8 remove and add header includes to avoid unused ones, and
  add missing ones to be self-contained.
====================

Link: https://lore.kernel.org/r/20240514011335.176158-1-martineau@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 40a1d11f 7fad5b37

include/net/mptcp.h

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ struct mptcp_out_options { 
};



#define MPTCP_SCHED_NAME_MAX	16

#define MPTCP_SCHED_MAX		128

#define MPTCP_SCHED_BUF_MAX	(MPTCP_SCHED_NAME_MAX * MPTCP_SCHED_MAX)



#define MPTCP_SUBFLOWS_MAX	8



struct mptcp_sched_data {

net/mptcp/ctrl.c

+27 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) 
	pernet->allow_join_initial_addr_port = 1;

	pernet->stale_loss_cnt = 4;

	pernet->pm_type = MPTCP_PM_TYPE_KERNEL;

	strcpy(pernet->scheduler, "default");

	strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler));

}



#ifdef CONFIG_SYSCTL
@@ -133,6 +133,24 @@ static int proc_scheduler(struct ctl_table *ctl, int write, 
	return ret;

}



static int proc_available_schedulers(struct ctl_table *ctl,

				     int write, void *buffer,

				     size_t *lenp, loff_t *ppos)

{

	struct ctl_table tbl = { .maxlen = MPTCP_SCHED_BUF_MAX, };

	int ret;



	tbl.data = kmalloc(tbl.maxlen, GFP_USER);

	if (!tbl.data)

		return -ENOMEM;



	mptcp_get_available_schedulers(tbl.data, MPTCP_SCHED_BUF_MAX);

	ret = proc_dostring(&tbl, write, buffer, lenp, ppos);

	kfree(tbl.data);



	return ret;

}



static struct ctl_table mptcp_sysctl_table[] = {

	{

		.procname = "enabled",
@@ -187,6 +205,12 @@ static struct ctl_table mptcp_sysctl_table[] = { 
		.mode = 0644,

		.proc_handler = proc_scheduler,

	},

	{

		.procname = "available_schedulers",

		.maxlen	= MPTCP_SCHED_BUF_MAX,

		.mode = 0644,

		.proc_handler = proc_available_schedulers,

	},

	{

		.procname = "close_timeout",

		.maxlen = sizeof(unsigned int),
@@ -214,7 +238,8 @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) 
	table[4].data = &pernet->stale_loss_cnt;

	table[5].data = &pernet->pm_type;

	table[6].data = &pernet->scheduler;

	table[7].data = &pernet->close_timeout;

	/* table[7] is for available_schedulers which is read-only info */

	table[8].data = &pernet->close_timeout;



	hdr = register_net_sysctl_sz(net, MPTCP_SYSCTL_PATH, table,

				     ARRAY_SIZE(mptcp_sysctl_table));

net/mptcp/mib.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */



#include <net/inet_common.h>



enum linux_mptcp_mib_field {

	MPTCP_MIB_NUM = 0,

	MPTCP_MIB_MPCAPABLEPASSIVE,	/* Received SYN with MP_CAPABLE */

net/mptcp/pm_netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "protocol.h"

#include "mib.h"

#include "mptcp_pm_gen.h"



static int pm_nl_pernet_id;

net/mptcp/pm_userspace.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include "protocol.h"

#include "mib.h"

#include "mptcp_pm_gen.h"



void mptcp_free_local_addr_list(struct mptcp_sock *msk)

{