From patchwork Wed Jan 3 09:14:19 2018 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: 32849 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 135171B1B2; Wed, 3 Jan 2018 10:15:17 +0100 (CET) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id E90C11B1A5 for ; Wed, 3 Jan 2018 10:15:15 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id i11so1487244wmf.4 for ; Wed, 03 Jan 2018 01:15:15 -0800 (PST) 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=u2/kBS+BNnvQXDcM3FendQEUe39a4TChjxUh+57Q5Iw=; b=DCBQddiexyCtTKjuT0Oq3q4xE9jeZEO4Fi2pDxM2ErRhG9eXf2CKeNFelMLVlCg96h PWJA+6ZU1k6qxnq1TFy8d4U5ZdAM7Gd4IyQiR61vDTjTkwkj+BADM3ogsiaqKPRgzC8A 5iwU8GweVieSH/KSpzqePy8rOAjoh77nWv7EnFdVp3lvZTTkwppwmNeqwFk8h1Ubi2V7 STytEFzt/4VTxCtfuhYV5TEPL2GI3BVtqYDS2jxnd5UWsuZVRx8iFaOmoLoCd/RCKBEC L2iu9r/qIFw9E/Q8K6SThhE7W1Hg3ofBBsXSx2ioodiEreAYcJd5+QSjaQ36J/gvrHGg E3zA== 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=u2/kBS+BNnvQXDcM3FendQEUe39a4TChjxUh+57Q5Iw=; b=gF8KSHFsM1DHFAzD3YCdbjErTEWLli/tzQ+EDfVI5RQj+3RjzGVorpenvDDgQYA1Om xSzU0he1PTYU3cSltKPj0fTmbWf2yl0TLragEb6WEiwEm4rQ8qj2/+ZdpeRSsnXkxYTS NWqyod9Q4KK20AJfw2Q2v6ue5YLokCWTgpsVSZ9vaHTE1FJ3R3rhxzmoH690XfG1oP5l B+txZzs9XM7YZ5uFil5T0jh5wyS8kz7DTuIcLKHQcnuexXzXFmGN990bWC5hqE1MR4Kf +58h0PwtLoeIkeJJUuFjkzpKa7tjT6Y1cEQ1qP7GPMkRrYu5c3N6tPT1XM+qGC4aUa30 ZQQg== X-Gm-Message-State: AKGB3mJbJdxgPEex51z+ZsXLMt0+ZNmBBJgzwote0TCyWI1siQC1Y6Ry Yz3lMLd73sdy+8d7wG2wPN29KxkHYg== X-Google-Smtp-Source: ACJfBouJ8vwkle2fs7o2EqsE764uPWPQlr8VI493I0Q3/jIvZj6UADn+uxAvvaTCCdFEXapO84uKQQ== X-Received: by 10.80.158.15 with SMTP id z15mr1708591ede.262.1514970915430; Wed, 03 Jan 2018 01:15:15 -0800 (PST) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id x17sm506909edx.9.2018.01.03.01.15.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 01:15:14 -0800 (PST) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Yongseok Koh , Adrien Mazarguil , stable@dpdk.org Date: Wed, 3 Jan 2018 10:14:19 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH] net/mlx5: fix un-supported RSS hash fields use 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" MLX5 NIC does not support all hash fields, this patch limit by refusing impossible RSS combination to avoid errors. Fixes: 2f97422e7759 ("mlx5: support RSS hash update and get") Cc: stable@dpdk.org Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_defs.h | 5 +++++ drivers/net/mlx5/mlx5_flow.c | 11 +++++++++-- drivers/net/mlx5/mlx5_rss.c | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 3a7706cfd..64bb0712e 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -34,6 +34,8 @@ #ifndef RTE_PMD_MLX5_DEFS_H_ #define RTE_PMD_MLX5_DEFS_H_ +#include + #include "mlx5_autoconf.h" /* Reported driver name. */ @@ -105,4 +107,7 @@ /* Number of packets vectorized Rx can simultaneously process in a loop. */ #define MLX5_VPMD_DESCS_PER_LOOP 4 +/* Supported RSS */ +#define MLX5_RSS_HF_MASK (~(ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP)) + #endif /* RTE_PMD_MLX5_DEFS_H_ */ diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 6605cfd9f..e0775172c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -50,6 +50,7 @@ #include #include "mlx5.h" +#include "mlx5_defs.h" #include "mlx5_prm.h" /* Define minimal priority for control plane flows. */ @@ -568,9 +569,15 @@ priv_flow_convert_rss_conf(struct priv *priv, struct mlx5_flow_parse *parser, const struct rte_eth_rss_conf *rss_conf) { - const struct rte_eth_rss_conf *rss = - rss_conf ? rss_conf : &priv->rss_conf; + const struct rte_eth_rss_conf *rss; + if (rss_conf) { + if (rss_conf->rss_hf & MLX5_RSS_HF_MASK) + return EINVAL; + rss = rss_conf; + } else { + rss = &priv->rss_conf; + } if (rss->rss_key_len > 40) return EINVAL; parser->rss_conf.rss_key_len = rss->rss_key_len; diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index f4911359b..f47bda667 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -51,6 +51,7 @@ #include #include "mlx5.h" +#include "mlx5_defs.h" #include "mlx5_rxtx.h" /** @@ -72,6 +73,10 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev, int ret = 0; priv_lock(priv); + if (rss_conf->rss_hf & MLX5_RSS_HF_MASK) { + ret = -EINVAL; + goto out; + } if (rss_conf->rss_key && rss_conf->rss_key_len) { priv->rss_conf.rss_key = rte_realloc(priv->rss_conf.rss_key, rss_conf->rss_key_len, 0);