Skip to content

Commit

Permalink
net_sched: convert rsvp to call tcf_exts_destroy from rcu callback
Browse files Browse the repository at this point in the history
Adjust destroy path of cls_rsvp to call tcf_exts_destroy() after
rcu grace period.

Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexei Starovoitov authored and David S. Miller committed Aug 26, 2015
1 parent ed7aa87 commit 9e528d8
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions net/sched/cls_rsvp.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,22 @@ static int rsvp_init(struct tcf_proto *tp)
return -ENOBUFS;
}

static void
rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
static void rsvp_delete_filter_rcu(struct rcu_head *head)
{
tcf_unbind_filter(tp, &f->res);
struct rsvp_filter *f = container_of(head, struct rsvp_filter, rcu);

tcf_exts_destroy(&f->exts);
kfree_rcu(f, rcu);
kfree(f);
}

static void rsvp_delete_filter(struct tcf_proto *tp, struct rsvp_filter *f)
{
tcf_unbind_filter(tp, &f->res);
/* all classifiers are required to call tcf_exts_destroy() after rcu
* grace period, since converted-to-rcu actions are relying on that
* in cleanup() callback
*/
call_rcu(&f->rcu, rsvp_delete_filter_rcu);
}

static bool rsvp_destroy(struct tcf_proto *tp, bool force)
Expand Down

0 comments on commit 9e528d8

Please sign in to comment.