diff options
| author | Vlad Buslov <vladbu@mellanox.com> | 2018-08-10 19:51:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-11 21:37:09 +0200 |
| commit | 5e48180ed8bcfa60e02887ba801307caf14bbe40 (patch) | |
| tree | 2c0ad3f0cb94e0c75edabfb1480302072fc1609d /net | |
| parent | net: sched: act_sample: remove dependency on rtnl lock (diff) | |
| download | linux-5e48180ed8bcfa60e02887ba801307caf14bbe40.tar.xz linux-5e48180ed8bcfa60e02887ba801307caf14bbe40.zip | |
net: sched: act_simple: remove dependency on rtnl lock
Use tcf spinlock to protect private simple action data from concurrent
modification during dump. (simple init already uses tcf spinlock when
changing action state)
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/act_simple.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index aa51152e0066..18e4452574cd 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c @@ -156,10 +156,11 @@ static int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a, .index = d->tcf_index, .refcnt = refcount_read(&d->tcf_refcnt) - ref, .bindcnt = atomic_read(&d->tcf_bindcnt) - bind, - .action = d->tcf_action, }; struct tcf_t t; + spin_lock_bh(&d->tcf_lock); + opt.action = d->tcf_action; if (nla_put(skb, TCA_DEF_PARMS, sizeof(opt), &opt) || nla_put_string(skb, TCA_DEF_DATA, d->tcfd_defdata)) goto nla_put_failure; @@ -167,9 +168,12 @@ static int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a, tcf_tm_dump(&t, &d->tcf_tm); if (nla_put_64bit(skb, TCA_DEF_TM, sizeof(t), &t, TCA_DEF_PAD)) goto nla_put_failure; + spin_unlock_bh(&d->tcf_lock); + return skb->len; nla_put_failure: + spin_unlock_bh(&d->tcf_lock); nlmsg_trim(skb, b); return -1; } |