[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1481005511.18162.564.camel@edumazet-glaptop3.roam.corp.google.com>
Date: Mon, 05 Dec 2016 22:25:11 -0800
From: Eric Dumazet <eric.dumazet@...il.com>
To: fgao@...ai8.com
Cc: davem@...emloft.net, maheshb@...gle.com, edumazet@...gle.com,
netdev@...r.kernel.org, gfree.wind@...il.com
Subject: Re: [PATCH net-next 1/1] driver: ipvlan: Free the port memory
directly with kfree instead of kfree_rcu
On Tue, 2016-12-06 at 12:29 +0800, fgao@...ai8.com wrote:
> From: Gao Feng <fgao@...ai8.com>
>
> There is no one which may reference the "port" in ipvlan_port_create
> when netdev_rx_handler_register failed. So it could free it directly
> with kfree instead of kfree_rcu.
>
> Signed-off-by: Gao Feng <fgao@...ai8.com>
> ---
> drivers/net/ipvlan/ipvlan_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
> index c6aa667..1a601151 100644
> --- a/drivers/net/ipvlan/ipvlan_main.c
> +++ b/drivers/net/ipvlan/ipvlan_main.c
> @@ -128,7 +128,7 @@ static int ipvlan_port_create(struct net_device *dev)
> return 0;
>
> err:
> - kfree_rcu(port, rcu);
> + kfree(port);
> return err;
> }
>
This looks a partial patch.
If you really care, why don't you also replace the kfree_rcu() in
ipvlan_port_destroy() ?
diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
index 05a62d2216c54651f6158c35d446d2e395b38dc3..031093e1c25f55244e6bdfde4ebeb65c0f2f10c1 100644
--- a/drivers/net/ipvlan/ipvlan.h
+++ b/drivers/net/ipvlan/ipvlan.h
@@ -97,7 +97,6 @@ struct ipvl_port {
struct work_struct wq;
struct sk_buff_head backlog;
int count;
- struct rcu_head rcu;
};
static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 5430460167b5e8945d29a3febdd324461bf5af5c..ffe8994e64fc1791ef07d80ad2340bc82d541bba 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -128,7 +128,7 @@ static int ipvlan_port_create(struct net_device *dev)
return 0;
err:
- kfree_rcu(port, rcu);
+ kfree(port);
return err;
}
@@ -145,7 +145,7 @@ static void ipvlan_port_destroy(struct net_device *dev)
netdev_rx_handler_unregister(dev);
cancel_work_sync(&port->wq);
__skb_queue_purge(&port->backlog);
- kfree_rcu(port, rcu);
+ kfree(port);
}
#define IPVLAN_FEATURES \
Powered by blists - more mailing lists