From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0069.outbound.protection.outlook.com [104.47.42.69]) by dpdk.org (Postfix) with ESMTP id 86822F970 for ; Fri, 3 Mar 2017 08:14:20 +0100 (CET) Received: from DM5PR03CA0018.namprd03.prod.outlook.com (10.175.104.28) by CY4PR03MB2951.namprd03.prod.outlook.com (10.175.116.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Fri, 3 Mar 2017 07:14:18 +0000 Received: from BL2FFO11FD014.protection.gbl (2a01:111:f400:7c09::132) by DM5PR03CA0018.outlook.office365.com (2603:10b6:3:118::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12 via Frontend Transport; Fri, 3 Mar 2017 07:14:18 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.com; dmarc=fail action=none header.from=nxp.com; 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.933.11 via Frontend Transport; Fri, 3 Mar 2017 07:14:18 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v237D50Q005035; Fri, 3 Mar 2017 00:14:15 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 3 Mar 2017 18:16:40 +0530 Message-ID: <1488545223-25739-24-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> References: <1487205586-6785-1-git-send-email-hemant.agrawal@nxp.com> <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329988585808936; (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)(336005)(7916002)(39840400002)(39860400002)(39850400002)(39450400003)(39380400002)(39400400002)(39410400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(5660300001)(86362001)(50986999)(53936002)(110136004)(356003)(38730400002)(305945005)(76176999)(105606002)(2351001)(50466002)(48376002)(106466001)(47776003)(2906002)(81166006)(92566002)(189998001)(36756003)(626004)(6666003)(8936002)(33646002)(5003940100001)(54906002)(8676002)(104016004)(77096006)(8656002)(85426001)(50226002)(4326008)(6916009)(2950100002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2951; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD014; 1:cNDXud0GdkhCNUtwJYY6X60govmcAYBhLoWFxrvbBTMtb7N5pmi56lSuZtw4oaC61tN+o9VJdq97jpSby4iQhW13JE5zcAZ7iIO3DQBd3zsu8vFAIUaoovAZv4gRs+eEkPGiXaZ2stiiMmZt+hCiv1TrvXJd0gWuDIXMPMb4V27cT7X9CtNpi1x7woLLdwK5N98MktFXHARhchHtHrlLuHuIF1Okj2kW6pcS/MgMa50zDyaWZ+HEl9c/8jIzE90ghbtSyH9hQIosEOIU51ASqub12SjN89xMGd//lIlUgoEzDe8Es4orrZJBxAgxw3XjuvUnTgV0pX8wodU6GAMuedL4z73/sOmMn8xnmRcDrR7pBEt4FHzLAvsHyUISBzcci7PoXJyhUvaOL35KUsFGxsLgnDRaYKq0aPgMeczEi6tZp0EQmjUD2CWIiK9pnReImryiiTOAwHnO431F1WV0Hj4qCqvD8+vjgK8GDGkBs4fSXSUxxVK/LuQSYWVJk0tkFyq2/NaRnrQltYlNMAqFUuh9F5JbEskm6/LolNvb2n/mShbSI8/2X5Y54aG4OQsCN5pX+prAC3U3L8v0B57MHS7JZx6JViBNbCPKqM1cNVzcj1M9AZNoevuDUQRO1HYzgXMqhab+LbSRsHNKTxWFbQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 8b153783-a9c8-4059-02c7-08d46204e878 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR03MB2951; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2951; 3:4EEAyCrcx5tqHVFnhZM8GxY9HCiWGuUp1SHCWr5zTCHRhdx6EYs3TCEHh4Do/MZcG/WrsRy1PsfRduX/hWmzNe5hlNr3fOYFDMsqrJRMa/bRx2Am9viTYBe8yt68ahI8dwcHeYEuk041JS7W+if8ZLJ9yVXMSmA/pIlKCljbfEQgs4r3Rssk3GqCjpNq/0j9HXJVL+n+QHwKjx0BOLcibQA2FJMMjOJUkKIaQYX8AXoXPlLvCqEVvo0yH3ihg1S0FnmV6bvItOt2TFfWYyQ3KuHXNT3IvDaIU+wHnmSu7tcDbG7TlPrtTu1ZP03wH56U/UvyDyZiXN73QbRUI1tprPZF9dkS+eclJvL0BtqD/MS/Qx8+hsuLiJYJThQi3gRC; 25:JK7T7gH8RTesAjiUZwK1gnETAJvTLMO3c+Wrq5DEtkanm9NFAyFpRqZ7wbGSldia+Qt4TjAWCP5Lq8wFr38oiI3mifVBVtnS71N+YLyDM2A3KISuK0NTvrjeNSTw8bRttbJ+9R6d4atf7qMn19VsXWh8tVeNDe0WUBAhoTw91Q8+2VfCtZC4kYGWlnOmCMTouJqYbNXdEyPnMZ2Q/MNyOPgoBPzxQtYiSqPPBiWDLVoThdkQPdeAjCSt73X4JtAh+V/2GTCqbUoB0uuSVLhPzCIZg6n6vg7vROM+cOWDMudoS1MBp9uSkhM6+cXsCNWE8qzm/WEk4KWPysV720sBmjEZZlsNuCAa37hYcMAEaxV8ryZp3HZDYKM8/Z4mu1Rpk6TxO3t6x517YI82gtqBJIR0fJJ+HkFe4NMJI88QYffReHQ7krjkroVxnhmKOYu4 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2951; 31:vLsFprpeAIisNiL5KIdos6OutaxnpYVZAxQQra2frMOW7jdRj0opiA1xdxglAr7AEXNlSi6/yvvudPSmuulosraxsGPGk7IpBHOw8Bwxka5zWoJOY8wucOsx5MHd91H1DjYRvrKCQOXD7BkEcxBfc0HR6PjvKrQmsOj00vCDa94eqdfqKVlRPSMQMPPa35vRm2d5igFbgiAHvFB0yJqqK6kJB4n703Q5hLUKO3guh4HKaEUF64WAYYvPB7+JyOm95Px8Wq+GFp0XxlqNUvejIrzqAaheJgUNzE4voV+NiHo= 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)(5005006)(8121501046)(13018025)(13015025)(13017025)(13023025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123565025)(20161123556025)(20161123563025)(20161123561025); SRVR:CY4PR03MB2951; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2951; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2951; 4:R0htTptZkALFqLQ2uq56MKMEqmHEjnnfQ7hQSEX3WN2hkMMKRDwqbUODOk5TWlUCM0snz1CNNxjblAtSHu0MYa5mLWH1bRTosrYOzWvhRHd5mMm8JxSC0x0PFIXBnuXcbnn63+8AZOSGvV088ATxm6/DHKV4ONaaF1UH8wuN5Wxm85tEZt5TseLPasBkdVU8iCjNK7Gu2O8VixUluEs2bknm6y7M8813NxfriQye+MAptVfbSGRnN5IzzemxEwODf/UuPlkNXhbQWpFVlpajy6sSQZkxJvDdID8Qs9Bri4+xyqB1ek7vXj8MztVLwGFvtatzrTjdB3U0LzHwRVY6qbbZrN/4uqqTkjZcpYwfOKMr2B/pXx37iQyBaoWF7Uk8CBJ1RxU2XMNiHOILcGs9JL/qFSUDo50DFq9VpnFR4nm82NzOZf8XQVlNMTkAYr+6jiUq+CSJpZkWd43y8//HG1J5cZx5dsTGwhI1IbM108J6TrZA2JNP9xZp4kw/y4OYU8fS2SSfhDk/9ZtM09mWL9ZMe6rE4DT4k02NhjAUQRZ33QtFS/+gKItYMgO1f2mpDCO+9kWjYsvBLx0M3vc/5l06QRiCvwKvZ8LAysk+UzijLQ2F6KrJqbgNkAOofTC9elAGyG4yL0s2q+qCz3FIJmzWG8964LJK1YwlqJJp8jZJX8ZDM2/5br+t4trWAKImHjQe+o0y7U5M6RDJPVHEsU4fKs+BypGg9KQHSTz/Pk8+QIH5+lqebmZvghvpIzAN X-Forefront-PRVS: 0235CBE7D0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2951; 23:f0xcef5dMWJGRtJ5IhE7gp3wTzXTZwSBsuepH1eBN?= =?us-ascii?Q?3UmZ/twjl6nCkULdYuNO807N0lBKym2T9T8O37XvSY1iGcoXLLDKEg7xkUye?= =?us-ascii?Q?mm01GBYPOas0Q1AKohaNDR56HNmQeE9/031eLw8ijeiRRk1JD3uQMeoQonVO?= =?us-ascii?Q?bXwOXteg8PvD+06pJorfeFyrp4bF61Cx1U1wFc/nwgfdoKMTVqtcZ7xj6bmr?= =?us-ascii?Q?aeeOnCAh+/X8IJjdD1qw/5ZkS7volR1cH+dHagHq/ZV78HaZhVsJXP2Cjg5q?= =?us-ascii?Q?x+N176Evw+bQ0AJXlIhV2SPqi6E90RP1GLxprDP6Wzw3+HG9vREAi1ZD4TqH?= =?us-ascii?Q?09XUs3Yb3DiZT3oXLz6LhqAoeD5VW/10NxUK/etUEdHISA31nyMugrsTMUoc?= =?us-ascii?Q?NsmNj9oFM+xQqprozwd7O6MH4jnszqq0zmTxnczdlW4PXzyLC2vR23PMlfCh?= =?us-ascii?Q?8SR2QdP4XMIl+g61MgIyKKN65+uZOOlY+ZWYJIpG50y2KOBKlJshAPBHwsIw?= =?us-ascii?Q?Td+tr4B6w8Kt2+mk2KiRW8s5OBk3wAHHudwIDTQk+seK/M2rdc0XsItYMn+J?= =?us-ascii?Q?KsmKYR7i0uNRrzewNSATpjHJAoCeRcyRSiScuGB5aRm8gSowb9/128BfVpSh?= =?us-ascii?Q?TX5NmViAnAlLmUdYwo/o6jzLyNXypzLEs6QzecFXxQwpdK+ehYCpqQsZoJQm?= =?us-ascii?Q?QOI7gx/aG44R4RZjYbDYZ5Y4YPemLiwY69aap3pYpeIRXgYoL9Jzv+mxDPcl?= =?us-ascii?Q?URhKEHY7goEuMqBlVX0LlsH2YtPhnTvSDhgyH/c09kHKqTfT/Nj0Xfjky3Ze?= =?us-ascii?Q?fJFp679Itct0Cq27AP2eb7rNedLMWgu99ChO9xb003fQfEfryGjXwJC8tX1F?= =?us-ascii?Q?L1mwcRjiajMPiHYsEhDnT/mkuj1Vdx0MpQoySrQFaOlzhxZ+gH+7KYN0LtCI?= =?us-ascii?Q?M176tSaTciXqVJjS+2ACq6dHPh0Rz755t2A5uHelJ/m4k+Kz7B+M8TmzytlM?= =?us-ascii?Q?kmxbaVFzRZg5yPdEZnw+nX5CIVaJ8Bq7A/BcaP4rapG5OYOwzYkOxF1zbeDa?= =?us-ascii?Q?25SIXOl5q+EpdGMMYdzqNPqE8xZuoZ5Rxsb1dVuxWg7sJXSqo0FSei9ip1Sc?= =?us-ascii?Q?32xGzqT8B6mzawKqtmAMFnD3XvCMJcaLLfiid/Kk2jy82IUA/EDALf8+qlcE?= =?us-ascii?Q?IniFdNjBFDJHogMzvtXe2fIVDxkEqpQP22oHhiwm0gZgHCZb4K+RoXZZntPc?= =?us-ascii?Q?xmA58Xqi4NO/Nr5WzTZxLy+wBYhTIyt/oqTm8up?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2951; 6:rxvYU0VXYzkHD33EpA9ItqNSKmb3rzxWaUW4YlIya0N1BaNRkD6nfMJgIya59OAqiJ1+WVy2TJvcw9bL5R94wUx0cr20rFes86AtrY1ev4CtmivjCF/HGLHlhkJXGgeCSSoy3pS3hYOOwzPBuFY1dEWgs4vAkMbQJ4nXbtDvzy6ZW1j4nzenmmyujk5I5Y/TpcYvXL3ZejIiu8qNk7duBsynE/6lUuwVsVLjopX/2d6UaFCX3BDrmvrypbLsgn+N5TwoeXi6GwwPGc9OPFuuEn6ek95WQSbKKYVOPXsNS2HwaE7WLSVuuibm20kyhXQQtM0LfOwdpgRS8lzyRTkfk7HbaidrgIWNjcBqZXs9Vl4OiPH2lQ5nXZ8rSRnUR/8cy7ZXu7SKBJ5nEwX0rZkQMxmeo/hqoNME4UvexTur9nw=; 5:PkUyt76amP0tkKzvmXpwdB0ffHIWJPGv34I/6CkGOCH1HosTuyCBOYZ61uPIFYfDMekn5sz3HwRsT3NYiR6g465O3twqTJ7tVUrrz68CAJk0echOpNbOJqzAEVw9UhlIVAqEyQsTsIZXCqnsRB6WrcC6j74Ya6sRcTSEUow3rfo/OPTxlSPUDWUfJi274gCZ; 24:jgOumXmM5hyfTpP4vNhdzvp/OxIoXYJ0fWSI6jr9bzlFOdymOFAKl5AVXAqyJDWH1qAUtCY4gGSKc8IVRyuJ6QwKpZV3AAPhUCOWFGVNSWo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2951; 7:aU/JoqUZ8MANsGoodI4k0Q8vqFlVxxIfGTCUeFZCFGyu+ddRlh0qnqhRtf19CyGwCmT+wfixXDEi4afrcXZo9pW8m6tbYo2t5d6zVXb/OYfkvdc38dk2r8eIoqhyKqJpbTMpauDresC/T75XpyWcprXyc1XV7rLm5gcmX5jhpZ6WJRl6mIIK+0ZOoJOZs4ZvExZS2Sh50SUt/EEw7EnxbCz59Gr3LSPf2BOMbHmviPZ5UbaY/XrB5IvrIF4m4TxD6CgCceLy/AGvsnayVWZj7Wd6aLoPnBkR2PudUva5edcpx5jWEKMC9XdPQfSR0CPs2lkq0AJIMS1qhkVwaGOdWw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 07:14:18.3780 (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: CY4PR03MB2951 Subject: [dpdk-dev] [PATCHv8 23/46] 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: , X-List-Received-Date: Fri, 03 Mar 2017 07:14:21 -0000 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 4f78565..b5f3ebb 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -59,6 +59,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 SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c 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 934755a..c14b4df 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; priv->hw = dpni_dev; 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 */ -- 1.9.1