nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: sched: take rtnl lock in tc_setup_flow_action()

Browse source 
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>
This commit is contained in:
Vlad Buslov 2019-08-26 16:45:03 +03:00 committed by David S. Miller
parent 11bd634da2
commit 9838b20a7f
4 changed files with 20 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/pkt_cls.h
View file

@ -504,7 +504,7 @@ tcf_match_indev(struct sk_buff *skb, int ifindex)
} }
int tc_setup_flow_action(struct flow_action *flow_action, int tc_setup_flow_action(struct flow_action *flow_action,
const struct tcf_exts *exts); const struct tcf_exts *exts, bool rtnl_held);
int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type, int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type,
void *type_data, bool err_stop, bool rtnl_held); void *type_data, bool err_stop, bool rtnl_held);
int tc_setup_cb_add(struct tcf_block *block, struct tcf_proto *tp, int tc_setup_cb_add(struct tcf_block *block, struct tcf_proto *tp,

17
net/sched/cls_api.c
View file

@ -3266,14 +3266,17 @@ int tc_setup_cb_reoffload(struct tcf_block *block, struct tcf_proto *tp,
EXPORT_SYMBOL(tc_setup_cb_reoffload); EXPORT_SYMBOL(tc_setup_cb_reoffload);
int tc_setup_flow_action(struct flow_action *flow_action, int tc_setup_flow_action(struct flow_action *flow_action,
const struct tcf_exts *exts) const struct tcf_exts *exts, bool rtnl_held)
{ {
const struct tc_action *act; const struct tc_action *act;
int i, j, k; int i, j, k, err = 0;
if (!exts) if (!exts)
return 0; return 0;
if (!rtnl_held)
rtnl_lock();
j = 0; j = 0;
tcf_exts_for_each_action(i, act, exts) { tcf_exts_for_each_action(i, act, exts) {
struct flow_action_entry *entry; struct flow_action_entry *entry;
@ -3318,6 +3321,7 @@ int tc_setup_flow_action(struct flow_action *flow_action,
entry->vlan.prio = tcf_vlan_push_prio(act); entry->vlan.prio = tcf_vlan_push_prio(act);
break; break;
default: default:
err = -EOPNOTSUPP;
goto err_out; goto err_out;
} }
} else if (is_tcf_tunnel_set(act)) { } else if (is_tcf_tunnel_set(act)) {
@ -3335,6 +3339,7 @@ int tc_setup_flow_action(struct flow_action *flow_action,
entry->id = FLOW_ACTION_ADD; entry->id = FLOW_ACTION_ADD;
break; break;
default: default:
err = -EOPNOTSUPP;
goto err_out; goto err_out;
} }
entry->mangle.htype = tcf_pedit_htype(act, k); entry->mangle.htype = tcf_pedit_htype(act, k);
@ -3393,15 +3398,19 @@ int tc_setup_flow_action(struct flow_action *flow_action,
entry->id = FLOW_ACTION_PTYPE; entry->id = FLOW_ACTION_PTYPE;
entry->ptype = tcf_skbedit_ptype(act); entry->ptype = tcf_skbedit_ptype(act);
} else { } else {
err = -EOPNOTSUPP;
goto err_out; goto err_out;
} }
if (!is_tcf_pedit(act)) if (!is_tcf_pedit(act))
j++; j++;
} }
return 0;
err_out: err_out:
return -EOPNOTSUPP; if (!rtnl_held)
rtnl_unlock();
return err;
} }
EXPORT_SYMBOL(tc_setup_flow_action); EXPORT_SYMBOL(tc_setup_flow_action);

6
net/sched/cls_flower.c
View file

@ -452,7 +452,8 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
cls_flower.rule->match.key = &f->mkey; cls_flower.rule->match.key = &f->mkey;
cls_flower.classid = f->res.classid; 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) { if (err) {
kfree(cls_flower.rule); kfree(cls_flower.rule);
if (skip_sw) 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.mask = &f->mask->key;
cls_flower.rule->match.key = &f->mkey; 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) { if (err) {
kfree(cls_flower.rule); kfree(cls_flower.rule);
if (tc_skip_sw(f->flags)) { if (tc_skip_sw(f->flags)) {

4
net/sched/cls_matchall.c
View file

@ -97,7 +97,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
cls_mall.command = TC_CLSMATCHALL_REPLACE; cls_mall.command = TC_CLSMATCHALL_REPLACE;
cls_mall.cookie = cookie; cls_mall.cookie = cookie;
err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts); err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts, true);
if (err) { if (err) {
kfree(cls_mall.rule); kfree(cls_mall.rule);
mall_destroy_hw_filter(tp, head, cookie, NULL); mall_destroy_hw_filter(tp, head, cookie, NULL);
@ -300,7 +300,7 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
TC_CLSMATCHALL_REPLACE : TC_CLSMATCHALL_DESTROY; TC_CLSMATCHALL_REPLACE : TC_CLSMATCHALL_DESTROY;
cls_mall.cookie = (unsigned long)head; cls_mall.cookie = (unsigned long)head;
err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts); err = tc_setup_flow_action(&cls_mall.rule->action, &head->exts, true);
if (err) { if (err) {
kfree(cls_mall.rule); kfree(cls_mall.rule);
if (add && tc_skip_sw(head->flags)) { if (add && tc_skip_sw(head->flags)) {