Skip to content

Commit

Permalink
net_sched: use tcf_queue_work() in flower 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 94cdb47 commit 0552c8a
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions net/sched/cls_flower.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ struct cls_fl_filter {
struct list_head list;
u32 handle;
u32 flags;
struct rcu_head rcu;
union {
struct work_struct work;
struct rcu_head rcu;
};
struct net_device *hw_dev;
};

Expand Down Expand Up @@ -215,12 +218,22 @@ static int fl_init(struct tcf_proto *tp)
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);
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)
Expand Down

0 comments on commit 0552c8a

Please sign in to comment.