mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-12 01:20:14 +00:00
l2tp: free sessions using rcu
l2tp sessions may be accessed under an rcu read lock. Have them freed via rcu and remove the now unneeded synchronize_rcu when a session is removed. Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Tom Parkin <tparkin@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fc7ec7f554
commit
d17e899995
@ -166,7 +166,7 @@ static void l2tp_session_free(struct l2tp_session *session)
|
||||
trace_free_session(session);
|
||||
if (session->tunnel)
|
||||
l2tp_tunnel_dec_refcount(session->tunnel);
|
||||
kfree(session);
|
||||
kfree_rcu(session, rcu);
|
||||
}
|
||||
|
||||
struct l2tp_tunnel *l2tp_sk_to_tunnel(const struct sock *sk)
|
||||
@ -1269,8 +1269,6 @@ static void l2tp_session_unhash(struct l2tp_session *session)
|
||||
|
||||
spin_unlock_bh(&pn->l2tp_session_idr_lock);
|
||||
spin_unlock_bh(&tunnel->list_lock);
|
||||
|
||||
synchronize_rcu();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -66,6 +66,7 @@ struct l2tp_session_coll_list {
|
||||
struct l2tp_session {
|
||||
int magic; /* should be L2TP_SESSION_MAGIC */
|
||||
long dead;
|
||||
struct rcu_head rcu;
|
||||
|
||||
struct l2tp_tunnel *tunnel; /* back pointer to tunnel context */
|
||||
u32 session_id;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user