d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: rename Verbs flow to generic name

Browse Source 
As part of the effort to support DPDK on Windows and other OS,
rename from IB related name to generic name.

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Dekel Peled 2020-06-28 17:06:50 +03:00 committed by Ferruh Yigit
parent 43330c4de3
commit 341c894104
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/mlx5/mlx5_flow.h
View File

@ -538,7 +538,7 @@ struct mlx5_flow_handle {
/**< Index to next device flow handle. */
uint64_t layers;
/**< Bit-fields of present layers, see MLX5_FLOW_LAYER_*. */
void *ib_flow; /**< Verbs flow pointer. */
void *drv_flow; /**< pointer to driver flow object. */
uint32_t split_flow_id:28; /**< Sub flow unique match flow id. */
uint32_t mark:1; /**< Metadate rxq mark flag. */
uint32_t fate_action:3; /**< Fate action type. */

11
drivers/net/mlx5/mlx5_flow_dv.c
View File

@ -8673,12 +8673,11 @@ __flow_dv_apply(struct rte_eth_dev *dev, struct rte_flow *flow,
dh->rix_default_fate = MLX5_FLOW_FATE_DEFAULT_MISS;
dv->actions[n++] = priv->sh->default_miss.action;
}
dh->ib_flow =
dh->drv_flow =
mlx5_glue->dv_create_flow(dv_h->matcher->matcher_object,
(void *)&dv->value, n,
dv->actions);
if (!dh->ib_flow) {
if (!dh->drv_flow) {
rte_flow_error_set(error, errno,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
@ -9041,9 +9040,9 @@ __flow_dv_remove(struct rte_eth_dev *dev, struct rte_flow *flow)
handle_idx);
if (!dh)
return;
if (dh->ib_flow) {
claim_zero(mlx5_glue->dv_destroy_flow(dh->ib_flow));
dh->ib_flow = NULL;
if (dh->drv_flow) {
claim_zero(mlx5_glue->dv_destroy_flow(dh->drv_flow));
dh->drv_flow = NULL;
}
if (dh->fate_action == MLX5_FLOW_FATE_DROP ||
dh->fate_action == MLX5_FLOW_FATE_QUEUE ||

12
drivers/net/mlx5/mlx5_flow_verbs.c
View File

@ -1778,9 +1778,9 @@ flow_verbs_remove(struct rte_eth_dev *dev, struct rte_flow *flow)
return;
SILIST_FOREACH(priv->sh->ipool[MLX5_IPOOL_MLX5_FLOW], flow->dev_handles,
handle_idx, handle, next) {
if (handle->ib_flow) {
claim_zero(mlx5_glue->destroy_flow(handle->ib_flow));
handle->ib_flow = NULL;
if (handle->drv_flow) {
claim_zero(mlx5_glue->destroy_flow(handle->drv_flow));
handle->drv_flow = NULL;
}
/* hrxq is union, don't touch it only the flag is set. */
if (handle->rix_hrxq) {
@ -1901,9 +1901,9 @@ flow_verbs_apply(struct rte_eth_dev *dev, struct rte_flow *flow,
handle->rix_hrxq = hrxq_idx;
}
MLX5_ASSERT(hrxq);
handle->ib_flow = mlx5_glue->create_flow(hrxq->qp,
&dev_flow->verbs.attr);
if (!handle->ib_flow) {
handle->drv_flow = mlx5_glue->create_flow
(hrxq->qp, &dev_flow->verbs.attr);
if (!handle->drv_flow) {
rte_flow_error_set(error, errno,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,