Commit df2735ee authored by Cong Wang's avatar Cong Wang Committed by David S. Miller

net_sched: use tcf_queue_work() in matchall filter

Defer the tcf_exts_destroy() in RCU callback to
tc filter workqueue and get RTNL lock.
Reported-by: default avatarChris 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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e071dff2
...@@ -21,7 +21,10 @@ struct cls_mall_head { ...@@ -21,7 +21,10 @@ struct cls_mall_head {
struct tcf_result res; struct tcf_result res;
u32 handle; u32 handle;
u32 flags; u32 flags;
struct rcu_head rcu; union {
struct work_struct work;
struct rcu_head rcu;
};
}; };
static int mall_classify(struct sk_buff *skb, const struct tcf_proto *tp, static int mall_classify(struct sk_buff *skb, const struct tcf_proto *tp,
...@@ -41,13 +44,23 @@ static int mall_init(struct tcf_proto *tp) ...@@ -41,13 +44,23 @@ static int mall_init(struct tcf_proto *tp)
return 0; return 0;
} }
static void mall_destroy_work(struct work_struct *work)
{
struct cls_mall_head *head = container_of(work, struct cls_mall_head,
work);
rtnl_lock();
tcf_exts_destroy(&head->exts);
kfree(head);
rtnl_unlock();
}
static void mall_destroy_rcu(struct rcu_head *rcu) static void mall_destroy_rcu(struct rcu_head *rcu)
{ {
struct cls_mall_head *head = container_of(rcu, struct cls_mall_head, struct cls_mall_head *head = container_of(rcu, struct cls_mall_head,
rcu); rcu);
tcf_exts_destroy(&head->exts); INIT_WORK(&head->work, mall_destroy_work);
kfree(head); tcf_queue_work(&head->work);
} }
static int mall_replace_hw_filter(struct tcf_proto *tp, static int mall_replace_hw_filter(struct tcf_proto *tp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment