Allow compilation of HWS meter code only on platforms
that support HWS.
Fixes: 24865366e495 ("net/mlx5: support flow meter action for HWS")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson <getel...@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnow...@nvidia.com>
---
drivers/net/mlx5/mlx5_flow_meter.c | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_meter.c
b/drivers/net/mlx5/mlx5_flow_meter.c
index c0578ce6e9..57de95b4b9 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -896,6 +896,7 @@ mlx5_flow_meter_profile_get(struct rte_eth_dev *dev,
meter_profile_id);
}
+#if defined(HAVE_MLX5_HWS_SUPPORT)
/**
* Callback to add MTR profile with HWS.
*
@@ -981,6 +982,7 @@ mlx5_flow_meter_profile_hws_delete(struct rte_eth_dev *dev,
memset(fmp, 0, sizeof(struct mlx5_flow_meter_profile));
return 0;
}
+#endif
/**
* Find policy by id.
@@ -1123,6 +1125,7 @@ mlx5_flow_meter_policy_validate(struct rte_eth_dev *dev,
return 0;
}
+#if defined(HAVE_MLX5_HWS_SUPPORT)
/**
* Callback to check MTR policy action validate for HWS
*
@@ -1159,6 +1162,7 @@ mlx5_flow_meter_policy_hws_validate(struct rte_eth_dev
*dev,
}
return 0;
}
+#endif
static int
__mlx5_flow_meter_policy_delete(struct rte_eth_dev *dev,
@@ -1485,6 +1489,7 @@ mlx5_flow_meter_policy_get(struct rte_eth_dev *dev,
&policy_idx);
}
+#if defined(HAVE_MLX5_HWS_SUPPORT)
/**
* Callback to delete MTR policy for HWS.
*
@@ -1807,7 +1812,7 @@ mlx5_flow_meter_policy_hws_add(struct rte_eth_dev *dev,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
NULL, "Failed to create meter policy.");
}
-
+#endif
/**
* Check meter validation.
*
@@ -2177,6 +2182,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t
meter_id,
NULL, "Failed to create devx meter.");
}
+#if defined(HAVE_MLX5_HWS_SUPPORT)
/**
* Create meter rules.
*
@@ -2260,6 +2266,7 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev,
uint32_t meter_id,
__atomic_fetch_add(&policy->ref_cnt, 1, __ATOMIC_RELAXED);
return 0;
}
+#endif
static int
mlx5_flow_meter_params_flush(struct rte_eth_dev *dev,
@@ -2744,6 +2751,7 @@ static const struct rte_mtr_ops mlx5_flow_mtr_ops = {
.stats_read = mlx5_flow_meter_stats_read,
};
+#if defined(HAVE_MLX5_HWS_SUPPORT)
static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops = {
.capabilities_get = mlx5_flow_mtr_cap_get,
.meter_profile_add = mlx5_flow_meter_profile_hws_add,
@@ -2762,6 +2770,7 @@ static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops = {
.stats_update = NULL,
.stats_read = NULL,
};
+#endif
/**
* Get meter operations.
@@ -2777,12 +2786,16 @@ static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops =
{
int
mlx5_flow_meter_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
{
+#if defined(HAVE_MLX5_HWS_SUPPORT)
struct mlx5_priv *priv = dev->data->dev_private;
if (priv->sh->config.dv_flow_en == 2)
*(const struct rte_mtr_ops **)arg = &mlx5_flow_mtr_hws_ops;
else
*(const struct rte_mtr_ops **)arg = &mlx5_flow_mtr_ops;
+#else
+ *(const struct rte_mtr_ops **)arg = &mlx5_flow_mtr_ops;
+#endif
return 0;
}
@@ -3161,7 +3174,6 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct
rte_mtr_error *error)
struct mlx5_flow_meter_profile *fmp;
struct mlx5_legacy_flow_meter *legacy_fm;
struct mlx5_flow_meter_info *fm;
- struct mlx5_flow_meter_policy *policy;
struct mlx5_flow_meter_sub_policy *sub_policy;
void *tmp;
uint32_t i, mtr_idx, policy_idx;
@@ -3229,15 +3241,20 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct
rte_mtr_error *error)
mlx5_l3t_destroy(priv->policy_idx_tbl);
priv->policy_idx_tbl = NULL;
}
+#if defined(HAVE_MLX5_HWS_SUPPORT)
if (priv->mtr_policy_arr) {
+ struct mlx5_flow_meter_policy *policy;
+
for (i = 0; i < priv->mtr_config.nb_meter_policies; i++) {
policy = mlx5_flow_meter_policy_find(dev, i,
&policy_idx);
- if (policy->initialized)
+ if (policy->initialized) {
mlx5_flow_meter_policy_hws_delete(dev, i,
error);
+ }
}
}
+#endif
if (priv->mtr_profile_tbl) {
MLX5_L3T_FOREACH(priv->mtr_profile_tbl, i, entry) {
fmp = entry;
@@ -3251,14 +3268,17 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct
rte_mtr_error *error)
mlx5_l3t_destroy(priv->mtr_profile_tbl);
priv->mtr_profile_tbl = NULL;
}
+#if defined(HAVE_MLX5_HWS_SUPPORT)
if (priv->mtr_profile_arr) {
for (i = 0; i < priv->mtr_config.nb_meter_profiles; i++) {
fmp = mlx5_flow_meter_profile_find(priv, i);
- if (fmp->initialized)
+ if (fmp->initialized) {
mlx5_flow_meter_profile_hws_delete(dev, i,
error);
+ }
}
}
+#endif
/* Delete default policy table. */
mlx5_flow_destroy_def_policy(dev);
if (priv->sh->refcnt == 1)
--
2.39.2
