From patchwork Thu Aug 24 07:28:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 805279 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xdGDB3bLfz9sRm for ; Thu, 24 Aug 2017 17:30:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915AbdHXHaB (ORCPT ); Thu, 24 Aug 2017 03:30:01 -0400 Received: from mail-by2nam01on0084.outbound.protection.outlook.com ([104.47.34.84]:15200 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751484AbdHXH2j (ORCPT ); Thu, 24 Aug 2017 03:28:39 -0400 Received: from CY4PR03CA0093.namprd03.prod.outlook.com (10.171.242.162) by CO2PR03MB2263.namprd03.prod.outlook.com (10.166.92.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Thu, 24 Aug 2017 07:28:37 +0000 Received: from BY2FFO11FD020.protection.gbl (2a01:111:f400:7c0c::181) by CY4PR03CA0093.outlook.office365.com (2603:10b6:910:4d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Thu, 24 Aug 2017 07:28:37 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; 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 BY2FFO11FD020.mail.protection.outlook.com (10.1.14.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Thu, 24 Aug 2017 07:28:37 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7O7STqe005094; Thu, 24 Aug 2017 00:28:35 -0700 From: Madalin Bucur To: , CC: , Subject: [PATCH v3 4/7] dpaa_eth: enable Rx hashing control Date: Thu, 24 Aug 2017 10:28:25 +0300 Message-ID: <1503559708-13405-5-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1503559708-13405-1-git-send-email-madalin.bucur@nxp.com> References: <1503559708-13405-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131480333175136225; (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)(39860400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(43066003)(86362001)(54906002)(3450700001)(106466001)(53936002)(76176999)(81156014)(305945005)(356003)(50226002)(97736004)(50986999)(105606002)(8676002)(47776003)(8936002)(81166006)(626005)(104016004)(5660300001)(36756003)(189998001)(498600001)(6666003)(85426001)(33646002)(4326008)(48376002)(5003940100001)(50466002)(2906002)(68736007)(77096006)(2950100002)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2263; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD020; 1:QJp9J1PVALJvXcysnfQc6E4467AuJIJq/ti75/YpEbv+nJ2VnK4x2tVanLBzL3sC5+JaW3lTfGsK8KmVSMDGOjWK/it8AWxjE63Az/ha1I9qu7chmiM2HEFsWJK5Af1z MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8bc0612e-a159-4aa1-3378-08d4eac1bc3c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603196)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2263; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 3:7Y3R8Kameq3OEE6RNhY1OTvM+nz33f3l6MeiUHRrW66fDe8cuECYJ1Io7kgf01NRe8hY1UORGUhw12PbDGqavZHrJfomVee6dQmIZDWFbpUFSKlb2yw5jfaY6EVbhkFd4txTkeK10czCVj4wlWCIRqToGxkGdlkxJO7PfcO4WITMnoJD9wIayLPIbZ+XtOvgMmp5XLBL/yJiRmuUvM2ZHlJa4ZN+brIlVxoMtZZpzzQ76HM/bLg6PtOttxoi82u8+HF2L4C+NbBU1AcX9d3rNsz8Y8AJz5FRHwYNkGrrjquIeG0FRbU3aXXgR9QfnZfIJYPOrTr8E/Wky0JMsQ5uCqhc3hBRcC72LzzfdXaOJv8=; 25:+Z/mW0g9m1biCC5ulXrxH0WQJkKLGzRN1pLtGntK5oDntgyPl0W69a3SlkmN40NuQslNOcwhD10peDLAv4joOyUV5bOVMZPYpqmbZIorrkbBiE7AilJpxkf0AfByM2XuNVO8VFL19o5hOQigphfHG4jzam0n1hDm7cifsw3xY3XqH42J8aUN77L9cVKv3BQcs54CUqdGsshbYFrw6bxiH0zqKJ9sMf5B6TBBtap3su7bEfI2WoB0fYWPnciJdztTmbCg5gkX9WP9kIuGOkmRa0gYGSETld1n+AaXvLK4l4/UjjMxNBAJpWhcD2q0xiagT4fas+Dz8u6FAIDc++iOTA== X-MS-TrafficTypeDiagnostic: CO2PR03MB2263: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 31:xyUJ8QuE4b56Rdt40FM4diIhoY7hBkYiUfQJozM8qEDveSXETziEjXbeZ6RMQPE68NtUvVPzR7OKVnQNuJjupu+VwZSscBbAahSP2Rv40tV+UPPTcS4oGKyuF925cO6t3iaiAtMlEVzu4IDeflMqI8KzWn2eyVX0GU/vEuJ4ftrgB4QBQaN/a4myHIsgsU3EuhqsfuUs8SZRV85QbS3JtY0aks0gbocsODd8WSuKTEs=; 4:M1JIIxJ4H+tb8nsJYwc/UiNWh6VzXr75ERE+pJ2PEDrpiGc6gqgE3G1VYuYL52CCAYRw2n7lk78Xvu3OmSK05uiaRyjc71nWyxy07Nuxcte85gbHu8t5tAuo7JZsRNjqFvMlwGqDhMoujLFqxbbLRK5mKexWCnmhTJDdqh/n4BwnD1/PJ/hgeBl95wBBNMCN/MRlsgjGRYSwKbzbUoTWCHAg0p3EpSBTJ4YTYaqROYsaekXzpfk2cvNYsqdRXDZezFatiAEe4u3w5BYYKWz71VeO+J7buVh8tJ75UfBhdEU= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6096035)(20161123561025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100)(20161123565025)(20161123556025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2263; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2263; X-Forefront-PRVS: 04097B7F7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2263; 23:tOD++i4pvu9j9nvZN/r6LclgL7GMd2JJ5wBCrU2L/?= =?us-ascii?Q?vdV90e/C5gV+IFsJ3iS3vJV7ApKwQZ3rmnp4S5Iz7QnYU1x2jMD/k23hhfc4?= =?us-ascii?Q?l1DeVKpNvc19xAnwGh66+ILSMPML38PtGSVRyJzH7IXeUYZIz7L8CHyF8+Mg?= =?us-ascii?Q?RMtar73vJE2SPgXBS8WgTxTuckQSUoAjnle0uB2gE44uKswUb6JpVB2Qjc97?= =?us-ascii?Q?iVra3NSQyzitc5a3HWaK8OpYuw/JMg4uoWGB4s8pCfAAWfe+VZtTg6VqtwJX?= =?us-ascii?Q?NQ1Ml7yEQRV9T0PvahcWtOW4/MZcc1gfZlzuZtY5k0HgHm5xh9i5AOEmmRRC?= =?us-ascii?Q?LZwfLfZVS2F7nRQRf9mTmLs54U+Lyj4xrEtT5d6XvA6dnIwrs4C6tXCEp57R?= =?us-ascii?Q?RN/HZrcjLFn/SmrXnP5v3AX4TNFO6IFQtzJN6DPNNOvtuDnmFIFhNz6Ozj/Q?= =?us-ascii?Q?e6TKOD3GS0msEPDunAm6sRX+3HwdMijBLSZNCdPbn1VX0behLvofL/rR0yDR?= =?us-ascii?Q?LsHR0M0tKkJjb+ZpJspQNZP2sm/sH9dj3x13oqkYjo+E+RoINd9ScNQ6ywxb?= =?us-ascii?Q?J/TFwppDPoNXkI4bsIK1LEP/sw78YsiFnDwT3MwNRbjk/ukyzsJNtOeBzB9d?= =?us-ascii?Q?DoYBr8SGpdKcRnaV/wMDS+0mSrUPyag0L779Pz+CI4cWCBDSDlk4b5TW0zbr?= =?us-ascii?Q?Oh2NX34f7uHVFZWKwsD0+L1IMv8h0eAC61lMRhhEInsxxZWn7zoxrqyYWzOF?= =?us-ascii?Q?crhO7tHRJc+fc9/swnrb7nQcav8iipPRsFVFXPyzXRQwivfFwyc1yq/EVxUk?= =?us-ascii?Q?f1TV26WPX8k3c9fkwiryiqPEYScsuJTbsrduxaAy3x0JpR99Mzt/J4p7Whvm?= =?us-ascii?Q?abnHSUf3s/F21D8TNWI1s++CvGO5sznaVoa8pgRrVmfPHel22rV3eI6VHVAL?= =?us-ascii?Q?tD72YZI/5pO8pjLL/y5Z8Ym1uxuKXAYmqpVuMwslcpcH5b1eVuGPCOUKnLEP?= =?us-ascii?Q?irVshnLVbr3ArB3KEO3qF5/3faxLcV01hepue0niFSjTewUFTxt0vN+bvvdA?= =?us-ascii?Q?ZhXEjCtanOh5nTtyfSEGutjbCIjgwsZ/cekQhCSMt3g/BXtEGQwMzm27Kwxt?= =?us-ascii?Q?VPfFU5bdQg=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 6:B06Xk1qXKrX+0clwNpBsYPQzQysmdkqAxKS0YHKElmDzHQSSbx2Nkg/g6daEsMMUDb9XMpzpkzXL3l0sEXEXPGckZgLYUYuSopV8qviua51NRAcU109XU6g3eqEUX+JxUvuES8DSA9GZoyjgcvbUDnt601VjzXqOvb9uxIdg9UrX48fNYMo+55NQTAaC8bcYRk0i1XdvoITg8cWtnOqKh8+QDe5yqEfK2fpzyFZF0RUTV7oYdsbUlS/v0EZK8SluNaWXi2GZ4x4pD8TosURkpXfSghmzk1aYePzE4gbh7xz720R0ukPhmMmG4NiUMKZhx8Lct0fUEx8+cxzaMUhLfg==; 5:LFqxx6Vckoqo88dCG456kruiQlZpopLn7V2AZOO8aSjsfu+uLI92/VRHUJ3kTKi5nZEpwGMhXQ+BIA9OgBewwCFKI9DUejHvNOLTycJd/sa+O15xl2o9Mq/3zTxiauzGBF6aAhsqHLyCSBBIZM3zGQ==; 24:RmpEBYenfrtbBxsi0XbgFBM5rG0fZRqbRxGY7Wn9YdSzbDXlno0rpZkDUPtRKwOZi31PUQTpgqeixgj1R4IOlodB0P/mNubQbDRybe+ZjUA=; 7:aF6daaFjeFoyFAyAPPkcjtSfKWe1h7GHtxRrGvKjCVhG7D/VZ/V9W0thaEcCfUtozQM8rj0YfeWF9YsV6gFYgkefwlFZ1ON6AkbwUKsTuPIcRC48Z2R8WP8n/p/IslcCDmZ2TewrVWS7n3dLO5XBRbsiRNd+KCEWGlnBR8XGNnlbNwg0KPaUv3PAU3dSD3X/0GKfnTIu+k6rygcp6HFLpZs8KlqBuzcorjFw3r4lS4E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2017 07:28:37.1704 (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: CO2PR03MB2263 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allow ethtool control of the Rx flow hashing. By default RSS is enabled, this allows to turn it off by bypassing the FMan Keygen block and sending all traffic on the default Rx frame queue. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 113 +++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c index aad825088..965f652 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c @@ -399,6 +399,117 @@ static void dpaa_get_strings(struct net_device *net_dev, u32 stringset, memcpy(strings, dpaa_stats_global, size); } +static int dpaa_get_hash_opts(struct net_device *dev, + struct ethtool_rxnfc *cmd) +{ + cmd->data = 0; + + switch (cmd->flow_type) { + case TCP_V4_FLOW: + case TCP_V6_FLOW: + case UDP_V4_FLOW: + case UDP_V6_FLOW: + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + /* Fall through */ + case IPV4_FLOW: + case IPV6_FLOW: + case SCTP_V4_FLOW: + case SCTP_V6_FLOW: + case AH_ESP_V4_FLOW: + case AH_ESP_V6_FLOW: + case AH_V4_FLOW: + case AH_V6_FLOW: + case ESP_V4_FLOW: + case ESP_V6_FLOW: + cmd->data |= RXH_IP_SRC | RXH_IP_DST; + break; + default: + cmd->data = 0; + break; + } + + return 0; +} + +static int dpaa_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, + u32 *unused) +{ + int ret = -EOPNOTSUPP; + + switch (cmd->cmd) { + case ETHTOOL_GRXFH: + ret = dpaa_get_hash_opts(dev, cmd); + break; + default: + break; + } + + return ret; +} + +static void dpaa_set_hash(struct net_device *net_dev, bool enable) +{ + struct mac_device *mac_dev; + struct fman_port *rxport; + struct dpaa_priv *priv; + + priv = netdev_priv(net_dev); + mac_dev = priv->mac_dev; + rxport = mac_dev->port[0]; + + fman_port_use_kg_hash(rxport, enable); +} + +static int dpaa_set_hash_opts(struct net_device *dev, + struct ethtool_rxnfc *nfc) +{ + int ret = -EINVAL; + + /* we support hashing on IPv4/v6 src/dest IP and L4 src/dest port */ + if (nfc->data & + ~(RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3)) + return -EINVAL; + + switch (nfc->flow_type) { + case TCP_V4_FLOW: + case TCP_V6_FLOW: + case UDP_V4_FLOW: + case UDP_V6_FLOW: + case IPV4_FLOW: + case IPV6_FLOW: + case SCTP_V4_FLOW: + case SCTP_V6_FLOW: + case AH_ESP_V4_FLOW: + case AH_ESP_V6_FLOW: + case AH_V4_FLOW: + case AH_V6_FLOW: + case ESP_V4_FLOW: + case ESP_V6_FLOW: + dpaa_set_hash(dev, !!nfc->data); + ret = 0; + break; + default: + break; + } + + return ret; +} + +static int dpaa_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) +{ + int ret = -EOPNOTSUPP; + + switch (cmd->cmd) { + case ETHTOOL_SRXFH: + ret = dpaa_set_hash_opts(dev, cmd); + break; + default: + break; + } + + return ret; +} + const struct ethtool_ops dpaa_ethtool_ops = { .get_drvinfo = dpaa_get_drvinfo, .get_msglevel = dpaa_get_msglevel, @@ -412,4 +523,6 @@ const struct ethtool_ops dpaa_ethtool_ops = { .get_strings = dpaa_get_strings, .get_link_ksettings = dpaa_get_link_ksettings, .set_link_ksettings = dpaa_set_link_ksettings, + .get_rxnfc = dpaa_get_rxnfc, + .set_rxnfc = dpaa_set_rxnfc, };