2022-03-20 14:05:16

by Ziyang Xuan (William)

Subject: [PATCH net-next v3 2/3] net: ipvlan: add net device refcount tracker

Add net device refcount tracker to ipvlan.

Signed-off-by: Ziyang Xuan <[email protected]>
---
drivers/net/ipvlan/ipvlan.h | 1 +
drivers/net/ipvlan/ipvlan_main.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
index 3837c897832e..6605199305b7 100644
--- a/drivers/net/ipvlan/ipvlan.h
+++ b/drivers/net/ipvlan/ipvlan.h
@@ -64,6 +64,7 @@ struct ipvl_dev {
struct list_head pnode;
struct ipvl_port *port;
struct net_device *phy_dev;
+ netdevice_tracker dev_tracker;
struct list_head addrs;
struct ipvl_pcpu_stats __percpu *pcpu_stats;
DECLARE_BITMAP(mac_filters, IPVLAN_MAC_FILTER_SIZE);
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index dcdc01403f22..be06f122092e 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -160,7 +160,7 @@ static int ipvlan_init(struct net_device *dev)
port->count += 1;

/* Get ipvlan's reference to phy_dev */
- dev_hold(phy_dev);
+ dev_hold_track(phy_dev, &ipvlan->dev_tracker, GFP_KERNEL);

return 0;
}
@@ -674,7 +674,7 @@ static void ipvlan_dev_free(struct net_device *dev)
struct ipvl_dev *ipvlan = netdev_priv(dev);

/* Get rid of the ipvlan's reference to phy_dev */
- dev_put(ipvlan->phy_dev);
+ dev_put_track(ipvlan->phy_dev, &ipvlan->dev_tracker);
}

void ipvlan_link_setup(struct net_device *dev)
--
2.25.1

2022-03-24 17:44:39

by Eric Dumazet

Subject: Re: [PATCH net-next v3 2/3] net: ipvlan: add net device refcount tracker

On 3/19/22 02:53, Ziyang Xuan wrote:
> Add net device refcount tracker to ipvlan.


Just squash this to prior patch.


Ideally all new dev_hold()/dev_put() should be

dev_hold_track() and dev_put_track()


> Signed-off-by: Ziyang Xuan <[email protected]>
> ---
> drivers/net/ipvlan/ipvlan.h | 1 +
> drivers/net/ipvlan/ipvlan_main.c | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
> index 3837c897832e..6605199305b7 100644
> --- a/drivers/net/ipvlan/ipvlan.h
> +++ b/drivers/net/ipvlan/ipvlan.h
> @@ -64,6 +64,7 @@ struct ipvl_dev {
> struct list_head pnode;
> struct ipvl_port *port;
> struct net_device *phy_dev;
> + netdevice_tracker dev_tracker;
> struct list_head addrs;
> struct ipvl_pcpu_stats __percpu *pcpu_stats;
> DECLARE_BITMAP(mac_filters, IPVLAN_MAC_FILTER_SIZE);
> diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
> index dcdc01403f22..be06f122092e 100644
> --- a/drivers/net/ipvlan/ipvlan_main.c
> +++ b/drivers/net/ipvlan/ipvlan_main.c
> @@ -160,7 +160,7 @@ static int ipvlan_init(struct net_device *dev)
> port->count += 1;
>
> /* Get ipvlan's reference to phy_dev */
> - dev_hold(phy_dev);
> + dev_hold_track(phy_dev, &ipvlan->dev_tracker, GFP_KERNEL);
>
> return 0;
> }
> @@ -674,7 +674,7 @@ static void ipvlan_dev_free(struct net_device *dev)
> struct ipvl_dev *ipvlan = netdev_priv(dev);
>
> /* Get rid of the ipvlan's reference to phy_dev */
> - dev_put(ipvlan->phy_dev);
> + dev_put_track(ipvlan->phy_dev, &ipvlan->dev_tracker);
> }
>
> void ipvlan_link_setup(struct net_device *dev)