From patchwork Mon Jan 23 11:59:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 19891 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 456C1FA3F; Mon, 23 Jan 2017 13:01:48 +0100 (CET) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0041.outbound.protection.outlook.com [104.47.32.41]) by dpdk.org (Postfix) with ESMTP id 468B9F95F for ; Mon, 23 Jan 2017 13:01:18 +0100 (CET) Received: from BN6PR03CA0025.namprd03.prod.outlook.com (10.175.124.11) by CY1PR0301MB0746.namprd03.prod.outlook.com (10.160.159.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Mon, 23 Jan 2017 12:01:16 +0000 Received: from BL2FFO11FD014.protection.gbl (2a01:111:f400:7c09::138) by BN6PR03CA0025.outlook.office365.com (2603:10b6:404:10c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Mon, 23 Jan 2017 12:01:15 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD014.mail.protection.outlook.com (10.173.160.222) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Mon, 23 Jan 2017 12:01:14 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0NC07eh019311; Mon, 23 Jan 2017 05:01:12 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Mon, 23 Jan 2017 17:29:49 +0530 Message-ID: <1485172803-17288-20-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485172803-17288-1-git-send-email-hemant.agrawal@nxp.com> References: <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> <1485172803-17288-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131296464750038656; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39840400002)(39860400002)(39410400002)(39380400002)(39450400003)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(47776003)(38730400001)(2351001)(626004)(77096006)(6916009)(53936002)(2950100002)(92566002)(305945005)(5660300001)(36756003)(50466002)(54906002)(68736007)(6666003)(110136003)(48376002)(106466001)(356003)(8656002)(50986999)(105606002)(76176999)(8676002)(85426001)(8936002)(4326007)(86362001)(50226002)(104016004)(5003940100001)(2906002)(97736004)(33646002)(189998001)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0746; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD014; 1:m/mQHkk+Rv3MTMR+tcp/4/cfUnpJExghZsjnZqWolTVBovy+3Glwca01MVayxbdIgX4PLAMwPMt976kqiYXXeQfI6QyKpTTwl3lBWzzCKslX7AfbXi2ZgnGQo43vpD/2qBAeAZyAW8BehQq+bajJ5gjobGPM1QKICQHgLuwcOcJv8mZu6l/sRXuN9HcG4qM6RoVZPXygRMCFgn5bKvr0nMx3TPha8uxbh3kjonz8gX1d6oT+i/toLM8peA+1UQUYt+xS5AFNu89YAnYWJfYE/6fQcfHS2zovT8qD1l2I6dlVIhLiAoakICQlKrcOdhUUOkwBragE7CJpqxxo4BbS2xb+BtxuugjQV01idYBhc5SxULgTnYSJ06Qd+P7sFt0ygfzRbjfgaZHYl06ygHfUYkRTNL88WR+M5gBEXrYdQPN8zpjDGW2o3xrbEhpx0SRqqK1NbCWBEREEpnk3amH1UIGa+v3+m2tB5UNlShD2XPreG58PupxzkBtNYyOoiSJmLyRJ+TOYTGhWO//WXN2UiNxclnV5rzHDfLYK4ba/aBwgZwaEAlfGCCjtzqSO+KgNusLU/ri9Ko+TqIV8cqFy0PtSdpwqNqG6wA+FpbHMvQY8dYT2grtzfBXcOP1tcJF3xuumh/9+iEymSle5I39QID8H8UG9uY6MLsHy8DvDXs6BcV2E8bo52/3rJjQYOB7VyfKkbIMAPKBLoI0XURMOWjqlzG0fiDctDvMPzMUss1YB2GPY/yVk9fmzZb5h9/t/ MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 1616b0a5-07ca-47bb-6d24-08d443878825 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0746; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 3:RENQARFdCJqj4Xhb82pMRcYypGpAwJaginES3xF395goIVNxm+fu2q12MsuoR4MmKvaz14/bCKuUd/5mS1/jYNYWAsAgxi5+3Fxtz63VYZ39vjIsLXTpubuyHDCuHslnQigpzNmvwS2gXfBMXwnZ3yBBhcJ8SB1tBhct1eomITF7TNRcv9XvVLT14qCA7++cxIVAI/KAzJjQq1h5BXpPidiWlXZts7O5G4IGEnk5rlt9uYrrnUt6mgxixPBuEySz0aMb9Ao1pKRUlu4yjarzKfF063Z0KSO7m0kysPWwk7++IlbHIvueIrt3OswxYVaYK13kme1zX+yzWpW8KI3trQYBrZ0/g1af4AEo7aQUEcHdZJJTiylwZ6+BweNDGhv8; 25:C38Mj3K7TeSaN8hM6KQbRKWHOrg3fEYv6YAHNy+HVCENvUlFqqd51rJPDpfvzGZRNQ2njQTONqcUGjhB23AsbIzE7uAczkm8pv4Q3NXXxwO907QUCJpnnq35nCl6FL0v3R39LJK3oTnKxwhPxTGZ59u53ED/cPMYELOoc5zyrCDFZTcNhKaCtVKbwClsWpdAASP6kFKZLwSeCJlfUZtbkHnJb9hTGzx6zH7jUbCLMNfrObqkRz4+qtPLGnaGNKqSd9XfYFfJFsND/o62bX8NwdhCdmWlHgXwTQOOpVGMvbjQ5ve7m90Iyf+58hIFLm8dF5haoP/MUmxbYvx1Ph6lyumCvf6zsrAuHatMCLpn/B6WSYfPven49MwNUWcDIglsF7ozqRP6FME5bzMY4Fn8dY/guwMof40GWw4e/anAMR3wxbvOZMg/Pskq9r2hRr+rl8zj8Xga0DJPG1vNtwQl1g== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 31:QB118xyTvJi8fhG/2IPa0Fbz6qD3adB78ukFtnwP80+mp10XHg9HIC0c6dbJzXY6P65LI6muna8iEFa75QCI2SThANTxVrc+6/tK6xPSsFo9lhO/rsD4fNf+VaCm1bDUzBzNTxdpHPRSWYsjKZ+wlAx7OLJxM25CaD4tptHX6FuvcrG74W68lJvfBlBUuLXNKcULqXpJphYLQNVhp+N4749oi1cWww2R6QHImQocXHWdcSXVz/cdZpIvHl+Qz4DkkX7dUPB/FGsQubSRW6o5Kg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:CY1PR0301MB0746; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0746; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 4:kzp3/35keM3Ccyzwo50mW/uEeNgdyt/wclPUirBTNc42TwcqtBg3Dp8Hgy4CNXz6/tsQ7PDhcGHE/SYrYqIUcwEC9aNf0olJC6UJBRE8bpYF1rNZGdT8mASpEFmlFnnlGeAUdshUZEN2D3x+XXpJWQhXN0y7KAiEKEN04v8+1RNLLZqYwzGIujZSZ1pqqZ2eGK0uEbRMheyYPjvBuJA3FshlIAO4wYrNdo570ph/RxeFrGG69yxaLCgeSfKaBI9f/aJaOHPE10mT3OlVQfluZHqj+pVSWz6V4c/Ftrilz+23dudkxmqEii3Ro7MjzT6Pk/K/a2jv7agK8jWmzML91m57MypDt3xMX0NJQ2jHsKkncq67FEn2zD9OZmflFbsQ/2x0KrJ0rW+g5/4NgoQSA9MjD/EnXfS6uDeBA4GC4ByLGTHrMCniF6MbN2QsnXzk2ImsV+mQnA3PAvGocb6nfVW85wdIk7MGMUbIqqzv9fJPvDQk/F+t8hwRWcicy2iSjWy8yT0TnQv4HTe5NYxMFjwJ2HbzsyHJpROuHURIATpy8FTS2afCJWdsbcN01E6+OQ2QS7QOkiHctg4wozvSdKf5XGqvjLHS+jQIISM72+awcJKXZUncBAiiO8Y+uiXO2RQctgcieE3yYwMsFVf6jNooiY7sd4m531EXkDeBXwnpOI06x4/6U0zJrsu+mAVjK5AC7jWcLxRRMZgHpV6HqGJuJMLooJzVzbJqb804JlfMxnbXvgtIFGOChesNnGbj X-Forefront-PRVS: 0196A226D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0746; 23:JVkUQtesKEhz2PzpKSs8iJ7RpXhu5j8h54jjqMX?= TTBtrQh7VJzWP6vDBHvxZ5uv+mtkH+EippctgWOcJb3YG8yzgAv9MMe3Lc1NTTkKR+xfRXEsE1VOI0gR26apz6X9ZOVdVSe3zb8ZqegIH1j7QFXU7GFOXYZ/beikWpfWG1gzut0P3gyC8ajGoxFQSVh0CLSV3F4ddS+cnKuE1PoTHcD6Z/gscA9m5ziGutC9I7bspsEEWEQizjsg8QcE5zOb71Z84E4kPMRJKwKOqu3Wg6YbK8W58bANLGiftcG1A4Nli/5xG8TLzdeU1n03TCedikhlQYYFl3WDGM1MJSUG7AnUu3LOTPU9GbBaNgF5XTnvZsbf0aUbKLtL7rKWSI9ryR9GKjb46pf9HuTOCnH8OHcuImmWmIqxZxQPFEiLoI2aOyXTAtKGJ4d65zw7k0I9GHBoVA64rl7+9NdLMlM9bi693Sg3CzSNIg8ko3gAnfxpG16iiodgBpoorRsmaiWf38qTSzemR7xg+cIPbrWM+2+BZqvWTCOD+UBYTt979I7PJxup63o1hfXsk98U/Yn9Tj8qUnGMSgmAjIZ25K/GVo+VsMgyNcnd68IG3MQMRhZkzv5lvNTALuIfxPctqbHlmmBuydtpD7lWv7FWxqtQ6x7MU4OXZbaRD1OGeiizF30eDAAn1YMM/fC51XlNyuJ8Qs9KwXK2xzjlzo2L2UY7TKM9dbfuWmZWvTl2Hm4UhDDISxFUJU6L+UN3FuCTgLDj3XI5MNj7PORewLchsAJnSkvvQreZkXmjQFbH1XEgUkP6RfdAgyuRfMugtid209TAyvxOt1A2IsGPMrcSUODKLpjoHDv+YHp9iNmdZQPRsXUVsK3CnkCg5yzzYYrfC3h+QCa9PGWivk7ZzzeIq7Qx9foBmjJXyR3VTblJ612mcJd+/+CtJiTO3uHd0LgSGlG2EFlqFy+K8pEndZanCemNthlpHWfCHgudkRSYwikYwwGqSztAPBLHH1YkHF3phwhQTGpPRYQrkiCMKGeKyql+d1gRzrQVnkvHA4cuzrsaa1mFYZ3ZbWrRDrAsKmUN3weGz4PbF3TLbJ8PdMZyQA13CYPVFDXVrmRACJK6NtYv33XS8UJ2ehnopMzVUjEs6DGjYLcCaVRftxOsWNitq4DPlK3GEvZZdnNeGuBYW1v9AeywuPTS/XmJ9mCJ05u5LOZUwZQr/9Ob0K+d8906Yk1COXIuq49mRnDrTsNP62O4WFEnIQqTqVJEW0XZot4HosbNHycCDJUSKgDtC9rIbxirSKdOUgLKtZyGst9gg0eU/cRA= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 6:QjvGMMQPfpo7bcXlx2BzD90CeKBZeTKiNEZAmD29w442njyAwAvRQVVEGnsK9t5BdqGtjgvw0JdEXO2AdEWxyReD55jxocOPG/3ef7xPLo19dbj8qutgBwUqpjOvtQyRzdv0gUVFxQEgfgmFYQLVu2BtTsEw4pybs4rKTJeRkuV8ks04gMva9scDn96FmD3CpoCKSzU7IYJ4sNKHcnqxhFdoY2D71bnCG4SVfXrFcFVwt0tjFNSX3fy0wkSCpJsP6OeLLEV15ZtOiR3zAzzxVVrZBionOqZFBdAGQ4ph7XkKE5yaqeYAmbKWI0im62wuCWKY6DA4Aun6hT2XNvG4m+pajsPcavFVazGbs5K6IAIZ4i3ZluowPOdz88hzKPpozANjuA+LPV83Y3t/vnzEFjD60Ev1a5tLuoSL+lPoYHU6MbMLqlFUxHowVH7SDpwf; 5:zLL9r95lNVnm7YM3D3dUZNzAD/2v2WcPfzfqTGpsfBcd75LAx+9OX6K0y9Sn3xYDVURxKaoq9u+XTsb78Kj4wy3tO2wIUBbuuDzUWkP6Qo1Uhg4veVvxV2BS5Ko0K6dOCvgJV86e3P7+3/LiSXiznyALfAXEY4zIZRsm7vdFRYbplgx7V/ft+gGzCDEAwtcm; 24:GA+1Ff7Q/b1cx/lq74F/YFdEhf/Qv24anYDg7U0CEHctTYCwxKJX8SUrQfhLtiaXhGbyFCr23gtrwRP//7tiQgOEVYD4wSI9P57ec1IeXok= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 7:kOQw8AIkaP5PgaM74XlATNBrxlCXxFBSZvIyeRYVTUBconc6hc+YBxHuhO7HI6MFnD7BnghwpglH7PeXhnryMbxcrH55IK3n//9aXGUKyoWE2cc8YEvgipqDif71foO+YW93Ty52tBxs0VzM7Kg8kOnoMY/7bCww8S6MEMf8pZ2/FRaxXUCBGwahGodFZlo0dxAA7b624VCLU97nG3K9S7Bl+dB2fuIy/PCGzbRgkFfIBrx+zhKbvbSpu3uZv7d62x67pdx6RkW6d4/ugZh8PV52+vk033gSD1AUT5BU0yO51MQy+qOI35ZiyOwAFu3MedwPuBtleww8srDReN73Agz3j//k5kDOYHJaVTMLcenBzyWNyxr2IofbaHt9rwFcr2tIslc1aGU0HdvhvlNPE0yCPI3D7GDJyxXMc0Ss3r+2mi2i7G0wafDle/UvEjBEk7ldFgXgaut6QpQUZC4CEA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2017 12:01:14.8166 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0746 Subject: [dpdk-dev] [PATCHv6 19/33] net/dpaa2: add rss flow distribution 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" Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/net/dpaa2/Makefile | 1 + drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 287 +++++++++++++++++++++++++++++++++ drivers/net/dpaa2/dpaa2_ethdev.c | 31 +++- drivers/net/dpaa2/dpaa2_ethdev.h | 12 ++ 5 files changed, 328 insertions(+), 4 deletions(-) create mode 100644 drivers/net/dpaa2/base/dpaa2_hw_dpni.c diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini index 0b59725..20152a0 100644 --- a/doc/guides/nics/features/dpaa2.ini +++ b/doc/guides/nics/features/dpaa2.ini @@ -5,6 +5,7 @@ ; [Features] Queue start/stop = Y +RSS hash = Y Linux VFIO = Y ARMv8 = Y Usage doc = Y diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile index 5fb5f67..7d62f1e 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -57,6 +57,7 @@ EXPORT_MAP := rte_pmd_dpaa2_version.map # library version LIBABIVER := 1 +SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c # library dependencies diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c new file mode 100644 index 0000000..c95c083 --- /dev/null +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c @@ -0,0 +1,287 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "../dpaa2_ethdev.h" + +static void +dpaa2_distset_to_dpkg_profile_cfg( + uint32_t req_dist_set, + struct dpkg_profile_cfg *kg_cfg); + +int +dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev, + uint32_t req_dist_set) +{ + struct dpaa2_dev_priv *priv = eth_dev->data->dev_private; + struct fsl_mc_io *dpni = priv->hw; + struct dpni_rx_tc_dist_cfg tc_cfg; + struct dpkg_profile_cfg kg_cfg; + void *p_params; + int ret, tc_index = 0; + + p_params = rte_malloc( + NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE); + if (!p_params) { + RTE_LOG(ERR, PMD, "Memory unavaialble\n"); + return -ENOMEM; + } + memset(p_params, 0, DIST_PARAM_IOVA_SIZE); + memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg)); + + dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg); + tc_cfg.key_cfg_iova = (uint64_t)(p_params); + tc_cfg.dist_size = eth_dev->data->nb_rx_queues; + tc_cfg.dist_mode = DPNI_DIST_MODE_HASH; + + ret = dpni_prepare_key_cfg(&kg_cfg, p_params); + if (ret) { + RTE_LOG(ERR, PMD, "Unable to prepare extract parameters\n"); + rte_free(p_params); + return ret; + } + + ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW, priv->token, tc_index, + &tc_cfg); + rte_free(p_params); + if (ret) { + RTE_LOG(ERR, PMD, "Setting distribution for Rx failed with" + " err code: %d\n", ret); + return ret; + } + + return 0; +} + +int dpaa2_remove_flow_dist( + struct rte_eth_dev *eth_dev, + uint8_t tc_index) +{ + struct dpaa2_dev_priv *priv = eth_dev->data->dev_private; + struct fsl_mc_io *dpni = priv->hw; + struct dpni_rx_tc_dist_cfg tc_cfg; + struct dpkg_profile_cfg kg_cfg; + void *p_params; + int ret; + + p_params = rte_malloc( + NULL, DIST_PARAM_IOVA_SIZE, RTE_CACHE_LINE_SIZE); + if (!p_params) { + RTE_LOG(ERR, PMD, "Memory unavaialble\n"); + return -ENOMEM; + } + memset(p_params, 0, DIST_PARAM_IOVA_SIZE); + memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg)); + + tc_cfg.key_cfg_iova = (uint64_t)(p_params); + tc_cfg.dist_size = 0; + tc_cfg.dist_mode = DPNI_DIST_MODE_NONE; + + ret = dpni_prepare_key_cfg(&kg_cfg, p_params); + if (ret) { + RTE_LOG(ERR, PMD, "Unable to prepare extract parameters\n"); + rte_free(p_params); + return ret; + } + + ret = dpni_set_rx_tc_dist(dpni, CMD_PRI_LOW, priv->token, tc_index, + &tc_cfg); + rte_free(p_params); + if (ret) { + RTE_LOG(ERR, PMD, "Setting distribution for Rx failed with" + " err code: %d\n", ret); + return ret; + } + return ret; +} + +static void +dpaa2_distset_to_dpkg_profile_cfg( + uint32_t req_dist_set, + struct dpkg_profile_cfg *kg_cfg) +{ + uint32_t loop = 0, i = 0, dist_field = 0; + int l2_configured = 0, l3_configured = 0; + int l4_configured = 0, sctp_configured = 0; + + memset(kg_cfg, 0, sizeof(struct dpkg_profile_cfg)); + while (req_dist_set) { + if (req_dist_set % 2 != 0) { + dist_field = 1U << loop; + switch (dist_field) { + case ETH_RSS_L2_PAYLOAD: + + if (l2_configured) + break; + l2_configured = 1; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_ETH; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_ETH_TYPE; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + break; + + case ETH_RSS_IPV4: + case ETH_RSS_FRAG_IPV4: + case ETH_RSS_NONFRAG_IPV4_OTHER: + case ETH_RSS_IPV6: + case ETH_RSS_FRAG_IPV6: + case ETH_RSS_NONFRAG_IPV6_OTHER: + case ETH_RSS_IPV6_EX: + + if (l3_configured) + break; + l3_configured = 1; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_IP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_IP_SRC; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_IP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_IP_DST; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_IP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_IP_PROTO; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + kg_cfg->num_extracts++; + i++; + break; + + case ETH_RSS_NONFRAG_IPV4_TCP: + case ETH_RSS_NONFRAG_IPV6_TCP: + case ETH_RSS_NONFRAG_IPV4_UDP: + case ETH_RSS_NONFRAG_IPV6_UDP: + case ETH_RSS_IPV6_TCP_EX: + case ETH_RSS_IPV6_UDP_EX: + + if (l4_configured) + break; + l4_configured = 1; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_TCP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_TCP_PORT_SRC; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_TCP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_TCP_PORT_SRC; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + break; + + case ETH_RSS_NONFRAG_IPV4_SCTP: + case ETH_RSS_NONFRAG_IPV6_SCTP: + + if (sctp_configured) + break; + sctp_configured = 1; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_SCTP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_SCTP_PORT_SRC; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + + kg_cfg->extracts[i].extract.from_hdr.prot = + NET_PROT_SCTP; + kg_cfg->extracts[i].extract.from_hdr.field = + NH_FLD_SCTP_PORT_DST; + kg_cfg->extracts[i].type = + DPKG_EXTRACT_FROM_HDR; + kg_cfg->extracts[i].extract.from_hdr.type = + DPKG_FULL_FIELD; + i++; + break; + + default: + PMD_DRV_LOG(WARNING, "Bad flow distribution" + " option %x\n", dist_field); + } + } + req_dist_set = req_dist_set >> 1; + loop++; + } + kg_cfg->num_extracts = i; +} diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index df16159..87f7640 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -115,7 +115,8 @@ } vq_id = 0; - for (dist_idx = 0; dist_idx < priv->nb_rx_queues; dist_idx++) { + for (dist_idx = 0; dist_idx < priv->num_dist_per_tc[DPAA2_DEF_TC]; + dist_idx++) { mcq = (struct dpaa2_queue *)priv->rx_vq[vq_id]; mcq->tc_index = DPAA2_DEF_TC; mcq->flow_id = dist_idx; @@ -141,6 +142,7 @@ { struct rte_eth_dev_data *data = dev->data; struct rte_eth_conf *eth_conf = &data->dev_conf; + int ret; PMD_INIT_FUNC_TRACE(); @@ -152,6 +154,18 @@ return -1; } + if (eth_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) { + /* Return in case number of Rx queues is 1 */ + if (data->nb_rx_queues == 1) + return 0; + ret = dpaa2_setup_flow_dist(dev, + eth_conf->rx_adv_conf.rss_conf.rss_hf); + if (ret) { + PMD_INIT_LOG(ERR, "unable to set flow distribution." + "please check queue config\n"); + return ret; + } + } return 0; } @@ -183,7 +197,7 @@ dpaa2_q->mb_pool = mb_pool; /**< mbuf pool to populate RX ring. */ /*Get the tc id and flow id from given VQ id*/ - flow_id = rx_queue_id; + flow_id = rx_queue_id % priv->num_dist_per_tc[dpaa2_q->tc_index]; memset(&cfg, 0, sizeof(struct dpni_queue)); options = options | DPNI_QUEUE_OPT_USER_CTX; @@ -373,7 +387,7 @@ struct fsl_mc_io *dpni_dev; struct dpni_attr attr; struct dpaa2_dev_priv *priv = eth_dev->data->dev_private; - int ret, hw_id; + int i, ret, hw_id; PMD_INIT_FUNC_TRACE(); @@ -415,7 +429,16 @@ } priv->num_tc = attr.num_tcs; - priv->nb_rx_queues = attr.num_queues; + for (i = 0; i < attr.num_tcs; i++) { + priv->num_dist_per_tc[i] = attr.num_queues; + break; + } + + /* Distribution is per Tc only, + * so choosing RX queues from default TC only + */ + priv->nb_rx_queues = priv->num_dist_per_tc[DPAA2_DEF_TC]; + priv->nb_tx_queues = attr.num_queues; eth_dev->data->nb_rx_queues = priv->nb_rx_queues; diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 5f599a7..d24fcc6 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -37,12 +37,16 @@ #include #include +#define MAX_TCS DPNI_MAX_TC #define MAX_RX_QUEUES 16 #define MAX_TX_QUEUES 16 /*default tc to be used for ,congestion, distribution etc configuration. */ #define DPAA2_DEF_TC 0 +/* Size of the input SMMU mapped memory required by MC */ +#define DIST_PARAM_IOVA_SIZE 256 + struct dpaa2_dev_priv { void *hw; int32_t hw_id; @@ -53,7 +57,15 @@ struct dpaa2_dev_priv { void *rx_vq[MAX_RX_QUEUES]; void *tx_vq[MAX_TX_QUEUES]; + uint16_t num_dist_per_tc[MAX_TCS]; uint8_t num_tc; uint8_t flags; /*dpaa2 config flags */ }; + +int dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev, + uint32_t req_dist_set); + +int dpaa2_remove_flow_dist(struct rte_eth_dev *eth_dev, + uint8_t tc_index); + #endif /* _DPAA2_ETHDEV_H */