X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_flow_verbs.c;h=6b86437abcb964c49f8afd0312eb2c396575bf13;hb=bf89db4409bb43659ee49626f76869a31bb55150;hp=f70b879823969a07b8fdc9f5bdc3b800ea7b7180;hpb=77749adab954d0f3f4d2217a6908c7b82fbfabb8;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index f70b879823..6b86437abc 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -64,7 +64,7 @@ flow_verbs_counter_get_by_idx(struct rte_eth_dev *dev, MLX5_ASSERT(pool); if (ppool) *ppool = pool; - return &pool->counters_raw[idx % MLX5_COUNTERS_PER_POOL]; + return MLX5_POOL_GET_CNT(pool, idx % MLX5_COUNTERS_PER_POOL); } /** @@ -176,7 +176,7 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id) pool = cont->pools[pool_idx]; if (!pool) continue; - cnt = TAILQ_FIRST(&pool->counters); + cnt = TAILQ_FIRST(&pool->counters[0]); if (cnt) break; } @@ -201,22 +201,23 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id) cont->n += MLX5_CNT_CONTAINER_RESIZE; } /* Allocate memory for new pool*/ - size = sizeof(*pool) + sizeof(*cnt_ext) * + size = sizeof(*pool) + (sizeof(*cnt_ext) + sizeof(*cnt)) * MLX5_COUNTERS_PER_POOL; pool = rte_calloc(__func__, 1, size, 0); if (!pool) return 0; + pool->type |= CNT_POOL_TYPE_EXT; for (i = 0; i < MLX5_COUNTERS_PER_POOL; ++i) { - cnt = &pool->counters_raw[i]; - TAILQ_INSERT_HEAD(&pool->counters, cnt, next); + cnt = MLX5_POOL_GET_CNT(pool, i); + TAILQ_INSERT_HEAD(&pool->counters[0], cnt, next); } - cnt = &pool->counters_raw[0]; + cnt = MLX5_POOL_GET_CNT(pool, 0); cont->pools[n_valid] = pool; pool_idx = n_valid; rte_atomic16_add(&cont->n_valid, 1); TAILQ_INSERT_HEAD(&cont->pool_list, pool, next); } - i = cnt - pool->counters_raw; + i = MLX5_CNT_ARRAY_IDX(pool, cnt); cnt_ext = MLX5_GET_POOL_CNT_EXT(pool, i); cnt_ext->id = id; cnt_ext->shared = shared; @@ -226,7 +227,7 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id) /* Create counter with Verbs. */ ret = flow_verbs_counter_create(dev, cnt_ext); if (!ret) { - TAILQ_REMOVE(&pool->counters, cnt, next); + TAILQ_REMOVE(&pool->counters[0], cnt, next); return MLX5_MAKE_CNT_IDX(pool_idx, i); } /* Some error occurred in Verbs library. */ @@ -260,7 +261,7 @@ flow_verbs_counter_release(struct rte_eth_dev *dev, uint32_t counter) claim_zero(mlx5_glue->destroy_counters(cnt_ext->cs)); cnt_ext->cs = NULL; #endif - TAILQ_INSERT_HEAD(&pool->counters, cnt, next); + TAILQ_INSERT_HEAD(&pool->counters[0], cnt, next); } } @@ -282,7 +283,7 @@ flow_verbs_counter_query(struct rte_eth_dev *dev __rte_unused, struct mlx5_flow_counter *cnt = flow_verbs_counter_get_by_idx (dev, flow->counter, &pool); struct mlx5_flow_counter_ext *cnt_ext = MLX5_CNT_TO_CNT_EXT - (pool, cnt); + (pool, cnt); struct rte_flow_query_count *qc = data; uint64_t counters[2] = {0, 0}; #if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42) @@ -678,6 +679,28 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow, udp.val.src_port &= udp.mask.src_port; udp.val.dst_port &= udp.mask.dst_port; } + item++; + while (item->type == RTE_FLOW_ITEM_TYPE_VOID) + item++; + if (!(udp.val.dst_port & udp.mask.dst_port)) { + switch ((item)->type) { + case RTE_FLOW_ITEM_TYPE_VXLAN: + udp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN); + udp.mask.dst_port = 0xffff; + break; + case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: + udp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN_GPE); + udp.mask.dst_port = 0xffff; + break; + case RTE_FLOW_ITEM_TYPE_MPLS: + udp.val.dst_port = htons(MLX5_UDP_PORT_MPLS); + udp.mask.dst_port = 0xffff; + break; + default: + break; + } + } + flow_verbs_spec_add(&dev_flow->verbs, &udp, size); } @@ -941,21 +964,19 @@ flow_verbs_translate_action_drop * the input is valid and that there is space to insert the requested action * into the flow. * - * @param[in] dev_flow - * Pointer to mlx5_flow. + * @param[in] rss_desc + * Pointer to mlx5_flow_rss_desc. * @param[in] action * Action configuration. */ static void -flow_verbs_translate_action_queue(struct mlx5_flow *dev_flow, +flow_verbs_translate_action_queue(struct mlx5_flow_rss_desc *rss_desc, const struct rte_flow_action *action) { const struct rte_flow_action_queue *queue = action->conf; - struct rte_flow *flow = dev_flow->flow; - if (flow->rss.queue) - (*flow->rss.queue)[0] = queue->index; - flow->rss.queue_num = 1; + rss_desc->queue[0] = queue->index; + rss_desc->queue_num = 1; } /** @@ -963,28 +984,23 @@ flow_verbs_translate_action_queue(struct mlx5_flow *dev_flow, * the input is valid and that there is space to insert the requested action * into the flow. * + * @param[in] rss_desc + * Pointer to mlx5_flow_rss_desc. * @param[in] action * Action configuration. - * @param[in, out] action_flags - * Pointer to the detected actions. - * @param[in] dev_flow - * Pointer to mlx5_flow. */ static void -flow_verbs_translate_action_rss(struct mlx5_flow *dev_flow, +flow_verbs_translate_action_rss(struct mlx5_flow_rss_desc *rss_desc, const struct rte_flow_action *action) { const struct rte_flow_action_rss *rss = action->conf; const uint8_t *rss_key; - struct rte_flow *flow = dev_flow->flow; - if (flow->rss.queue) - memcpy((*flow->rss.queue), rss->queue, - rss->queue_num * sizeof(uint16_t)); - flow->rss.queue_num = rss->queue_num; + memcpy(rss_desc->queue, rss->queue, rss->queue_num * sizeof(uint16_t)); + rss_desc->queue_num = rss->queue_num; /* NULL RSS key indicates default RSS key. */ rss_key = !rss->key ? rss_hash_default_key : rss->key; - memcpy(flow->rss.key, rss_key, MLX5_RSS_HASH_KEY_LEN); + memcpy(rss_desc->key, rss_key, MLX5_RSS_HASH_KEY_LEN); /* * rss->level and rss.types should be set in advance when expanding * items for RSS. @@ -1115,6 +1131,8 @@ flow_verbs_translate_action_count(struct mlx5_flow *dev_flow, * Pointer to the list of actions. * @param[in] external * This flow rule is created by request external to PMD. + * @param[in] hairpin + * Number of hairpin TX actions, 0 means classic flow. * @param[out] error * Pointer to the error structure. * @@ -1127,6 +1145,7 @@ flow_verbs_validate(struct rte_eth_dev *dev, const struct rte_flow_item items[], const struct rte_flow_action actions[], bool external __rte_unused, + int hairpin __rte_unused, struct rte_flow_error *error) { int ret; @@ -1541,6 +1560,7 @@ flow_verbs_prepare(struct rte_eth_dev *dev, dev_flow->verbs.size = 0; dev_flow->verbs.attr.num_of_specs = 0; dev_flow->ingress = attr->ingress; + dev_flow->hash_fields = 0; /* Need to set transfer attribute: not supported in Verbs mode. */ return dev_flow; } @@ -1577,6 +1597,9 @@ flow_verbs_translate(struct rte_eth_dev *dev, uint64_t priority = attr->priority; uint32_t subpriority = 0; struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_flow_rss_desc *rss_desc = &((struct mlx5_flow_rss_desc *) + priv->rss_desc) + [!!priv->flow_nested_idx]; if (priority == MLX5_FLOW_PRIO_RSVD) priority = priv->config.flow_prio - 1; @@ -1602,12 +1625,12 @@ flow_verbs_translate(struct rte_eth_dev *dev, dev_flow->handle->fate_action = MLX5_FLOW_FATE_DROP; break; case RTE_FLOW_ACTION_TYPE_QUEUE: - flow_verbs_translate_action_queue(dev_flow, actions); + flow_verbs_translate_action_queue(rss_desc, actions); action_flags |= MLX5_FLOW_ACTION_QUEUE; dev_flow->handle->fate_action = MLX5_FLOW_FATE_QUEUE; break; case RTE_FLOW_ACTION_TYPE_RSS: - flow_verbs_translate_action_rss(dev_flow, actions); + flow_verbs_translate_action_rss(rss_desc, actions); action_flags |= MLX5_FLOW_ACTION_RSS; dev_flow->handle->fate_action = MLX5_FLOW_FATE_QUEUE; break; @@ -1655,7 +1678,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, subpriority = MLX5_PRIORITY_MAP_L3; dev_flow->hash_fields |= mlx5_flow_hashfields_adjust - (dev_flow, tunnel, + (rss_desc, tunnel, MLX5_IPV4_LAYER_TYPES, MLX5_IPV4_IBV_RX_HASH); item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV4 : @@ -1667,7 +1690,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, subpriority = MLX5_PRIORITY_MAP_L3; dev_flow->hash_fields |= mlx5_flow_hashfields_adjust - (dev_flow, tunnel, + (rss_desc, tunnel, MLX5_IPV6_LAYER_TYPES, MLX5_IPV6_IBV_RX_HASH); item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV6 : @@ -1679,7 +1702,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, subpriority = MLX5_PRIORITY_MAP_L4; dev_flow->hash_fields |= mlx5_flow_hashfields_adjust - (dev_flow, tunnel, ETH_RSS_TCP, + (rss_desc, tunnel, ETH_RSS_TCP, (IBV_RX_HASH_SRC_PORT_TCP | IBV_RX_HASH_DST_PORT_TCP)); item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP : @@ -1691,7 +1714,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, subpriority = MLX5_PRIORITY_MAP_L4; dev_flow->hash_fields |= mlx5_flow_hashfields_adjust - (dev_flow, tunnel, ETH_RSS_UDP, + (rss_desc, tunnel, ETH_RSS_UDP, (IBV_RX_HASH_SRC_PORT_UDP | IBV_RX_HASH_DST_PORT_UDP)); item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_UDP : @@ -1732,7 +1755,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, /* Other members of attr will be ignored. */ dev_flow->verbs.attr.priority = mlx5_flow_adjust_priority(dev, priority, subpriority); - dev_flow->verbs.attr.port = (uint8_t)priv->ibv_port; + dev_flow->verbs.attr.port = (uint8_t)priv->dev_port; return 0; } @@ -1848,19 +1871,22 @@ flow_verbs_apply(struct rte_eth_dev *dev, struct rte_flow *flow, } } else { uint32_t hrxq_idx; + struct mlx5_flow_rss_desc *rss_desc = + &((struct mlx5_flow_rss_desc *)priv->rss_desc) + [!!priv->flow_nested_idx]; - MLX5_ASSERT(flow->rss.queue); - hrxq_idx = mlx5_hrxq_get(dev, flow->rss.key, + MLX5_ASSERT(rss_desc->queue_num); + hrxq_idx = mlx5_hrxq_get(dev, rss_desc->key, MLX5_RSS_HASH_KEY_LEN, dev_flow->hash_fields, - (*flow->rss.queue), - flow->rss.queue_num); + rss_desc->queue, + rss_desc->queue_num); if (!hrxq_idx) - hrxq_idx = mlx5_hrxq_new(dev, flow->rss.key, + hrxq_idx = mlx5_hrxq_new(dev, rss_desc->key, MLX5_RSS_HASH_KEY_LEN, dev_flow->hash_fields, - (*flow->rss.queue), - flow->rss.queue_num, + rss_desc->queue, + rss_desc->queue_num, !!(handle->layers & MLX5_FLOW_LAYER_TUNNEL)); hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ],