net/mlx5: move flow priority discovery to Verbs file
Function calls mlx5_flow_adjust_priority() and mlx5_flow_discover_priorities() are Verbs based. Move them from file mlx5_flow.c to file mlx5_flow_verbs.c Signed-off-by: Ophir Munk <ophirmu@mellanox.com> Acked-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Ophir Munk
Ferruh Yigit
parent
50f95b23c9
commit
3eca5f8a61
@ -927,7 +927,6 @@ int mlx5_traffic_restart(struct rte_eth_dev *dev);
|
||||
|
||||
int mlx5_flow_discover_mreg_c(struct rte_eth_dev *eth_dev);
|
||||
bool mlx5_flow_ext_mreg_supported(struct rte_eth_dev *dev);
|
||||
int mlx5_flow_discover_priorities(struct rte_eth_dev *dev);
|
||||
void mlx5_flow_print(struct rte_flow *flow);
|
||||
int mlx5_flow_validate(struct rte_eth_dev *dev,
|
||||
const struct rte_flow_attr *attr,
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
#include <rte_malloc.h>
|
||||
#include <rte_ip.h>
|
||||
|
||||
#include <mlx5_glue.h>
|
||||
#include <mlx5_devx_cmds.h>
|
||||
#include <mlx5_prm.h>
|
||||
#include <mlx5_malloc.h>
|
||||
@ -267,17 +266,6 @@ struct mlx5_fdir {
|
||||
struct rte_flow_action_queue queue;
|
||||
};
|
||||
|
||||
/* Map of Verbs to Flow priority with 8 Verbs priorities. */
|
||||
static const uint32_t priority_map_3[][MLX5_PRIORITY_MAP_MAX] = {
|
||||
{ 0, 1, 2 }, { 2, 3, 4 }, { 5, 6, 7 },
|
||||
};
|
||||
|
||||
/* Map of Verbs to Flow priority with 16 Verbs priorities. */
|
||||
static const uint32_t priority_map_5[][MLX5_PRIORITY_MAP_MAX] = {
|
||||
{ 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 },
|
||||
{ 9, 10, 11 }, { 12, 13, 14 },
|
||||
};
|
||||
|
||||
/* Tunnel information. */
|
||||
struct mlx5_flow_tunnel_info {
|
||||
uint64_t tunnel; /**< Tunnel bit (see MLX5_FLOW_*). */
|
||||
@ -483,106 +471,6 @@ mlx5_flow_ext_mreg_supported(struct rte_eth_dev *dev)
|
||||
return config->flow_mreg_c[2] != REG_NONE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Discover the maximum number of priority available.
|
||||
*
|
||||
* @param[in] dev
|
||||
* Pointer to the Ethernet device structure.
|
||||
*
|
||||
* @return
|
||||
* number of supported flow priority on success, a negative errno
|
||||
* value otherwise and rte_errno is set.
|
||||
*/
|
||||
int
|
||||
mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
|
||||
{
|
||||
struct mlx5_priv *priv = dev->data->dev_private;
|
||||
struct {
|
||||
struct ibv_flow_attr attr;
|
||||
struct ibv_flow_spec_eth eth;
|
||||
struct ibv_flow_spec_action_drop drop;
|
||||
} flow_attr = {
|
||||
.attr = {
|
||||
.num_of_specs = 2,
|
||||
.port = (uint8_t)priv->dev_port,
|
||||
},
|
||||
.eth = {
|
||||
.type = IBV_FLOW_SPEC_ETH,
|
||||
.size = sizeof(struct ibv_flow_spec_eth),
|
||||
},
|
||||
.drop = {
|
||||
.size = sizeof(struct ibv_flow_spec_action_drop),
|
||||
.type = IBV_FLOW_SPEC_ACTION_DROP,
|
||||
},
|
||||
};
|
||||
struct ibv_flow *flow;
|
||||
struct mlx5_hrxq *drop = mlx5_hrxq_drop_new(dev);
|
||||
uint16_t vprio[] = { 8, 16 };
|
||||
int i;
|
||||
int priority = 0;
|
||||
|
||||
if (!drop) {
|
||||
rte_errno = ENOTSUP;
|
||||
return -rte_errno;
|
||||
}
|
||||
for (i = 0; i != RTE_DIM(vprio); i++) {
|
||||
flow_attr.attr.priority = vprio[i] - 1;
|
||||
flow = mlx5_glue->create_flow(drop->qp, &flow_attr.attr);
|
||||
if (!flow)
|
||||
break;
|
||||
claim_zero(mlx5_glue->destroy_flow(flow));
|
||||
priority = vprio[i];
|
||||
}
|
||||
mlx5_hrxq_drop_release(dev);
|
||||
switch (priority) {
|
||||
case 8:
|
||||
priority = RTE_DIM(priority_map_3);
|
||||
break;
|
||||
case 16:
|
||||
priority = RTE_DIM(priority_map_5);
|
||||
break;
|
||||
default:
|
||||
rte_errno = ENOTSUP;
|
||||
DRV_LOG(ERR,
|
||||
"port %u verbs maximum priority: %d expected 8/16",
|
||||
dev->data->port_id, priority);
|
||||
return -rte_errno;
|
||||
}
|
||||
DRV_LOG(INFO, "port %u flow maximum priority: %d",
|
||||
dev->data->port_id, priority);
|
||||
return priority;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adjust flow priority based on the highest layer and the request priority.
|
||||
*
|
||||
* @param[in] dev
|
||||
* Pointer to the Ethernet device structure.
|
||||
* @param[in] priority
|
||||
* The rule base priority.
|
||||
* @param[in] subpriority
|
||||
* The priority based on the items.
|
||||
*
|
||||
* @return
|
||||
* The new priority.
|
||||
*/
|
||||
uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
|
||||
uint32_t subpriority)
|
||||
{
|
||||
uint32_t res = 0;
|
||||
struct mlx5_priv *priv = dev->data->dev_private;
|
||||
|
||||
switch (priv->config.flow_prio) {
|
||||
case RTE_DIM(priority_map_3):
|
||||
res = priority_map_3[priority][subpriority];
|
||||
break;
|
||||
case RTE_DIM(priority_map_5):
|
||||
res = priority_map_5[priority][subpriority];
|
||||
break;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify the @p item specifications (spec, last, mask) are compatible with the
|
||||
* NIC capabilities.
|
||||
|
||||
@ -922,6 +922,7 @@ int mlx5_flow_group_to_table(const struct rte_flow_attr *attributes,
|
||||
uint64_t mlx5_flow_hashfields_adjust(struct mlx5_flow_rss_desc *rss_desc,
|
||||
int tunnel, uint64_t layer_types,
|
||||
uint64_t hash_fields);
|
||||
int mlx5_flow_discover_priorities(struct rte_eth_dev *dev);
|
||||
uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
|
||||
uint32_t subpriority);
|
||||
int mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
|
||||
|
||||
@ -38,6 +38,118 @@
|
||||
#define VERBS_SPEC_INNER(item_flags) \
|
||||
(!!((item_flags) & MLX5_FLOW_LAYER_TUNNEL) ? IBV_FLOW_SPEC_INNER : 0)
|
||||
|
||||
/* Map of Verbs to Flow priority with 8 Verbs priorities. */
|
||||
static const uint32_t priority_map_3[][MLX5_PRIORITY_MAP_MAX] = {
|
||||
{ 0, 1, 2 }, { 2, 3, 4 }, { 5, 6, 7 },
|
||||
};
|
||||
|
||||
/* Map of Verbs to Flow priority with 16 Verbs priorities. */
|
||||
static const uint32_t priority_map_5[][MLX5_PRIORITY_MAP_MAX] = {
|
||||
{ 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 },
|
||||
{ 9, 10, 11 }, { 12, 13, 14 },
|
||||
};
|
||||
|
||||
/**
|
||||
* Discover the maximum number of priority available.
|
||||
*
|
||||
* @param[in] dev
|
||||
* Pointer to the Ethernet device structure.
|
||||
*
|
||||
* @return
|
||||
* number of supported flow priority on success, a negative errno
|
||||
* value otherwise and rte_errno is set.
|
||||
*/
|
||||
int
|
||||
mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
|
||||
{
|
||||
struct mlx5_priv *priv = dev->data->dev_private;
|
||||
struct {
|
||||
struct ibv_flow_attr attr;
|
||||
struct ibv_flow_spec_eth eth;
|
||||
struct ibv_flow_spec_action_drop drop;
|
||||
} flow_attr = {
|
||||
.attr = {
|
||||
.num_of_specs = 2,
|
||||
.port = (uint8_t)priv->dev_port,
|
||||
},
|
||||
.eth = {
|
||||
.type = IBV_FLOW_SPEC_ETH,
|
||||
.size = sizeof(struct ibv_flow_spec_eth),
|
||||
},
|
||||
.drop = {
|
||||
.size = sizeof(struct ibv_flow_spec_action_drop),
|
||||
.type = IBV_FLOW_SPEC_ACTION_DROP,
|
||||
},
|
||||
};
|
||||
struct ibv_flow *flow;
|
||||
struct mlx5_hrxq *drop = mlx5_hrxq_drop_new(dev);
|
||||
uint16_t vprio[] = { 8, 16 };
|
||||
int i;
|
||||
int priority = 0;
|
||||
|
||||
if (!drop) {
|
||||
rte_errno = ENOTSUP;
|
||||
return -rte_errno;
|
||||
}
|
||||
for (i = 0; i != RTE_DIM(vprio); i++) {
|
||||
flow_attr.attr.priority = vprio[i] - 1;
|
||||
flow = mlx5_glue->create_flow(drop->qp, &flow_attr.attr);
|
||||
if (!flow)
|
||||
break;
|
||||
claim_zero(mlx5_glue->destroy_flow(flow));
|
||||
priority = vprio[i];
|
||||
}
|
||||
mlx5_hrxq_drop_release(dev);
|
||||
switch (priority) {
|
||||
case 8:
|
||||
priority = RTE_DIM(priority_map_3);
|
||||
break;
|
||||
case 16:
|
||||
priority = RTE_DIM(priority_map_5);
|
||||
break;
|
||||
default:
|
||||
rte_errno = ENOTSUP;
|
||||
DRV_LOG(ERR,
|
||||
"port %u verbs maximum priority: %d expected 8/16",
|
||||
dev->data->port_id, priority);
|
||||
return -rte_errno;
|
||||
}
|
||||
DRV_LOG(INFO, "port %u flow maximum priority: %d",
|
||||
dev->data->port_id, priority);
|
||||
return priority;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adjust flow priority based on the highest layer and the request priority.
|
||||
*
|
||||
* @param[in] dev
|
||||
* Pointer to the Ethernet device structure.
|
||||
* @param[in] priority
|
||||
* The rule base priority.
|
||||
* @param[in] subpriority
|
||||
* The priority based on the items.
|
||||
*
|
||||
* @return
|
||||
* The new priority.
|
||||
*/
|
||||
uint32_t
|
||||
mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
|
||||
uint32_t subpriority)
|
||||
{
|
||||
uint32_t res = 0;
|
||||
struct mlx5_priv *priv = dev->data->dev_private;
|
||||
|
||||
switch (priv->config.flow_prio) {
|
||||
case RTE_DIM(priority_map_3):
|
||||
res = priority_map_3[priority][subpriority];
|
||||
break;
|
||||
case RTE_DIM(priority_map_5):
|
||||
res = priority_map_5[priority][subpriority];
|
||||
break;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get Verbs flow counter by index.
|
||||
*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user