From patchwork Mon Apr 3 11:25:15 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: 23151 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 90AAE2C18; Mon, 3 Apr 2017 13:25:32 +0200 (CEST) Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by dpdk.org (Postfix) with ESMTP id 9DA342BBE for ; Mon, 3 Apr 2017 13:25:31 +0200 (CEST) Received: by mail-wr0-f169.google.com with SMTP id w11so163815625wrc.3 for ; Mon, 03 Apr 2017 04:25:31 -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:in-reply-to:references; bh=RPE8AQmgR7os95/dTEsXWhVenZ65jLBc7QeYD/b1rvI=; b=S1s55JUwVl+kP+JzYFWYHCd6xDjeIOWgyvr9/JgC+usfpQUqrpq9EAs/T1jY/pwwUx ws7qupCczLA4HK4VbhOQOC4qv3KOU+4rtmxESeViCBjv2eCtwBbPv1dwluLpSb6lFssG ak7Y6CnGCbEcnpnUmxAFuLd3qveeoE7j8g/650W9XGYf6RekxLLflUEeBEHqHZdDblYx 9X16ui7vmB4WpUPeWbiqdSGVPENeLaONdt6ielfHAYH7mP2fZA1sdcOyGKDO0jr3o3hb RsVA8jng51R3RSEEjjNUpdOrAhCzZJ6nwrO1yH11QNH7ZsUsGo4BWDvtlSpi71RaFxzx 2Rrg== 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:in-reply-to :references; bh=RPE8AQmgR7os95/dTEsXWhVenZ65jLBc7QeYD/b1rvI=; b=cNn6ug7Wd4SWk92PY61blZfzuC0yZg0DVDVZ9oH0l1UuQAqeNJcpGqaTjRSyRfRRkc Uvc5b7jTX+nDqKQEPbMZmIE3hrcVHf/exFexvFBhay0ZGAnWdaBmtS5zeFKFBhJJW9zG uP4UJAZrVPxymwm4SyBsWAB3daP6eRJ38q6tJCNEoN9syXOkLgzjo2UoKuFaspH28NXo Ji7rIq4WGLsyK3fEh55gLkpcB7E6fPlOQNNH8x3SWpazHKZRus8yt0leWWFWm7R4+dk4 mRFzcFQSxfUyFTrwb78RCPLOnyzIZmGO0lBNKoBYy6fPOHrm3/1F7yhEoF4XD6X+LT5g bLhQ== X-Gm-Message-State: AFeK/H2iNavP5GWn7MkLfDqEnORXH0QzZwiiFEccI1V2a4AyI0zzfjchnlb7A0Gzc59HdCAx X-Received: by 10.28.186.70 with SMTP id k67mr8857671wmf.65.1491218731006; Mon, 03 Apr 2017 04:25:31 -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 b66sm16255066wrd.29.2017.04.03.04.25.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 04:25:30 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Ferruh Yigit Cc: Adrien Mazarguil , Yongseok Koh Date: Mon, 3 Apr 2017 13:25:15 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: <2a99263e0ab95c4af08ffb2dc17084a72b9265ee.1490773631.git.nelio.laranjeiro@6wind.com> References: <2a99263e0ab95c4af08ffb2dc17084a72b9265ee.1490773631.git.nelio.laranjeiro@6wind.com> Subject: [dpdk-dev] [PATCH] net/mlx5: fix RSS flow rule with non existing queues 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" RSS flow rule validation accepts any queue even non existing ones which causes a segmentation fault at creation time. Fixes: fb4db56ea074 ("net/mlx5: support RSS action flow rule") Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil Acked-by: Yongseok Koh --- To be integrated after DPDK 17.05-rc1 v2: split the patch-set in two distinct patches. --- drivers/net/mlx5/mlx5_flow.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index b34be55..3691e95 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -488,16 +488,18 @@ priv_flow_validate(struct priv *priv, break; } } - if (action->queues_n && !found) { + if (action->queues_n > 1 && !found) { rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, actions, "queue action not in RSS queues"); return -rte_errno; } - action->queue = 1; - action->queues_n = 1; - action->queues[0] = queue->index; + if (!found) { + action->queue = 1; + action->queues_n = 1; + action->queues[0] = queue->index; + } } else if (actions->type == RTE_FLOW_ACTION_TYPE_RSS) { const struct rte_flow_action_rss *rss = (const struct rte_flow_action_rss *) @@ -524,6 +526,16 @@ priv_flow_validate(struct priv *priv, return -rte_errno; } } + for (n = 0; n < rss->num; ++n) { + if (rss->queue[n] >= priv->rxqs_n) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "queue id > number of" + " queues"); + return -rte_errno; + } + } action->queue = 1; for (n = 0; n < rss->num; ++n) action->queues[n] = rss->queue[n];