* [PATCH] net: Support filtering interfaces on no master
@ 2021-08-08 13:28 Lahav Schlesinger
2021-08-08 20:02 ` David Ahern
0 siblings, 1 reply; 4+ messages in thread
From: Lahav Schlesinger @ 2021-08-08 13:28 UTC (permalink / raw)
To: netdev; +Cc: dsahern, davem, kuba
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.
Signed-off-by: Lahav Schlesinger <lschlesinger@drivenets.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
---
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 53e85c70c6e5..1b1e0ca70650 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2533,6 +2533,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 (bool)master;
+
if (!master || master->ifindex != master_idx)
return true;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f6af3e74fc44..8ccc314744d4 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1970,6 +1970,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 (bool)master;
+
if (!master || master->ifindex != master_idx)
return true;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: Support filtering interfaces on no master
2021-08-08 13:28 [PATCH] net: Support filtering interfaces on no master Lahav Schlesinger
@ 2021-08-08 20:02 ` David Ahern
2021-08-09 6:54 ` Lahav Schlesinger
0 siblings, 1 reply; 4+ messages in thread
From: David Ahern @ 2021-08-08 20:02 UTC (permalink / raw)
To: Lahav Schlesinger, netdev; +Cc: dsahern, davem, kuba
On 8/8/21 7:28 AM, 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.
>
> Signed-off-by: Lahav Schlesinger <lschlesinger@drivenets.com>
> Cc: David Ahern <dsahern@kernel.org>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Jakub Kicinski <kuba@kernel.org>
> ---
> 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 53e85c70c6e5..1b1e0ca70650 100644
> --- a/net/core/neighbour.c
> +++ b/net/core/neighbour.c
> @@ -2533,6 +2533,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 (bool)master;
return !!master;
same below
> +
> if (!master || master->ifindex != master_idx)
> return true;
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index f6af3e74fc44..8ccc314744d4 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -1970,6 +1970,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 (bool)master;
> +
> if (!master || master->ifindex != master_idx)
> return true;
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: Support filtering interfaces on no master
2021-08-08 20:02 ` David Ahern
@ 2021-08-09 6:54 ` Lahav Schlesinger
2021-08-09 20:32 ` Jakub Kicinski
0 siblings, 1 reply; 4+ messages in thread
From: Lahav Schlesinger @ 2021-08-09 6:54 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, dsahern, davem, kuba
On Sun, Aug 08, 2021 at 02:02:36PM -0600, David Ahern wrote:
> On 8/8/21 7:28 AM, 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.
> >
> > Signed-off-by: Lahav Schlesinger <lschlesinger@drivenets.com>
> > Cc: David Ahern <dsahern@kernel.org>
> > Cc: David S. Miller <davem@davemloft.net>
> > Cc: Jakub Kicinski <kuba@kernel.org>
> > ---
> > 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 53e85c70c6e5..1b1e0ca70650 100644
> > --- a/net/core/neighbour.c
> > +++ b/net/core/neighbour.c
> > @@ -2533,6 +2533,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 (bool)master;
>
> return !!master;
>
> same below
>
> > +
> > if (!master || master->ifindex != master_idx)
> > return true;
> >
> > diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> > index f6af3e74fc44..8ccc314744d4 100644
> > --- a/net/core/rtnetlink.c
> > +++ b/net/core/rtnetlink.c
> > @@ -1970,6 +1970,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 (bool)master;
> > +
> > if (!master || master->ifindex != master_idx)
> > return true;
> >
> >
>
From 7908142b2d4799672a7f9dd27e848214e3c4a0a7 Mon Sep 17 00:00:00 2001
From: Lahav Schlesinger <lschlesinger@drivenets.com>
Date: Sun, 8 Aug 2021 13:16:44 +0000
Subject: [PATCH] net: Support filtering interfaces on no master
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.
Signed-off-by: Lahav Schlesinger <lschlesinger@drivenets.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
---
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 53e85c70c6e5..3aeefc48b96a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2533,6 +2533,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 f6af3e74fc44..bc4d62174ab0 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1970,6 +1970,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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: Support filtering interfaces on no master
2021-08-09 6:54 ` Lahav Schlesinger
@ 2021-08-09 20:32 ` Jakub Kicinski
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2021-08-09 20:32 UTC (permalink / raw)
To: Lahav Schlesinger; +Cc: David Ahern, netdev, dsahern, davem
On Mon, 9 Aug 2021 09:54:32 +0300 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.
>
> Signed-off-by: Lahav Schlesinger <lschlesinger@drivenets.com>
> Cc: David Ahern <dsahern@kernel.org>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Jakub Kicinski <kuba@kernel.org>
Please make a fresh posting with [PATCH net-next v2] as the subject tag.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-09 20:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-08 13:28 [PATCH] net: Support filtering interfaces on no master Lahav Schlesinger
2021-08-08 20:02 ` David Ahern
2021-08-09 6:54 ` Lahav Schlesinger
2021-08-09 20:32 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.