Skip to contentSkip to conversation

net: Support filtering interfaces on no master

PATCH Superseded Lahav Schlesinger 2 participants 3 messages Aug 10, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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.

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

Cc David Ahern <[email protected]>
Cc David S. Miller <[email protected]>
Cc Jakub Kicinski <[email protected]>
---
 net/core/neighbour.c | 7 +++++++
 net/core/rtnetlink.c | 7 +++++++
 2 files changed, 14 insertions(+)
net/core/neighbour.c +7 -0
index b963d6b02c4f..2d5bc3a75fae 100644
@@ -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;
 
net/core/rtnetlink.c +7 -0
index 7c9d32cfe607..2dcf1c084b20 100644
@@ -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;
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 7 lines · Lahav Schlesinger

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.

.....

Quoted 7 lines

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

Quoted 48 lines
Cc David Ahern <[email protected]>
Cc David S. Miller <[email protected]>
Cc Jakub Kicinski <[email protected]>
---
 net/core/neighbour.c | 7 +++++++
 net/core/rtnetlink.c | 7 +++++++
 2 files changed, 14 insertions(+)
net/core/neighbour.c +7 -0
index b963d6b02c4f..2d5bc3a75fae 100644
@@ -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;
 
net/core/rtnetlink.c +7 -0
index 7c9d32cfe607..2dcf1c084b20 100644
@@ -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;
 
Signature · 1 line
2.25.1
#2 lore raw
Quoted 19 lines · Leon Romanovsky
Quoted 7 lines · Lahav Schlesinger

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.

.....

Quoted 7 lines

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

Quoted 4 lines

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

Thanks

Oops, sorry about that!

Quoted 48 lines
Quoted 48 lines
Cc David Ahern <[email protected]>
Cc David S. Miller <[email protected]>
Cc Jakub Kicinski <[email protected]>
---
 net/core/neighbour.c | 7 +++++++
 net/core/rtnetlink.c | 7 +++++++
 2 files changed, 14 insertions(+)
net/core/neighbour.c +7 -0
index b963d6b02c4f..2d5bc3a75fae 100644
@@ -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;
 
net/core/rtnetlink.c +7 -1
index 7c9d32cfe607..2dcf1c084b20 100644
@@ -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