2023-08-04 09:30:15

by Yang Yang

Subject: [PATCH] net: tipc: add net device refcount tracker for bearer

From: xu xin <[email protected]>

Add net device refcount tracker to the struct tipc_bearer.

Signed-off-by: xu xin <[email protected]>
Reviewed-by: Yang Yang <[email protected]>
Cc: Kuang Mingfu <[email protected]>
---
net/tipc/bearer.c | 10 +++++-----
net/tipc/bearer.h | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 2cde375477e3..01ffd1f2337a 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -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);
}

/**
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 41eac1ee0c09..1adeaf94aa62 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -174,6 +174,7 @@ struct tipc_bearer {
u16 encap_hlen;
unsigned long up;
refcount_t refcnt;
+ netdevice_tracker devtracker;
};

struct tipc_bearer_names {
--
2.15.2

2023-08-05 12:46:42

by Simon Horman

Subject: Re: [PATCH] net: tipc: add net device refcount tracker for bearer

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.
>
> Signed-off-by: xu xin <[email protected]>
> Reviewed-by: Yang Yang <[email protected]>
> Cc: Kuang Mingfu <[email protected]>

...

> @@ -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);
> }
>
> /**
> diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
> index 41eac1ee0c09..1adeaf94aa62 100644
> --- a/net/tipc/bearer.h
> +++ b/net/tipc/bearer.h
> @@ -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.

> };
>
> struct tipc_bearer_names {

With that fixed, feel free to add:

Reviewed-by: Simon Horman <[email protected]>

--
pw-bot: changes-requested

2023-08-06 20:56:42

by Simon Horman

Subject: Re: [PATCH] net: tipc: add net device refcount tracker for bearer

On Sat, Aug 05, 2023 at 01:26:56PM +0200, Simon Horman wrote:
> 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.
> >
> > Signed-off-by: xu xin <[email protected]>
> > Reviewed-by: Yang Yang <[email protected]>
> > Cc: Kuang Mingfu <[email protected]>
>
> ...
>
> > @@ -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);
> > }
> >
> > /**
> > diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
> > index 41eac1ee0c09..1adeaf94aa62 100644
> > --- a/net/tipc/bearer.h
> > +++ b/net/tipc/bearer.h
> > @@ -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.
>
> > };
> >
> > struct tipc_bearer_names {
>
> With that fixed, feel free to add:
>
> Reviewed-by: Simon Horman <[email protected]>

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

2023-08-07 02:26:46

by Tung Quang Nguyen

Subject: RE: [PATCH] net: tipc: add net device refcount tracker for bearer

>Add net device refcount tracker to the struct tipc_bearer.
>
>Signed-off-by: xu xin <[email protected]>
>Reviewed-by: Yang Yang <[email protected]>
>Cc: Kuang Mingfu <[email protected]>
>---
> net/tipc/bearer.c | 10 +++++-----
> net/tipc/bearer.h | 1 +
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 2cde375477e3..01ffd1f2337a 100644
>--- a/net/tipc/bearer.c
>+++ b/net/tipc/bearer.c
>@@ -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);
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 ?