diff options
| author |   Vlad Buslov <vladbu@mellanox.com> | 2019-08-26 16:45:03 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-26 14:17:43 -0700 |
| commit | 9838b20a7fb28c69fa66ac8e68d967ffe1d0ecad (patch) | |
| tree | 9ed88766141671e1bd7f930d7b53746a18d11c37 /net/sched/cls_flower.c | |
| parent | net: sched: conditionally obtain rtnl lock in cls hw offloads API (diff) | |
| download | linux-dev-9838b20a7fb28c69fa66ac8e68d967ffe1d0ecad.tar.xz linux-dev-9838b20a7fb28c69fa66ac8e68d967ffe1d0ecad.zip | |
net: sched: take rtnl lock in tc_setup_flow_action()
In order to allow using new flow_action infrastructure from unlocked
classifiers, modify tc_setup_flow_action() to accept new 'rtnl_held'
argument. Take rtnl lock before accessing tc_action data. This is necessary
to protect from concurrent action replace.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sched/cls_flower.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 5cb694469b51..fb305bd45d93 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -452,7 +452,8 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, cls_flower.rule->match.key = &f->mkey; cls_flower.classid = f->res.classid; - err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts); + err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts, + true); if (err) { kfree(cls_flower.rule); if (skip_sw) @@ -1819,7 +1820,8 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb, cls_flower.rule->match.mask = &f->mask->key; cls_flower.rule->match.key = &f->mkey; - err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts); + err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts, + true); if (err) { kfree(cls_flower.rule); if (tc_skip_sw(f->flags)) { |