Skip to content

Commit

Permalink
net_sched: use tcf_queue_work() in matchall filter
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Cong Wang authored and David S. Miller committed Oct 29, 2017
1 parent e071dff commit df2735e
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions net/sched/cls_matchall.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ struct cls_mall_head {
struct tcf_result res;
u32 handle;
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,
Expand All @@ -41,13 +44,23 @@ static int mall_init(struct tcf_proto *tp)
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)
{
struct cls_mall_head *head = container_of(rcu, struct cls_mall_head,
rcu);

tcf_exts_destroy(&head->exts);
kfree(head);
INIT_WORK(&head->work, mall_destroy_work);
tcf_queue_work(&head->work);
}

static int mall_replace_hw_filter(struct tcf_proto *tp,
Expand Down

0 comments on commit df2735e

Please sign in to comment.