diff options
| author | Vlad Buslov <vladbu@mellanox.com> | 2019-02-12 23:39:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-13 21:06:43 -0800 |
| commit | 1f15bb4f399ceccd85522b24af31198f53516f9b (patch) | |
| tree | ecf4bf7c20a5c1983185f5851294abec066a0d6e /net/sched/cls_flower.c | |
| parent | cba2bf7a22acaaa18e9030596464b11ee57e077e (diff) | |
| download | linux-stable-1f15bb4f399ceccd85522b24af31198f53516f9b.tar.gz linux-stable-1f15bb4f399ceccd85522b24af31198f53516f9b.tar.bz2 linux-stable-1f15bb4f399ceccd85522b24af31198f53516f9b.zip | |
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: Vlad Buslov <vladbu@mellanox.com>
Fixes: 3a7b68617de7 ("cls_api: add translator to flow_action representation")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_flower.c')
| -rw-r--r-- | net/sched/cls_flower.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 32fa3e20adc5..640f83e7f93f 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -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); if (err) { 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); @@ -1503,7 +1507,11 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, tc_setup_cb_t *cb, &f->exts); if (err) { 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; |