Skip to content

Commit 11c9531

Browse files
idoschdavem330
authored andcommitted
net/sched: flower: Take verbose flag into account when logging error messages
The verbose flag was added in commit 81c7288 ("sched: cls: enable verbose logging") to avoid suppressing logging of error messages that occur "when the rule is not to be exclusively executed by the hardware". However, such error messages are currently suppressed when setup of flow action fails. Take the verbose flag into account to avoid suppressing error messages. This is done by using the extack pointer initialized by tc_cls_common_offload_init(), which performs the necessary checks. Before: # tc filter add dev dummy0 ingress pref 1 proto ip flower dst_ip 198.51.100.1 action police rate 100Mbit burst 10000 # tc filter add dev dummy0 ingress pref 2 proto ip flower verbose dst_ip 198.51.100.1 action police rate 100Mbit burst 10000 After: # tc filter add dev dummy0 ingress pref 1 proto ip flower dst_ip 198.51.100.1 action police rate 100Mbit burst 10000 # tc filter add dev dummy0 ingress pref 2 proto ip flower verbose dst_ip 198.51.100.1 action police rate 100Mbit burst 10000 Warning: cls_flower: Failed to setup flow action. Signed-off-by: Ido Schimmel <[email protected]> Reviewed-by: Petr Machata <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4c096ea commit 11c9531

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

net/sched/cls_flower.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,10 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
467467
err = tc_setup_offload_action(&cls_flower.rule->action, &f->exts);
468468
if (err) {
469469
kfree(cls_flower.rule);
470-
if (skip_sw) {
471-
NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow action");
472-
return err;
473-
}
474-
return 0;
470+
NL_SET_ERR_MSG_MOD(cls_flower.common.extack,
471+
"Failed to setup flow action");
472+
473+
return skip_sw ? err : 0;
475474
}
476475

477476
err = tc_setup_cb_add(block, tp, TC_SETUP_CLSFLOWER, &cls_flower,
@@ -2357,8 +2356,9 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
23572356
err = tc_setup_offload_action(&cls_flower.rule->action, &f->exts);
23582357
if (err) {
23592358
kfree(cls_flower.rule);
2359+
NL_SET_ERR_MSG_MOD(cls_flower.common.extack,
2360+
"Failed to setup flow action");
23602361
if (tc_skip_sw(f->flags)) {
2361-
NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow action");
23622362
__fl_put(f);
23632363
return err;
23642364
}

0 commit comments

Comments
 (0)