Skip to content

Commit

Permalink
net_sched: use tcf_queue_work() in rsvp 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 c2f3f31 commit d4f84a4
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions net/sched/cls_rsvp.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ struct rsvp_filter {

u32 handle;
struct rsvp_session *sess;
struct rcu_head rcu;
union {
struct work_struct work;
struct rcu_head rcu;
};
};

static inline unsigned int hash_dst(__be32 *dst, u8 protocol, u8 tunnelid)
Expand Down Expand Up @@ -282,12 +285,22 @@ static int rsvp_init(struct tcf_proto *tp)
return -ENOBUFS;
}

static void rsvp_delete_filter_rcu(struct rcu_head *head)
static void rsvp_delete_filter_work(struct work_struct *work)
{
struct rsvp_filter *f = container_of(head, struct rsvp_filter, rcu);
struct rsvp_filter *f = container_of(work, struct rsvp_filter, work);

rtnl_lock();
tcf_exts_destroy(&f->exts);
kfree(f);
rtnl_unlock();
}

static void rsvp_delete_filter_rcu(struct rcu_head *head)
{
struct rsvp_filter *f = container_of(head, struct rsvp_filter, rcu);

INIT_WORK(&f->work, rsvp_delete_filter_work);
tcf_queue_work(&f->work);
}

static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
Expand Down

0 comments on commit d4f84a4

Please sign in to comment.