From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0046.outbound.protection.outlook.com [104.47.2.46]) by dpdk.org (Postfix) with ESMTP id 192842C02 for ; Tue, 5 Jun 2018 02:13:09 +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=4AxtTRPewZ30tuspj6pZXoxpsEK5fozEnOhjqFiQRtA=; b=MPMQ/nCGyRUnBjJ/KshsGaS261U7gvST1H+KtfJFhKuiVqkfuAz4eUmloiMB4+miPNbtlBbMK4SvigxEOzHWRv9wKc3gPoB1+nQZB1SDm3VsFTY09fIM51iSaK10gEYKp/TBU/ItNpYLLudeeOk/kWtdEM0Q6/wqbDX1XXtjS38= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:13:06 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, Dahir Osman , Allain Legacy Date: Mon, 4 Jun 2018 17:11:00 -0700 Message-Id: <20180605001129.13184-39-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:MwrvsqmWaIBbqhLzszyRouDSc7h4JKRytBjWSGZj/pVopPGVayt0YdbhO290lQS6456PaejKR0Dza0m/goeASJRv7Qn9+PK/xHfXTOXXxHyNyocfyFXsZUb3VeMRNwFA2eKehl6C23/mjHfZCECvLv0PqdjQWHZi9MBD3AXairKi1YFCFoB+rN+Rt1BDoKucWOBPfcrX8T8HbhbnR893Th+RjfvgHQvJWWqwuYhutDtl512XkpXwdzbpm3x19ZCi; 25:OHkDdD7QTrIyczAr96QnK0ur+G8X+wt0KvVMsm7QLNnNWwsoxQ2ny/+qOiSQ/G63Pafnhlinkl19KOqhm9u20IKNDvLUUgFCx1LpGtd3LEj/zUOycEMdfZHarM3ojHeR1FjgYLZEW9+pEt7CcvIzLrHFvQj0mwzcqkZ9fv3QpVXRaRTBesiN37p+/Z6unf+Ipv1AH+YJl04vI285UcGfAHfUYvB1izIWEIrhnPQo3Se4PzI/jCYbII+jhBbESDFDCQ8cLCybLj7/FH20OXvSE1ewo9qA8P6HKYvmFgAaYly/P6+JC2VL+8RQOPxvZcHI2ma3c9YxRB1m+dzhmLODCw==; 31:ipBuszBpQfTjPfvR+HSyOjIZLxE1gbP9Gie4LH0her9z2IkXAasGMHsR7Oqc8bpZpGseARenyh4IKFp8we5OqqprcjfJEurae5YSQnPwEJ7DA74wF8CnWWWcSketgJbo9yv3DrHSAL4vs9r3J4WEVILA2hZZleBT6GMax+npwtzekbPIltzPl9XKjc6y9nPdZ3K3BMygzKdqwHdrfWWJSx978B8ErhCPp0S6u8Rl2pY= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:RMJp00La/+Btudpbr0p6j1M9YkA8GTzJmUOpLQC474COwFNiPt/UvAC0WuxwNtFNRkovA23d3s3gWcvODRlV0utyYAi3Q14EzB2WekzRM9SUpRfRlB/dgYk2LVduW1GAjv+v2FKvQdQ5JtIZEqpYDyinG2IhsFJuQ1mEJISCAxiNTDXqd//b/fQfK259B2Uetcfq5lERmoD/DcFCPJh0IRmkxwOYyQZ0ttzHLVB/ZByKLJcSR0Zx4sjSrMMnAeSp2i5RH4o3qtesdsSHqYzYNU7QyIcpv18DkLB2nVQ/YvSRYwdjEcqtxi4NNrvtsc8X6DpxaTMhaLQbRjDJUcHwLyC9w33nZJBnfZTiatR+n487pvq7LwBJGWzImrkagHIuMP81imEdnJkA2FtbYtStM6TXuCXxE56VAt3to14Bwqto3/HGaznwzWS937vvjqzbbtzl7KRhBf51AiuUxlvuXcT5RNWksiQlvPNr1mcoOi3uuWWMWoO+ecR//jRfhXJC; 4:DIqg/Sno/qb9smMI+sSS+fCzlrzEt/RVA8HohnGkFTHVheQeCxNbotboA7cHuezyVyYIB0OWqXeb5ucQi6q1a6i4Fyz8UertzlM5G4k/J0NnP2NNAayYdSjheL9N9DiI8qqhPILoe/YpHvStTbG7MA+5nmNWOteE12ng4OG105wmofF10gxSwoCtp0B2BFw1jTSdjtXuYZZgtOPXpLrj52YHzsqRHlcKDLwm6qUkCBbc5mp8v2P+tIesVcAFcz3Y+evGaPKb64poKnoL03BLfA== 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)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(51416003)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(575784001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(48376002)(105586002)(54906003)(69596002)(68736007)(7736002)(16586007)(26953001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0501MB2036; 23:eURcpNmC161A3vUUlENdHc6lKgh4UiqefiX/wfL?= =?us-ascii?Q?2TveF3BFRlAALyryCoddS/4iXX+4s+XEFN1dLtFkdV67+Np0ytVXjcnYS7GZ?= =?us-ascii?Q?j6WumsRg2nbW6d8wlS5gIseJEOGDuOAcLZSir054ijFOQL6SZohVqB45lVCh?= =?us-ascii?Q?RS3i5d4+emdEUj6K0plP6W8OU3OOp+J7Fv4IEVTij2z75dSGGuMa84/yj+Iq?= =?us-ascii?Q?uJ2A+9YjDq/eP/gpUV+cu6g8UZ5RJW0p5jmvfg7EtYULnAVXOkqD6n0CSFxW?= =?us-ascii?Q?HpwPwFjb8r0sBoUhtUfPYbVVn19HsYsVq/0I4jlQrXKH3J9xIStENllmHcZI?= =?us-ascii?Q?4M/PqH676ne+LzW3vMl2DtYqGI/4XrfKnyKdtsZ27of5HRwhdfRK9XwHQJew?= =?us-ascii?Q?euPgNvHmtMD7bL70R+frW1dNdL0le/nqy5ndKRf0Y5BLjjzz4bXIJHOhM8ms?= =?us-ascii?Q?T9R7FbjxEgNA3AYSyL4+jZKs+zaewFZpJRQ25xTR5CmR/C2hzP+TbbjrC5Aj?= =?us-ascii?Q?AHsn3BLELlrEqTHh61BwgHnvXZPPTeYicHn25oYhiicYdDRnQNK31Vs6eNn6?= =?us-ascii?Q?yJhfYiGoPiHYaT8cFEhDpEunNGQw3AtyvADljUit5Fqe8Hd0S245ot1wDllR?= =?us-ascii?Q?eCJpaZHAtos0UbtImhSmwuWjBbzZhdHtEmYaK6powkykpMnhOHnWZqI0nN0+?= =?us-ascii?Q?kUuYadY/4Szl+7kn10O53pKqvCvp6OCiD8rbtMzDALjso0GGwIYD73Sr4krh?= =?us-ascii?Q?LryYlALpC0NkSIiXeu2wX1fkKj9u+FfWttmfA3Ojh/8mmh+EdCG7AWY0hdSU?= =?us-ascii?Q?afcYHpxTxVczQJyt3xFUFyiVEhGFSF06IcEwqlzrIKRDIV0L+pnfUXNkcgu2?= =?us-ascii?Q?waD4MbzmOZ1aNo1NEZdqySCfT1oZhwc4kO7qh2TtyCBuUR+bc7bNopWZWp8i?= =?us-ascii?Q?/lMuxNTYUcd5WYdP1K19NMuadE0uJ+U0Jh/3j1Sl560Ax9n2WzIC+Utc1bT4?= =?us-ascii?Q?F5uNUCnMsjJcmemkgW3CFWlO7Re7VD95ZVAO4uhV6b+JW5beZ6sBdZU88Pkq?= =?us-ascii?Q?9SOSA+z5CnhNoELuSGZH8bi4yJzh2730aAsq0+fEAilGi0MFqPelXgjAR0EQ?= =?us-ascii?Q?UvKG/XvZiKYkEudwnJHdpTavaAAVDWA6R5Z1TILrkg9HcnYSspZjDDpPviFb?= =?us-ascii?Q?bXpeywE7CFFtwce4pGpUGNTPD+TdxzES7wm5CL6Hap4OSrLPmN9zSKDQG97R?= =?us-ascii?Q?Jct1qI0sfWu9qC5xjQLB0ZSviXeqlHXHUQ++eTOiCEacuGwsbJuXQE9CuARP?= =?us-ascii?Q?xOdFPgfh46DIY26YzTcBQP/G2Krv6DpGET2p5irFrL6OFYLGnJlCJo4FUagz?= =?us-ascii?Q?ekJKhn2duQWU0MrWGphPckiioB5SnimgjHT6IsuFp3gcbQF7P?= X-Microsoft-Antispam-Message-Info: +Q7PvUUNaMTfyUjkN9KlCv0B84wq07RhECL1wQrAiqBvkaMPUXuYhEmZRTz1O7yR4+Vd4+ADilj1lzIUbUVSWc3aMouh66dFYTVLKRC74z1qlmO+rvK8RHb1kcyPfibsFoOSkqsmAsaNkWsq+r4idw93swIgFdcIunevQ4JMXE44U3ziKiIBsOHkmk3OK3FR X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:vYmRLKkJjR+/be6y4DAsf096roop2XOc3244CyEtE82fNzHdVf3uLlWOXrbqvg3zeNHiWaqiuIsHe5C4ZLRTfa+zZLfSdKxoDbce+HYCegDcimhJaIr9od6uWDYFXEWHiO9yFUojW0y4npa6rcQ5zhDT3CymvxGCG4ZO7ZnvQtNUrhVidPfUVhuJ1X6PIltNq7kslEp4N+YNDnp5VcD3wl38Jgk8/pbHDns9ZdrdAa86z+Kluobc1DRb57ytdXSZHb5RzybNs7MoBfM4bvgYfFZI8EwzQTcQEZMYX9Iia9Q52ZuxKf4WcDAbWzPlT7Fj4eIQJ7xdUCEpZ94TTJHZviJ0DcGcHMrTuvEjU08bjEdBHHuI6bKikJx5oiecCPklCDKKsmgpz+sUkibhoTT2iBWYnW5XW2YmNRyOT6MXXWsGRLTKMew6C49PeZcrICg5TGqgSAfYBDXmoGcJ3ov4iA==; 5:S/tSyPRefSohlqBI0QA/j/ozcP5oxwLn2TAmnWKs3NIjRG9oGq7N2xqZny5Pv6CqRfy95PhkaobKYJK6oyzhGWLcPlaEkjLXOZUXZXw7P+Wqz8vVzrDPAniZBMwvFv8iYVulbuxDPV3uDaosbTUNynjspdpaoScy/+cyJVcajY8=; 24:jg1xFqZ01SlW1A2wCKt/fQ2rFrVKZPxFMrQ02iXBZNRURm6V6CMiaET0ec2mv7PietOeOIBiSAf1Lskg0+PqJIWrgSFOvM0YmtLHUrvHDDw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:GJOXkT71HTYOPkMbEBMEf00/jBsjhcFJp2h6jHNGaulsWdpCRiWlRZceapTyDV6GfdbHg3TCcNrwCcX/jZA8CjsDptVGhr+ZEsAwZjrTWPQ4X8TyE28JERrvH6hlJKuGGK01w9GWTSTXAeKTvT1GY3NVes4E4HJkbgGP21UcOC631dpe3G9FmHYJCJLd7WYbUBqpXlEaR/J5mBQHZUmuVgLV0qMN7ble24r4XYQBhHcXFZknSSN4J6wRtokmdDCL X-MS-Office365-Filtering-Correlation-Id: 80e7f85a-f41e-40c6-b99c-08d5ca791d9f X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:13:06.2465 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80e7f85a-f41e-40c6-b99c-08d5ca791d9f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 38/67] net/mlx5: setup RSS regardless of queue count X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:13:09 -0000 From: Dahir Osman [ upstream commit 66669155da323e6d8516c3b276888ee0f3cbd799 ] In some environments it is desirable to have the NIC perform RSS normally on the packet regardless of the number of queues configured. The RSS hash result that is stored in the mbuf can then be used by the application to make decisions about how to distribute workloads to threads, secondary processes, or even virtual machines if the application is a virtual switch. This change to the mlx5 driver aligns with how other drivers in the Intel family work. Signed-off-by: Allain Legacy Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh Tested-by: Allain Legacy --- drivers/net/mlx5/mlx5_flow.c | 2 +- drivers/net/mlx5/mlx5_rss.c | 10 ++++++++++ drivers/net/mlx5/mlx5_rxq.c | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 444b92484..9bf1c570c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -980,7 +980,7 @@ mlx5_flow_convert_finalise(struct mlx5_flow_parse *parser) unsigned int i; /* Remove any other flow not matching the pattern. */ - if (parser->queues_n == 1) { + if (parser->queues_n == 1 && !parser->rss_conf.rss_hf) { for (i = 0; i != hash_rxq_init_n; ++i) { if (i == HASH_RXQ_ETH) continue; diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index 90682a308..daadfbe5d 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -70,6 +70,8 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) { struct priv *priv = dev->data->dev_private; + unsigned int i; + unsigned int idx; if (rss_conf->rss_hf & MLX5_RSS_HF_MASK) { rte_errno = EINVAL; @@ -87,6 +89,14 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev, priv->rss_conf.rss_key_len = rss_conf->rss_key_len; } priv->rss_conf.rss_hf = rss_conf->rss_hf; + /* Enable the RSS hash in all Rx queues. */ + for (i = 0, idx = 0; idx != priv->rxqs_n; ++i) { + if (!(*priv->rxqs)[i]) + continue; + (*priv->rxqs)[i]->rss_hash = !!rss_conf->rss_hf && + !!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS); + ++idx; + } return 0; } diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 1b0a95e0a..17b70dc9a 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1012,7 +1012,8 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, tmpl->rxq.crc_present ? "disabled" : "enabled", tmpl->rxq.crc_present << 2); /* Save port ID. */ - tmpl->rxq.rss_hash = priv->rxqs_n > 1; + tmpl->rxq.rss_hash = !!priv->rss_conf.rss_hf && + (!!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS)); tmpl->rxq.port_id = dev->data->port_id; tmpl->priv = priv; tmpl->rxq.mp = mp; -- 2.11.0