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

Commit 9366fad7 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Ian Maund
Browse files

net: Use fwmark reflection in PMTU discovery. 



Currently, routing lookups used for Path PMTU Discovery in
absence of a socket or on unmarked sockets use a mark of 0.
This causes PMTUD not to work when using routing based on
netfilter fwmark mangling and fwmark ip rules, such as:

  iptables -j MARK --set-mark 17
  ip rule add fwmark 17 lookup 100

This patch causes these route lookups to use the fwmark from the
received ICMP error when the fwmark_reflect sysctl is enabled.
This allows the administrator to make PMTUD work by configuring
appropriate fwmark rules to mark the inbound ICMP packets.

Black-box tested using user-mode linux by pointing different
fwmarks at routing tables egressing on different interfaces, and
using iptables mangling to mark packets inbound on each interface
with the interface's fwmark. ICMPv4 and ICMPv6 PMTU discovery
work as expected when mark reflection is enabled and fail when
it is disabled.

Change-Id: Id7fefb7ec1ff7f5142fba43db1960b050e0dfaec
Signed-off-by: default avatarLorenzo Colitti <lorenzo@google.com>
Git-commit: 2cf4347e486ca01b5ca6429b50e79b93de07adf8
Git-repo: https://android.googlesource.com/kernel/common.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent 4ecfac31

Documentation/networking/ip-sysctl.txt

+6 −2
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ fwmark_reflect - BOOLEAN 
	Controls the fwmark of kernel-generated IPv4 reply packets that are not

	associated with a socket for example, TCP RSTs or ICMP echo replies).

	If unset, these packets have a fwmark of zero. If set, they have the

	fwmark of the packet they are replying to.

	fwmark of the packet they are replying to. Similarly affects the fwmark

	used by internal routing lookups triggered by incoming packets, such as

	the ones used for Path MTU Discovery.

	Default: 0



route/max_size - INTEGER
@@ -1110,7 +1112,9 @@ fwmark_reflect - BOOLEAN 
	Controls the fwmark of kernel-generated IPv6 reply packets that are not

	associated with a socket for example, TCP RSTs or ICMPv6 echo replies).

	If unset, these packets have a fwmark of zero. If set, they have the

	fwmark of the packet they are replying to.

	fwmark of the packet they are replying to. Similarly affects the fwmark

	used by internal routing lookups triggered by incoming packets, such as

	the ones used for Path MTU Discovery.

	Default: 0



conf/interface/*:

net/ipv4/route.c

+7 −0
Original line number Diff line number Diff line
@@ -956,6 +956,9 @@ void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, 
	struct flowi4 fl4;

	struct rtable *rt;



	if (!mark)

		mark = IP4_REPLY_MARK(net, skb->mark);



	__build_flow_key(&fl4, NULL, iph, oif,

			 RT_TOS(iph->tos), protocol, mark, flow_flags);

	rt = __ip_route_output_key(net, &fl4);
@@ -973,6 +976,10 @@ static void __ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) 
	struct rtable *rt;



	__build_flow_key(&fl4, sk, iph, 0, 0, 0, 0, 0);



	if (!fl4.flowi4_mark)

		fl4.flowi4_mark = IP4_REPLY_MARK(sock_net(sk), skb->mark);



	rt = __ip_route_output_key(sock_net(sk), &fl4);

	if (!IS_ERR(rt)) {

		__ip_rt_update_pmtu(rt, &fl4, mtu);

net/ipv6/route.c

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, 


	memset(&fl6, 0, sizeof(fl6));

	fl6.flowi6_oif = oif;

	fl6.flowi6_mark = mark;

	fl6.flowi6_mark = mark ? mark : IP6_REPLY_MARK(net, skb->mark);

	fl6.flowi6_flags = 0;

	fl6.daddr = iph->daddr;

	fl6.saddr = iph->saddr;