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

net_sched: use tcf_queue_work() in route 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 c0d378ef
...@@ -57,7 +57,10 @@ struct route4_filter { ...@@ -57,7 +57,10 @@ struct route4_filter {
u32 handle; u32 handle;
struct route4_bucket *bkt; struct route4_bucket *bkt;
struct tcf_proto *tp; struct tcf_proto *tp;
struct rcu_head rcu; union {
struct work_struct work;
struct rcu_head rcu;
};
}; };
#define ROUTE4_FAILURE ((struct route4_filter *)(-1L)) #define ROUTE4_FAILURE ((struct route4_filter *)(-1L))
...@@ -254,12 +257,22 @@ static int route4_init(struct tcf_proto *tp) ...@@ -254,12 +257,22 @@ static int route4_init(struct tcf_proto *tp)
return 0; return 0;
} }
static void route4_delete_filter(struct rcu_head *head) static void route4_delete_filter_work(struct work_struct *work)
{ {
struct route4_filter *f = container_of(head, struct route4_filter, rcu); struct route4_filter *f = container_of(work, struct route4_filter, work);
rtnl_lock();
tcf_exts_destroy(&f->exts); tcf_exts_destroy(&f->exts);
kfree(f); kfree(f);
rtnl_unlock();
}
static void route4_delete_filter(struct rcu_head *head)
{
struct route4_filter *f = container_of(head, struct route4_filter, rcu);
INIT_WORK(&f->work, route4_delete_filter_work);
tcf_queue_work(&f->work);
} }
static void route4_destroy(struct tcf_proto *tp) static void route4_destroy(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