Commit eb4f17f1 authored by Litao Jiao's avatar Litao Jiao
Browse files

net/smc: Introduce a sysctl for setting SMC-R buffer type 

mainline inclusion
from mainline-v6.0-rc1
commit 4bc5008e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I76JHC
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/net/smc?id=4bc5008e4387106215b50ae1a4ac2467455725ca



--------------------------------

This patch introduces the sysctl smcr_buf_type for setting
the type of SMC-R sndbufs and RMBs.

Valid values includes:

- SMCR_PHYS_CONT_BUFS, which means use physically contiguous
  buffers for better performance and is the default value.

- SMCR_VIRT_CONT_BUFS, which means use virtually contiguous
  buffers in case of physically contiguous memory is scarce.

- SMCR_MIXED_BUFS, which means first try to use physically
  contiguous buffers. If not available, then use virtually
  contiguous buffers.

Signed-off-by: default avatarWen Gu <guwen@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLitao Jiao <jiaolitao@sangfor.com.cn>
parent 8e1559e6

Documentation/networking/smc-sysctl.rst

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



==========

SMC Sysctl

==========



/proc/sys/net/smc/* Variables

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



smcr_buf_type - INTEGER

        Controls which type of sndbufs and RMBs to use in later newly created

        SMC-R link group. Only for SMC-R.



        Default: 0 (physically contiguous sndbufs and RMBs)



        Possible values:



        - 0 - Use physically contiguous buffers

        - 1 - Use virtually contiguous buffers

        - 2 - Mixed use of the two types. Try physically contiguous buffers first.

          If not available, use virtually contiguous buffers then.

include/net/netns/smc.h

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ struct netns_smc { 
#ifdef CONFIG_SYSCTL

	struct ctl_table_header		*smc_hdr;

#endif

	unsigned int			sysctl_smcr_buf_type;

};

#endif

net/smc/smc_core.h

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ enum smc_lgr_type { /* redundancy state of lgr */ 
	SMC_LGR_ASYMMETRIC_LOCAL,	/* local has 1, peer 2 active RNICs */

};



enum smcr_buf_type {		/* types of SMC-R sndbufs and RMBs */

	SMCR_PHYS_CONT_BUFS	= 0,

	SMCR_VIRT_CONT_BUFS	= 1,

	SMCR_MIXED_BUFS		= 2,

};



enum smc_llc_flowtype {

	SMC_LLC_FLOW_NONE	= 0,

	SMC_LLC_FLOW_ADD_LINK	= 2,

net/smc/smc_sysctl.c

+14 −0
Original line number Diff line number Diff line
@@ -15,8 +15,20 @@ 
#include <net/net_namespace.h>



#include "smc_sysctl.h"

#include "smc_core.h"



static int two = 2;



static struct ctl_table smc_table[] = {

	{

		.procname	= "smcr_buf_type",

		.data		= &init_net.smc.sysctl_smcr_buf_type,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= proc_douintvec_minmax,

		.extra1		= SYSCTL_ZERO,

		.extra2		= &two,

	},

	{  }

};
@@ -40,6 +52,8 @@ int __net_init smc_sysctl_net_init(struct net *net) 
	if (!net->smc.smc_hdr)

		goto err_reg;



	net->smc.sysctl_smcr_buf_type = SMCR_PHYS_CONT_BUFS;



	return 0;



err_reg: