From patchwork Fri Nov 3 21:32:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 834113 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=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="Qk1Qoggb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yTFY74w6sz9s7C for ; Sat, 4 Nov 2017 08:32:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753178AbdKCVcl (ORCPT ); Fri, 3 Nov 2017 17:32:41 -0400 Received: from mail-co1nam03on0087.outbound.protection.outlook.com ([104.47.40.87]:31472 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750772AbdKCVck (ORCPT ); Fri, 3 Nov 2017 17:32:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GAip3JRVPRRH2f4sggvYug9IApKykRarkfTTMI2h7FM=; b=Qk1Qoggbo39jGX8Mlsx5Y9ZTGqusMe92gw0d1qSk1ytCceBw2KcViINGJH8zQKDOKccLtoHtE5yeDgH2U4QumTEy14hWR3RPQL+BlqtZSgXnXygIbshoS2gxAFgj6eMdbpxzGhw8RNqoPhmgUzb6TxvpNNUCYO23PtjLRs6XO9w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by MWHPR07MB3182.namprd07.prod.outlook.com (10.172.96.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.178.6; Fri, 3 Nov 2017 21:32:38 +0000 Date: Fri, 3 Nov 2017 14:32:33 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next] liquidio: do not consider packets dropped by network stack as driver Rx dropped Message-ID: <20171103213233.GA25403@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BN6PR03CA0093.namprd03.prod.outlook.com (10.164.122.159) To MWHPR07MB3182.namprd07.prod.outlook.com (10.172.96.140) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: abb8383f-d5fd-4067-f7f2-08d523026829 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:MWHPR07MB3182; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 3:obVrbCEqMIysxHn8k7UDdZQoixo/lepwpKH0S3NfKNhnYZ5bfUpMoSzWSPA2v3puMWzbs4q3odiVOwtxwPtl7t3MbQYmM18jmfoLITD+EoQhPCYpA0k1A2iQhL0/Z0/nDUujq6e6qxqBLnhAOEW1sbTSSi2s5NXtIKd67TYHhh5NuDP0RgRKhLAlWKyaQwoXBccygl7oxeBaxEet0alf2dMU3+9YrdkQtJgMio+ezpE+vgKCMG3ipmcnaYFOiCgC; 25:h5oeomTJ6tkV+eIWfl7FwooSJExEjY0U47fJTG7f8IdNgK1N7qBZZmNyFz7SxM3EMlGNOO+OCVamEQtCnGUhzMBPfusBfTHb0pbtmTh47aOa878AZAjd3NCF+oaPHTeJJxBCvxTgf80aM0lyV0PSMiPysmHoWqZYA2oFlUOCJnAPte6stcSOkW7PIoBj0kkHScCvZcm3iq/Sx2E1b/jxNoW6H8kjWKM3Jjxo+OGyQkt40rAXx3HPwR/og0QOHzXdu801lB+5qFFHOIUb152RcVFnajBK7hw1xYGLaTPu9S1zflRJ3CsxONA6cX3N7sPiV0cEXmcbewGDHMMbVUpOEw==; 31:yKBCQdcyTczt1mofGWzhXC1s032iQjsjwzKipmzdVP8zBVQl/+cYEIQVno0w4Ip9/PKVZBW7Bkj2K1VCGVNgq9rHWc2RuaUkfjSVmEmJqSUQRxJuBeqrf8wy3wZmSLovGrjAIqJ5UrDXDJUr4V9ba+i60sgPhHEOHQgi7I5EMRfZ4FlESyES8EQLgIHNZgcTVxouGXA9N2SVnqM2Ou/pU3a0u7/yNigfXv4RoMKYnLA= X-MS-TrafficTypeDiagnostic: MWHPR07MB3182: X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 20:ksimaaoVH2E4giTCIpt3FC5q02GK7onedH3XHkQm+bZJjPb6MaczTDXAEV+nMlmgShSERtNBPQ1HGaWp+mKjKYGy3XgA0pB0jCmt60LV4jOBjWdqBSnpayDhxF3Opf3JhEXnW9DqYA8npzC+qwmqpHHPM2HBhajTb+3pwJ6Q/1cX+Jzjdc1j31ZsMKN1Wj7z064mlOsxrtgFDFnLsJSLY2TxQVCc3aPzBYqvfmRrV61pBFnM3yCzsVqlRP7/Wf0GoAd7CX75sshd4wMcu3+fnyD/M7XQ3JjufTtII0kmLiuoP6nmZDz/biwldr6R1EFFAinvhzNoKI430PRlt5FcwbWuv9z64HMFk1PUFaEIOhrij/1X7CAo01adVCfAPeyxItNxT9fDFtg40mjpZWae/6YdjPbHAmzLl2lu/Jso8M450bZKVKboagaBc41srlje/RN4+kTsXHFpU6mhdAKAQ5CJMFCl0fnxHpyLkig/l1GTJ1g6MuxFWtg5Fh417eSX; 4:fSg1W/Unwb/2BmZzO9wRattIQyxABR4hpexyQlezGBeWJHs0RAIn04g0uYBiWuTg8HhHFS2zsd3X8sf2eCTTQoTrLMhmjY5ykfz3qAUgLOA/2jniqckNPjIPeHCMziXjlR/bjrIjCoiZ/UOe2euqZHQrzGgfzRG5FsS9exH8gzXdxyUs7mOoSEL2nJ+/q/mJA9oQZL32HJBcXe8lFNb+QvKjad1NUh5aDU7xnm9bNz2YgWwDqeAbAChziRn4uduEM4JEeqpvpPvVz+y/aueAcA== X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(3231021)(10201501046)(6041248)(20161123555025)(20161123562025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR07MB3182; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR07MB3182; X-Forefront-PRVS: 0480A51D4A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(376002)(346002)(199003)(189002)(8936002)(16526018)(8676002)(72206003)(478600001)(83506002)(68736007)(7736002)(50466002)(23726003)(3846002)(189998001)(305945005)(6116002)(81156014)(6486002)(25786009)(1076002)(81166006)(2351001)(316002)(47776003)(66066001)(50986999)(54356999)(33656002)(58126008)(16586007)(2906002)(53936002)(6916009)(6666003)(2361001)(97736004)(6496005)(4326008)(106356001)(5660300001)(86362001)(101416001)(105586002)(76506005)(107886003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3182; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 23:7kekrCjPahd2IBuPEU86eoQcJaT0fJcJ1lux4Uh8Aztr867CKupQCetitvZLdwUw7vBKlBYl3P4m13wUbwhAtsbDRLdCsrdk809R4brGPYr4ts8LbKTnVOOp7IbzYLdgj/yUE77GfDnd0IWuKkutCY1pjmuxXaA6O2p8g7hT+vNyl7JvgGz7l0o02VozjBKCzTfL+SB9r0fm5Yz+XogN3PMuOVslUQWiEXVU9p8z6Ucv1ICwgjJ5H448eY4554fssdH6WVxYv+WX7PTv/vt9f+KaQ7GGWImPHZghlniUEGOY6dOcSM8zDoIc7X3vRHJiKPpJ/Xz4ako1AgTeDQr678DNuxxiVPQXHg1Xdbw2KWg5aHgQxaVcd6Ac0YQ215TzpiR/HJRBVecMHHyFU466yuZgmgGAnhghNS56V9TJ9Uulrbxl6+RFzbcf9Vf6er4/PG+oxNypaFC8CjUMI8x4Klx0ie4bZkDeZnN0DzTp5HJPtAHxtuP7M0gdqbzOEaOT8ERl+1px17Il1glYr7nP5zEedL001mT0FZ1H0WhJIjYiyQsm2oGnFMKUmjJCfO7y9KJdSK/YyGfme2xxvwGWq/BjY0mpoB6ln066NP1ugMU22oRLS42RLnU83bv3AvRg0V1H/fl8eWyER/hzWnLl9dYN6mOHIXnZzxJAlmTxeQvuT8CiuV/SaGFQVfQHcRFgEaqWO12g5Ls8fHva9MD4w4OPKbP2ed0HHFsBQ7QhGeyOkZ6pLgl9fWjccmF093I5/XgAEeBqHYtr+ja9z7tOnl7SgUQsHHz9okdgBnTK5yAVB70qMAS9hvPPNqoM2ZAt0hsFRGHQ6Ahkq/tka9ZzeVgC9/Mti4NOwLgvfidAVXA1dwT6/LC43UgW824I5C45s9t7jcynorTEKEi0EwMbx+G+C8+iN1l342FWT+3YjO2O7jlLhrIGLX9YIuljBhI9xBtwliJ+/pVUzato2p2PJlXOr/dl9X6RGsvXGofXRm0oVjI9EGwguSl60MU1TLSEUoG0NlxA6qS31DsSl84xou3Acn3uG0W6YQppuaEepBOJGFU6AsusUMOp/oIY0nvlcYej3KPMVKQE7JuyADDo2niZbK/jFILhcaRXvj2H8s4uKg5HhfZ4YLDoLwQdICE/rudNfqO1BnHlph6CLuCkqw== X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3182; 6:d801w2s7WsHaFSTa9UWiAnlunp0rKsFM+KsgV43UhAy0rVb864V50cOy0Lk/D7S/V2D7TC3Wa6Oi9qwVMKmAWvk9OCYxGW3Tn7iePhbCGR3jSFh5Xzti6wh44bUyjZ0gidz6zrJ8YegGAJ8JtVmZNo90EjNwhW2Vxaqd3gMNsT5aSj5cirKd7Hbucf80BA22qDw9gUGKpc7+OgTLtG2j/vfyHDBi55QLBas0Q4xhLtAxK9kxhvHT8/pCHZz3x05vCw2j0cuXrGj/lErBuGP9uo0E1+0igXHCwF1RHDT+gHkc4MLJWc8FHTTwBewcAEUNrWAfgbBUQkbNTmWlM/xu958C4jWVOynFM6+O8p9dWIY=; 5:gNgKYxUa6bEqHxO/X+kZs6X6At6gzabMK9KcZcsmE13QLysqft/tdxvfmu2J3Ip48LOPfbwcCMMVLrsUIHPXc8qQ1rt2ElI21uX2JkzNJ4mnkUkrtREA5YBLQ6fz81KZg03hwF7kzTVvYegeo9NS/UZATrwy7q/PhziQo/SdQ7E=; 24:xq1gYj9i5kjdYg+bqQ9i6ijQnH1QXhvwY19BjrvcNhRAQQijhPeQsDhok7AE11bpJJnSq7qMyjeZrTbB3C5rVzNdbBYnkQm4CNJfyYBBt50=; 7:fAdmk7nSjB24CBQlEySstGaOkYjxXkvJPgYmnLu31Zd7Y3+SKSobEKgZCnbl94ViHickSU7g3pJBV7bF980DR3UwOGQhQC2V1hXpxUOmwbL4zghO8zZe3Kxnqp6TAXwPLAaky1pfeZneTb7rfWb7a7nUD2nuV6B+ixezxVgqqnRfGGU/O1hkI5CFOs6fagYvemcwC0zdGqj1kAkcIgbgrgGqITs2evOqZpZM7Us69+XwEmjtYV3V1hkp4NMcFlV9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2017 21:32:38.3843 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: abb8383f-d5fd-4067-f7f2-08d523026829 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3182 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha netdev->rx_dropped was including packets dropped by napi_gro_receive. If a packet is dropped by network stack, it should not be counted under driver Rx dropped. Made necessary changes to not include network stack drops under netdev->rx_dropped. Signed-off-by: Intiyaz Basha Signed-off-by: Satanand Burla Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_core.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c index 89b7820..32ae63b 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_core.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c @@ -467,7 +467,6 @@ static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs, if (netdev) { struct lio *lio = GET_LIO(netdev); struct octeon_device *oct = lio->oct_dev; - int packet_was_received; /* Do not proceed if the interface is not in RUNNING state. */ if (!ifstate_check(lio, LIO_IFSTATE_RUNNING)) { @@ -570,18 +569,10 @@ static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs, __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vtag); } - packet_was_received = (napi_gro_receive(napi, skb) != GRO_DROP); - - if (packet_was_received) { - droq->stats.rx_bytes_received += len; - droq->stats.rx_pkts_received++; - } else { - droq->stats.rx_dropped++; - netif_info(lio, rx_err, lio->netdev, - "droq:%d error rx_dropped:%llu\n", - droq->q_no, droq->stats.rx_dropped); - } + napi_gro_receive(napi, skb); + droq->stats.rx_bytes_received += len; + droq->stats.rx_pkts_received++; } else { recv_buffer_free(skb); }