Commit 1f15bb4f authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller

net: sched: flower: only return error from hw offload if skip_sw

Recently introduced tc_setup_flow_action() can fail when parsing tcf_exts
on some unsupported action commands. However, this should not affect the
case when user did not explicitly request hw offload by setting skip_sw
flag. Modify tc_setup_flow_action() callers to only propagate the error if
skip_sw flag is set for filter that is being offloaded, and set extack
error message in that case.
Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Fixes: 3a7b6861 ("cls_api: add translator to flow_action representation")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cba2bf7a
...@@ -396,7 +396,11 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, ...@@ -396,7 +396,11 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts); err = tc_setup_flow_action(&cls_flower.rule->action, &f->exts);
if (err) { if (err) {
kfree(cls_flower.rule); kfree(cls_flower.rule);
return err; if (skip_sw) {
NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow action");
return err;
}
return 0;
} }
err = tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, skip_sw); err = tc_setup_cb_call(block, TC_SETUP_CLSFLOWER, &cls_flower, skip_sw);
...@@ -1503,7 +1507,11 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, tc_setup_cb_t *cb, ...@@ -1503,7 +1507,11 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, tc_setup_cb_t *cb,
&f->exts); &f->exts);
if (err) { if (err) {
kfree(cls_flower.rule); kfree(cls_flower.rule);
return err; if (tc_skip_sw(f->flags)) {
NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow action");
return err;
}
continue;
} }
cls_flower.classid = f->res.classid; cls_flower.classid = f->res.classid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment