From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0062.outbound.protection.outlook.com [104.47.0.62]) by dpdk.org (Postfix) with ESMTP id CF76B58FA for ; Thu, 17 May 2018 13:04:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2LYZX8Piz7cq03aoIbMwY9fi4HshyaU9XyVU0tPtFv4=; b=chNMFncqMB7/8VhX3OUL4WsfBXzDK5uIHU/Q1AdcNJmkY1hjvoMGiNGavKDwNd/yobuSlUQRPCbRUECxpwmQ/iBtMvVil0E57yyMhYFbAQVtivNYQph/DQDMGosjXtQ6trXiMWlshdRfek+pUg7VBt6LIaKc3/WhZ0jcNArEm94= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ophirmu@mellanox.com; Received: from mellanox.com (37.142.13.130) by AM4PR0501MB2306.eurprd05.prod.outlook.com (2603:10a6:200:53::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.776.11; Thu, 17 May 2018 11:04:51 +0000 From: Ophir Munk To: dev@dpdk.org, Adrien Mazarguil Cc: Thomas Monjalon , Olga Shern , Ophir Munk , Shahaf Shuler Date: Thu, 17 May 2018 11:04:40 +0000 Message-Id: <1526555080-19259-1-git-send-email-ophirmu@mellanox.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: VI1PR08CA0166.eurprd08.prod.outlook.com (2603:10a6:800:d1::20) To AM4PR0501MB2306.eurprd05.prod.outlook.com (2603:10a6:200:53::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM4PR0501MB2306; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2306; 3:IqtfoXpt7EKUhxltIoGZUt2ZBmEB+ljTyUSSIBj+ZJ2f38bdQS2CcGgzm0W8ANt4XGIDBhmKE7WgYbDtxUq2WrASenOdbxC+6dwfSwudiQ+5JGWdM0ViIeJMsYezFkQow9BKyHn/6ZUg/nyKXJ+DW1BI+KXVvrKMmJ3332JNUNEPryFED6C/g2qNvUw0gPv9tqYIS1sFVPx7ASjTGqzYrxDJMq9JUUi7xF8+eBXyEdSRduPpEz+lPxnphcOwz2yu; 25:YyVoTTDfZbyMYEwmvPx5H4C8eG8DbFIZmMQQq5ELxUYBvc0TWeP1pt5LQvDxANJmK9+mI28bITUVieDuZjni/8BqXgOJtHRxpYEuZ11Nw6thqNvkN33yitPgvR2Z8u3TF29WFIN4TjSqoia+cQ7pFLzLuvMMisaogU543dSwWSR4JHZ+XZnRB4E2I8j1rb9EV4Q5esiMrkhRk1zN1VbGMMJlfwtxXtVuIm8VHzIe/uX1LyfqF2E1ymMEnBZ7KaB1t+fvqqgjIdO/BgKQlLqQCmzWrZHK6lFK+DOVUkHWYZF3B4TD4GMFiHCLpXVfP4ZUuqp3EnTTT1Rq+hxxkWrqkQ==; 31:4DWiYrGWKALU4bEEfhUj65E4S8v8H3tIMpwmzJ3NU1J/ldEuUDaMw7eE7AOxg5inzceXtPRVKTLckGkywG+UiuwCFYxU1Sbxzb7GjYdiHpO+iNKpAj4emUJfqSZUG/xe/VUAgmHqyj+3uEoSj66gWJYwMHopj+3bLz0VRVTW1jHCJ/nXM854Kgm6Sjzs6JLFOwl99pkK7Wka2lMOisQ7gMkf/s3qRBTjsMWleGoT/70= X-MS-TrafficTypeDiagnostic: AM4PR0501MB2306: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2306; 20:qERu/k2eQjVeWiNviy76ieO6myYXqUoZreBaapeIKmamAgev4BWvGy3eDMy0w8o7eJ6R6zOrS2N3YyQxZxP64ZrAb4rvKo628hVtMw+ll2XEt8o6GMa4c46giQ4B2MMg6IFzCgFiIDJhAzDbn6SsDxjSoLI2yGmBfJaMsG+jM4r08SFNMIh4MkAu4arO0eQy+83aBcD+ApThdsPMqI9Vx4HIe8tuawOeUu1RtN70q/6zB9nnonBwy1jZwHNMUOykhIsIxxN77IgKqf2Qsn0puCiNHa/ZAHzRC1rv73WuK/Jj8INPcjVtTXmHqMG0RBF5Gkgcmk47+BkWqJeLOuTMB3qfYXvuYiLIuEcfZf/BVnfPiIpGuHtS+fDjc3QSm8BgFQYCCDzPA5106voFGrmuOvGDmcje6Jg7UWiUOvAnhyoxdQjU+UE8Rj3z1TVYWQNUIKYbJpon8V6ae0Qiey6KyoFHZhg2OI2lsy1Tlrc0w0qqTl8wANV4cLMF7k2nMDpD; 4:5wGu7cZqUOXiC3tJP96iNB4gH71nssLAdRuJrXZAl23W+yxlPm4REjXEqzKA6M2QNvhDmDfj9pP8lvJXk5b+uSkjHN8Sr6AidCL5tk4TSAVZDG/ffVPHZSexWO/OvXKDm9wWiF3+TFKRG+Ijp45iCeE5qVxJygzibZvtQq/G08WMtuZtPFNQ5PXFbcjBOjPVV2ftcCtLQqXZKV8+t7/5OnMXRTt2k/00I3YCvPsceIJfyet1Ze9r3JyYxgkPTGdEBXMeIwsanoFSjIHeCs1kKg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:AM4PR0501MB2306; BCL:0; PCL:0; RULEID:; SRVR:AM4PR0501MB2306; X-Forefront-PRVS: 067553F396 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(39380400002)(376002)(346002)(366004)(199004)(189003)(2616005)(956004)(476003)(15650500001)(69596002)(305945005)(7736002)(2906002)(47776003)(33026002)(8676002)(81156014)(81166006)(68736007)(36756003)(50466002)(48376002)(316002)(16586007)(8936002)(54906003)(66066001)(50226002)(107886003)(386003)(97736004)(105586002)(6666003)(7696005)(52116002)(4720700003)(5660300001)(55016002)(16526019)(59450400001)(478600001)(4326008)(6916009)(51416003)(21086003)(53936002)(486006)(26005)(6116002)(86362001)(25786009)(3846002)(106356001)(186003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR0501MB2306; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR0501MB2306; 23:0egvibJuVFh9l7G2OksBQ7dM8YO3qhTB5o8+QMr?= =?us-ascii?Q?OumC1QTYw6NIm+E8kO3n3j7YI1hT+k24Gji4f/Wmois7n0lzwmAHhWTjKLWI?= =?us-ascii?Q?9Mzk/6BzY3mR9jeBFJU1yK0tEr2o1cpkF1IwUvoRyW5n/+Wnvm+d3GhjqAka?= =?us-ascii?Q?0T5SAlTNn6u7z/lNZ/8mdOF/8yILLvj8PCS5V05bhqHwCmgg+1RnufwtndSI?= =?us-ascii?Q?jPM4+dfz4obSuU3PkbxYLO2CA3YP4IL6bs4xpsTiMTpamQI+LZw6puRNkOL7?= =?us-ascii?Q?1Uffhc3E0eUt37XWdabixTv9YNCenmgdwiENK5+CXgJeyAO6JO7W4sLtYy60?= =?us-ascii?Q?TGElICsQKSU8wVXg0jIPqKFd1pv1I64xBZbRpnMLTS5kJhv8kqMLlr4Q0zDK?= =?us-ascii?Q?0wpsITHiSpUJmuee3jUGYSrF6THZ7YmYwTNmZKGdt/qUT97ssQu6BKXaTTOp?= =?us-ascii?Q?ULWr9rNUAldeIZ/DvX7YVmxntoMwaPg+XOzIzCPjeYFwJnreDcbljIkSqr4k?= =?us-ascii?Q?eYrC6GAYbmPjefH4JOIcnRi0tadslgu6mhOIj5IpwMMoz75QryiE+g56Y+DA?= =?us-ascii?Q?GFAseDsxZNlVRtQHaJOkUzPAA4JqNGfkhMtsUYEmmtZfKEZcJFYKFbYV9fcx?= =?us-ascii?Q?IRLHOyyP6d6q8FnEWYReuoeV4SyLSME6uydlUNxZpIwhPg+cZ8rh5fPNM1of?= =?us-ascii?Q?PAcg1L0O1MId28i0tTYfHklBheyegUvbboXNg2jyINK58mtGbsbZCu4fsRzR?= =?us-ascii?Q?H2dxAz5onkHx8/v8klXe0HA2HKjFaHfxsx3f7qLORGmkZE61eO4nbyyQA97h?= =?us-ascii?Q?rqyiZbEMqysMKmXrhVI72y+yeuHulprx63I2EenOiF1vv6ZXBHLNcV/UJD+R?= =?us-ascii?Q?gDrNlUwXxKOrJnjnC1At0lwiOgSwboHOtSXF00Huklke9eTKxvS1rQqrTmBI?= =?us-ascii?Q?X9xiEIzOJYDU+hpq56GoSJ7InQKAXT0FhU9bWjhqzsKbn9jixhMOtCEGoogp?= =?us-ascii?Q?n1HI1bO0SoAvSXZbSiHWsntA18GnKPhb2R6IxPAQLf1ad5zEVtmOSFjF2ydp?= =?us-ascii?Q?j/OtVt9kyeptkvg4c9hYtQjCEVJhYMHZ4MuEDEd9sCZNDviFskmk8BjkBBbc?= =?us-ascii?Q?LWLeN1dCShz62abbgDpebvTnWWZeaMHJAvr4iIpoG8XsdDC4Q+tmndnkdp93?= =?us-ascii?Q?m/yIq6N/A/wxoYGsW+N6E+U6UFbJp8CqbTYPOrxATh8I3JtJs5IEjm6yxsg7?= =?us-ascii?Q?MKrbtwgS7b4ZutE7J2pBRmYhbgJPxRizZe3+i31pYI0DI56UV517lDYpZSrf?= =?us-ascii?Q?9bg=3D=3D?= X-Microsoft-Antispam-Message-Info: UujZwuVRYEx/4uGTGTUjOB6jG9tM5IuA9thRsvoP5yDJWqTR6qmZWCZIBolLJrLl0Jm+s2tRQDMzKKTOfk7YaPwNjy3v0Ge8+mNCByM5NhqNriJO/4JpQUpEuihp9EkjPtginqmDhal8GMjC0MaqUtOK02pYTmxbjxUbSzMdltNi1G1qIABnjsCMJt2TL1Ml X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2306; 6:iL6LxWJCEFAXtyBYhUf8BmUtNBl4cm+OT7XYKDEp5nqaHsShBld7apLhHlaiAt1rHtrTWAHCmdPb8EGLdZ1w6YERnyqIMy0UK+CLB63RKCbzs/ivAYYWbk3dH9B29PbJCXKlWs9CG14wT/9+WCMJoFXP5hTofufJOc3ewBymy9NORv9M/vGy1RlXBOwKbGofaixCRWJK8AWCoTIWMeHLVadisaOtzrd6QXN3UtM+y1HXjURjnnDWAAYJTjvKAqY18ENGcMycgq6RnlcTEe0O12NrnrEEOKNjL2Exyl7Afce/74/xCWpCek1/tYp1jZbpUB0yNN+txD583ex1bhLfaTMj1CBdHVisiFPaBeZKLPAODUm79kyI4+RV/CMhomKUhls9cvtV8oAXHCh4sOCneZU7fkHb2BNpM9A5VibD6AlvYDJlI5wKZFtvo5LoelYHxQxwfMrjsLFhqxe5eY7rxA==; 5:CMlATM2jqVirnlbpCIXPRxDr8nk4qSZoO9KL3cg40l2oxQ7dzVQ/z92TG3KnHPhHAgspZpGi+GRxDxsuy2M2sMi5J9yrQVUF3Ui3vBRvKFPiFBmsWjEYdPRbxt2qbIyKra0tevR1XmHlmnDjBL3gYPmHo4bIsXdW0FYlb6jEbuI=; 24:xjNiy27YI3Evn+pI+ti9r6Mic7KGnai8zh8k/QFrM6m+HNrXC0ayT3JEicVB8RM0lASON+0NNE5AnAJaFs4I1sSoY/O2eNIAuFYEysO6NyM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR0501MB2306; 7:UCBs6Hg1e3Srpg3vrRyrdwZI9lk9H7/lGlBWyCAzD/OkvajbDZN1OAWyTzQQ7eBRPrYIB8RIAUH6/vl/BL+TzWt2/gRxygbcwF9/ZJOZXc224YAwU+7/OaJj9hM8596DVyCOMEbY17FIESbe8w8hueWx4bbvTRhS0riasc2IYShte3qEiwFRNKJiRdSfSyk0ReOGquZQ5I5zt4wFGHtSzptAG37GsPShLfP/AGSlT1O1gjEmjD978hCVY+W4C+Nh X-MS-Office365-Filtering-Correlation-Id: b2fee24b-5ae5-48e5-098c-08d5bbe6039e X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2018 11:04:51.0105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2fee24b-5ae5-48e5-098c-08d5bbe6039e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0501MB2306 Subject: [dpdk-dev] [PATCH v1] net/mlx4: add an RSS hash update callback 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: , X-List-Received-Date: Thu, 17 May 2018 11:04:54 -0000 Add an RSS hash update callback to eth_dev_ops. Signed-off-by: Ophir Munk --- drivers/net/mlx4/Makefile | 1 + drivers/net/mlx4/mlx4.c | 1 + drivers/net/mlx4/mlx4.h | 7 ++++++ drivers/net/mlx4/mlx4_rss.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 drivers/net/mlx4/mlx4_rss.c diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index 73f9d40..eb89f6b 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -23,6 +23,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxq.c SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_txq.c SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_utils.c +SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rss.c ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DLOPEN_DEPS),y) INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib += $(LIB_GLUE) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 9f8ecd0..7000511 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -261,6 +261,7 @@ static const struct eth_dev_ops mlx4_dev_ops = { .flow_ctrl_get = mlx4_flow_ctrl_get, .flow_ctrl_set = mlx4_flow_ctrl_set, .mtu_set = mlx4_mtu_set, + .rss_hash_update = mlx4_rss_hash_update, .filter_ctrl = mlx4_filter_ctrl, .rx_queue_intr_enable = mlx4_rx_intr_enable, .rx_queue_intr_disable = mlx4_rx_intr_disable, diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 300cb4d..6842a71 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -50,6 +50,9 @@ /** Port parameter. */ #define MLX4_PMD_PORT_KVARG "port" +/** Supported RSS. */ +#define MLX4_RSS_HF_MASK (~(ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP)) + enum { PCI_VENDOR_ID_MELLANOX = 0x15b3, }; @@ -144,4 +147,8 @@ void mlx4_rxq_intr_disable(struct priv *priv); int mlx4_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx); int mlx4_rx_intr_enable(struct rte_eth_dev *dev, uint16_t idx); +/* mlx4_rss.c */ + +int mlx4_rss_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf); #endif /* RTE_PMD_MLX4_H_ */ diff --git a/drivers/net/mlx4/mlx4_rss.c b/drivers/net/mlx4/mlx4_rss.c new file mode 100644 index 0000000..656a00d --- /dev/null +++ b/drivers/net/mlx4/mlx4_rss.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2015 6WIND S.A. + * Copyright 2015 Mellanox Technologies, Ltd + */ + +#include +#include +#include +#include + +/* Verbs headers do not support -pedantic. */ +/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ +#ifdef PEDANTIC +#pragma GCC diagnostic ignored "-Wpedantic" +#endif +#include +#ifdef PEDANTIC +#pragma GCC diagnostic error "-Wpedantic" +#endif + +#include "mlx4.h" +#include "mlx4_flow.h" +#include "mlx4_utils.h" + +/** + * DPDK callback to update the RSS hash configuration. + * + * @param dev + * Pointer to Ethernet device structure. + * @param[in] rss_conf + * RSS configuration data. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +int +mlx4_rss_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf) +{ + /* + * limitation: MLX4 supports all of IP, UDP and TCP hash + * functions together and not in partial combinations + * Just make sure no unsupported HF is requested + */ + if (rss_conf->rss_hf & MLX4_RSS_HF_MASK) { + rte_errno = EINVAL; + return -rte_errno; + } + if (rss_conf->rss_key && rss_conf->rss_key_len) { + /* + * Currently mlx4 RSS key cannot be updated + */ + ERROR("port %u RSS key cannot be updated", + dev->data->port_id); + rte_errno = EINVAL; + return -rte_errno; + } + return 0; +} -- 2.7.4