From patchwork Tue Apr 11 15:21:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 23510 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 46A06567F; Tue, 11 Apr 2017 17:22:16 +0200 (CEST) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 3759C532E for ; Tue, 11 Apr 2017 17:22:15 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id t189so3748898wmt.1 for ; Tue, 11 Apr 2017 08:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Ga6M3okB1013N7K1yRPE5OWNGSSsFzm+685HyyWGu5M=; b=jSF8iVAYlOJz7382nEvtjpRoMrty7I1b/f83WBzVUpzNj2+lez58xsjh39v6y+9q6Z o4MD7qsPgrwcIZmlGwRzEmbwypr9g65CHDPcCq/Hdh+4T+U8sgaRQ3Y6OD93+vso7Hwg tpe5FCWurSEzv2j5qKPImIThF6lFHPIU/LyaT2GCIQrqEgDmqx89HXle6R9+TQyQFNTn /OC6kxe5dtHT5yd2do+S62+I6TU/TGlEgESkzCxf+K3Kw29T6UzMVQy9/s3Fu+G0mlHT UWQmuyvXMm6ohAhjJGONq7SdJ2fEbhfdl77PxlGRtIzYqCVDPaD+0nqCamnp40mn37vl aipg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ga6M3okB1013N7K1yRPE5OWNGSSsFzm+685HyyWGu5M=; b=bE5ugZj4hQygluJPW+SyiSjIcCuJbZbia4T6DLEHsl3wUccrCG9fiSwJ2ehfi9m2P3 3W8L3TIpGioYRgSsw8cvKgtt1MVpLadB3+UVz3Q+Nj388FC0vuxkvo2xfsMi5+zBvdjO nn967iBcNvGTMeBnpAlsZSG29LsiQDLvlCckTUovPE8nt1tiledPAElTY/NMJbizdWdL tg9kefdXHQI9qTu8Q9eDC+UJKONz65uHQmkey4mWC+O3T+Cvt6D6X1LxHv+Oow+Sv1Vh wTZF51r83FdHRvC1Esu9HsPbjNMaeuv7i/D98Wq/g8JtoHhXoJTj7Qg8KHoeW79Bexs5 xsxg== X-Gm-Message-State: AN3rC/6eF0z4fYcFfaeT0ZL6eQytTklAS+MUP6IVQLYT81xT+F4V7umtD85j8ctx4ye1B9DD X-Received: by 10.28.35.207 with SMTP id j198mr13267404wmj.17.1491924134710; Tue, 11 Apr 2017 08:22:14 -0700 (PDT) Received: from ping.vm.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id u145sm2887215wmu.1.2017.04.11.08.22.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 08:22:14 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Adrien Mazarguil Date: Tue, 11 Apr 2017 17:21:51 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH 1/2] net/mlx5: fix flow queues array allocation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Flow queues array offset is not properly computed causing all sorts of issues. Address it by making the rte_flow structure less complex. Fixes: 360663e1df46 ("net/mlx5: prepare support for RSS action rule") Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_flow.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 3691e95..c735c43 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -98,11 +98,11 @@ struct rte_flow { struct ibv_exp_flow *ibv_flow; /**< Verbs flow. */ struct ibv_exp_wq *wq; /**< Verbs work queue. */ struct ibv_cq *cq; /**< Verbs completion queue. */ - struct rxq *(*rxqs)[]; /**< Pointer to the queues array. */ uint16_t rxqs_n; /**< Number of queues in this flow, 0 if drop queue. */ uint32_t mark:1; /**< Set if the flow is marked. */ uint32_t drop:1; /**< Drop queue. */ uint64_t hash_fields; /**< Fields that participate in the hash. */ + struct rxq *rxqs[]; /**< Pointer to the queues array. */ }; /** Static initializer for items. */ @@ -1038,24 +1038,20 @@ priv_flow_create_action_queue(struct priv *priv, assert(priv->pd); assert(priv->ctx); assert(!action->drop); - rte_flow = rte_calloc(__func__, 1, - sizeof(*rte_flow) + sizeof(struct rxq *) * - action->queues_n, 0); + rte_flow = rte_calloc(__func__, 1, sizeof(*rte_flow) + + sizeof(*rte_flow->rxqs) * action->queues_n, 0); if (!rte_flow) { rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, NULL, "cannot allocate flow memory"); return NULL; } - rte_flow->rxqs = (struct rxq *(*)[])((uintptr_t)rte_flow + - sizeof(struct rxq *) * - action->queues_n); for (i = 0; i < action->queues_n; ++i) { struct rxq_ctrl *rxq; rxq = container_of((*priv->rxqs)[action->queues[i]], struct rxq_ctrl, rxq); wqs[i] = rxq->wq; - (*rte_flow->rxqs)[i] = &rxq->rxq; + rte_flow->rxqs[i] = &rxq->rxq; ++rte_flow->rxqs_n; rxq->rxq.mark |= action->mark; } @@ -1265,7 +1261,7 @@ priv_flow_destroy(struct priv *priv, * present in any other marked flow (RSS or not). */ for (queue_n = 0; queue_n < flow->rxqs_n; ++queue_n) { - rxq = (*flow->rxqs)[queue_n]; + rxq = flow->rxqs[queue_n]; for (tmp = LIST_FIRST(&priv->flows); tmp; tmp = LIST_NEXT(tmp, next)) { @@ -1278,7 +1274,7 @@ priv_flow_destroy(struct priv *priv, ++tqueue_n) { struct rxq *trxq; - trxq = (*tmp->rxqs)[tqueue_n]; + trxq = tmp->rxqs[tqueue_n]; if (rxq == trxq) ++mark_n; } @@ -1489,7 +1485,7 @@ priv_flow_stop(struct priv *priv) unsigned int n; for (n = 0; n < flow->rxqs_n; ++n) - (*flow->rxqs)[n]->mark = 0; + flow->rxqs[n]->mark = 0; } DEBUG("Flow %p removed", (void *)flow); } @@ -1534,7 +1530,7 @@ priv_flow_start(struct priv *priv) unsigned int n; for (n = 0; n < flow->rxqs_n; ++n) - (*flow->rxqs)[n]->mark = 1; + flow->rxqs[n]->mark = 1; } } return 0;