Commit fc3c82ee authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: add a new sysctl checksum_enabled 



This patch added a new sysctl, named checksum_enabled, to control
whether DSS checksum can be enabled.

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Co-developed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe3ab1cb

Documentation/networking/mptcp-sysctl.rst

+8 −0
Original line number Diff line number Diff line
@@ -24,3 +24,11 @@ add_addr_timeout - INTEGER (seconds) 
	sysctl.



	Default: 120



checksum_enabled - BOOLEAN

	Control whether DSS checksum can be enabled.



	DSS checksum can be enabled if the value is nonzero. This is a

	per-namespace sysctl.



	Default: 0

net/mptcp/ctrl.c

+16 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct mptcp_pernet { 


	u8 mptcp_enabled;

	unsigned int add_addr_timeout;

	u8 checksum_enabled;

};



static struct mptcp_pernet *mptcp_get_pernet(struct net *net)
@@ -40,10 +41,16 @@ unsigned int mptcp_get_add_addr_timeout(struct net *net) 
	return mptcp_get_pernet(net)->add_addr_timeout;

}



int mptcp_is_checksum_enabled(struct net *net)

{

	return mptcp_get_pernet(net)->checksum_enabled;

}



static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet)

{

	pernet->mptcp_enabled = 1;

	pernet->add_addr_timeout = TCP_RTO_MAX;

	pernet->checksum_enabled = 0;

}



#ifdef CONFIG_SYSCTL
@@ -65,6 +72,14 @@ static struct ctl_table mptcp_sysctl_table[] = { 
		.mode = 0644,

		.proc_handler = proc_dointvec_jiffies,

	},

	{

		.procname = "checksum_enabled",

		.maxlen = sizeof(u8),

		.mode = 0644,

		.proc_handler = proc_dou8vec_minmax,

		.extra1       = SYSCTL_ZERO,

		.extra2       = SYSCTL_ONE

	},

	{}

};
@@ -82,6 +97,7 @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) 


	table[0].data = &pernet->mptcp_enabled;

	table[1].data = &pernet->add_addr_timeout;

	table[2].data = &pernet->checksum_enabled;



	hdr = register_net_sysctl(net, MPTCP_SYSCTL_PATH, table);

	if (!hdr)

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static inline void mptcp_subflow_delegated_done(struct mptcp_subflow_context *su 


int mptcp_is_enabled(struct net *net);

unsigned int mptcp_get_add_addr_timeout(struct net *net);

static inline int mptcp_is_checksum_enabled(struct net *net) { return false; }

int mptcp_is_checksum_enabled(struct net *net);

void mptcp_subflow_fully_established(struct mptcp_subflow_context *subflow,

				     struct mptcp_options_received *mp_opt);

bool mptcp_subflow_data_available(struct sock *sk);