l2tp: avoid to use synchronize_rcu in tunnel free function
authorxeb@mail.ru <xeb@mail.ru>
Fri, 24 Aug 2012 01:07:38 +0000 (01:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Aug 2012 16:31:03 +0000 (12:31 -0400)
Avoid to use synchronize_rcu in l2tp_tunnel_free because context may be
atomic.

Signed-off-by: Dmitry Kozlov <xeb@mail.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_core.c
net/l2tp/l2tp_core.h

index 393355d37b476bc67219d57221759c3a1bdb52e8..513cab08a9863c0080d510ae5a2a4d927ad2ccdd 100644 (file)
@@ -1347,11 +1347,10 @@ static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel)
        /* Remove from tunnel list */
        spin_lock_bh(&pn->l2tp_tunnel_list_lock);
        list_del_rcu(&tunnel->list);
+       kfree_rcu(tunnel, rcu);
        spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
-       synchronize_rcu();
 
        atomic_dec(&l2tp_tunnel_count);
-       kfree(tunnel);
 }
 
 /* Create a socket for the tunnel, if one isn't set up by
index a38ec6cdeee1a7ba81dc0ea9f659ca3f46bccb46..56d583e083a7baf7b0cf707a76882a88701d8025 100644 (file)
@@ -163,6 +163,7 @@ struct l2tp_tunnel_cfg {
 
 struct l2tp_tunnel {
        int                     magic;          /* Should be L2TP_TUNNEL_MAGIC */
+       struct rcu_head rcu;
        rwlock_t                hlist_lock;     /* protect session_hlist */
        struct hlist_head       session_hlist[L2TP_HASH_SIZE];
                                                /* hashed list of sessions,