flow_offload: restrict driver to pass one allowed bit to flow_action_hw_stats_types_c...

The intention of this helper was to allow driver to specify one type
that it supports, so not only "any" value would pass. So make the API
more strict and allow driver to pass only 1 bit that is going
to be checked.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 33d3e70..f285713 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -2879,7 +2879,7 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
                return -EINVAL;
 
        if (!flow_action_hw_stats_types_check(flow_action, extack,
-                                             FLOW_ACTION_HW_STATS_TYPE_DELAYED))
+                                             FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT))
                return -EOPNOTSUPP;
 
        attr->flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
@@ -3374,7 +3374,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
                return -EINVAL;
 
        if (!flow_action_hw_stats_types_check(flow_action, extack,
-                                             FLOW_ACTION_HW_STATS_TYPE_DELAYED))
+                                             FLOW_ACTION_HW_STATS_TYPE_DELAYED_BIT))
                return -EOPNOTSUPP;
 
        flow_action_for_each(i, act, flow_action) {

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index 6849cb5..d1b1e4a 100644 (file)
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -300,9 +300,10 @@ flow_action_first_entry_get(const struct flow_action *action)
 }
 
 static inline bool
-flow_action_hw_stats_types_check(const struct flow_action *action,
-                                struct netlink_ext_ack *extack,
-                                u8 allowed_hw_stats_type)
+__flow_action_hw_stats_types_check(const struct flow_action *action,
+                                  struct netlink_ext_ack *extack,
+                                  bool check_allow_bit,
+                                  enum flow_action_hw_stats_type_bit allow_bit)
 {
        const struct flow_action_entry *action_entry;
 
@@ -311,12 +312,12 @@ flow_action_hw_stats_types_check(const struct flow_action *action,
        if (!flow_action_mixed_hw_stats_types_check(action, extack))
                return false;
        action_entry = flow_action_first_entry_get(action);
-       if (allowed_hw_stats_type == 0 &&
+       if (!check_allow_bit &&
            action_entry->hw_stats_type != FLOW_ACTION_HW_STATS_TYPE_ANY) {
                NL_SET_ERR_MSG_MOD(extack, "Driver supports only default HW stats type \"any\"");
                return false;
-       } else if (allowed_hw_stats_type != 0 &&
-                  !(action_entry->hw_stats_type & allowed_hw_stats_type)) {
+       } else if (check_allow_bit &&
+                  !(action_entry->hw_stats_type & BIT(allow_bit))) {
                NL_SET_ERR_MSG_MOD(extack, "Driver does not support selected HW stats type");
                return false;
        }
@@ -324,10 +325,19 @@ flow_action_hw_stats_types_check(const struct flow_action *action,
 }
 
 static inline bool
+flow_action_hw_stats_types_check(const struct flow_action *action,
+                                struct netlink_ext_ack *extack,
+                                enum flow_action_hw_stats_type_bit allow_bit)
+{
+       return __flow_action_hw_stats_types_check(action, extack,
+                                                 true, allow_bit);
+}
+
+static inline bool
 flow_action_basic_hw_stats_types_check(const struct flow_action *action,
                                       struct netlink_ext_ack *extack)
 {
-       return flow_action_hw_stats_types_check(action, extack, 0);
+       return __flow_action_hw_stats_types_check(action, extack, false, 0);
 }
 
 struct flow_rule {