git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/txgbe: support destroying consistent filter
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_flow_dv.c
diff --git
a/drivers/net/mlx5/mlx5_flow_dv.c
b/drivers/net/mlx5/mlx5_flow_dv.c
index
50673ce
..
e4736ee
100644
(file)
--- a/
drivers/net/mlx5/mlx5_flow_dv.c
+++ b/
drivers/net/mlx5/mlx5_flow_dv.c
@@
-2612,6
+2612,10
@@
flow_dv_validate_action_l2_encap(struct rte_eth_dev *dev,
* Pointer to the rte_eth_dev structure.
* @param[in] action_flags
* Holds the actions detected until now.
* Pointer to the rte_eth_dev structure.
* @param[in] action_flags
* Holds the actions detected until now.
+ * @param[in] action
+ * Pointer to the action structure.
+ * @param[in] item_flags
+ * Holds the items detected.
* @param[in] attr
* Pointer to flow attributes
* @param[out] error
* @param[in] attr
* Pointer to flow attributes
* @param[out] error
@@
-2623,6
+2627,8
@@
flow_dv_validate_action_l2_encap(struct rte_eth_dev *dev,
static int
flow_dv_validate_action_decap(struct rte_eth_dev *dev,
uint64_t action_flags,
static int
flow_dv_validate_action_decap(struct rte_eth_dev *dev,
uint64_t action_flags,
+ const struct rte_flow_action *action,
+ const uint64_t item_flags,
const struct rte_flow_attr *attr,
struct rte_flow_error *error)
{
const struct rte_flow_attr *attr,
struct rte_flow_error *error)
{
@@
-2656,6
+2662,11
@@
flow_dv_validate_action_decap(struct rte_eth_dev *dev,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"decap action for VF representor "
"not supported on NIC table");
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"decap action for VF representor "
"not supported on NIC table");
+ if (action->type == RTE_FLOW_ACTION_TYPE_VXLAN_DECAP &&
+ !(item_flags & MLX5_FLOW_LAYER_VXLAN))
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+ "VXLAN item should be present for VXLAN decap");
return 0;
}
return 0;
}
@@
-2676,6
+2687,10
@@
const struct rte_flow_action_raw_decap empty_decap = {.data = NULL, .size = 0,};
* Holds the actions detected until now.
* @param[out] actions_n
* pointer to the number of actions counter.
* Holds the actions detected until now.
* @param[out] actions_n
* pointer to the number of actions counter.
+ * @param[in] action
+ * Pointer to the action structure.
+ * @param[in] item_flags
+ * Holds the items detected.
* @param[out] error
* Pointer to error structure.
*
* @param[out] error
* Pointer to error structure.
*
@@
-2688,7
+2703,8
@@
flow_dv_validate_action_raw_encap_decap
const struct rte_flow_action_raw_decap *decap,
const struct rte_flow_action_raw_encap *encap,
const struct rte_flow_attr *attr, uint64_t *action_flags,
const struct rte_flow_action_raw_decap *decap,
const struct rte_flow_action_raw_encap *encap,
const struct rte_flow_attr *attr, uint64_t *action_flags,
- int *actions_n, struct rte_flow_error *error)
+ int *actions_n, const struct rte_flow_action *action,
+ uint64_t item_flags, struct rte_flow_error *error)
{
const struct mlx5_priv *priv = dev->data->dev_private;
int ret;
{
const struct mlx5_priv *priv = dev->data->dev_private;
int ret;
@@
-2723,8
+2739,8
@@
flow_dv_validate_action_raw_encap_decap
"encap combination");
}
if (decap) {
"encap combination");
}
if (decap) {
- ret = flow_dv_validate_action_decap(dev, *action_flags, a
ttr
,
- error);
+ ret = flow_dv_validate_action_decap(dev, *action_flags, a
ction
,
+
item_flags, attr,
error);
if (ret < 0)
return ret;
*action_flags |= MLX5_FLOW_ACTION_DECAP;
if (ret < 0)
return ret;
*action_flags |= MLX5_FLOW_ACTION_DECAP;
@@
-4326,6
+4342,8
@@
flow_dv_modify_create_cb(struct mlx5_hlist *list, uint64_t key __rte_unused,
* Pointer to the Ethernet device structure.
* @param[in] attr
* Attributes of flow that includes this action.
* Pointer to the Ethernet device structure.
* @param[in] attr
* Attributes of flow that includes this action.
+ * @param[in] item_flags
+ * Holds the items detected.
* @param[out] error
* Pointer to error structure.
*
* @param[out] error
* Pointer to error structure.
*
@@
-4337,6
+4355,7
@@
flow_dv_validate_action_sample(uint64_t action_flags,
const struct rte_flow_action *action,
struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
const struct rte_flow_action *action,
struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
+ const uint64_t item_flags,
struct rte_flow_error *error)
{
struct mlx5_priv *priv = dev->data->dev_private;
struct rte_flow_error *error)
{
struct mlx5_priv *priv = dev->data->dev_private;
@@
-4430,7
+4449,7
@@
flow_dv_validate_action_sample(uint64_t action_flags,
case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
ret = flow_dv_validate_action_raw_encap_decap
(dev, NULL, act->conf, attr, &sub_action_flags,
case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
ret = flow_dv_validate_action_raw_encap_decap
(dev, NULL, act->conf, attr, &sub_action_flags,
- &actions_n, error);
+ &actions_n,
action, item_flags,
error);
if (ret < 0)
return ret;
++actions_n;
if (ret < 0)
return ret;
++actions_n;
@@
-5764,6
+5783,7
@@
flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:
case RTE_FLOW_ACTION_TYPE_NVGRE_DECAP:
ret = flow_dv_validate_action_decap(dev, action_flags,
case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:
case RTE_FLOW_ACTION_TYPE_NVGRE_DECAP:
ret = flow_dv_validate_action_decap(dev, action_flags,
+ actions, item_flags,
attr, error);
if (ret < 0)
return ret;
attr, error);
if (ret < 0)
return ret;
@@
-5773,7
+5793,7
@@
flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
ret = flow_dv_validate_action_raw_encap_decap
(dev, NULL, actions->conf, attr, &action_flags,
case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
ret = flow_dv_validate_action_raw_encap_decap
(dev, NULL, actions->conf, attr, &action_flags,
- &actions_n, error);
+ &actions_n,
actions, item_flags,
error);
if (ret < 0)
return ret;
break;
if (ret < 0)
return ret;
break;
@@
-5791,7
+5811,7
@@
flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
(dev,
decap ? decap : &empty_decap, encap,
attr, &action_flags, &actions_n,
(dev,
decap ? decap : &empty_decap, encap,
attr, &action_flags, &actions_n,
- error);
+
actions, item_flags,
error);
if (ret < 0)
return ret;
break;
if (ret < 0)
return ret;
break;
@@
-6006,7
+6026,8
@@
flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
case RTE_FLOW_ACTION_TYPE_SAMPLE:
ret = flow_dv_validate_action_sample(action_flags,
actions, dev,
case RTE_FLOW_ACTION_TYPE_SAMPLE:
ret = flow_dv_validate_action_sample(action_flags,
actions, dev,
- attr, error);
+ attr, item_flags,
+ error);
if (ret < 0)
return ret;
action_flags |= MLX5_FLOW_ACTION_SAMPLE;
if (ret < 0)
return ret;
action_flags |= MLX5_FLOW_ACTION_SAMPLE;
@@
-8786,9
+8807,8
@@
flow_dv_sample_create_cb(struct mlx5_cache_list *list __rte_unused,
sampler_attr.sample_actions = (struct mlx5dv_dr_action **)
&sample_dv_actions[0];
sampler_attr.action = cache_resource->set_action;
sampler_attr.sample_actions = (struct mlx5dv_dr_action **)
&sample_dv_actions[0];
sampler_attr.action = cache_resource->set_action;
- cache_resource->verbs_action =
- mlx5_glue->dr_create_flow_action_sampler(&sampler_attr);
- if (!cache_resource->verbs_action) {
+ if (mlx5_os_flow_dr_create_flow_action_sampler
+ (&sampler_attr, &cache_resource->verbs_action)) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, "cannot create sample action");
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, "cannot create sample action");
@@
-8800,7
+8820,7
@@
flow_dv_sample_create_cb(struct mlx5_cache_list *list __rte_unused,
error:
if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB &&
cache_resource->default_miss)
error:
if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB &&
cache_resource->default_miss)
- claim_zero(mlx5_
glue->
destroy_flow_action
+ claim_zero(mlx5_
flow_os_
destroy_flow_action
(cache_resource->default_miss));
else
flow_dv_sample_sub_actions_release(dev,
(cache_resource->default_miss));
else
flow_dv_sample_sub_actions_release(dev,
@@
-8898,6
+8918,7
@@
flow_dv_dest_array_create_cb(struct mlx5_cache_list *list __rte_unused,
struct mlx5dv_dr_domain *domain;
uint32_t idx = 0, res_idx = 0;
struct rte_flow_error *error = ctx->error;
struct mlx5dv_dr_domain *domain;
uint32_t idx = 0, res_idx = 0;
struct rte_flow_error *error = ctx->error;
+ int ret;
/* Register new destination array resource. */
cache_resource = mlx5_ipool_zmalloc(sh->ipool[MLX5_IPOOL_DEST_ARRAY],
/* Register new destination array resource. */
cache_resource = mlx5_ipool_zmalloc(sh->ipool[MLX5_IPOOL_DEST_ARRAY],
@@
-8946,11
+8967,12
@@
flow_dv_dest_array_create_cb(struct mlx5_cache_list *list __rte_unused,
}
}
/* create a dest array actioin */
}
}
/* create a dest array actioin */
-
cache_resource->action = mlx5_glue->
dr_create_flow_action_dest_array
+
ret = mlx5_os_flow_
dr_create_flow_action_dest_array
(domain,
cache_resource->num_of_dest,
(domain,
cache_resource->num_of_dest,
- dest_attr);
- if (!cache_resource->action) {
+ dest_attr,
+ &cache_resource->action);
+ if (ret) {
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,