Skip to contentSkip to conversation

net: tipc: add net device refcount tracker for bearer

PATCH In review [email protected] 3 participants 4 messages Aug 4, 2023 – Aug 7, 2023

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

PATCH 1/1 net: tipc: add net device refcount tracker for bearer

From: xu xin <[email protected]>

Add net device refcount tracker to the struct tipc_bearer.

---
 net/tipc/bearer.c | 10 +++++-----
 net/tipc/bearer.h |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)
net/tipc/bearer.c +5 -5
index 2cde375477e3..01ffd1f2337a 100644
@@ -426,15 +426,15 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
 	struct net_device *dev;
 
 	/* Find device with specified name */
-	dev = dev_get_by_name(net, dev_name);
+	dev = netdev_get_by_name(net, dev_name, &b->devtracker, GFP_KERNEL);
 	if (!dev)
 		return -ENODEV;
 	if (tipc_mtu_bad(dev)) {
-		dev_put(dev);
+		netdev_put(dev, &b->devtracker);
 		return -EINVAL;
 	}
 	if (dev == net->loopback_dev) {
-		dev_put(dev);
+		netdev_put(dev, &b->devtracker);
 		pr_info("Enabling <%s> not permitted\n", b->name);
 		return -EINVAL;
 	}
@@ -445,7 +445,7 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
 		tipc_net_init(net, node_id, 0);
 	}
 	if (!tipc_own_id(net)) {
-		dev_put(dev);
+		netdev_put(dev, &b->devtracker);
 		pr_warn("Failed to obtain node identity\n");
 		return -EINVAL;
 	}
@@ -479,7 +479,7 @@ void tipc_disable_l2_media(struct tipc_bearer *b)
 	dev_remove_pack(&b->pt);
 	RCU_INIT_POINTER(dev->tipc_ptr, NULL);
 	synchronize_net();
-	dev_put(dev);
+	netdev_put(dev, &b->devtracker);
 }
 
 /**
net/tipc/bearer.h +1 -0
index 41eac1ee0c09..1adeaf94aa62 100644
@@ -174,6 +174,7 @@ struct tipc_bearer {
 	u16 encap_hlen;
 	unsigned long up;
 	refcount_t refcnt;
+	netdevice_tracker	devtracker;
 };
 
 struct tipc_bearer_names {
Signature · 1 line
2.15.2
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · On Fri, Aug 04, 2023 at 04:53:41PM +0800, [email protected] wrote:

From: xu xin <[email protected]>

Add net device refcount tracker to the struct tipc_bearer.

...

Quoted 14 lines
net/tipc/bearer.c +1 -1
@@ -479,7 +479,7 @@ void tipc_disable_l2_media(struct tipc_bearer *b)
 	dev_remove_pack(&b->pt);
 	RCU_INIT_POINTER(dev->tipc_ptr, NULL);
 	synchronize_net();
-	dev_put(dev);
+	netdev_put(dev, &b->devtracker);
 }
 
 /**
net/tipc/bearer.h +0 -0
index 41eac1ee0c09..1adeaf94aa62 100644

net/tipc/bearer.h struct tipc_bearer { · line 177

Quoted 4 lines
net/tipc/bearer.h +1 -0
@@ -174,6 +174,7 @@ struct tipc_bearer {
 	u16 encap_hlen;
 	unsigned long up;
 	refcount_t refcnt;
+	netdevice_tracker	devtracker;

Hi Xu Xin and Yang Yang,

Please add netdevice_tracker to the kernel doc for struct tipc_bearer, which appears just above the definition of the structure.

net/tipc/bearer.h struct tipc_bearer { · line 180

Quoted 3 lines
net/tipc/bearer.h +0 -0
 };
 
 struct tipc_bearer_names {

With that fixed, feel free to add:

Signature · 1 line
pw-bot: changes-requested
reviewer
#2 lore raw
Quoted 35 lines · Simon Horman
Quoted 7 lines · On Fri, Aug 04, 2023 at 04:53:41PM +0800, [email protected] wrote:

From: xu xin <[email protected]>

Add net device refcount tracker to the struct tipc_bearer.

...

Quoted 14 lines
net/tipc/bearer.c +1 -1
@@ -479,7 +479,7 @@ void tipc_disable_l2_media(struct tipc_bearer *b)
 	dev_remove_pack(&b->pt);
 	RCU_INIT_POINTER(dev->tipc_ptr, NULL);
 	synchronize_net();
-	dev_put(dev);
+	netdev_put(dev, &b->devtracker);
 }
 
 /**
net/tipc/bearer.h +0 -0
index 41eac1ee0c09..1adeaf94aa62 100644

net/tipc/bearer.h struct tipc_bearer { · line 177

Quoted 4 lines
net/tipc/bearer.h +1 -0
@@ -174,6 +174,7 @@ struct tipc_bearer {
 	u16 encap_hlen;
 	unsigned long up;
 	refcount_t refcnt;
+	netdevice_tracker	devtracker;

Hi Xu Xin and Yang Yang,

Please add netdevice_tracker to the kernel doc for struct tipc_bearer, which appears just above the definition of the structure.

Quoted 7 lines

net/tipc/bearer.h struct tipc_bearer { · line 180

Quoted 3 lines
net/tipc/bearer.h +0 -0
 };
 
 struct tipc_bearer_names {

With that fixed, feel free to add:

Given review of other, similar patches, by Eric. I think it would be best to confirm that this patch has been tested.

#3 lore raw
In reply to [email protected]
Quoted 19 lines

Add net device refcount tracker to the struct tipc_bearer.

---
net/tipc/bearer.c | 10 +++++-----
net/tipc/bearer.h | 1 +

2 files changed, 6 insertions(+), 5 deletions(-)
net/tipc/bearer.c +1 -1
@@ -426,15 +426,15 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b,
 	struct net_device *dev;
 
 	/* Find device with specified name */
-	dev = dev_get_by_name(net, dev_name);
+	dev = netdev_get_by_name(net, dev_name, &b->devtracker, GFP_KERNEL);

net/tipc/bearer.c int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b, · line 437

Quoted 10 lines
net/tipc/bearer.c +2 -2
 	if (!dev)
 		return -ENODEV;
 	if (tipc_mtu_bad(dev)) {
-		dev_put(dev);
+		netdev_put(dev, &b->devtracker);
 		return -EINVAL;
 	}
 	if (dev == net->loopback_dev) {
-		dev_put(dev);
+		netdev_put(dev, &b->devtracker);

Loopback device is using tn->loopback_pt.dev_tracker, not b->devtracker. Did you try to configure bearer on a net namespace to test if your patch works ?