Subject: Re: [PATCH net-next v3] net: Support filtering interfaces on no master

From: Leon Romanovsky <[email-masked]>
Date: Tue, 10 Aug 2021 10:12:21 +0300

On Tue, Aug 10, 2021 at 06:49:43AM +0000, Lahav Schlesinger wrote:
> Currently there's support for filtering neighbours/links for interfaces
> which have a specific master device (using the IFLA_MASTER/NDA_MASTER
> attributes).
> 
> This patch adds support for filtering interfaces/neighbours dump for
> interfaces that *don't* have a master.
>

.....

> I have a patch for iproute2 ready for adding this support in userspace.
> 
> v2 -> v3
>  - Change the way 'master' is checked for being non NULL
> v1 -> v2
>  - Change from filtering just for non VRF slaves to non slaves at all
> 

The above lines don't belong to commit message. Please put them under "---"

Thanks

> Signed-off-by: Lahav Schlesinger <[email-masked]>
> Cc: David Ahern <[email-masked]>
> Cc: David S. Miller <[email-masked]>
> Cc: Jakub Kicinski <[email-masked]>
> ---
>  net/core/neighbour.c | 7 +++++++
>  net/core/rtnetlink.c | 7 +++++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/net/core/neighbour.c b/net/core/neighbour.c
> index b963d6b02c4f..2d5bc3a75fae 100644
> --- a/net/core/neighbour.c
> +++ b/net/core/neighbour.c
> @@ -2528,6 +2528,13 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)
>  		return false;
>  
>  	master = dev ? netdev_master_upper_dev_get(dev) : NULL;
> +
> +	/* 0 is already used to denote NDA_MASTER wasn't passed, therefore need another
> +	 * invalid value for ifindex to denote "no master".
> +	 */
> +	if (master_idx == -1)
> +		return !!master;
> +
>  	if (!master || master->ifindex != master_idx)
>  		return true;
>  
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 7c9d32cfe607..2dcf1c084b20 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -1959,6 +1959,13 @@ static bool link_master_filtered(struct net_device *dev, int master_idx)
>  		return false;
>  
>  	master = netdev_master_upper_dev_get(dev);
> +
> +	/* 0 is already used to denote IFLA_MASTER wasn't passed, therefore need
> +	 * another invalid value for ifindex to denote "no master".
> +	 */
> +	if (master_idx == -1)
> +		return !!master;
> +
>  	if (!master || master->ifindex != master_idx)
>  		return true;
>  
> -- 
> 2.25.1
>