From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nelio Laranjeiro Subject: [PATCH 2/4] net/mlx5: fix flow single queue Date: Tue, 13 Mar 2018 15:17:37 +0100 Message-ID: <07145c9505263ba30de44a5c5186431935b98884.1520950386.git.nelio.laranjeiro@6wind.com> References: Cc: dev@dpdk.org, stable@dpdk.org To: Adrien Mazarguil , Yongseok Koh Return-path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id A318AA49B for ; Tue, 13 Mar 2018 15:18:57 +0100 (CET) Received: by mail-wr0-f194.google.com with SMTP id z12so23197875wrg.4 for ; Tue, 13 Mar 2018 07:18:57 -0700 (PDT) In-Reply-To: In-Reply-To: References: <7aeb54018d1a8dd06638632076f25fbc88945afd.1518686582.git.nelio.laranjeiro@6wind.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The flow is created with any steering being applied in the NIC when the device is handling a single Rx queue. Fixes: cede123a158f ("net/mlx5: fix flow creation with a single target queue") Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow") Cc: stable@dpdk.org Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_flow.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e1ffb38a5..e7040daad 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -937,11 +937,12 @@ mlx5_flow_convert_finalise(struct mlx5_flow_parse *parser) /* Remove any other flow not matching the pattern. */ if (parser->queues_n == 1) { for (i = 0; i != hash_rxq_init_n; ++i) { - if (i == parser->layer || !parser->queue[i].ibv_attr) + if (i == HASH_RXQ_ETH) continue; rte_free(parser->queue[i].ibv_attr); parser->queue[i].ibv_attr = NULL; } + return; } if (parser->layer == HASH_RXQ_ETH) { goto fill; @@ -1807,6 +1808,7 @@ mlx5_flow_create_action_queue(struct rte_eth_dev *dev, struct priv *priv = dev->data->dev_private; int ret; unsigned int i; + unsigned int flows_n = 0; assert(priv->pd); assert(priv->ctx); @@ -1830,12 +1832,18 @@ mlx5_flow_create_action_queue(struct rte_eth_dev *dev, NULL, "flow rule creation failure"); goto error; } + ++flows_n; DRV_LOG(DEBUG, "port %u %p type %d QP %p ibv_flow %p", dev->data->port_id, (void *)flow, i, (void *)flow->frxq[i].hrxq, (void *)flow->frxq[i].ibv_flow); } + if (!flows_n) { + rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, + NULL, "internal error in flow creation"); + goto error; + } for (i = 0; i != parser->queues_n; ++i) { struct mlx5_rxq_data *q = (*priv->rxqs)[parser->queues[i]]; -- 2.11.0