From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbdHVRcF (ORCPT ); Tue, 22 Aug 2017 13:32:05 -0400 Received: from mail-sn1nam02on0040.outbound.protection.outlook.com ([104.47.36.40]:62409 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751979AbdHVRbR (ORCPT ); Tue, 22 Aug 2017 13:31:17 -0400 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; From: Madalin Bucur To: , CC: , Subject: [PATCH v2 4/6] dpaa_eth: add NETIF_F_RXHASH Date: Tue, 22 Aug 2017 20:31:04 +0300 Message-ID: <1503423066-15420-5-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1503423066-15420-1-git-send-email-madalin.bucur@nxp.com> References: <1503423066-15420-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131478966753040087;(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)(1110001)(1109001)(339900001)(199003)(189002)(2906002)(6666003)(106466001)(50986999)(3450700001)(76176999)(189998001)(97736004)(5003940100001)(47776003)(43066003)(54906002)(50466002)(104016004)(305945005)(81156014)(48376002)(81166006)(8936002)(68736007)(50226002)(33646002)(575784001)(356003)(5660300001)(53936002)(86362001)(498600001)(77096006)(2950100002)(85426001)(626005)(4326008)(105606002)(36756003)(8676002);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR03MB3328;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD037;1:zTGfOJmRnauEYf4TsSRg1KQ0wsGUVMBPprMGP/Xl+c2998T2MmOo4TYDsZHYatObDLnmEnv9YvvmdHvHDtdAmyj93YxApIxF3XBGtNrhOj7fpjrU1TKvWVgkWJ7jWZvH MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92bbf9d4-43d8-422d-0bcf-08d4e9839724 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603171)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:MWHPR03MB3328; X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB3328;3:LpTrhdirfLTg41l7I55i0yThy9EENAGQvnz2F3AjWwA3jIHLueAUReT09oMvsjexWea2tw646trQRNi70YOQEIWT0bhV5LhtE1Q+PH0xOierQzuLj+lgqoMduGaQvyVTxTIU/qB1H54v97hGD2iW9/RutEzuGivmEGEDxzACKC9gdoZZnVHQXyA+ZTzkAeEZMkm1x0TfAqXin4KM7zjPq0YzbDF8C1sGzIrdxB0b9wA6SrgqpaunS9B9iR1+dFVp0r7m3mJkUoUqpzNqGSHnzDAxaL637lzYdbxWHEi72Ed5q/0ZS9eMptkrPi2fPJva9n4MaiKZzb+QmjWWKYR7wNxpXsbdgUK84NkE1bzMx78=;25:F4aIBpeAUyvLkpitrSB6q9vlT/Du8YGaIXgEKBY6c7lAvjoNEyjMmIbzaHL0hQyklTEIICnKrAMeBN50E/J4L3Uxef98gsGh+PmHoDHtfZbFwPya6rNkfqEiDz/NZ5QjcO9+2qa4q1AueJL00ag6yS7PO3PcYEXrK1NGIostWkET4NPBT7S1Sj4axLxnT+jBs80+0yh1txXjpuEVDmUzlBVFw2bDuWM5qoE397AFgiTv3KY4fCnXMCf/KpBFL8C628SVgHOFvYMA2KsJosQEkpuIPHMvxLXXHlGbJ3hiT/RJusqnTuiWxqywszRUWW1vCqeB2mwftsMzv2HciNEdDA== X-MS-TrafficTypeDiagnostic: MWHPR03MB3328: X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB3328;31:oiMU+97NXJwShpvGrounIzLWbjbtl5qENa56wgfvRUNaQCpLTj6NCmHCDWp6hZ/EeedfC8wcKj/zfkB8lnjKVHKpli80TaO5HHIpkqxYVSHRouThy6wdhzsNiZjxusPFyNlhVNSlD59LiJYnwNpUMZAbmUQjo7xoSLq3AJHMd31HCsGjuSYV5RkdWAJHZKUF4wp20CVxYeVdTb3kB/Aj6vvce4BGbcd+CrRmBN3095I=;4:xrEwpcb/SxetuYoebqQ3S3HBVahyRAH+bHifJCs2VaZzxildLOKQu59/p2BIWX5/15I0PtvJozcY5xHRMM02swC6qWwnpK4bLRREM3N7/WzNoXRzLMcJcegAg5jiI6kYKlOqFG8fMt9wT8JVKQVvuBDJU8iboM06eByTgjyMkMrsqZpl4mH0PoqveZm0vwuocrGAh9OxYZB0pLiLRG0GTn4t8yoL6hpAx4THngVrX219imzEotbjQjsRcbJNxcCnXNEVgTbqRdbKgE4jDtNusqIkyGH383hIBml7OIXhGR8= 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)(5005006)(13018025)(13016025)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(20161123556025)(20161123563025)(20161123559100)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:MWHPR03MB3328;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:MWHPR03MB3328; X-Forefront-PRVS: 04073E895A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR03MB3328;23:G3pIWyTsqXLzznu+9xguvSFXLX2vJoRhjCA7QcXGn?= =?us-ascii?Q?b+nuhqybydE7e8LekNRLX9vbjLyY25fAjaU3cqfsKhIj/UYKV80tTWFblWJI?= =?us-ascii?Q?HNEmKYn0FiOLosCgg4VDveiRiQsRdPnQFo9T5gE4/fT2besVXJ2PRgs4tYtz?= =?us-ascii?Q?DYx5ljqzji2WfKTWe9CP8dOhAWbFJKhy3gbHaQWSeaEjUlL7FmyXQUMvIzpm?= =?us-ascii?Q?lQVdVgK4XWbtUacsQw7a9Qt28mQMAmUGWc4TrvCTPQ9WE/IllDYfLrcTrMp6?= =?us-ascii?Q?RXByI86tMaCMkPEYyI/IjmJ+9DwOkj54Hy5/icjvrIydrnkpkl6F25QtNc9g?= =?us-ascii?Q?Gffs06QBa11JpuASAT0M1es05U2m7FngbAoEN0YHY0a04GfnqoCnwBWn12q+?= =?us-ascii?Q?OvV3Y4QJGlpSUKJdsgvCI3ExyPlZKq8bK7qj2Xhqc+/a7e22mlVG9Di+SZss?= =?us-ascii?Q?VCOjdEjfrlWVEUHBHTtEeKq66sRD565jsd0/GagaoWadVE7mJQntk1huMeXi?= =?us-ascii?Q?Tz4LBqdBsTmFn3oh6OwJ57ORYKYVdv0TZHbudKrPNOW4UAs8mrncV9RbWW+z?= =?us-ascii?Q?+oX3z5P8Fnj97KXtW+gUwjl/Up6TyLhtJdN4kiETj359ezdCWVTHjLgXpzda?= =?us-ascii?Q?nBfZH2tKGKIc+2W3YddQadvycC7+ylZKbgcM8nobTSm2sVY41rFM9lGvhHQ/?= =?us-ascii?Q?hsdIOwolUak5kDvXEVAfEcL/Z4ovtmNuN46g2dY2+KPTsEAuCVNCkUoZQ1HX?= =?us-ascii?Q?2M+DyvXHBjoMrKqBamyO7Spw4UMCWo/8JD2UOFzQvjGWi8bUVaZNCQCj8GIf?= =?us-ascii?Q?eytI4dvrdcqCgslojgPEeuIHkFqSKEjJzLMpLvY5tnT3Yvv/ZrtU3fPmLzq7?= =?us-ascii?Q?pYl3WG7ghlIZvA6o+SCkCVVFC6yrlCLrlBDMDuh9LIEQMB4OvQIrgngkQThY?= =?us-ascii?Q?r3a1Ydee45xtl4oh1KOmXbcvcxoA1Dlpj81E9pYoJq/HeCfPFfop7BjDbaCk?= =?us-ascii?Q?scVzXSl37+g35idvjwTwgDRnGVNILaz0C+X6l8W+J1rIfc+dzq1L3kp7Kucn?= =?us-ascii?Q?ZhSpT2dAhEEA78QbgiRSL2OT+r9Hu0vzYMOgEPPEpRfzLhkLjvvo0N/5eWTA?= =?us-ascii?Q?NEqjFwFgL0=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR03MB3328;6:vJiNo1/sbg7VeUshCMhGQV/5db6b3lgr/7VYk5CsMxTFZkHozYuVsDLstCiwhreeBXsNmuDZZ3stSNBlFiQSt8L5VfSyQOxKx5xduQM9LIdCiIpmFWzObzoAaGVwBTnoORncL39epVelUfbbZ2RLR4pL5YzmlolyF56vMDuebdnldiPWlx70whkaJINhemmDprrfzj0FkfKO6gm30Mv+1oGtzfn4yOLJzXtAuqbbBFa6o85bxv3wiEddXUh5SYPms1llBQWtAWfdxM1GYKSfAq+5EpBrb9wR1y4rOsCTRgA17AMljUEaMQHXQXvmH4aZgTMmASucRUfVizjHudH99Q==;5:IcNsx3tpsfnb+5yDP8+ejQXJZiO5jol4tY6b/rDblk9zTQJ8EExaRA2Xr/kSX3U4jj/o8Ke6E7IeJxD3DchEfUKU94OicJ/p7MrKdOtUDlRMUG/6JDp/zIv2qo1hXfdUUBTlEzWBTVernL9YbRpvBQ==;24:BObzn/XXqxBOeya0cOJETDHFRaCpdbek3DiZa40O07hoepg97RvQ/jHJBPgnc5UHes6NEMmc2ztfxhZovjqeT6TSAmGP2ic+vqXJJCnBhi4=;7:OZlqBlVH2l3+Ox7guKBe68pqjSIfYeD4ZOU+HeV+IQyetZdWylzxCCZVGPfqaXtIdBU/7KEKlGwEIU7Gp7HB7J/vtI23A2R43adMmZsU4CoK0paSm+8Bn/18yIAC+XhPjRWc2LvCXIZTe8ONZCFp4iLSJZb0Vr7H4TQ/9ZNQS56Kd45v+2ljOpPSi+X+1RUmByfexexOyBGBpPIbu0oeoMTy5jsoIXdncXwK/loChKg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2017 17:31:15.0076 (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: MWHPR03MB3328 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 b0ad9c4..451bae7 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 */ -- 2.1.0