mlxsw: restrict supported HW stats type to "any"
authorJiri Pirko <jiri@mellanox.com>
Sat, 7 Mar 2020 11:40:15 +0000 (12:40 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Mar 2020 04:07:48 +0000 (21:07 -0700)
Currently don't allow actions with any other type to be inserted.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

index 7435629c9e65943600e16afb49b760eff69a7a5e..588d374531cc7314c413aff7ff728152b7c20d65 100644 (file)
@@ -29,10 +29,16 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp,
        if (!flow_action_mixed_hw_stats_types_check(flow_action, extack))
                return -EOPNOTSUPP;
 
-       /* Count action is inserted first */
-       err = mlxsw_sp_acl_rulei_act_count(mlxsw_sp, rulei, extack);
-       if (err)
-               return err;
+       act = flow_action_first_entry_get(flow_action);
+       if (act->hw_stats_type == FLOW_ACTION_HW_STATS_TYPE_ANY) {
+               /* Count action is inserted first */
+               err = mlxsw_sp_acl_rulei_act_count(mlxsw_sp, rulei, extack);
+               if (err)
+                       return err;
+       } else {
+               NL_SET_ERR_MSG_MOD(extack, "Unsupported action HW stats type");
+               return -EOPNOTSUPP;
+       }
 
        flow_action_for_each(i, act, flow_action) {
                switch (act->id) {