From patchwork Wed Aug 29 08:27:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 963309 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="Dm1z1wBo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 420f2N2sPJz9s3C for ; Wed, 29 Aug 2018 18:30:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727990AbeH2MZ7 (ORCPT ); Wed, 29 Aug 2018 08:25:59 -0400 Received: from mail-eopbgr700073.outbound.protection.outlook.com ([40.107.70.73]:62679 "EHLO NAM04-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727133AbeH2MZ7 (ORCPT ); Wed, 29 Aug 2018 08:25:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EpvJCTsq5QMMRNn+jWnajjQQLCmK9HG+EYZwyG3RlXk=; b=Dm1z1wBo014Sq/B3UIlc+EeurzYoM+53+JUPpsne8pCq/c0+e3xqsiA6nJO9pDT9x+lzzKivUs3Ou0a8rbh4t8EGemRu6L2GlHC50PMFBhC7oPWKK2fDb5er22wB0DwmEz6Ubd3/XBpG9KcNDEZm80gGfptg2d/So8XWr3v2ULc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by CY1PR0301MB1578.namprd03.prod.outlook.com (2a01:111:e400:529c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Wed, 29 Aug 2018 08:30:08 +0000 Date: Wed, 29 Aug 2018 16:27:06 +0800 From: Jisheng Zhang To: , "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Gregory CLEMENT , linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] net: mvneta: fix rx_offset_correction set and usage Message-ID: <20180829162706.24111f9c@xhacker.debian> In-Reply-To: <20180829162456.2bd69796@xhacker.debian> References: <20180829162456.2bd69796@xhacker.debian> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TYAPR01CA0149.jpnprd01.prod.outlook.com (2603:1096:404:7e::17) To CY1PR0301MB1578.namprd03.prod.outlook.com (2a01:111:e400:529c::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff24efc4-36b5-45d9-2f69-08d60d89a24b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:CY1PR0301MB1578; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1578; 3:Y5rr7JqScCJz+Z5Bk78sXqP1UYSOAWEORdbEJks8N8DVxcuQ9efe/yQ/CSf599aUXuX/HHk0XBsV6b19A9VgoEKt2Jf5hy6AmmD4oL7xqs7e9CnNATQkTHR8joJLYA9IuMElEUJDR4WVbfyyRtYiTi/OFpqLaFr8xUwZMVh+dE9qy40CERxDEXM1kw1M4r9lzcqAaPnAWoRdEQyYAR7vE067SklTbP4Fe48kC1wNVFT6S2Me/aRFXeg4+pHow+ms; 25:M0KDcIetDiAdHpSg05Ft10FNOW7rB6N7zz5xCaQEingJ6G9w4qIkfwpNWofGlzZgONn3FPvUUOXTy0CZAnaZpDdHKmkFR/RCpKYSiFMX55wAvlMQvczogfqyj6umTCpSr+JoADiuaxGqVZ+PopZ9PDdQkxSxkB7+MYUNXd1Kk+chSJv6xGpUl7awD0ZVUcAetc6qWDduCmc7saNxocgUG0Uld0EROo8f7X7MJoLypmNFYN6q17SQsLrVJmj49yDxpIb8HfSHxH8GGLyxTOBcBL5NLPjEdyBMOLIDFk/hfytDmZTMSYzUjlHbsyZAt2elldRDhdJ5dUVvlUKtudbZGQ==; 31:N7b9Id8vwOP/gdZKUKO7korETGVmj99dQ9QYx4/Ow/CQCQEZcbEhEAQzLViRPqKTMcuBYjqLGVuFXrf2aEA29CYmRS9tWXjRcunsU+413zQkGLKkWnhFuuU48Grefq5kRvnhksHuoW0iwLWL2pZR3beauuBzPa8r329TNQcBpb1ro0KZbp8EGRrqcK/xgRzjQjcL730gd3OmJC/vjm/V64Bh8UhuB0XX3WX6zdSXT+I= X-MS-TrafficTypeDiagnostic: CY1PR0301MB1578: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1578; 20:5CaRY5BAh9r/QXmdmGR7ZEVXlCMRuid+pdhIvZYswLMRKzd2iqkcSXH4E/gAZSqbu+tBkbFvBH4XfCR2HpvgpF6alFAEKyUgTe53ftJwCDNU7TRDOdQ/zH3RybtIgCJ6yEbPpoh6wezhCaIKHMR4d+H6hvcWkLSwj9+KaFoeuOY3WL2nZKkHxIfU4jDRRzWyAcwA0byfGZJL46YHtyXz/Au+g7lkSCylw81Q9TuhbRkwMK+8E6qOso0X4J8WonyYXqRaflZQaie3NvMURE0EO87o2IHjXBrCyMTl5dk+mh7lfPadiyyrL/SVYgf17PqTzc3JHqfOOBXqOBaZxXdI1NmkkgEmE0kjuyn9c3aI0/Sr4PnAvW6xlun0UO8wPCM9ePPCr2pEl0/K46xJy4+YtSIV9bMI19aN4VerHq3/l6wLSgzJvjYfaTsUki8asz3hSrcMuaIZ2v9T9Ka1mAW+ntlkVpK9pV3nMoaqUnbwI8JjAhV3tEHPGOovhR3S2s4E; 4:lDZmkQU8d2vKzc0bT2BXT3SmYsX+aumm+dWnU7oy2JmZAYrRVXQdAkXX8pXiV73ZPhvCKASxH14hP8kKv9hu5rVYa1+f6VqRJZsuENdET7cBdHNof5g+cj/pFkGbS7NdFJbtq+CuWIfK9MfKxqAh96V7l78RqOF2dgD+Lla94e/c4OtUpJ8ZcvJ7yc+Tubsa/yOOsxviARwYejSFR8cOEGaZ1O5FTgKVOkXNX9XItbwqxaDOHoFVQAVJ5vddk76LpOVxE74E+0R2N/aAStLy5A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699016); SRVR:CY1PR0301MB1578; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1578; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(39860400002)(376002)(346002)(136003)(189003)(199004)(11346002)(446003)(50466002)(81166006)(26005)(305945005)(68736007)(478600001)(3846002)(81156014)(8936002)(86362001)(76176011)(386003)(6506007)(97736004)(52116002)(7696005)(72206003)(50226002)(1076002)(23726003)(956004)(14444005)(6116002)(316002)(33896004)(54906003)(110136005)(16526019)(186003)(2906002)(8676002)(7736002)(230700001)(55016002)(9686003)(106356001)(476003)(105586002)(5660300001)(486006)(25786009)(4326008)(53936002)(66066001)(47776003)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1578; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1578; 23:vaGkosicxCeEepDUTVOCWEILHMkNmZUHXzrOFjPtdQHqXmrwq2LFOI/RmOY4rhof+ChYyW7x5FTlsyi8h8JYeaEfk+3W5o8sD/sKvHTRdGKSgAg4SINUm3Kt1WffymJINaM21JtGr9ArDDRd8ADUy54VwCdezteLwAoKVkW6S1u6/QUrN8u84yucjpJ2/GQI5XA31uozqft1YY0Qij2w9k18YX4VIhRaw56Mlyg94DurgfTd46EGFmrfUeCHETwqydQp7W1gHVNsRiU9cU7P4otIbKFsBg3W2Qw4r7A16pFC/Fyislh45OF+pyrVOi4ienrUX1KtdXLTjs/nRr1RbaGqvxU1vSKHz4rLvreiCHnaLJeIEI2uZAY+0zqf7IcLz3pkgVava42PGEODhbWyQypKA5YzUdE+bJIsEyB5RZ1DrL9wVPIVphwgCwIga2HEf8KkpaN+ftUxojwnq0sEb1XAL8mR4F9+IQ4/uPeMvyeJkdrj5uVkbrZTsGTulPaTqRJmIljlp46WObiW5iENvbZeAVnGD5Tylf5dNcmnDxen43VkJl9TdavWWHBE1RLiWRvG6pitxI/Qtj6AKutL/vCib/MX7le5012OEJYUsahrsdy4M5F4BcLpDGsIJE2XQI5e/bD+s4FN0fUOkkYwGUclxRob4ZQHF/tv4zVme83+uhKhDfXpXL3a/p27BTo1ooVVio3S+hNP5Xf0K7SJM0dO40WrBH86eoUs18gXVa36oA/Ocz5myg/nFy7y3oKrueZqgZf+XlI0T4FhyZ0yzz48GOd4gZg9j4KJXsF9wGvBwegcEpgp53kZWqeCeQj3x4aUHOLW8AH7j7NVCOGndLibOWA0OhPvrd/tXW54zSuFzJOpYv52zjmBwYMydhoLh37a2YKiMtypqoX7F41Dqb8Fpt51cQsOaWAtucaRfNiUye+Uj5mxzmqvA5PoXPiea/JQppL+hSVayD9FgfsvE0YsEAjebFGo0srvn9vLB9nmQl7E5eYM55wV/IVKnrw7626v97UF99uvR2dYHh5SE/kR5p+5b0oA/0JRhWt2HUZpk+p+wxJyO2ZX8yChfAOg79jWTob+o7kufAjbMoMDz303gzZpILxEe0tbXfYaFS+yw3u3idPk6jT82kFhMz6l23lQCeg273aPBaQQD8bc2o8QaJ4e+RNXU+G1NyqErh0y+lmTWfqk9u2wq9i32bcy5NmrfNG2sUoseZWyCzR0PEsx3ZuZzKDAOQxn80mXzfc= X-Microsoft-Antispam-Message-Info: ZvDc0SivJLQGg4kcthX+BI2ST1i42PK4UnHAMPm1/S0R7p5eVlwIhNMfgRmgiLkZXZM2jtiuGOFMT8e4Y1o59G9SxKQ6kFNKM9vZwV6T6r8YWgaK1taPhp/oqodCNhnUAhUe1+P8dQtbAwqiip38D0EHKWM8xDv0XaY3vCAQ4jShag5epPPkqTKrwF3Mo2SKORL8EzdyjGJqfN6mAovzKbv1Uj0YVanYWlX3YVVjyPhg24W0psvzyK6ocQukgLOMQSiNwvj5Tp2IpHR1yDuToztv1d3SHIxNtVWxHHS89kZV4skOjJTbbfuNXVl2gAF2BEY13Rs0XhEaLZJEt3dneeX2Rj4UwNj25ba2rh7bxmQ= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1578; 6:O+P1BTOjvwbC3A77ivJWJa/Mkd+AncyGc1scIbatiXXAMmsk7ZxQ8ohfGVPjpvua4IjzLohdE9jfIZjgmPXKLTRBg5afUw952x8o1rRnSdhWv7r10ghWDFZPM4modX7Pwonoi//ZrmxMwTqLZyg/3wBPTdhfCqw6m5xBX8fOvSpaq0LhFjlRbDY3GeAwBc7zKAHOvsEDD+VdKno5FR1pznPSIXrTuhvMjBvJbZoByEvSZPeBiMRIA0kYffWB0hSQCZFDM6KrlRHPNnJ3TgyjGylM5CM//WdjxI/QxoTrAAwclUaCJQwhU1oyUA+02cgNgz4mdVCxmzhySKZoOHmqZH5UZkrmOEWvSW2Y22zTN3mBgVzpGwXs1kudNorQpu58GdD4WBoaeDfFB9ZeFyzng35fvCCfztC1GtgbeDez37uYfAvsTynSSgZUfXlfGpOEKqclG2Gtr8gc1PtTSwKmDw==; 5:WbOhcDrW7JZhHCAxajJzZ10bVEkf7L9wUyGXN00ku8UWrQN2pIE8hgWgiKl9xLgWZ6xLme0tNM9h08xiN9ShtoK6M7GdxB1pUT1OovKXn+XYocxnbFyUtaegbQx9dAc69HbzFGCzAohJtWtlg7TxXkHiLXHazKeSV9i8ABSnWyM=; 7:NoeD0wdrvJL97PTe4IcsGZSKdyO6BvJXccJHAkSgQDTC5QQid++rSYuL+yWW/eIlrxv+aJ1S2+M00wnR9DpScfa5nifnnkiVncH4L3H5a+y3C24aKR2ZnRN6zcKonxXf+yhniD3a081bqJhbHahpzKreVk43/OUqFst70UMpnUq/t0b1KyDyukXBX8FfkCLulplg9rpc6TjRMekMY12H9h9k8obcB8n/3AEbTbxgU7ats1YoPyenkXiJQ9Hej0/1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 08:30:08.5113 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff24efc4-36b5-45d9-2f69-08d60d89a24b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1578 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The rx_offset_correction is RX packet offset correction for platforms, it's not related with SW BM, instead, it's only related with the platform's NET_SKB_PAD. Fix the issue by reverting to the original behavior. Fixes: 562e2f467e71 ("net: mvneta: Improve the buffer allocation method for SWBM") Signed-off-by: Jisheng Zhang --- drivers/net/ethernet/marvell/mvneta.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index bc80a678abc3..0ce94f6587a5 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2899,21 +2899,18 @@ static void mvneta_rxq_hw_init(struct mvneta_port *pp, mvreg_write(pp, MVNETA_RXQ_BASE_ADDR_REG(rxq->id), rxq->descs_phys); mvreg_write(pp, MVNETA_RXQ_SIZE_REG(rxq->id), rxq->size); + /* Set Offset */ + mvneta_rxq_offset_set(pp, rxq, NET_SKB_PAD - pp->rx_offset_correction); + /* Set coalescing pkts and time */ mvneta_rx_pkts_coal_set(pp, rxq, rxq->pkts_coal); mvneta_rx_time_coal_set(pp, rxq, rxq->time_coal); if (!pp->bm_priv) { - /* Set Offset */ - mvneta_rxq_offset_set(pp, rxq, 0); mvneta_rxq_buf_size_set(pp, rxq, pp->frag_size); mvneta_rxq_bm_disable(pp, rxq); mvneta_rxq_fill(pp, rxq, rxq->size); } else { - /* Set Offset */ - mvneta_rxq_offset_set(pp, rxq, - NET_SKB_PAD - pp->rx_offset_correction); - mvneta_rxq_bm_enable(pp, rxq); /* Fill RXQ with buffers from RX pool */ mvneta_rxq_long_pool_set(pp, rxq); @@ -4547,7 +4544,13 @@ static int mvneta_probe(struct platform_device *pdev) SET_NETDEV_DEV(dev, &pdev->dev); pp->id = global_port_id++; - pp->rx_offset_correction = 0; /* not relevant for SW BM */ + + /* Set RX packet offset correction for platforms, whose + * NET_SKB_PAD, exceeds 64B. It should be 64B for 64-bit + * platforms and 0B for 32-bit ones. + */ + pp->rx_offset_correction = + max(0, NET_SKB_PAD - MVNETA_RX_PKT_OFFSET_CORRECTION); /* Obtain access to BM resources if enabled and already initialized */ bm_node = of_parse_phandle(dn, "buffer-manager", 0); @@ -4562,13 +4565,6 @@ static int mvneta_probe(struct platform_device *pdev) pp->bm_priv = NULL; } } - /* Set RX packet offset correction for platforms, whose - * NET_SKB_PAD, exceeds 64B. It should be 64B for 64-bit - * platforms and 0B for 32-bit ones. - */ - pp->rx_offset_correction = max(0, - NET_SKB_PAD - - MVNETA_RX_PKT_OFFSET_CORRECTION); } of_node_put(bm_node); From patchwork Wed Aug 29 08:27:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 963310 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="wG+Eta2a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 420f3C46NLz9s3Z for ; Wed, 29 Aug 2018 18:31:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728139AbeH2M0r (ORCPT ); Wed, 29 Aug 2018 08:26:47 -0400 Received: from mail-eopbgr690078.outbound.protection.outlook.com ([40.107.69.78]:48160 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727245AbeH2M0r (ORCPT ); Wed, 29 Aug 2018 08:26:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jm4BaL0NQFhNa+A1ISRcyLK+GL21wNHApx6exQXongI=; b=wG+Eta2axCAZbZut18vbA038uS2Djj1W8EeTO75PMauHnna6dWN7lvuFp1/uiDH1ap9CUF8+wDTC61AcUSf4wiUnLlqfTl4vxFSwvwUO3EFo+UhmgSpUeeJBGIwzOnbsXZGucZjQEYHMtz4YIB7y4EvioVwt6a4TRmLM7Iek6LA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by BY2PR0301MB1573.namprd03.prod.outlook.com (2a01:111:e400:526e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Wed, 29 Aug 2018 08:30:52 +0000 Date: Wed, 29 Aug 2018 16:27:51 +0800 From: Jisheng Zhang To: , "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Gregory CLEMENT , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] net: mvneta: fix the wrong function to unmap rx buf Message-ID: <20180829162751.018acbb6@xhacker.debian> In-Reply-To: <20180829162456.2bd69796@xhacker.debian> References: <20180829162456.2bd69796@xhacker.debian> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: OSAPR01CA0160.jpnprd01.prod.outlook.com (2603:1096:604:d::28) To BY2PR0301MB1573.namprd03.prod.outlook.com (2a01:111:e400:526e::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 945bfebc-4224-4d04-5707-08d60d89bcad X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BY2PR0301MB1573; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 3:fQx6B7owvOshMs6bwmGj73eyFiZvPCJfTs9WS2Y2Q13SGHMg1JC+4oDQ5HZXQrS7RLfwAeHnbv/pM5DI81o8Y2QFKCeWD6NNTaUesJQW7T4OA7zrD+amS4oCsWBpSpfnawWy6LMAvPV4O/zjpHIrsjm1YyjYZCvj3kW1nLE5uCYDIEgQFWKugccth1Rh7egVp83rbjztAIPiHh70a80AXzL0UHw5vDGcKz8jtIz55zXuDEYKdpPlfwvLVAy0tUwo; 25:/XQ07x7CxfhkE/sgxD2ymR2aQNew2+hxBQ5H3NQERWLuXr9OPK2jxAczRoDyvhDyiBDAIwiEz87+SCe0rX1TV4J9X1iRd4f2FshByAVDtX9/tEAXaz2EkBAC4LTf7zdkxpmo3VZ16zGuowqLjyUEGI+9V81zTrNJIqrORz/lgPosgANBhXfaqhLznAxZIPEoJyNdJue13VF272hNxQZkGpCTVpp0Q8XrgX4COchfl8rihr+EX6H93wBd5BAH68lFKF7Idm8gl8aQgLC7jx0uNLKAu/VgZ4MQ0VAyvNGrWd7QFLTnGhoyl7pgDnw2cAvTImWMXQJ5zj3log/gJY+uZA==; 31:vsMlEkyb+cbBTDx1bilkB4oshtreBZyZLzaFzLWjPWwVnEOJAXcWKODUrOkvy2Bl9wNODsqmteJ8bXldtnIFUj5PNDimvQDwgyT7EWPeiUBdgjp8GgRpM8arCjkzZ0HS/bsAPY63dF33/AMDCGne5EOv+Ol+Yt4uXzUHZ3PM+7w9r4KX3RTfdfn75Jy8mrVtMdWkXMZKq+X38K47nSgXLcMhirXJ/sh9e3w6VoW9XXQ= X-MS-TrafficTypeDiagnostic: BY2PR0301MB1573: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 20:1hgPOa10t4XUX8a3b7A+rdlM6LcCW5udt5hiPawM6Un/2ErCZ68xidTKyY5TgxtBYM6mbKH0qmSAHdZiFtSotk1rOC40X4lAh7urIdx6C3/4DverIrH2+OFv3fBBF2FqH6bn+WDE3LgdtJUqs9f4zSSbuzhkaOZOl8U0tMdIAVUJE3oF6gyj9SBXvGD1RP+CHyI71MZnVhrNc5MgeBDHeqyfEHiLf5fhnPmedgjK7p8ts41aoFoD9hh9f/2qZGy7yKwOkefMPv7XfSGl+QDmHzcU+vJXD7ooYra70DhYEl1q7E2zFcH+7juMSgQHf4i9+pPXYK8qWbwHmlJ1PnZCzGCLfGlVl72ddTW6tPz8vBQ1yQlhix1zVvBO8FxDz0pneo5PLAPJaNakvw+QxFhsNdXQDcm2GFKpXKOIU3wWuojPQYt0n38tsVWAANGp/zXDroSs/Mb44YpFItehaQQFrEjzXqOWOMonoUi3Wf27X93+uwkeJwN90m9AJKjk/OSb; 4:Oh+ZRBTLiD8lccKB6pCikHSRWcFInUXOBxj064njxVOBy96FU213r3S1MHcXxmtPy7VQt6QwJHEizqM/fGPQ8ZhtdT326TMbtw+ZI/NW8ryujQJxRTHpR/PpmtUE7HeKOb5bEdcCEmeoeBXk2ddHLYWG1Y952nXIqmJA7MgfMuYC3NMvyUnvZRDMs82K3p05ezA+pkPezrmdg3+SF95bM6Q8+wfM8Rf+F8UIOSWyTpfzU7Zvz/djm3yFyYMLddgTY6KcN/dTfEw9jgTGlY52ow== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BY2PR0301MB1573; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB1573; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(366004)(396003)(136003)(376002)(199004)(189003)(53936002)(8936002)(26005)(72206003)(52116002)(7696005)(76176011)(478600001)(33896004)(316002)(486006)(446003)(16526019)(186003)(55016002)(956004)(11346002)(476003)(50466002)(6506007)(110136005)(386003)(9686003)(86362001)(54906003)(25786009)(97736004)(5660300001)(3846002)(106356001)(105586002)(66066001)(1076002)(23726003)(50226002)(230700001)(47776003)(6116002)(4326008)(7736002)(68736007)(2906002)(305945005)(81166006)(8676002)(81156014)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB1573; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 23:19zp3OzJpsvA+vIzDjWHucuIO5jP30pRrTNFIh44/+022ldvRLYh3/iP2KIVVns24MgroBEL69XWYbS7GT4tM234eCRx8xTsn8kEaexxUUMYxIERRWuDWdJVFjy0262GvMg8rL2V/Jc0FX9hJo6jf9CS9ytHaE6vtRMyUTGRDm0k0qd60FbRT/v8iZcccNFAakTRqh7+KVyYjPw9xt9SkMPMahynM6TEU/EDv4oE9Ay9F3JWIgCMX8RSH3x8BVXI7uIZsGbZ+crNSzrpLNoeTW22/XUaalltfDjwzOyK6CFFDltuLOqbhT2Em314zO2KVewTVt7PnkjA0KjYQt9eXMhkOAVpw0F476zfP1Lz2XIFc9n6qeM+Lauz5u/HeRvCKWJJNSa9fdMKOrMRQbaFN1gmFaEVEzp7SIzu3yssGuuIRBHp7gcqLYrP1xGcaSAskdCh1W+M3huLrAAyzFZoQKcKuLnLe6qgdkE6BNDOLKlviMh9YjLSxQmvINjLk46U9918qjVMBnivYvHFHHADD1A+zudjDYJCny2PiA6nJwWZ0LyhSv7c6GnKQ0EOz38hcchQWxOPsHoO0dM4rctLdnHUOF7tdG2uIAUBL9khuSbZ0tNNJoJW9EX+MtxjikoD3OuTiiKS2zbaUqDEvLRqcuQZci+O0PZQCCnYNPtST1TIJ8JUtEFVVckDZl/I+KH4RsvglJbDdXanXzmTh1Af/Yp0J1SOWcXG46BIDJvpyQcy4Dfia4WkiF0Q9/M3U7KlPzjWA6x3igzsXTsgPIBokowTF3jhrNxTM0InXkT2MjuR1rvh20Wztuin/UBF//Tzj7q0cCEXg+srC/GLt42M7RhkbQUQPj6qikAK5CbwGCGqUHwBV5Q6kr/GLElRBRS+FYEPvmPJWuLFDsoHw06aWXIxky0zuKaeITUF3JvwLWCRZ1jqtygdbt6i0aSDHOHxxPUQeO8D6nWfzoUrIKcHVIujPpwUhbHNF56/Y3vImJJ1R0a86ATSk7F6Jxh5HDrs9ujaCLjnoarpJULq7la1xnq0VH5sCwcGoEqf1Nv0uL/Z8GnMXPrvYG/qaIHmgxZhiirvVlwUGme3quYDeA5kZndamqxOJtklxCcpa2weGJP7hMtO5YezlMH4SiVpFO7Z3i4QfhfMmaq9XCzbnsLegw5l+8rBuXyUgi3rjgTG0ICXvfTYqWxZ0qeWgiEnTEdYDkWEvmCsEvQWIJu2+RuM1Q== X-Microsoft-Antispam-Message-Info: q35CbPSFFR7dw09PcmqbSq1PF4tAR9sHrkcKF42VAufpt/N22NdKg2RwLfgHY46TGM62sZ43476Z+MtfoeandzFCpFadEDDD/1hLs6NglHV7gckkBm5+Zy6puk3kwJLdjuQHX9IG6+Rdy2D7sU4AUUmQRZEEaiuKRbu4zmTgUlqL31ztvlM/wwMxSoELgGgL9/91nW//pNBI5uGOg4idwjuQIqaPoH+SEEBfMWi6DX/t2GvRtj+FfMkuhIw7szyP7ZYez/nbwjuZ9DdkIA0me/FvgtfGn0O+NZrM9JOEif5O3AzKgzc6VPBGWyzXZj34uaJWeSFcEsHKIHr8AEsEDXnZxiA6MVSQokDrAFPcbIo= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB1573; 6:Dl2OTBmjKT2OI5csLo4hDb6MBqA+oppZzTirIPipofflpzTEgMZCpYwOes2mpSiLX/c0Kiayjzd9WN5MRNEZOJu1lQCvPoEE5pANHUEMphEEZJQ+lCSJvBQHx0ZXfWLhpRRu6aJYCzdKw4eCTZrTKajeXB9Kcm9izZeWK+rvSUJZFwuLS1NUeLr/nNMHZ5QLEROSccqAk7+BLFbuh0I4go+dUzNsWY41LsIdkiF98RQgW6H66H7FDWMagT+WxYiuJ7vdSgTqh8bfImHEqSota6CbS9cR8uDVcR24SIhsx1vOctZUoRK4mJZ7hlwqhp4VE/QElyGoeIR27zun+/jdPtLg4lFjpIh/5hFjdi6IROejA/FBAdstWO3NncMaWpUvruN80a9ilr/lR9FgvyQIXQzhRiiVHqCV7KtY1OcTsEFuj35vFm8BRyCM6LSa+H/p2gUA4g7dkUUZROS0Xw1CnA==; 5:hrku4tz40iIt4wMnvVkvlynzEFFwxVOIzEgivxRTwxLUSBuHpgeC5pkhpcHuhUJKtuZQooVRoCrMF47v+wpl354KTg3Or+7S9xSfEkcOSlRYjBG1HRofbZn8cWpHe0wwUKohRPp1ucjejlmH/WIlapIYt1Vm7RpsmJYU5m6g01U=; 7:3LF+w8ozXHU+gsWSROyvaLDVsGYsizdxgrfNVDb0CvmAOwm2ZOyQ92Rsr0YkTpq4COr5AzA3lAjfdZ54S30RNQP5TyfWpKMZ7kMEOMfghQtAaxpHLXmV3E66sbxTP0h7vl6YQZQtcuGuTxtj642fgAkKDCYsRR+jP/2RhyXx/r/XlRFZnKOrNWPmY8fNpIC1Bb+74XDB7c6w3SKHwBqg/GcehmtvyDBh1O6/a12gy5EFmEClnDpft/gj2nZUo0Tb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 08:30:52.5133 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 945bfebc-4224-4d04-5707-08d60d89bcad X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1573 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 7e47fd84b56b ("net: mvneta: Allocate page for the descriptor") always allocate one page for each rx descriptor, so the rx is mapped with dmap_map_page() now, but the unmap routine isn't updated at the same time. Fix this by using dma_unmap_page() in corresponding places. Fixes: 7e47fd84b56b ("net: mvneta: Allocate page for the descriptor") Signed-off-by: Jisheng Zhang --- drivers/net/ethernet/marvell/mvneta.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 0ce94f6587a5..d9206094fce3 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1890,8 +1890,9 @@ static void mvneta_rxq_drop_pkts(struct mvneta_port *pp, if (!data || !(rx_desc->buf_phys_addr)) continue; - dma_unmap_single(pp->dev->dev.parent, rx_desc->buf_phys_addr, - MVNETA_RX_BUF_SIZE(pp->pkt_size), DMA_FROM_DEVICE); + dma_unmap_page(pp->dev->dev.parent, rx_desc->buf_phys_addr, + MVNETA_RX_BUF_SIZE(pp->pkt_size), + DMA_FROM_DEVICE); __free_page(data); } } @@ -2008,8 +2009,8 @@ static int mvneta_rx_swbm(struct napi_struct *napi, skb_add_rx_frag(rxq->skb, frag_num, page, frag_offset, frag_size, PAGE_SIZE); - dma_unmap_single(dev->dev.parent, phys_addr, - PAGE_SIZE, DMA_FROM_DEVICE); + dma_unmap_page(dev->dev.parent, phys_addr, + PAGE_SIZE, DMA_FROM_DEVICE); rxq->left_size -= frag_size; } } else { @@ -2039,9 +2040,8 @@ static int mvneta_rx_swbm(struct napi_struct *napi, frag_offset, frag_size, PAGE_SIZE); - dma_unmap_single(dev->dev.parent, phys_addr, - PAGE_SIZE, - DMA_FROM_DEVICE); + dma_unmap_page(dev->dev.parent, phys_addr, + PAGE_SIZE, DMA_FROM_DEVICE); rxq->left_size -= frag_size; } From patchwork Wed Aug 29 08:28:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 963311 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="MtYHMV63"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 420f484xLGz9s3C for ; Wed, 29 Aug 2018 18:31:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728129AbeH2M1c (ORCPT ); Wed, 29 Aug 2018 08:27:32 -0400 Received: from mail-by2nam03on0076.outbound.protection.outlook.com ([104.47.42.76]:27631 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727399AbeH2M1c (ORCPT ); Wed, 29 Aug 2018 08:27:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1GpQ1vdMRz74HnBfPeLYxMzVUTwPtfd+1sLQlXdhO1o=; b=MtYHMV63QDVDDeAyfbTzrmM+H9IwndPYUeMZoFTxh75UZq8wdvjsZm4tlmkYXJXkRF2U5RFgUWSnzfY2ZdphwjC8tDc1SgV1Jx8l0sh++vvkUYg/NkpS48rcUShq46jXAwt6D4Ll2JAHHGMeRVrxA+G5Z0m/gnQo/SSSGMjKoyI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by BLUPR0301MB1569.namprd03.prod.outlook.com (2a01:111:e400:52a9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.15; Wed, 29 Aug 2018 08:31:41 +0000 Date: Wed, 29 Aug 2018 16:28:36 +0800 From: Jisheng Zhang To: , "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Gregory CLEMENT , linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/5] net: mvneta: Don't check NETIF_F_GRO ourself Message-ID: <20180829162836.2551ba46@xhacker.debian> In-Reply-To: <20180829162456.2bd69796@xhacker.debian> References: <20180829162456.2bd69796@xhacker.debian> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TYAPR01CA0082.jpnprd01.prod.outlook.com (2603:1096:404:2c::22) To BLUPR0301MB1569.namprd03.prod.outlook.com (2a01:111:e400:52a9::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 805f038f-1079-48c8-296d-08d60d89d9d1 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BLUPR0301MB1569; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1569; 3:Ph22fHJZlCf4w+ZVO7s/oNBf61zTffZQX8F33XezsKa9cP+c5V+4NdJDCyO24nRQ1QoxCEK9peNnkQFYyQLk6CndEHN50w3Ep81D6B6onv7ePcAvv8UmshG9riWD/Z/EzL6b0iyFiMmgvZdVaxtuubYFTisK6aFQmAh27uJeUqDOTOn2/Q8yqOdCmrwWvVVEl8r65r64EJzu58WmhUfbyK7MFzA1GvNiqExKyxw4/HO5RFikGnQbT44ie5ndfYBc; 25:UBydm+m+v3FaOH2OeMMnrBUfMGlczIiCcXTiZvLt+DgtzeTqFUPrJPF92saKV6hjrOvQES0Y0ZKplhjBuMX817Hh+Sjeh0ojx+cnFvAgcusEJ0z7ixMuq1lDoxRoUxOgOMC41nXGfJ4AQ0AoPGX7wO+pb3SlJjC1t6KNDPfTf+3ujUoVa+f3wr4jDhJEMyJ/ylsZp9I96YPlTCRgqqC1tRDyZC3MxoDrWwewIg7uXc7WaNxvbJ8CRGvuoqvPjZqJKMoJZbv/tCcdqwh+flFbvxeoFGtf9v1XyYTZftIs9jZ6T97Lu/xrjSGWBjxYRgxrsKrb89euuCud5vvfqTNAcg==; 31:btyBF+0Sm2MJAZmq/F9yBm7hMui7pTduuq/fGhmPq7fQO6t4SDSiqOv0GCVv/I0Xu6GW9fye7gLFNXpV5MBlYWL/vnF17OxJ3E+7t5eCvTFfgioVGVreM4KQ9o6zVrPGz5WY6U47p2lwgT8fm/CrmNztMYAWeE1R6DVPZtI4evW53qJb/glNh1Lc1CiYXfu8Sl9dGiSQhzJj/ibJ+WZpVGPP6aAfzQXAH1dfRyVeXN4= X-MS-TrafficTypeDiagnostic: BLUPR0301MB1569: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1569; 20:IRf3lD3xXRuVLmix2jp3LnQcJo7rvpP+gEte/P4kiQBEuaO3RuOEzfizOaX8Ej/Ot6DcfuMk6l/1JxiXRHtY46P/m0WTt1lfnrCVtS/Jgy9rsXyxjPYrf6qqSXc4si97sQ9tXF6q8QRLfa2eDlVK3Qeu5+f1QLFi1t7Bw4KeLd2c/BP3vx2HEiqyk4T4gIItdcUbFT3CqLc7oTndKBR88mOGEFiabvwP12PX+s+wA9f7xVjM2MfWHYNQ14NBXGg0sl+mFxLJfCRnOdjUN8UEwQuxqtZSjEtKGPa3XyZkLGPx5x9e3odEX0Iewz8q01BWVjcJKkHUQ3rRVY7iPL/UEoHHCjfwF7zMcJcPlfa5mDl8ACJTTIsRFxXhk4hooTVgQHhDaklLr8a3otScob8mXy75BInUJiwL+eGEvSPRFQZJ9rmIcQagN8NCn+7rRDvdJqIUX2VkVJawNRW4lVFqGnfPJYIzvS3hF0TGUp/NiRSTQHRYpO02mtlj3rguxMEv; 4:TIe49X96dD5q4z007QFFh8pjRCRTyvzI/qlb2thJGW1tayv2moKqOhdWlkRB/ago/6/IpkJVOkdRQUtlE/gTiRfpFG422K1trv2uxVJs7+3TTFzXtmtjTyRu6fJeAQeN/tANimybCSAKxlb+KHqUozcjng0J9/9tLnT91ss3VE5XQHJiA74End6jNWMJoSYvSIMlFdcM5gtPnscGoAlMpfDbPE8p+WDjrUUF5rX6lu/u8laaOnReE92HPmHryB8sB2phoChzRMbhKTKk+Sa1iQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699016); SRVR:BLUPR0301MB1569; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0301MB1569; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(376002)(366004)(396003)(39860400002)(346002)(199004)(189003)(478600001)(23726003)(2906002)(72206003)(1076002)(106356001)(33896004)(105586002)(230700001)(7736002)(6666003)(3846002)(6116002)(54906003)(476003)(66066001)(110136005)(956004)(55016002)(316002)(486006)(305945005)(97736004)(47776003)(53936002)(76176011)(7696005)(52116002)(50466002)(81166006)(81156014)(446003)(11346002)(5660300001)(9686003)(8676002)(16526019)(4326008)(86362001)(6506007)(386003)(8936002)(186003)(25786009)(68736007)(50226002)(26005)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB1569; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1569; 23:1czOTk2tnERmDLtxTTybRBjI7TUkg6Ue0Qu4BoppoA1WmwM0XThXZawUGaoO2ocAe0X4sxT0nq8jYmPoViIH0U9u/wtQiS+sbTlH5x5YABGWQhH6J2c7/BwBU5/swEa8Mowj1smHfNT+TLk1AbkfmzDeK7gYUtFqZUZUdJVMvCpTN1XeR+gmahJZ58kuswowBA+FKfbizkt95QJAK18VcVZMZ9XYOPFRLbRAIxG3DSZA4rEWFNJFg7lOybDCeC5N8O3yu9qBoduqCKHfNn+DoWL9G2YP3IfjTcBObV+sJ6NpDp3RiQ+9UclltEDwNobRvl4AI3KpJy8UQnNBY2ClcZ5o7A6TaC2vwyAB8VUnuk7uqpLCXuBQzL3l+IHF20V1dLAIKqmUR4kS5tjUh15UIH6+5RFZvABS/YRECqj9xrBDSLjHp5dSa6R90IfGBUX72voOA6gbaka8lAZzTEDvLoQF02wsd3epU6xgN3bnm1JugW3pgEoj/5u4GAhMLJ9bDGK6hHA9LiRo0b/OcvSLZBUIjoODOdWhrQGxE711Oe07OwWqFtCja8p15AYoXHb14qi6F3fjCqLxAqqF4KEco3ip19srqQBldgAAPQfn8aiSkDxIs/KIvRzG6ZIH3StWZBcoULBB3pC/ls1NszmGLnM12okJG1008w2muWT0h4OH+fToIGBxiDDFeOrnC1yK08rSGO96p4TKjJDWKxG58S5loVeje0pq5skuJH+dudmZT3jjO7kP/s5NJKE/LW5Ivp98BckSWKJkrayGU6tIcz9JliBoFHyFYzo75GQO4Hw6WOQ+lxPv0+sQ3FI4muwZhso4pg+l+LeNnp8osLnguDe2ICU//JxwPEOkrO4k1TNk9IqKjoJ3YsQZXR3A2cZQtSJpiHGwtMwlmFmhfzCmYpIHMol3UJu0fX0ljtohQbqzOFbqo5lfVOtqyLHgA8ILNc+dfcUNA7ejoWi2B6ZXUKGmsRw4AAFyuHnt+LTIfeUG5knXXj+DMavRR5dQ5CZWAaxGdD0z9cf42sp2X9+MqkSXNK8lWCKoW5+asyDwiEyyeg7SggDjSIbYWaF5FuTVqE43v76xBp3O4lPpSQAXwcnmD4FihoctLi7B00cVOlGDsRS7i2a8EJKiBf5omx18KP+PlEl6ifG6MLkGrBmfP0meZTPnIZ3Xb8tiNxXslyhKgQEye8+4hNOcgj27AmSc6nfmG/mf33Pvlx1q2FgDSKvp3CG+JJgPorXMI8BEKjE= X-Microsoft-Antispam-Message-Info: nFqi4DSpmHzhwu1gG3btB7fz5kR6J++uOaWF863670uNdGF9XBlMKlvcPrQAQSwaWIBuo45gLxYD3/xJlxxQt5vcGjY429ImQ4tkGKjCWA9xukkvfPE/Us+l1RVJlLg1RNjYVDiNbW1Y1jVR9rUl93vHa2/efcpjei8RnGmv9DqBa2c8AyN8EDuRKKcNUYBSHO7ljOn8/MbMHr0nlp/ojyzbUPTn4GDBwrAbJjH5tHa0xu6ZfpPlEh/DssaC4FAQaP/Gfslk1r6sqThzSdHd1RM3ZcN1K0CgqG1FaGR9rCm4a506smG5eShoCRuYTe1V33tsSeaDVRhqkEKFvKV+buF1MIr02iIkwp+3ALp6XeY= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1569; 6:ugdYt6/MylX4uXVWuPKyknsnPECV0VPrMkyIJw9JXeAR18rqkVOIi/Pzme+X6quU8g1DIx0zexArCYf3ZMmjQ2BlH7vnbkO9KPWSB7hhZH0MZBIi3hnVlUNSH338CY75Fy2rOt2kAwrDSWiHt+M90QTREVusL7HTutMV34Zaw34Mui3scwFqlXM/t6WWzd+A+vrq/ysa6XTgcJHX1KHpv90c7hwiRpuWo3ODPEjfpDplsUGURwZ5nCq66AFDu0ACwyCZAvJkjnZnrCyAaKlwK6qL1CMSejTC2jNqZiTGcf/gP+fOkM9Okjo/2amaxG6UsS57M2CSsUENKitga8rYIYezdtEvgccfgb4muzdKBJlTvXb5M+zquu7Omq036Rul2D+bnBWhp/BZQw+ZKBTZTF8m5aTJnHf/2DPf+zy/l3yBaSSeWs53sFjji7LJB0rxAnsUyuiIlnd04YPMd5pPQA==; 5:jnDPZ/sMv63UOz9k0Ct8s0iWnxIX3KSnctCbiYN4EF35PJlQQP24Unfx26kx1F/ScSUnFq3W65Q3g6ew7Bzf1aPagwioRpvMODL/ybjMn0+DSdS2w7U4/2Neb6YhDrBSd4Xus/niORit2+c+4nJ70jRz1sFnc47AR4DsP9Q6pf0=; 7:07Voa3viSUhvopnsBNcojW/L9neqSaXMpaiAbH1QKtpF258MI08rb+FJ+4HovJShYCgTCfsixxeJhS/cl+YxspR2vWDbi7Z2ULjR6xM3arZO0c7aesE/jh9P2LEFkClOVecI9vKUWfnIIMuLu09zcR7KudMXZSB9woLhoopMlJ5xV7rEWJArdotkNDWE0/SU7WrX/z1PEbkRj38ypVa3v76qlS60ijZLTjXSTWgj/y5/IOv8yDC6hyShP/iqo9OW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 08:31:41.0565 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 805f038f-1079-48c8-296d-08d60d89d9d1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0301MB1569 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org napi_gro_receive() checks NETIF_F_GRO bit as well, if the bit is not set, we will go through GRO_NORMAL in napi_skb_finish(), so fall back to netif_receive_skb_internal(), so we don't need to check NETIF_F_GRO ourself. Signed-off-by: Jisheng Zhang Reviewed-by: Gregory CLEMENT --- drivers/net/ethernet/marvell/mvneta.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index d9206094fce3..06634d4f9b94 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2065,10 +2065,7 @@ static int mvneta_rx_swbm(struct napi_struct *napi, /* Linux processing */ rxq->skb->protocol = eth_type_trans(rxq->skb, dev); - if (dev->features & NETIF_F_GRO) - napi_gro_receive(napi, rxq->skb); - else - netif_receive_skb(rxq->skb); + napi_gro_receive(napi, rxq->skb); /* clean uncomplete skb pointer in queue */ rxq->skb = NULL; From patchwork Wed Aug 29 08:29:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 963313 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="r1JwVCdw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 420f592gssz9s3C for ; Wed, 29 Aug 2018 18:32:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728091AbeH2M21 (ORCPT ); Wed, 29 Aug 2018 08:28:27 -0400 Received: from mail-bl2nam02on0065.outbound.protection.outlook.com ([104.47.38.65]:61516 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727322AbeH2M20 (ORCPT ); Wed, 29 Aug 2018 08:28:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ft7aLMdRhYL5fuIisx95uV5SmA1LSvSM7BuaglmHdcY=; b=r1JwVCdwKVBCleXcVql2CX395t29UNWGsH+b4UPg5WDflZuoznwIrW6Rc54T2jzTwWkOdRIyQ5wmZI0q6Sd8qrI1y2ZdYGLjuqXFVS6KDG2tvY/mLlBpgidxBJ4frkHCt2zlAAGjrP07uIAy25ex926YqJao26Dlorh0g+HhZLU= Received: from xhacker.debian (124.74.246.114) by SN1PR0301MB1582.namprd03.prod.outlook.com (2a01:111:e400:5232::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.13; Wed, 29 Aug 2018 08:32:34 +0000 Date: Wed, 29 Aug 2018 16:29:32 +0800 From: Jisheng Zhang To: , "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Gregory CLEMENT , linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/5] net: mvneta: enable NETIF_F_RXCSUM by default Message-ID: <20180829162932.6015e89d@xhacker.debian> In-Reply-To: <20180829162456.2bd69796@xhacker.debian> References: <20180829162456.2bd69796@xhacker.debian> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TYAPR04CA0013.apcprd04.prod.outlook.com (2603:1096:404:15::25) To SN1PR0301MB1582.namprd03.prod.outlook.com (2a01:111:e400:5232::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f53564b5-e479-4862-1cbf-08d60d89f90b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:SN1PR0301MB1582; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1582; 3:yBoxctC164cMeRfLKeSWVdo94sNc4BVyZgHxeRTlqalDhzbMJ0Gr3FHVszPuEwJywQ6gw/+N3ycARpqR2dkFeqqmdz8+raOKq5J7SjJAARkDPepc53TGo4iXQQll+wWD+THRu6lzI1kN+85HiTyVNk4Y9yOxVGfUiei/ARA2Ce8LP+k5wilwJt2po+JnpZsB1rv/KUCU+96el0yVkKmEsOvhYX2Lvx2V3K1vdZd8y9MovqVMGliS+n25eaAFOLrL; 25:d70ig/i2qx6NqvuDvmsjzVc16pU2KlbjtIEVJ3K/w+h8c8DB1uOKrJR+L+1WfNT9sZW98tVjth7JJ55jJGU0SP030ducujL2mmA0cjrLkqlYP1x1F3emYrXYXJG7axlV6ney6+04fsnpfQlsgVB7N3w2jesgbojFPreXFcKAascWIpbSWZ5gKBS8Kl+6tMI+pWVUinJd5fFD63DXO8MSNVpJ1QQ0NaMAFbk/s2rwXhWcpn4Q/CEcbxxJaEtviH2knDZIoSLsAxVAYZcFurlRUDCa867zOdB1ezVLL8/iw0HEe04e92klm9IjBMN0YqtXvTxdoZ4+ds9GJY97QoegAg==; 31:546s1rVXGxwElJkqi7vHKsf8ONYlRD3rG+kQRPeKd3ISh1V6M3YbZ8UPTdARTeaKEUJWzPy4DmIET3hQlf839i0VxnV7ByKrJl6MTsvq1uPW0Wk61CKPwkpfynoRRMEmczQKlvQO7UgQ1dbQgTTudfpBwPBXm5vLiPz2b0OP9LoSkKgXsicxfPMImzR0cAMyGTriD/kGlNMWB8AekeMKl7lH5A2BpcxV9dwQpz9DYKE= X-MS-TrafficTypeDiagnostic: SN1PR0301MB1582: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1582; 20:+sMBPJdgl5V2wMiQrFCsOapJmuGIcLnfoDOVdTmdecScQZH+tSY2j1u51ARhHEOH9Fu8M4ryxFAvmlMj6HiVKCPlhPLwGylR4HnSNOWYSHi/2h7pXYOlzEUN92gSV78vEtyiOAoF4lNLQWbwwcWo8c0Xa+/1NGTAGBzqilnEHjYwHmgFwMgBZ63Qgb5wEK3CDtG+9xtjDwCvhotXxyT5aXsYkhh/GXzdiPF4K7yMfM4ukwBtp6C2sizIAckeTMvWPg3OLa3PL+qE1EjmGbCmhvWP3BFJ/zgKkwbIQZLFC24JRvzCYO1lfMCVb2hUs4BkDipFEU1l1gyRkgvQbS5ksshoi3GElAaRK7y6/bYuCse+YerYcOv9W1i1/S1HjngQWOaDH7eUZzuZMI0JhpmSCNAuNjfA2hw2ZyduAwx6HRg6sDWL4lm6tGT1z858SCyJom46FzbpK1KdfslmrwXz6ww3reIb8M9haEkzsG5nAw/pCosKNcBpeInqTO5P4XDk; 4:PT+D8hThSpCu+yNSY5+1cQZ+ajS4CSbYGRQCQIrTV7oeKUK0vRixnZW4OAJgjNLOVsBa0BmWwrfrihU19R+hThQI/XIyVUKw4rSkES6VTPK6aRB9NUTMhX8Tuu7XW8/sctM5eNry4zkaEpdTi3L6Fqjkxbc3hrTCjv3uOMFjUuN6z6P966ohWTGIgZ/43N8C41WFo66oAr4vkqfp6NpgiYpbfZiacZQ3WslGGR1VjHgj8Y0TU7et34X4rOxNfdb2F6lpP7I+rYbrjdRqIJ/+FA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(201708071742011)(7699016); SRVR:SN1PR0301MB1582; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0301MB1582; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(136003)(346002)(376002)(189003)(199004)(7696005)(76176011)(230700001)(72206003)(68736007)(956004)(446003)(478600001)(2906002)(5660300001)(11346002)(110136005)(23726003)(54906003)(316002)(1076002)(50466002)(476003)(9686003)(3846002)(55016002)(6116002)(33896004)(25786009)(386003)(16526019)(50226002)(14444005)(106356001)(186003)(7736002)(486006)(52116002)(97736004)(26005)(4326008)(105586002)(8936002)(53936002)(66066001)(6506007)(81166006)(47776003)(86362001)(81156014)(305945005)(8676002)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1582; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1582; 23:wVxlmBmK6fz73ftE5MJDonNSslaAGLSH3w21ntqwRe5rYfQ9hP/aZp4Y1U89vtNU9pQYH67wvujel61+En8OSUiE8cF/xKtnJeP3P5VCYoQb0Yi3VjtRLkBVAKzzHcfUxonViMk7eGZfvNC/33xekW0Dm7X8+KsN/GKbPsRWHPC6WOQmyRdKoKDsgfh5TlzU9lZ7cHRtHqP5uF1lMSOzPoFIXFA/a4hcZb1HWIt1+/teh+Q6a+WrXTib1Y2puI36QvLAKkXkT0y2GxtbH9JYhrxKAhkM9QfBz7fMledLv0nzxrX0VoTIdZMaJ8zEk9a/t2j3NVDk5/2c026OMTrXSWF6SvBul6LHj5/CZl9zqnGG7pq0Vthrf+tRwKK6sOGdUOMhdrKlPqIhGjokFNXqc2mUSpFUIUyxAKflm1Fd6IVxIt1BOO63Dt/XOmdVvB0iqEqI4Ixx7ncN/OOe1B9WC4hRdRglgEXYnMpED2PK+hvmPZcpSXsp17bh9QOccAymeMPFiwSrwl5IdCfQviYT4xC7ZgdBkge6BY6MnllnHiQXrMh7UIZ6johHw3+65R9pf1CXXCEB9mdNejeCtPtnpsWhxA5UiCVa3nHYhmzeYQlprELCzXehefCFydm42Ejh78yA/05QDIKUxCV9Cc28EwCGy/AT4Az0Zm88sWluiytY9TmITw0mtdJ4YgOfZsd8Xol0ki46E8F1G4BbIi8V44hoBDvHf5pSH1KWnUzkqcGzZupTeQZxp/bhyw9VTl7VzVtbCzMWfSfV74L5fXQnUpR4m285sOwVBV/og2ZzdKaN/ik1d/ihFnt47XtaVD+kxEZAmwiG9bbpDmYikJPS1Pb+7kfspQADxZfn7pEhOiOnrLOzkkH7feOUU8rHs4AAOx5oLDVoqJ7B1eBkxwo6RgWC4VU9g9HsYdFZxD3J3p8Z8DilaGg/g7gpu0ttsf0DqOwG0zs5H/tSjRRSLGngTIor9BT60Uom5bdpCGhy4wbWR0tqzLRymkNuxqpV2OF6XHzIclTOc6Kc2FzGsQ5TfhlRBTvoFixAPwiipcf4vqwZSRQvJ5wPUXMt36F5Oj+Ujj6UM8TXVCtgk+560rE6WBCvytOyK5CsghFlHyHOBEgpSbuvDhtMqvFSRQM5po8BRwvuGRpzaPFdAM7rXpuSQvQrJeiVNOehKTfr7vuVJ3wrXeN9XSeG7GpYIBodGXxjc48y6V7bjyUoWnqe3g0D4oNOfmBUy8yoMXzluwiTdZY= X-Microsoft-Antispam-Message-Info: yThMBBXDBqNnyhxfaRpO7sVAPvLxEJV9vb47vaYWxhZfwhYi2cOigzfX0W/iC+W/bhsk9PH2/ulS09+OKDa/qmwX203ThTdV+1vLduGEOohUo9+fByy+R4Wpk4QNrfqiV7T6pYIldPmhUmsMXpBVYZUO5KsbQdsw5EqGvoJfXYWlx5V5ZAB53e/Kb47wxGrnu0YtTNA9drN+l0I75pZzQ6T33w+ymdtsrVEn/sSzsyEtnAIFCxHVHd4F0v7o97ZZF/nHLZ03OpR+3r3iyE2XgK+OveWWL4h1rO1AOZCwl/ta0kcdoMyzHKzZkktdnEn1j4RoLShAA6KNSGgj0dQGM5pfwUo1yHoyHHxEBB7zkxc= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1582; 6:ElNpdPfLlmF+w16xtkDmr3qk++zuXfz8fqF5WuZMlVW0bV8sCoQfM7TN9xHxzTT9mC3RUkCCMBYzkaLhRsGuzEsN8gSAO6gV1ZTllgMfUxkpc6blBuV35kWV23ckZfpuHYvjyB0kHK1TyaRyfC8Hkc4OznPDUyRcfEHZgaNpJGL/Oz4aRQtr4KJTQF57p7SWnvtgU3kRFjc9+mNvdAIQT4g9/7PfMS0H4o7sbFfKMrqP63bv9pTKxSbHv7a1rsZgx/d9DWA+5HpLLku2JZlGh/VDm5capmayyaKBpeYouh8jyRf6hxFZNWJc7G9nvJc4e+7ADFSXrQYCcm1/NQYIoYKgofNgZrUEps568eNiVD8OaYufe/8ra9kkuZ+bQv20Q1F8pR6eVZ/AIJC7VotLkqSy2bA9xrYqZxBCY7AkK4EWLzGGam07SS3smNhOyANbRHdFKnFzFshW8TeDkxwGQg==; 5:lCXXCpRN7Fs6dkXyYyyCjXXDNMcehQeyB53jGGyrA/pRbtjVYHIAqC3IKNeDplsHtEccY6U7sHuky1gRbaHtFBw72UU6hvc4Oan+qC3ho15QAKmZentPx/R4t18qHiQZeTqzjdGreY4QZKUEwivxOt5bjVx9+elYlxxw20+mjDU=; 7:NBwZHa43iNQdi83WHE02ppRRlPw3GPoKPbSNJ4YIeZ7fuSmJHbYZ2NC41TG2EIuQdfjabsV0/N8TTgQdaU2/o8WeJSLh+CGMkTd7La3IE1UJOKXwT/uLrDCIO1ltw5w+pMjopxIsT3vLJzqkUE4VJ6IC4qvZlFT4HOliOQus+izy5WrezPCJag9mbwRyBsM6+CPgdMaZUf+QPC/CuRIRoWe+teZEfCTfM0gYBPjlb7mRtn1oP64ednRcs0+cBBdv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 08:32:34.1164 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f53564b5-e479-4862-1cbf-08d60d89f90b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1582 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The code and HW supports NETIF_F_RXCSUM, so let's enable it by default. Signed-off-by: Jisheng Zhang Reviewed-by: Gregory CLEMENT --- drivers/net/ethernet/marvell/mvneta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 06634d4f9b94..7d98f7828a30 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4591,7 +4591,8 @@ static int mvneta_probe(struct platform_device *pdev) } } - dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_TSO; + dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | + NETIF_F_TSO | NETIF_F_RXCSUM; dev->hw_features |= dev->features; dev->vlan_features |= dev->features; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; From patchwork Wed Aug 29 08:30:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 963314 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="nuSZWYmU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 420f6H5BB3z9rvt for ; Wed, 29 Aug 2018 18:33:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728128AbeH2M3T (ORCPT ); Wed, 29 Aug 2018 08:29:19 -0400 Received: from mail-eopbgr720041.outbound.protection.outlook.com ([40.107.72.41]:13100 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727133AbeH2M3T (ORCPT ); Wed, 29 Aug 2018 08:29:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ssSYEkoUjeRD2907CRxsnGJWrPIgq8vvZI3n7lRvDkk=; b=nuSZWYmU7xerEJTMJbjWqIapm4Zc5NDd+Pg5AeY84pcMrV/izrnxOAyOOMcPai4tO39CCW7GKNiPOxMhRWTDg3LGVAIdW9vI9/2Jy3yE7wDd8Su5Ahf9mXCmnTsq0DXXXA+v951sv6/IZLQK+IIp1JST1fo5XPtXWwui71y2NhA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by BLUPR0301MB1571.namprd03.prod.outlook.com (2a01:111:e400:52a9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.14; Wed, 29 Aug 2018 08:33:26 +0000 Date: Wed, 29 Aug 2018 16:30:21 +0800 From: Jisheng Zhang To: , "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Gregory CLEMENT , linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/5] net: mvneta: reduce smp_processor_id() calling in mvneta_tx_done_gbe Message-ID: <20180829163021.70ce99ab@xhacker.debian> In-Reply-To: <20180829162456.2bd69796@xhacker.debian> References: <20180829162456.2bd69796@xhacker.debian> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TYAPR04CA0004.apcprd04.prod.outlook.com (2603:1096:404:15::16) To BLUPR0301MB1571.namprd03.prod.outlook.com (2a01:111:e400:52a9::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c07545e-34ab-4c17-3c45-08d60d8a18db X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BLUPR0301MB1571; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1571; 3:JALAq0nJFJmsx+XnA+bRySjdqSm9wFBJowbf7koxHe+R5XQbhxPR+cHNGcOtpZe6RyYdkkrvgNHiaOIihOuW3yDWJBzivGc0CwTcgL0aISwc10PuW+ydcKm1sTJMzAgtJFQgWlwTpXpD0/4CFCobvYuY6E2axc22+eqDwzChtrULECF3hx7svD7JGgQze+XunS7hWANoKCnOJZGvpj+TrxDWdne1QwaqnV2cxMSTJvhZ2JdqnVV+GkHWbNMahlcR; 25:MKzkG86o01JVckeRJ7Oo94+5t08S3m2JAsg8IuZTvR73ns77uH2luSg7+nkBBV5AlOu6rcyI+XmX/b6U3mKikdnMEPRIq9ziPm1JtRfh5c4IicuZNond+j2W08fo00YikgnyIWuzf6X7iD39FcM+8GtDR9OUHOJ6+ReqmqAL5Ul02WOH42deHbeeuzqeuVQ4l9MuG+ZHZgnURw6X5iaaAsFhhz+da2P0CxZ/MFCJ18RD4CT0bASwn53tEZ89zTqnqJuf9XGylvlrBNebuwwUJ2nJ+PQkgfUSJ/CbuWcYGRxPNpPMy/dEOIrD2juAD7E5FlimciwN2tlLoaSx4eBkfg==; 31:M59CLYmHouYEba1AlE9fYyYtvDT5Wyc1ohXdHMIamJpyK8KQtyjMHPHFg5HeqRCc1gelU1xT0+tzPOh6WAL+6odjf/2xCS7+RhUA/+WAtjQnTLY6WydM3Ap/vm98+QuP0ZeQe4wB1MR4UGc5pBBodfy3+rU7XvXjuDgnF5yxJZFI80+0iGC3Q2ndkHKh/PA0vosl5xDnUi8xqouDl+oFtSokWaH/Zl5UWQ+ebQcpdBA= X-MS-TrafficTypeDiagnostic: BLUPR0301MB1571: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1571; 20:bwAIowpOcWiNUVZVJV8FAbbvgBBDgS4tzrp1StIl0KIkSfBLxwAUZCYGtvfSBOOjjBW9JzQ9857o7xJwlLoUhl2Jq4ZwPa+5IASnGluJxTMowVpia2j5KXrwx+nAMiVxzOIebYLXSJljT+7BfGNGET17eSCf3qVtpdySdzdyqWLLVSHQ2AqlHcz5JPZ/rd/N/HhKwopZZhwkD4jIb+mrqCyH19bp7Rsw3VDOeaxgM/9qx9s/T/+rQa7ldogGk3/AuX3XM+s0bkFYfSWvXDIpmJ0TrdVF7DDgYwZq02j15EvSszGdIfLOMkEdJYJDWmK+nuZ6p9dcab3flaKZT3ZZQD/zrdrHqhszS8WB9wEkIGlF0+9s0rcCIrmvCTR5M7j8YR4YHI7j3v/exK+Km8sNlIhYr6qo+bFReC30DDJrGQ0Ysh5OemUunHCX7C6v3Qn1L3u/dvI9wnsufHO/y/JMpYCT13tTDh/AYUO2m2URe+yF/vy7de7hp9p+oAEm3J7e; 4:TOZFexnI+z2Q2yhNlQtfnAcigjfK8GO0XkWSPKYJsWPi+n3acwN/t8j148s+d2ofmqLTG4+JXYQUwFiY0JptbqFym45OgJ9gVWdM+F2QnA3olGeCtTGWV7qIXtRg2mVn7HD/vviHoLCELijFflYKeTY9qiUWdfrnxqM+FZW+ywCDu6qpsgWfJTmvSydnGtZGsS2IbWJV9jyZ9CZmxJV9vc1zTjVApQIomU1jpiCow9snf5onGw0cK0MzxADLvUmW4iGJ8LzvdPNHDTTIkSBBNQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(10201501046)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699016); SRVR:BLUPR0301MB1571; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0301MB1571; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(136003)(39860400002)(346002)(396003)(376002)(199004)(189003)(8676002)(55016002)(105586002)(68736007)(106356001)(14444005)(305945005)(7736002)(72206003)(4326008)(25786009)(478600001)(2906002)(9686003)(33896004)(97736004)(52116002)(7696005)(76176011)(1076002)(110136005)(54906003)(53936002)(316002)(23726003)(86362001)(6506007)(386003)(476003)(3846002)(6116002)(8936002)(47776003)(8746002)(66066001)(26005)(486006)(81166006)(81156014)(186003)(446003)(16526019)(956004)(6666003)(50226002)(5660300001)(50466002)(11346002)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB1571; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1571; 23:cQWMSq4no38gIjrAqwu54nRit40reQ2TkPAtbtdkt1gRxWm1lRD6Fn7PV7occudCB/tIvnwmmoc74rTHxr/qpPk5q1STWKD2B8Ht7jgvpLvDQBrfdZpan4HqLaHo5W3IzrbjLfdRexCX65UlBPUFj75FbpOUvTnMUF7h9TFWeZJ+fXK0Qj5pCi1UDD2iZ1iPHXvfD6VDCb0UfkJiT//Ge1biLhhgY5ikKZHUvI+OEqq8r+2P+yV8IRnQF0PbXfFa1mIc0tquA1VMQxcVDPiClZqYlGTVMBYLq9tpC4zLPKe+Sfo+J5RqSsh+yWYMwISE2ViMfpEb46nrbT50yycYxynE/GKZ/fBVCf592cNCDi+tFcON7JwMcqBcdJSO4cKv/IbfMbv6lfzjspV2OeEOQpUVp3iOZbtAibKRR1Q9o1RRwWPSONrw8kKIczoUW7qOml2mWr5nptZ/X9/9ajckjWjYT2BPzAbgfrErwtKu7iD8h2lkjPVTZcQfHKhGaLgcQBZQSFlTCU7e6o6pJq61SVNZSSEDwyGW9YtrdRoD791gliH3DsMJP1ec2rUGXALVkrs72U+7dwgPu2LvktrMl+QXUmX6HCwGa15AkMQexPFokQwiOiTftcSMUKL6axtfUnH5gk7HPNjpEgBiK+6RV9Cafn4UUORXAOhMx1YnTEPsEERk9ZaNPNeRSLKdvrgQPxTm4TvCNR2tJ++z6bKEes8mCkUd6ZYbZojLoXta0sSwDIRfLWbCb90a2LvfyUay6N7WJ8gtw8/W4JXWJxjQLLUqZHSn2iC/5OYcYD7ejLD3z6IQz+a6SXmHwG1JkBYB7jD680pyRHBWRmGJSaUqDZ6vne+f4KcmPabAIvbK+ldrGoeMHyHCuNXeQB/QZodkovRfuUMySICMDSTAI+iNvlseco46Ar5TV5a3HuYyyPjJOSUyctYL2pRfQ1zIjMFAR73kYz/XGPoD0TXyRBzO5Y0oDBesnqHk8UGiNhVESiDabuLLxMbQaYIipA+zvuhMVAYQhLu7RnA/lBVj01JPpTzqaDFZ6CGeJCOWSxaAmL1M8td+NN+N6BD7J9PPWaCcbqWUgkJi0Gnd5FofRCqoPsEgvZngmLddCskEVCjIqiwZbZ3l1zK8PO/DlNxyvnVf4M3AXYNEG2QQXovF4gB4MPcFdKzgZAz0RuJdBFGICdSWuswgMJnxRFCSnELl8NiKZsJe4fbzjD0geKhfHJa1Z08LSaFZAvERcUb6KtHIOkM= X-Microsoft-Antispam-Message-Info: sYIKzO2x3kzRqtZGTU1EQjwy7hmyxzhSuPpiisrQpuNZLX+2TsbPss9jmA5LqrWp+kxXJwaKiTMmoJhO8BWupDKITdLIX1E6uTS6xXuj+2nr7Ry2m06agmCKmFHwxiMtB9mL1JvbcPWsuW3qw+nPN53GVAsUpcbXDHANaMPAArE0G2Zgy5Ab5jrpIfBXErcX2eXTNkiiWCp7T42BtOSiM0ign2dRE84hK/z4dFMKth3CIYPG1UJwBaOSzRadjBBZBtuV45mD5N9JtaWVA5Z3ukULqfRIPg6UmlaV397dLi8mxkYaG1T9szFKE9/qH3FJaSKiubX48kiRJo2AdKcMbbGyylnu0QDbpjAA0BeiN7o= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1571; 6:vg29SGYJctr0UIf+zINMBMZhqt632KQji234vYhMIBfv17B/6AXU99OFeG8WHXmuMOPhAq+yIj2h15qH/SMgppibMjgKnIYHrE5SH/xt40GA6l0ZyXwqFVltDdqySdOOa9pE4z1nJgA7x5WbFQwVAzDmFEUxH2uX69NtzEXBY75WGPdqpD0rTSoxhaSZY4l7NdfXN1Ej+nOot9kF/ydwgzvrYXUu87+Iu0sFe9xyLeDanp8srJnwN7BrBivEwUFhHvt9Skp/ADxi4N6GqZFTRoijC8OE3dur5d26CiJZNjnPVoBp7QszsH8wWvqUH2fGJYhjTOXTPJ7emNfZ+W684uLG5tLH+WcKk6AHrDHiropRtUIyjZme5i6S4sAX5wQpPnGqVUp0Pso1TewH0OGwXUs6bxd83FttQlcGBcAfAkdPc5oDFLixgO9m1k4rIVTgDuEG4DTcDIJnEBLXC6pdUA==; 5:980CC0cHHGJQverQ6kpbqKqT5v66YJI/XXTPcZX+koPDuvbG5PfVeFT/axmZk2HG47hqa3xO3tDIPRFnaZ0Og3myuxuKaXuR28JsCH3TswnaLIbelwwVbD/AhWCO+2EMwmXRTgoLJbEblV4fyYXAYWKzE76ihdJKvMVJxkRVioo=; 7:PaWb3tum8ocHyVuE6qTM+sPuL+XtG5KgvGXWNQBgSuX9z3756qa9stHXJdL+K/5UD6NGDMoGViTwexsMbB50f3q694q796o2Hv42WLwWdHPXBQqrDvvZyK9bcu9jApI3GgAyU6bECB1AWHNaV+2vFflx7FDIgy6IL+MOp4I1zTXjoGny9VyoStGi3XWXpDtrjig+rOAg/RAFon04AFoB4XVefEN4TPVYhWKGNeWjRzaQnrXi3PdEDEKWUYSBNs3m SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 08:33:26.4734 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c07545e-34ab-4c17-3c45-08d60d8a18db X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0301MB1571 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the loop of mvneta_tx_done_gbe(), we call the smp_processor_id() each time, move the call out of the loop to optimize the code a bit. Before the patch, the loop looks like(under arm64): ldr x1, [x29,#120] ... ldr w24, [x1,#36] ... bl 0 <_raw_spin_lock> str w24, [x27,#132] ... After the patch, the loop looks like(under arm64): ... bl 0 <_raw_spin_lock> str w23, [x28,#132] ... where w23 is loaded so be ready before the loop. From another side, mvneta_tx_done_gbe() is called from mvneta_poll() which is in non-preemptible context, so it's safe to call the smp_processor_id() function once. Signed-off-by: Jisheng Zhang Reviewed-by: Gregory CLEMENT --- drivers/net/ethernet/marvell/mvneta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 7d98f7828a30..62e81e267e13 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2507,12 +2507,13 @@ static void mvneta_tx_done_gbe(struct mvneta_port *pp, u32 cause_tx_done) { struct mvneta_tx_queue *txq; struct netdev_queue *nq; + int cpu = smp_processor_id(); while (cause_tx_done) { txq = mvneta_tx_done_policy(pp, cause_tx_done); nq = netdev_get_tx_queue(pp->dev, txq->id); - __netif_tx_lock(nq, smp_processor_id()); + __netif_tx_lock(nq, cpu); if (txq->count) mvneta_txq_done(pp, txq);