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>
This commit is contained in:

committed by
David S. Miller

parent
11bd634da2
commit
9838b20a7f
@@ -97,7 +97,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
|
||||
cls_mall.command = TC_CLSMATCHALL_REPLACE;
|
||||
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) {
|
||||
kfree(cls_mall.rule);
|
||||
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;
|
||||
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) {
|
||||
kfree(cls_mall.rule);
|
||||
if (add && tc_skip_sw(head->flags)) {
|
||||
|
Reference in New Issue
Block a user