From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Ahern <dsa@cumulusnetworks.com>
Subject: Re: [RFC v1 2/3] vxlan: add support for underlay in non-default VRF
Date: Wed, 14 Nov 2018 11:58:39 -0800
Message-ID: <3777c36e-ccc7-2c4d-889b-46730fafc43d@cumulusnetworks.com>
References: <20181114093104.93286-1-abauvin@scaleway.com>
 <20181114093104.93286-3-abauvin@scaleway.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, akherbouche@scaleway.com
To: Alexis Bauvin <abauvin@scaleway.com>, roopa@cumulusnetworks.com,
        nicolas.dichtel@6wind.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-pf1-f194.google.com ([209.85.210.194]:45323 "EHLO
        mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725757AbeKOGDS (ORCPT
        <rfc822;netdev@vger.kernel.org>); Thu, 15 Nov 2018 01:03:18 -0500
Received: by mail-pf1-f194.google.com with SMTP id g62so5173225pfd.12
        for <netdev@vger.kernel.org>; Wed, 14 Nov 2018 11:58:42 -0800 (PST)
In-Reply-To: <20181114093104.93286-3-abauvin@scaleway.com>
Content-Language: en-US
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

you are making this more specific than it needs to be ....

On 11/14/18 1:31 AM, Alexis Bauvin wrote:
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index 27bd586b94b0..7477b5510a04 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
> @@ -208,11 +208,23 @@ static inline struct vxlan_rdst *first_remote_rtnl(struct vxlan_fdb *fdb)
>  	return list_first_entry(&fdb->remotes, struct vxlan_rdst, list);
>  }
>  
> +static int vxlan_get_l3mdev(struct net *net, int ifindex)
> +{
> +	struct net_device *dev;
> +
> +	dev = __dev_get_by_index(net, ifindex);
> +	while (dev && !netif_is_l3_master(dev))
> +		dev = netdev_master_upper_dev_get(dev);
> +
> +	return dev ? dev->ifindex : 0;
> +}

l3mdev_master_ifindex_by_index should work instead of defining this for
vxlan.

But I do not believe you need this function.


> +
>  /* Find VXLAN socket based on network namespace, address family and UDP port
>   * and enabled unshareable flags.
>   */
>  static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family,
> -					  __be16 port, u32 flags)
> +					  __be16 port, u32 flags,
> +					  int l3mdev_ifindex)
>  {
>  	struct vxlan_sock *vs;
>  
> @@ -221,7 +233,8 @@ static struct vxlan_sock *vxlan_find_sock(struct net *net, sa_family_t family,
>  	hlist_for_each_entry_rcu(vs, vs_head(net, port), hlist) {
>  		if (inet_sk(vs->sock->sk)->inet_sport == port &&
>  		    vxlan_get_sk_family(vs) == family &&
> -		    vs->flags == flags)
> +		    vs->flags == flags &&
> +		    vs->sock->sk->sk_bound_dev_if == l3mdev_ifindex)

Why not allow the vxlan socket to bind to any ifindex? In that case this
socket lookup follows what we do for tcp, udp and raw sockets, and  you
don't need to call out vrf / l3mdev directly (ie.,
s/l3mdev_ifindex/ifindex/g) - it comes for free.