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

Commit 432e05d3 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

net: ipv4: Control SKB reprioritization after forwarding 



After IPv4 packets are forwarded, the priority of the corresponding SKB
is updated according to the TOS field of IPv4 header. This overrides any
prioritization done earlier by e.g. an skbedit action or ingress-qos-map
defined at a vlan device.

Such overriding may not always be desirable. Even if the packet ends up
being routed, which implies this is an L3 network node, an administrator
may wish to preserve whatever prioritization was done earlier on in the
pipeline.

Therefore introduce a sysctl that controls this behavior. Keep the
default value at 1 to maintain backward-compatible behavior.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83ba4645

Documentation/networking/ip-sysctl.txt

+9 −0
Original line number Diff line number Diff line
@@ -81,6 +81,15 @@ fib_multipath_hash_policy - INTEGER 
	0 - Layer 3

	1 - Layer 4



ip_forward_update_priority - INTEGER

	Whether to update SKB priority from "TOS" field in IPv4 header after it

	is forwarded. The new SKB priority is mapped from TOS field value

	according to an rt_tos2priority table (see e.g. man tc-prio).

	Default: 1 (Update priority.)

	Possible values:

	0 - Do not update priority.

	1 - Update priority.



route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

	this when using large numbers of interfaces and/or routes.

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct netns_ipv4 { 
	int sysctl_ip_default_ttl;

	int sysctl_ip_no_pmtu_disc;

	int sysctl_ip_fwd_use_pmtu;

	int sysctl_ip_fwd_update_priority;

	int sysctl_ip_nonlocal_bind;

	/* Shall we try to damage output packets if routing dev changes? */

	int sysctl_ip_dynaddr;

net/ipv4/af_inet.c

+1 −0
Original line number Diff line number Diff line
@@ -1801,6 +1801,7 @@ static __net_init int inet_init_net(struct net *net) 
	 * We set them here, in case sysctl is not compiled.

	 */

	net->ipv4.sysctl_ip_default_ttl = IPDEFTTL;

	net->ipv4.sysctl_ip_fwd_update_priority = 1;

	net->ipv4.sysctl_ip_dynaddr = 0;

	net->ipv4.sysctl_ip_early_demux = 1;

	net->ipv4.sysctl_udp_early_demux = 1;

net/ipv4/ip_forward.c

+2 −1
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ int ip_forward(struct sk_buff *skb) 
	    !skb_sec_path(skb))

		ip_rt_send_redirect(skb);



	if (net->ipv4.sysctl_ip_fwd_update_priority)

		skb->priority = rt_tos2priority(iph->tos);



	return NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD,

net/ipv4/sysctl_net_ipv4.c

+9 −0
Original line number Diff line number Diff line
@@ -663,6 +663,15 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "ip_forward_update_priority",

		.data		= &init_net.ipv4.sysctl_ip_fwd_update_priority,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler   = proc_dointvec_minmax,

		.extra1		= &zero,

		.extra2		= &one,

	},

	{

		.procname	= "ip_nonlocal_bind",

		.data		= &init_net.ipv4.sysctl_ip_nonlocal_bind,