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

net_sched: use tcf_queue_work() in flower 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 94cdb475
...@@ -87,7 +87,10 @@ struct cls_fl_filter { ...@@ -87,7 +87,10 @@ struct cls_fl_filter {
struct list_head list; struct list_head list;
u32 handle; u32 handle;
u32 flags; u32 flags;
union {
struct work_struct work;
struct rcu_head rcu; struct rcu_head rcu;
};
struct net_device *hw_dev; struct net_device *hw_dev;
}; };
...@@ -215,12 +218,22 @@ static int fl_init(struct tcf_proto *tp) ...@@ -215,12 +218,22 @@ static int fl_init(struct tcf_proto *tp)
return 0; return 0;
} }
static void fl_destroy_filter(struct rcu_head *head) static void fl_destroy_filter_work(struct work_struct *work)
{ {
struct cls_fl_filter *f = container_of(head, struct cls_fl_filter, rcu); struct cls_fl_filter *f = container_of(work, struct cls_fl_filter, work);
rtnl_lock();
tcf_exts_destroy(&f->exts); tcf_exts_destroy(&f->exts);
kfree(f); kfree(f);
rtnl_unlock();
}
static void fl_destroy_filter(struct rcu_head *head)
{
struct cls_fl_filter *f = container_of(head, struct cls_fl_filter, rcu);
INIT_WORK(&f->work, fl_destroy_filter_work);
tcf_queue_work(&f->work);
} }
static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f) static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
......
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