mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
net_sched: use tcf_queue_work() in rsvp filter
Defer the tcf_exts_destroy() in RCU callback to tc filter workqueue and get RTNL lock. Reported-by: Chris Mi <chrism@mellanox.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Jiri Pirko <jiri@resnulli.us> Cc: John Fastabend <john.fastabend@gmail.com> Cc: Jamal Hadi Salim <jhs@mojatatu.com> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c2f3f31d40
commit
d4f84a41dc
@ -97,7 +97,10 @@ struct rsvp_filter {
|
||||
|
||||
u32 handle;
|
||||
struct rsvp_session *sess;
|
||||
struct rcu_head rcu;
|
||||
union {
|
||||
struct work_struct work;
|
||||
struct rcu_head rcu;
|
||||
};
|
||||
};
|
||||
|
||||
static inline unsigned int hash_dst(__be32 *dst, u8 protocol, u8 tunnelid)
|
||||
@ -282,12 +285,22 @@ static int rsvp_init(struct tcf_proto *tp)
|
||||
return -ENOBUFS;
|
||||
}
|
||||
|
||||
static void rsvp_delete_filter_work(struct work_struct *work)
|
||||
{
|
||||
struct rsvp_filter *f = container_of(work, struct rsvp_filter, work);
|
||||
|
||||
rtnl_lock();
|
||||
tcf_exts_destroy(&f->exts);
|
||||
kfree(f);
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
static void rsvp_delete_filter_rcu(struct rcu_head *head)
|
||||
{
|
||||
struct rsvp_filter *f = container_of(head, struct rsvp_filter, rcu);
|
||||
|
||||
tcf_exts_destroy(&f->exts);
|
||||
kfree(f);
|
||||
INIT_WORK(&f->work, rsvp_delete_filter_work);
|
||||
tcf_queue_work(&f->work);
|
||||
}
|
||||
|
||||
static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
|
||||
|
Loading…
Reference in New Issue
Block a user