net/sched: matchall: Take verbose flag into account when logging error messages

The verbose flag was added in commit 81c7288b170a ("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.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index ca5670fd5228ea820781cd3e1b3dbbac61c51b9e..37283b30692451ebfaf4516cf7cb6669159f4df5 100644 (file)
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -101,12 +101,10 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
        if (err) {
                kfree(cls_mall.rule);
                mall_destroy_hw_filter(tp, head, cookie, NULL);
-               if (skip_sw)
-                       NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow action");
-               else
-                       err = 0;
+               NL_SET_ERR_MSG_MOD(cls_mall.common.extack,
+                                  "Failed to setup flow action");
 
-               return err;
+               return skip_sw ? err : 0;
        }
 
        err = tc_setup_cb_add(block, tp, TC_SETUP_CLSMATCHALL, &cls_mall,
@@ -305,11 +303,10 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb,
        err = tc_setup_offload_action(&cls_mall.rule->action, &head->exts);
        if (err) {
                kfree(cls_mall.rule);
-               if (add && tc_skip_sw(head->flags)) {
-                       NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow action");
-                       return err;
-               }
-               return 0;
+               NL_SET_ERR_MSG_MOD(cls_mall.common.extack,
+                                  "Failed to setup flow action");
+
+               return add && tc_skip_sw(head->flags) ? err : 0;
        }
 
        err = tc_setup_cb_reoffload(block, tp, add, cb, TC_SETUP_CLSMATCHALL,