net_sched: use tcf_queue_work() in fw 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:
Родитель
0552c8afa0
Коммит
e071dff2a6
|
@ -46,7 +46,10 @@ struct fw_filter {
|
||||||
#endif /* CONFIG_NET_CLS_IND */
|
#endif /* CONFIG_NET_CLS_IND */
|
||||||
struct tcf_exts exts;
|
struct tcf_exts exts;
|
||||||
struct tcf_proto *tp;
|
struct tcf_proto *tp;
|
||||||
struct rcu_head rcu;
|
union {
|
||||||
|
struct work_struct work;
|
||||||
|
struct rcu_head rcu;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
static u32 fw_hash(u32 handle)
|
static u32 fw_hash(u32 handle)
|
||||||
|
@ -119,12 +122,22 @@ static int fw_init(struct tcf_proto *tp)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void fw_delete_filter_work(struct work_struct *work)
|
||||||
|
{
|
||||||
|
struct fw_filter *f = container_of(work, struct fw_filter, work);
|
||||||
|
|
||||||
|
rtnl_lock();
|
||||||
|
tcf_exts_destroy(&f->exts);
|
||||||
|
kfree(f);
|
||||||
|
rtnl_unlock();
|
||||||
|
}
|
||||||
|
|
||||||
static void fw_delete_filter(struct rcu_head *head)
|
static void fw_delete_filter(struct rcu_head *head)
|
||||||
{
|
{
|
||||||
struct fw_filter *f = container_of(head, struct fw_filter, rcu);
|
struct fw_filter *f = container_of(head, struct fw_filter, rcu);
|
||||||
|
|
||||||
tcf_exts_destroy(&f->exts);
|
INIT_WORK(&f->work, fw_delete_filter_work);
|
||||||
kfree(f);
|
tcf_queue_work(&f->work);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fw_destroy(struct tcf_proto *tp)
|
static void fw_destroy(struct tcf_proto *tp)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче