From patchwork Sun Aug 27 13:13:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 806244 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xgFsx4xTwz9s7h for ; Sun, 27 Aug 2017 23:21:41 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xgFsx43ZtzDrZy for ; Sun, 27 Aug 2017 23:21:41 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0070.outbound.protection.outlook.com [104.47.41.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xgFj307TnzDqg5 for ; Sun, 27 Aug 2017 23:13:58 +1000 (AEST) Received: from BN3PR03CA0084.namprd03.prod.outlook.com (10.167.1.172) by CY1PR03MB2267.namprd03.prod.outlook.com (10.166.207.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Sun, 27 Aug 2017 13:13:54 +0000 Received: from BY2FFO11FD040.protection.gbl (2a01:111:f400:7c0c::186) by BN3PR03CA0084.outlook.office365.com (2a01:111:e400:7a4d::44) 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; Sun, 27 Aug 2017 13:13:53 +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 BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Sun, 27 Aug 2017 13:13:53 +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 v7RDDhJn028627; Sun, 27 Aug 2017 06:13:51 -0700 From: Madalin Bucur To: , Subject: [PATCH v4 5/7] dpaa_eth: add NETIF_F_RXHASH Date: Sun, 27 Aug 2017 16:13:41 +0300 Message-ID: <1503839623-3906-6-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1503839623-3906-1-git-send-email-madalin.bucur@nxp.com> References: <1503839623-3906-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131483132336397727; (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)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(86362001)(5003940100001)(50226002)(77096006)(85426001)(68736007)(104016004)(8936002)(47776003)(3450700001)(498600001)(305945005)(4326008)(81166006)(43066003)(626005)(8676002)(81156014)(76176999)(53936002)(2906002)(5660300001)(36756003)(356003)(50466002)(50986999)(105606002)(189998001)(54906002)(48376002)(6666003)(106466001)(33646002)(2950100002)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2267; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD040; 1:QyeiUy7vzXqftlxhngaC8wKEBkKRnOQv9is9xobFogFfyXnx4LO2e960gGnL1OW6sYUNAcoZf4DLMdY/ACCJ3YdtUYRHx5aFsFv2IlYQFxxWR/QmG7OhqhGKpAKnCrIS MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b324b60-6784-4cb3-d28f-08d4ed4d7741 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR03MB2267; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2267; 3:JPeP7qtKbPHNMsn8oOtJ4A3eU+DFssGpCmua9+Pupm09EpRQcwpz7+HXXV8XV0oK1s7zOKPpPYCML34voXJeHKenSkA+4Z56+ZMUQDaFSzOSv32/6SNz2FOP/9MgGDplC50UFQ8jfr/dhux11+Tu4YmVa41cho8V5/oeVzL2J/+yDaOpCGW/DhN0eoQHac65GgrO3WMiq1dHY2XTrzcn0JlY3YiyM40MwvR8oIvPRqQNeCoZSICcIxNNx0wCVJuvH08/ioTdtuxcgpdvydwiypPnV6jqaF+Kil6/Ig0wfVI7O5AkBUyQDltA+s9Ijr8m+bAsqIEfNMV7nme5HkTMwOGM9Qj7LUWId6xk5r4qAfI=; 25:+46hdXEHXaHSgE3pTpHXQeAe2dYyx2yJ2TNIruScUra+d2L1GzGTGEBOIItrJP2GzLqmu67AtC7PUMXMCPOycZxN4nynYvHK6YceqWDdxxrMy2c5XOUWOKLjgM4Ni/LeK6jWF40sxU1caYu5gCBIN1M1Oz3bPI1LXMzkZqLs/D69xMxD9cRFrX7X8FcQlZMsL9Wly9wqAzlYc0RG6uxN87msDgD4tpIytbS3nBeKVytefxpJYC9+FNUDInmjNfQyEG0NYdtu64IzGDSqJUWXaMgrA2YF7xpcNAJaLHHiwYg0r5HYwaC0LJwKw404MlOqsIPzk/U48KwZ7kLLMJ932w== X-MS-TrafficTypeDiagnostic: CY1PR03MB2267: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2267; 31:p1S3ajMZaSPOyxd21VsMTLHsPi3q8eZSW1Ndzrc1CLjpF/nuIT6fWce4q4G42ZcWAeK3zZQXyHDA24CfW/e+PA1Nngj2KRTsqMbPrXYUvhtVPMOhMX2L5peg61A2N6E4LytafYF1Jh0Ex/DVbBGXZ2mBhxqmBYChPXGOB95av+n0ihqfKbQdGlFvYrT10Rkv8kphYMkp0NFz5DZq1Zb3J1OOAV/KUXieXXJPV7+Mv1E=; 4:IMHnqCjPcSF4PBzYx5JtCvKElo3YYIPHWPUB3LKciNAAS3gXGUd2VYfIBIkDXz/WU13Sv2VhFgjA4BYggfYBOujWO96Fve9GPPDK4PTaHkGBsSvOQGh5u+ZEvj/RtCtWTPqxQHjGSrpH4S4sQSSiK9hjkcOkKE1GmLc7ggcWmbeHB9asL6v+2OkPmTtXgtF88NFn5vYsV1R0NbZSgLwtQZ6KhVenKZt8tkU8vU9tbROtdr4eqrzFeVXlJm4c7khbdylWIg/EpK7880GdDe7FEqfmqYOEAXxmwRQw2KAvX8o= 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)(8121501046)(13018025)(5005006)(13016025)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123556025)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR03MB2267; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR03MB2267; X-Forefront-PRVS: 0412A98A59 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2267; 23:mDChNOoX7J/mzF53kizmUHzwgmwfmM71BMjgyGRKl?= D3zsn38sjJu12hH22gKictyBcq0DwBtGHpEvCpdHvA+T0c9S9N0NIPfdFIGgqBmBltbA7Ox0jEd5dIzhdMu+l42B7ivjldyNF6RzoP73UGLkJMoKP+b2EQ3rhL4Wi6bJJ38N3j/KE7Ls1H0WK8j8RmbYY/fvs4j7Qzm9AKoz3CEajIcCyy+KlHrsfaOgI7fcJDH3slsDQ1CwYtGGDXXXXQVLUrhBHo/kAo1gFkcfxOPHkhAZot8GtqMp5cn3kgsY716JBC88NXBVJFEK9cSxlaUU3m2zFPVPiVZ0QnI3m8ocvEBCoHccFTN1i19DCoEox6EvuSZYHiUwAsRcJVU2sHXm1Mp7UovOKAYkwSq+KAUcZooiXW1/VHmlnTRMcwbMT++TNBZfANR7St51m96w/ElWV29PCE/8FC6lsrK+iFJ0PUmyTIhJ1LrEBeBx2wcdn4N4x0REamgr3BrgAsy8kE5a8JvhZ72zGhhidda0BvlIooI1GbdjwpP5FoAEmnphf1dBJyHI90Zud26fdIAc0AthRKn78aaqRl6FC+a8b0s2Anch7EXiktyr8ll/n+XiKnQ+b6JTAbCDwBcyvBs1z4EPsyzLjDPjPjKfc63N4tbWxyqzz4OkmR95dDz42OzEccM9Yc7nrym2dgkTagCX6u+CXgORTzRTQa2Z66fAiMB3pm5wpU2+Ppe3uw43Mob4Lop893lOIEskrpuE9PuU1CargQEjYhfSG++xfcSb/r+5ncGj9oCiNubMNVb0BOCXEL9YKxZ0Eahmgx/6JU19bEBzB+hNsoAv/rK/or5MYvFZ1oXO3d3dt28D2O+2m5OHm2Xe/RvIKHsZuyVm9WsbWAlutL7B+bztigMYzl3FfOPi3X5TRgDoABwSSPfLL/rT3Y6AKP1nFHERWCDp/Uoaw3CzoVsQzOrh+5ePqfO4a4ROIvhx+piw5hnbUyr7/ZsU7gWnQTKBW5vsrEC4ZQbSwy+uR+O4sXkpInE0utaszRStzhuhCbZ6zsKCYqymPWa1ujDjNKfW7jcqvEyaOevLCIN2snyp8jN74bO/t+a/EO/EQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2267; 6:0Y6Pf9/2SX4oq8f7SGiAf/PliqMfUGu8XZIFZyU8uqHbOSYcrBpvkDNUslQAr40c8sazbDx/cz3LTyQzIwr/MXPqpw4wiLVie4krpK/JCYCdHNQixOoDgFXHTP5+i8lE5X59mK1Nj2FZC5AcHRwCTmQ3SSFv242GnhkLVehlU48GZm1FtV+gDa0Akn5y93BLsv6CD/x7HgvzofzwOPTiDCMFUdv5bDMtnLcF+A+F2A3Y9+KtTlmk+MKQByu9aYDdYDCItxKscITW6n7OS2j+hkpk4q3W1lDKqazYxM4g485SKygQRn60p3Pkq6YsHucbai0ynVUCn+GFiC1so8gbyw==; 5:P57fcTFcAByV81Y0OUPkTwDAX+OBPkVkXDNFA9J5umXNPrbIrc/j4qE9TWrMmn1J+fcdrylmpKCLhoNJf8U7B1GNx1C/NiWtRmxzJ2ivDtJllDm9/LcaVOLKbdc25DiYa6bY0S8HKxyAvJI87AbBDw==; 24:gw7uBeC6cD8fduCusossh26U7ws6cqMWrsVM0KfePhimkJjOLSIQ4Ias5t68b7e7Fw7iC/I5DnzJ3Ch+PIXS/9NK7dSJ7bKDSi3CpUMuVo4=; 7:whD2984mIPaftjnraPWXYi6YBdh4X2KIB0kwjKI6V2mOHPAo1myrryjRgCH6LBfaKu7CnP19iHuuB4P5l2nAeWSRu/ZsLG9/WMNUjQHM8MLh2z2qCGQ0DqHZRvgskdJ6PMAUEjHaZBtCcewXeEPUVGBFm47LHInwfKvR8KQtMuJjGeWo7JXITPMcd/gy2HCQNxej5lwwUhgS0FVG4Fh6e3gPa5xRUakEWd2Wye0znsQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2017 13:13:53.3433 (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: CY1PR03MB2267 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Set the skb hash when then FMan Keygen hash result is available. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 23 +++++++++++++++++++--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 1 + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 9 +++++++-- drivers/net/ethernet/freescale/fman/fman_port.c | 11 +++++++++++ drivers/net/ethernet/freescale/fman/fman_port.h | 2 ++ 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 6d89e74..73ca8d7 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -236,7 +236,7 @@ static int dpaa_netdev_init(struct net_device *net_dev, net_dev->max_mtu = dpaa_get_max_mtu(); net_dev->hw_features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | - NETIF_F_LLTX); + NETIF_F_LLTX | NETIF_F_RXHASH); net_dev->hw_features |= NETIF_F_SG | NETIF_F_HIGHDMA; /* The kernels enables GSO automatically, if we declare NETIF_F_SG. @@ -2237,12 +2237,13 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, dma_addr_t addr = qm_fd_addr(fd); enum qm_fd_format fd_format; struct net_device *net_dev; - u32 fd_status; + u32 fd_status, hash_offset; struct dpaa_bp *dpaa_bp; struct dpaa_priv *priv; unsigned int skb_len; struct sk_buff *skb; int *count_ptr; + void *vaddr; fd_status = be32_to_cpu(fd->status); fd_format = qm_fd_get_format(fd); @@ -2288,7 +2289,8 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, dma_unmap_single(dpaa_bp->dev, addr, dpaa_bp->size, DMA_FROM_DEVICE); /* prefetch the first 64 bytes of the frame or the SGT start */ - prefetch(phys_to_virt(addr) + qm_fd_get_offset(fd)); + vaddr = phys_to_virt(addr); + prefetch(vaddr + qm_fd_get_offset(fd)); fd_format = qm_fd_get_format(fd); /* The only FD types that we may receive are contig and S/G */ @@ -2309,6 +2311,18 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, skb->protocol = eth_type_trans(skb, net_dev); + if (net_dev->features & NETIF_F_RXHASH && priv->keygen_in_use && + !fman_port_get_hash_result_offset(priv->mac_dev->port[RX], + &hash_offset)) { + enum pkt_hash_types type; + + /* if L4 exists, it was used in the hash generation */ + type = be32_to_cpu(fd->status) & FM_FD_STAT_L4CV ? + PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3; + skb_set_hash(skb, be32_to_cpu(*(u32 *)(vaddr + hash_offset)), + type); + } + skb_len = skb->len; if (unlikely(netif_receive_skb(skb) == NET_RX_DROP)) @@ -2774,6 +2788,9 @@ static int dpaa_eth_probe(struct platform_device *pdev) if (err) goto init_ports_failed; + /* Rx traffic distribution based on keygen hashing defaults to on */ + priv->keygen_in_use = true; + priv->percpu_priv = devm_alloc_percpu(dev, *priv->percpu_priv); if (!priv->percpu_priv) { dev_err(dev, "devm_alloc_percpu() failed\n"); diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h index 496a12c..bd94220 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h @@ -159,6 +159,7 @@ struct dpaa_priv { struct list_head dpaa_fq_list; u8 num_tc; + bool keygen_in_use; u32 msg_enable; /* net_device message level */ struct { diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c index 965f652..faea674 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c @@ -402,6 +402,8 @@ static void dpaa_get_strings(struct net_device *net_dev, u32 stringset, static int dpaa_get_hash_opts(struct net_device *dev, struct ethtool_rxnfc *cmd) { + struct dpaa_priv *priv = netdev_priv(dev); + cmd->data = 0; switch (cmd->flow_type) { @@ -409,7 +411,8 @@ static int dpaa_get_hash_opts(struct net_device *dev, case TCP_V6_FLOW: case UDP_V4_FLOW: case UDP_V6_FLOW: - cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + if (priv->keygen_in_use) + cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; /* Fall through */ case IPV4_FLOW: case IPV6_FLOW: @@ -421,7 +424,8 @@ static int dpaa_get_hash_opts(struct net_device *dev, case AH_V6_FLOW: case ESP_V4_FLOW: case ESP_V6_FLOW: - cmd->data |= RXH_IP_SRC | RXH_IP_DST; + if (priv->keygen_in_use) + cmd->data |= RXH_IP_SRC | RXH_IP_DST; break; default: cmd->data = 0; @@ -458,6 +462,7 @@ static void dpaa_set_hash(struct net_device *net_dev, bool enable) rxport = mac_dev->port[0]; fman_port_use_kg_hash(rxport, enable); + priv->keygen_in_use = enable; } static int dpaa_set_hash_opts(struct net_device *dev, diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c index f571b3c..1789b20 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/fman_port.c @@ -1720,6 +1720,17 @@ u32 fman_port_get_qman_channel_id(struct fman_port *port) } EXPORT_SYMBOL(fman_port_get_qman_channel_id); +int fman_port_get_hash_result_offset(struct fman_port *port, u32 *offset) +{ + if (port->buffer_offsets.hash_result_offset == ILLEGAL_BASE) + return -EINVAL; + + *offset = port->buffer_offsets.hash_result_offset; + + return 0; +} +EXPORT_SYMBOL(fman_port_get_hash_result_offset); + static int fman_port_probe(struct platform_device *of_dev) { struct fman_port *port; diff --git a/drivers/net/ethernet/freescale/fman/fman_port.h b/drivers/net/ethernet/freescale/fman/fman_port.h index 5a99611..e86ca6a 100644 --- a/drivers/net/ethernet/freescale/fman/fman_port.h +++ b/drivers/net/ethernet/freescale/fman/fman_port.h @@ -151,6 +151,8 @@ int fman_port_enable(struct fman_port *port); u32 fman_port_get_qman_channel_id(struct fman_port *port); +int fman_port_get_hash_result_offset(struct fman_port *port, u32 *offset); + struct fman_port *fman_port_bind(struct device *dev); #endif /* __FMAN_PORT_H */