From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0058.outbound.protection.outlook.com [104.47.34.58]) by dpdk.org (Postfix) with ESMTP id 5509AD090 for ; Fri, 24 Mar 2017 14:36:12 +0100 (CET) Received: from DM5PR03CA0030.namprd03.prod.outlook.com (10.174.189.147) by BN3PR03MB2257.namprd03.prod.outlook.com (10.166.74.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Fri, 24 Mar 2017 13:36:10 +0000 Received: from BY2FFO11FD041.protection.gbl (2a01:111:f400:7c0c::195) by DM5PR03CA0030.outlook.office365.com (2603:10b6:4:3b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14 via Frontend Transport; Fri, 24 Mar 2017 13:36:09 +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 BY2FFO11FD041.mail.protection.outlook.com (10.1.14.226) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Fri, 24 Mar 2017 13:36:09 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2ODZhfs005481; Fri, 24 Mar 2017 06:36:06 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 24 Mar 2017 19:05:23 +0530 Message-ID: <1490362538-20854-8-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490362538-20854-1-git-send-email-hemant.agrawal@nxp.com> References: <1489756124-10805-1-git-send-email-hemant.agrawal@nxp.com> <1490362538-20854-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131348361697741655; (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)(39450400003)(39860400002)(39840400002)(39380400002)(39410400002)(39850400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(8936002)(305945005)(106466001)(105606002)(85426001)(33646002)(356003)(6916009)(5660300001)(8676002)(6666003)(50226002)(81166006)(2950100002)(5003940100001)(47776003)(54906002)(38730400002)(189998001)(50986999)(76176999)(50466002)(77096006)(86362001)(8656002)(4326008)(104016004)(2351001)(36756003)(110136004)(53936002)(2906002)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2257; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD041; 1:PUxdKaptv4O5Vranzgvq3i0SsktEnwgPgAsKiNvGAHRMteZ24cGzj8W3wXIO+MK4jwuo5PWns97EizZG90PxpODSaBTo3eRcYAqWsn0FoLMKRICLOchM76qqgNwQMebPk16VkVXiQs212cLRCCMrY5xF6mC+MYJ4u6ZJPRd9OkXxOLO16Fqcw+5Pm+uuU2EXmNHzfcSmpF90prV+ueM7RSEgyZ+ucisB3I9SLU/wR94reqjda/GuFQJm6LA8HLxEEQIKJDbGfb9nrcNP5Glz/cxH2uNTUxxcUf80K9mJiunJ8GjYziFr5zipFVlY2CW7r4Gwe0wLhBn+xza3+ZNZPywepiLTNQFjbxjMynuugVGe0xbf929PWm7ZfBVcrbWO7LQpZnF9u134FkQjYN2q1F76++AywYRFbQYSBXX61UsoP6e3VqaEn13ZFnmh88u8oLfl9K9tE7+6R1KRBexA1wybo5k+4StJhp60ET1aDh6OsWdb6xAerCViFYBvMThKGRippii/HFJrZu9pnikxIV+c5Pv5WWWm35USmY/FEkkdflepyvwRcuBs3gcjSAk93eoCh/V3A9tXPBtSP6oMrxN3ZiELdT1LPqyPmzi/e+ot8rSbodu5EjDJ6kJ7It20JRMGVWC9wF+GAyJvRjYz4g== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 7c3729b8-40b8-421a-69f6-08d472babb47 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN3PR03MB2257; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2257; 3:hItjyXn6VJCA2jdjUhtMp3qBvYI1tee5AZQ2dNp3vvNs3d7O/L7ZSa+07Mmpqltu6sOJh4WCR+0NPVDbnbtZxv/cV9iOCL93xKhml0SXqY/IpKmRT7tlVaiBY8Y53xkWGraY9KN5J9MYJxFv/bot/cnLNGSibXD26XO5BfZD9lSej2QEtLDzspebbWtUV32jqI/A0GmZttChuk56vCBTPscnY6c9R/rSfcFpDHuT1xvoGjTkd66nO0sdvU+ZOSMb0izZmjMTQlDdn7iJ15NaPwfPouKPhn7s/ML76fhURnRJsJm//USMRBotMqNVaarXsftsWgN+VKtlfbGPzajTMDJDIHkTwz/eVWLNQjk5HHwKJN15doZH5zYqjC27HZJt; 25:moaIw7SQILEGfAES3SVLLHBiW/Ov0nx1r85mdxHa/JaE3L7kdIR5kMdmRdzfamu0ljVb//sBhR3JOZ6xhn8kHgRlgPTbMAuUGQvZkrRRpghktshrZrJtliNmMuIRHYja32ybfiEKa7IEqZ9F3dUHoisio9wrS0aJxFToknJzBwpzev4slBTAGU0CP8DHAKDFSxJYuZKRGzJjfXNaJDfoEqWQKxSQ5izWrGmgZ0V9lCt8ufq05E009BMg28GQ70pgn9hMglOoGD84STuFKr3YUdBryEBnlHnEbFaUbWHKmocXT9gWreLoNO4Rey6lLD8CUR98Zf0HSCGRZY2lPnhHoVf3zs5DptcL4m7m6vALhj61IMGuFNH3DFacLNLI6MfmG3PPLNbJmetkmCBjmTNTpZnPL2ScEpFWrocgMOKSGiSwj+7uctLmmASfpN5VphUHdckyK8vV55D1rJiivlsBRg== X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2257; 31:6QZRfe1bi3m/kV441cXQuuuc4Sz30Z0nEZk1r9q5tWasnOh5mOCjqPOxLXRTVYHGdaYBQXvarum7fkR7jUexRaEj72ct5cOkUPhSphX8iKVIA7fZbT5V2Zvx3xyebTKyf/wPEvQ/G7TpkodcPKJGt4qb4mhGfkMeBfIvqGKXogzjsi6CMZwU5lHULDAx1OLU87SJu8jO6AyeQAqJdbe/gBhXBPkz2pxBCYimfHf1B3DyYiAbark2jv+nnNxpLoilUw9UFRJXPWXHhQmkAzwEWA== 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)(8121501046)(5005006)(13017025)(13015025)(13018025)(13024025)(13023025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123561025)(20161123556025)(20161123565025)(20161123563025); SRVR:BN3PR03MB2257; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR03MB2257; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2257; 4:XIBRyyYfcCBX4iXPQpgQVhI6CdBbYI0tSvxLWUpUyinUROeejZ/4ySBf/4Y/IwzViSpCoVgPRggGlgMMyTsp4n62ejhmUU6VToyehFDqZRrsfYUSZQBjHnDGWu5SuGZg5jEuN3E6rFS+oLeotNLK1ajmsdELKKHSOMFjARNG5TzHXcY8+GHrMB268n/mnGRP88GgPaXT0eWCk7u7k+3iLE6JyGTl/Qzxd7mN5p+sdyyqvacwHk8HKnECI5HfsyIGPTFBwtnwBDTctRJyr3cnlZRZncYZEy7kpv2MquTFvJ1OxLLJnuDDCA67RXeEwR/rJUDiaBj1UuAPjaq2ssEXKL3ARuWuEPjVriCgo6xBT3ui7QMSHNXoSsvAUOxgCZbJxM+cCC6SgyB4UIrZd9XVRBnSt2YP8QqQJcvkWdcwafvStURLWYJOr0HmFKqe0xZ/5fD1cMj3xbbmVnTZy2Nq/eMivu7rglRvhNl4dqpdjQLRb84A2QJUaLc9HgKd5sPAU1q6T1KhgmV9tYWhVXotNl0LbA3SbPH5ZZhE3S4zy02HQt6Nxl26HpGlVQJkxdozLPbNji3ltl7NA0HXUKouMg1E6hG4fv3whT8ZroTm76LgKdm2wG3nXV8IyBH0buzNJchg4W65eQroPJ9EJFnd+J/GLiE0HQahxAUICuWGIABC3z/FT97Zj3AEwQVZJNxykzzdiXpxSM+Oe0yNrk5hBDg3arZ0vwLZmvECv0BV5JDnHZ00FWZO+WiKilRoSBSZ X-Forefront-PRVS: 0256C18696 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2257; 23:eT2hfkIeII+as0+byR/JjJLcOzsOiIoPRqS3cCNZU?= =?us-ascii?Q?WAUu7HxQRXPwItjJ9zl7S7Mlvves4AKo3NcUKMRwcy+YxUeK7osB2RMhma3o?= =?us-ascii?Q?XRL/2vdC/xqitH7q6UM/dS3uC7VkUScMT0Xvh+NQ/bpSQNTRYha5D5pTLKLO?= =?us-ascii?Q?/w8V7Mt/i5SkYx166eP6f7S2mzE8s12aRG0AuB+6oAUBJquGI5HEaXNpwfzM?= =?us-ascii?Q?hWncN1r29k4F20lFHSl+GM97vWHWUhp/UQexdWFQ3uSCgewdSGSA2AVyOeu7?= =?us-ascii?Q?2hUDjM9Nz/TnYppTnkzC+p8zwC9xKjIQ13VXhg9VH1KMf5vteeJu6UwYbRe1?= =?us-ascii?Q?Mx5/05BCWJt0CB5KvlzXYJ5PD+qizSvNwjLPtZoA0lv3iWKgzw3aevOGowF4?= =?us-ascii?Q?6yOx2Djc9BKGacu7qbyk/pw2mp1GmPdrD+meQFQu68epsRHpwOCy0ViYvOap?= =?us-ascii?Q?X60R7a/DZWZZ61jzDV+6uJVec8e2zbs+JDkSR4xgZ5M81f4qBwtd10PTtj0C?= =?us-ascii?Q?4r+Zq37yn/szn0uJ7I1mR+t8XjaqxMjK3LYDpT19P3SU5QLSSbMrYFGE2wXs?= =?us-ascii?Q?4q2iJtaZ9I8YNiGMVxx9VMUkLS9gqZD0OH9oSIsrsjgSV+gBTQLKz+TLTYMm?= =?us-ascii?Q?LHmLu4T3ShNmJtWWI5Qq/xTt/L3vLgzDb6pTlBTvSUGchytWN15g298PVj9U?= =?us-ascii?Q?JkvtzHVcJ9rvIiHlJi0uPgEFHU4IIhMdGJ/RaymZl4cmKeuDBJyLW11YNLiV?= =?us-ascii?Q?PBPes5TM5TGWKv+NMc/flAuRfJp2ET7y7v+KpZwKiTDpxI/QEkvOgEjcISEa?= =?us-ascii?Q?+jR/XAZQDwA9/DHXe7gaPMw+3AvNteIKr1+zS8DThx2GOMHdHCdXkN2rwRDv?= =?us-ascii?Q?38FhvCMRmYtaStW8u1U1B17D+ZwXHHUcA+pimIL8XxIdiey+njC10RbVNOnT?= =?us-ascii?Q?ur7Ra9W3C8EXNf4tWyVV/2xnvrrGHpvNcn1Fkzx7WEfiPzXBw2Q9aUfPfXeg?= =?us-ascii?Q?Wyq8O7YV/p+945okv7+Z3i2Ed514LvROHDMcFgQfkfM+nPUegl4JjOLyagfZ?= =?us-ascii?Q?pBMAdCCVu3G/yblmuBFHJwLilEXAUTrovj461FoH8Ggm/VA445lS5+4PRnCO?= =?us-ascii?Q?J3Aa2YRY+yDIpvwXYYvnnSuDb3/H3egLezwfsN8Urn1AKGAWhWUqPiTcwkfq?= =?us-ascii?Q?tw+nGuUQZ3C8rUOl7ikdYXYrkDZVpb1Xsur?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2257; 6:cCqch0niCU7D7DzJ4U+2WxpWRX5sKUfoASju+DKmK3gkUXOs2vk9FLwCvXOVukJFDYPw/gt7suTvpSF9afiPdHEgEc6j0xQX/0QeLiv/XwxGrgSKmaL0VWNn02QdvB/J5knfj/B74EP7wllinG3I2CTXApzqCeshG9AVUTo1ko2rLRkdD9CG+5km0LzWEqHF6ocYYY/VG0NkLDTnLNco1ztSX/dizgbPTgqXZK0kwbW8u9IPd99cEorxMDbjIZac3dXW5FBQfcj4YkFqjSZ46MT/yUB1kw+vglnr0AVW+YYWGSTPgYB1gke1is0A5+hNtW9gcq43SOu27fi59QRAKSNFBqP5Nyl0fZ5qopee6urxDWY1xFW5kucyke8ekPWhIPuen7YCbMLi04bQl74TdTXOU54g749zzSk3SccVsoE=; 5:KtydmxCVTMJ3loNP3+ReDq4QjQpFEdNXDq4/BwwwoEHa/BkoZXGQBJIoBoeifxRxFQtg+C/SkQLg5puf91AcdwuxJqEVKIdyJCkjj1t7BR8H8TuPJ3iO9w1ZPH1tjKoRT0T9aSMKAlLKnZhWvRrp3V+g58UDhK1DpNvJtJ1WJR4DfIExp6sFnAAHgyxTK78G; 24:HUtJrdSaYGerwy/wWElbl4dMCjp7Y+UNBDdppGnqe/6fEa40PMknXxc86EikycfhR51OupqI8CT6hn/lI58X/KNlkzzaKS42vvpskTW85q8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2257; 7:l9M5TFyGA58mTantlTjgM7eL8nxT5kZHDsFYIXV+F+fvdyol9fetDrfVWii/dsOqEBfYd61wWmpuMmgzKXIw5QG9KUmPiAgXvbCIHFlqUF6WLrysi/EeLM1+giIjhK85O2cHw1QhdItxcr/Bg428uk95jY4N+q46G1Ql41gsI28DEv9gV9W1ZUy0Xa3MnStYXVH8XEGiDpkQwaJD50Cu1DUMa3mSPhH7R7/wJOSiry4qhM9fhtrRq729VbLPlNr9IKUCz69YlPmTetQvvriYYsOZNWcr5/mugF2vrqYnj3bCj4GQrygpwpOK+erO3iOGC7jgcEjnOPhOt97Kxv7Mgw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2017 13:36:09.5713 (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: BN3PR03MB2257 Subject: [dpdk-dev] [PATCH v10 07/22] 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, 24 Mar 2017 13:36:13 -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 43a9e83..c2ef774 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -58,6 +58,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 030919a..92d334c 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