diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2015-08-26 05:06:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-26 20:01:45 +0200 |
| commit | 9e528d89154b602209fda2fb92e89927bbffc976 (patch) | |
| tree | 41ecc69228d32340d9ee1d08ed26be4113f09dbb /net/sched/cls_rsvp.h | |
| parent | net_sched: convert tcindex to call tcf_exts_destroy from rcu callback (diff) | |
| download | linux-9e528d89154b602209fda2fb92e89927bbffc976.tar.xz linux-9e528d89154b602209fda2fb92e89927bbffc976.zip | |
net_sched: convert rsvp to call tcf_exts_destroy from rcu callback
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>
Diffstat (limited to 'net/sched/cls_rsvp.h')
| -rw-r--r-- | net/sched/cls_rsvp.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h index 02fa82792dab..f9c9fc075fe6 100644 --- a/net/sched/cls_rsvp.h +++ b/net/sched/cls_rsvp.h @@ -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) |