Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e802951 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller
Browse files

udp: Move the udp sysctl to namespace. 



This patch moves the udp_rmem_min, udp_wmem_min
to namespace and init the udp_l3mdev_accept explicitly.

The udp_rmem_min/udp_wmem_min affect udp rx/tx queue,
with this patch namespaces can set them differently.

Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 859844e5

include/net/netns/ipv4.h

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ struct netns_ipv4 { 
	atomic_t tfo_active_disable_times;

	unsigned long tfo_active_disable_stamp;



	int sysctl_udp_wmem_min;

	int sysctl_udp_rmem_min;



#ifdef CONFIG_NET_L3_MASTER_DEV

	int sysctl_udp_l3mdev_accept;

#endif

net/ipv4/sysctl_net_ipv4.c

+16 −16
Original line number Diff line number Diff line
@@ -520,22 +520,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

	},

	{

		.procname	= "udp_rmem_min",

		.data		= &sysctl_udp_rmem_min,

		.maxlen		= sizeof(sysctl_udp_rmem_min),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one

	},

	{

		.procname	= "udp_wmem_min",

		.data		= &sysctl_udp_wmem_min,

		.maxlen		= sizeof(sysctl_udp_wmem_min),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one

	},

	{ }

};
@@ -1167,6 +1151,22 @@ static struct ctl_table ipv4_net_table[] = { 
		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one,

	},

	{

		.procname	= "udp_rmem_min",

		.data		= &init_net.ipv4.sysctl_udp_rmem_min,

		.maxlen		= sizeof(init_net.ipv4.sysctl_udp_rmem_min),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one

	},

	{

		.procname	= "udp_wmem_min",

		.data		= &init_net.ipv4.sysctl_udp_wmem_min,

		.maxlen		= sizeof(init_net.ipv4.sysctl_udp_wmem_min),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one

	},

	{ }

};

net/ipv4/udp.c

+51 −35
Original line number Diff line number Diff line
@@ -122,12 +122,6 @@ EXPORT_SYMBOL(udp_table); 
long sysctl_udp_mem[3] __read_mostly;

EXPORT_SYMBOL(sysctl_udp_mem);



int sysctl_udp_rmem_min __read_mostly;

EXPORT_SYMBOL(sysctl_udp_rmem_min);



int sysctl_udp_wmem_min __read_mostly;

EXPORT_SYMBOL(sysctl_udp_wmem_min);



atomic_long_t udp_memory_allocated;

EXPORT_SYMBOL(udp_memory_allocated);
@@ -2553,8 +2547,8 @@ struct proto udp_prot = { 
	.get_port		= udp_v4_get_port,

	.memory_allocated	= &udp_memory_allocated,

	.sysctl_mem		= sysctl_udp_mem,

	.sysctl_wmem	   = &sysctl_udp_wmem_min,

	.sysctl_rmem	   = &sysctl_udp_rmem_min,

	.sysctl_wmem_offset	= offsetof(struct net, ipv4.sysctl_udp_wmem_min),

	.sysctl_rmem_offset	= offsetof(struct net, ipv4.sysctl_udp_rmem_min),

	.obj_size		= sizeof(struct udp_sock),

	.h.udp_table		= &udp_table,

#ifdef CONFIG_COMPAT
@@ -2831,6 +2825,26 @@ u32 udp_flow_hashrnd(void) 
}

EXPORT_SYMBOL(udp_flow_hashrnd);



static void __udp_sysctl_init(struct net *net)

{

	net->ipv4.sysctl_udp_rmem_min = SK_MEM_QUANTUM;

	net->ipv4.sysctl_udp_wmem_min = SK_MEM_QUANTUM;



#ifdef CONFIG_NET_L3_MASTER_DEV

	net->ipv4.sysctl_udp_l3mdev_accept = 0;

#endif

}



static int __net_init udp_sysctl_init(struct net *net)

{

	__udp_sysctl_init(net);

	return 0;

}



static struct pernet_operations __net_initdata udp_sysctl_ops = {

	.init       = udp_sysctl_init,

};



void __init udp_init(void)

{

	unsigned long limit;
@@ -2843,8 +2857,7 @@ void __init udp_init(void) 
	sysctl_udp_mem[1] = limit;

	sysctl_udp_mem[2] = sysctl_udp_mem[0] * 2;



	sysctl_udp_rmem_min = SK_MEM_QUANTUM;

	sysctl_udp_wmem_min = SK_MEM_QUANTUM;

	__udp_sysctl_init(&init_net);



	/* 16 spinlocks per cpu */

	udp_busylocks_log = ilog2(nr_cpu_ids) + 4;
@@ -2854,4 +2867,7 @@ void __init udp_init(void) 
		panic("UDP: failed to alloc udp_busylocks\n");

	for (i = 0; i < (1U << udp_busylocks_log); i++)

		spin_lock_init(udp_busylocks + i);



	if (register_pernet_subsys(&udp_sysctl_ops))

		panic("UDP: failed to init sysctl parameters.\n");

}

net/ipv6/udp.c

+26 −26
Original line number Diff line number Diff line
@@ -1528,8 +1528,8 @@ struct proto udpv6_prot = { 
	.get_port		= udp_v6_get_port,

	.memory_allocated	= &udp_memory_allocated,

	.sysctl_mem		= sysctl_udp_mem,

	.sysctl_wmem	   = &sysctl_udp_wmem_min,

	.sysctl_rmem	   = &sysctl_udp_rmem_min,

	.sysctl_wmem_offset     = offsetof(struct net, ipv4.sysctl_udp_wmem_min),

	.sysctl_rmem_offset     = offsetof(struct net, ipv4.sysctl_udp_rmem_min),

	.obj_size		= sizeof(struct udp6_sock),

	.h.udp_table		= &udp_table,

#ifdef CONFIG_COMPAT