Date:   Thu, 13 Aug 2020 09:12:58 -0400 (EDT)
From:   Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
To:     "David S. Miller" <davem@...emloft.net>
Cc:     David Ahern <dsahern@...nel.org>,
        linux-kernel <linux-kernel@...r.kernel.org>,
        netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH 2/3] ipv4/icmp: l3mdev: Perform icmp error route lookup
 on source device routing table

----- On Aug 12, 2020, at 5:43 PM, David S. Miller davem@...emloft.net wrote:

> From: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
> Date: Tue, 11 Aug 2020 15:50:02 -0400
> 
>> @@ -465,6 +465,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
>>  					int type, int code,
>>  					struct icmp_bxm *param)
>>  {
>> +	struct net_device *route_lookup_dev = NULL;
>>  	struct rtable *rt, *rt2;
>>  	struct flowi4 fl4_dec;
>>  	int err;
>> @@ -479,7 +480,17 @@ static struct rtable *icmp_route_lookup(struct net *net,
>>  	fl4->flowi4_proto = IPPROTO_ICMP;
>>  	fl4->fl4_icmp_type = type;
>>  	fl4->fl4_icmp_code = code;
>> -	fl4->flowi4_oif = l3mdev_master_ifindex(skb_dst(skb_in)->dev);
>> +	/*
>> +	 * The device used for looking up which routing table to use is
>> +	 * preferably the source whenever it is set, which should ensure
>> +	 * the icmp error can be sent to the source host, else fallback
>> +	 * on the destination device.
>> +	 */
>> +	if (skb_in->dev)
>> +		route_lookup_dev = skb_in->dev;
>> +	else if (skb_dst(skb_in))
>> +		route_lookup_dev = skb_dst(skb_in)->dev;
>> +	fl4->flowi4_oif = l3mdev_master_ifindex(route_lookup_dev);
> 
> The caller of icmp_route_lookup() uses the opposite prioritization of
> devices for determining the network namespace to use:
> 
>	if (rt->dst.dev)
>		net = dev_net(rt->dst.dev);
>	else if (skb_in->dev)
>		net = dev_net(skb_in->dev);
>	else
>		goto out;
> 
> Do we have to reverse the ordering there too?

Looking at the history:

Originally dst.dev was used as network namespace for icmp errors:

dde1bc0e6f861 (Denis V. Lunev           2008-01-22 23:50:57 -0800  450)         net = rt->u.dst.dev->nd_net;

commit dde1bc0e6f86183bc095d0774cd109f4edf66ea2
Author: Denis V. Lunev <den@...nvz.org>
Date:   Tue Jan 22 23:50:57 2008 -0800

    [NETNS]: Add namespace for ICMP replying code.
    
    All needed API is done, the namespace is available when required from
    the device on the DST entry from the incoming packet. So, just replace
    init_net with proper namespace.

Here I wonder what motivated use of the DST entry here ?

Note that this choice of DST network namespace applies to both __icmp_send and
icmp_unreach.

It has been followed by a few data structure layout changes:

c346dca10840a (YOSHIFUJI Hideaki        2008-03-25 21:47:49 +0900  430)         net = dev_net(rt->u.dst.dev);
d8d1f30b95a63 (Changli Gao              2010-06-10 23:31:35 -0700  585)         net = dev_net(rt->dst.dev);

It was then changed to fix a NULL pointer deref:

e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  586) 
e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  587)         if (rt->dst.dev)
e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  588)                 net = dev_net(rt->dst.dev);
e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  589)         else if (skb_in->dev)
e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  590)                 net = dev_net(skb_in->dev);
e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  591)         else
e2c693934194f (Hangbin Liu              2019-08-22 22:19:48 +0800  592)                 goto out;


> And when I read fallback in your commit message description, I
> imagined that you would have a two tiered lookup scheme.  First you
> would be trying the skb_in->dev for a lookup (to accomodate the VRF
> case), and if that failed you'd try again with skb_dst()->dev.

The code I proposed basically does use the skb_in->dev (if non-null)
for looking up which VRF table to use, else use skb_dst(skb_in) (if non-null)
for looking up which VRF table to use, else route_lookup_dev is NULL, which
means use the master table.

Whether this should instead try to lookup the source address with the skb_in->dev
table, and of that fails go to the next, is a good question. I think the context
I am missing in order to understand which approach is appropriate is which
scenario can cause skb_in->dev to be NULL, and which can cause skb_dst(skb_in)
to be NULL, and what is the expected behavior for icmp error route lookup in those
cases ?

Thanks,

Mathieu

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

Powered by blists - more mailing lists