From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751481AbcEIRrk (ORCPT ); Mon, 9 May 2016 13:47:40 -0400 Received: from mail-am1on0067.outbound.protection.outlook.com ([157.56.112.67]:48292 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751059AbcEIRrh (ORCPT ); Mon, 9 May 2016 13:47:37 -0400 Authentication-Results: spf=pass (sender IP is 193.47.165.134) smtp.mailfrom=mellanox.com; synopsys.com; dkim=none (message not signed) header.d=none;synopsys.com; dmarc=pass action=none header.from=mellanox.com; From: Elad Kanfi To: CC: , , , , Subject: [PATCH v3 2/2] net: nps_enet: bug fix - handle lost tx interrupts Date: Mon, 9 May 2016 20:13:20 +0300 Message-ID: <1462814000-16331-3-git-send-email-eladkan@mellanox.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1462814000-16331-1-git-send-email-eladkan@mellanox.com> References: <1462814000-16331-1-git-send-email-eladkan@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-11.0.0.1191-8.000.1202-22312.001 X-TM-AS-Result: No--5.365500-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:193.47.165.134;IPV:NLI;CTRY:IL;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(9170700002)(47776003)(49486002)(1220700001)(6806005)(87936001)(4326007)(5003940100001)(5008740100001)(48376002)(586003)(19580405001)(19580395003)(11100500001)(50986999)(86362001)(50466002)(551934003)(33646002)(50226002)(81166005)(77096005)(76176999)(101416001)(2351001)(2950100001)(229853001)(92566002)(189998001)(8936002)(36756003)(2906002)(106466001)(110136002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM2PR05MB0866;H:mtlcas13.mtl.com;FPR:;SPF:Pass;MLV:sfv;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;DB3FFO11FD012;1:0PVWhhRaGzTtNotGBhz2ajBlOUkfN5+63PW8a0SyYL48fnRXV3pfsiCW20HeTiyK2Qy6kiTQsCL7bIGuUnK7tlWHxcxJP0WhyQCwBRkJEs53XCHhbLnHr3UUidxV+WEkLBZws+WjYMhZKODITOvKBEYDR2TR2ZEc0fYYa3makR2fte7QO2V5cpo0HnuVMBLOdhwh7kEw9NHly1wpZdzNKJolX29VlDF6Jj7MOAD9u2Ie5vTa7LNNNnbYwgc/Eai3iPkE+WuRwNKuzsW+ykgPBagqG5Xgr9BcxjhZMlR8bmLFFOxqzDJ01TERXRx+K13n14Zu5obWEalbz1XXFkAE/M218bBRoqjeCyTI4/hPsJNiKaNtFMrEzqZiqWvSCWNDRlTug7nH94LpRabwBzeiG5bYZsVJdlCzU13/0N0DUSIn8Wa8ieOug6R0l7fxRPmpXS/8F1XMlcK4EGfOJbtCnyLOjrGUi0NoMQBfgclHIwWLdndWLyS7dJ9Nrtx3tD19lArSCx7amIBt7ys1pfd6dcERXO9oKyD3M9ml74tWVvo= X-MS-Office365-Filtering-Correlation-Id: 682f3fd1-1eca-4b13-5665-08d3782d47f6 X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0866;2:b9ZX5ONq0wStvszCL+1wN0n+HIWhoe8w6yEZu17HAELgDg2M712DqutswzX6/etQDneUwucpyd9t4IMbNU7NWVljH0Ci7U+ZXiqg3vcITjZtcylCx9EGjB+pPfPvoQiE2+AS+OPaQ+89mCIn0ZzaXJ2+J+vbYPbOPbv0aoxlyBm+YSxTvJPOzgEkyITqDSRW;3:1aOmnBGfKHhNmsng48QagyAynnrgUg1oJS0xzrhFCZPNnbWAZqkfGtyExsKQxj+ZIgMAtKt3yjD61/O+h8zW26hbMJSuNWBvYlT+es1NMAwfz7EUmectwtk+WYtsy3HzHCYSJT4JzzFicJPf7uXrUUlACdYFyUMx/Jgsi5zsDLfiN04ztIdKuOrJfrvQRJgS69EJ/w/CfVPWnfQppKDjWelIXpTAF+kmqtynAH8afe8MoXVq7uqHKZctpVklt31ivk4GaeWoDfCKYu7fj9tzww==;25:4EXwO5cMji5jNyAOthnA9WD5nlhgmKJ4RDl7xUr3uh821GtjSQO3WeIAbkpLt7pw3AkGribdft2ohtjQNMC0gZD7osXRNE4ezbXcmKu1eqQyO5hoX0KjgQFKWKyNHqweb6BUOhvNSjZyrE71gfwftRXztCMq6p7FISWYvnKr5461iWsL0S37Kt9RlQPvJuoAmIq9chb3jpcl/qouVwCzMGyDj58D89OEAJHw348u0eGZIt8Ul64yZ9SkSDNHQg9wIUVwCYMK46FLitcuq+VTA/4p86rGK4vfpWfcTepEjacSAMCDU3auk4vxL/IVTi7xX7sjh+HdJ4c9He6p/lLY4XiW7fOaTCr9exo22grvbKxO4ViM9T0cLUBfX2uxixOE8Oi/59Q1/cS++0gjURAy6QBCYRQzKnZPdhRuYS34niooXXFh5+xX91UvBPFLAk59 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501002);SRVR:AM2PR05MB0866; X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0866;20:PFsVcA5ZTC/jOqt468OcWbn4bky4eK0/pgLt2y/sbml8LPPJz6LKTyaJG6X3IuYGub1p4eqbnS0J90IO+tNeVEiNokY29FPJ4f9lWFqR4+LMAyMP51U9QKzaRyX9kt2YgFwWvF1+P3bV0BaUmZssSlxnTsNxi8MFgadj5HPkUOpCirBDH6TDK3eVP+LfTD+Gmn9EXAodD06SaLXM028M3or40k4YYvdwd8GTsqi7VIeZfXIW7m/DtEgOGO1S28K6+Id2lgfX/8rW0ShpkvbQJffXPEbwVcSsf7SrW/IEOjArFT2NgbHF9YKSun/Sm6r8N93La8H41cZW+VbRFqu2jyg9ztmwaK/OCPuEs1TnSQVcXhz+h6BGFxednt93T1btkOT0VlRUtR4aRzJzPRYz56AvV2TjrrRlzYXE7G44OifbW9dfh86fsR4bvb7tPJkRZhIAReY+wONUHByMMg722Nv+L3yXvL4CnjUOd+XQ854Vuhf5bhDLnAmqgk+NRflp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13018025)(13017025)(13015025)(13023025)(13024025)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:AM2PR05MB0866;BCL:0;PCL:0;RULEID:;SRVR:AM2PR05MB0866; X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0866;4:lKl3wYb8B/wojOiBQLgs/QWU5ryTcxeQEIG4QCd/zHQ09X73b+fks/AYkzuCwImX83/u+BqYbbfpmnIstZ3YhTVo0hDaMVLluRuu3K/evvtWlENONoUTCuKS1Wl3oEXuccb9NujQ1bcuSf/8iUAi7Mpmpo073Z58CQyaJVKxGqwxuSVo3Utasip8Vj0UTpj6I1+Z7E7xu27D+puK9cfng3OOxeI+aw0r3mQ+vQUoee6sstjEIl5JXCKjKeAiNQMCGR+VUabqellAtei6S134uW8U8IZkNTvlAF7tjgbI7iNakJEZHz/VuUCY/+CcTkDNibeWAAiulyNAHC1JwpLj6giSso/RGlDypeD/rCsRbLzgWNbTi7mXBsANOATo8qrMPVs2TO5olfb14ZOOa6U8Ni+hunhMRwkG/HQEXxRhxQTx9WFsDWji/60SLV5zZDjjcB9ysBqWcQE8S1kIR703RpJATmoKzJ5Q+Dz0klxYsQE= X-Forefront-PRVS: 0937FB07C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM2PR05MB0866;23:Z4zUMzX8RmvtM/dIb3lmrn+vM01zfJ2bTsK4M8tvO?= =?us-ascii?Q?m8QUT/iZb3myQi1NEYb8gdQsDPHom9RVfvm3N84putPt9vp99l/71cfPwRFY?= =?us-ascii?Q?Q5CWRhbcCt+AdNh/n4l5PM55P8aLQLs96NeYhhlhRu7IvLGvQoNakqNRZ108?= =?us-ascii?Q?pTS85UKU+OowKetWKz4CW98P7B/B00i8X+JXW2NcSrIwEz4/JIq6H79oqQKj?= =?us-ascii?Q?6Rnyc8AwoisfewsSvO3zcfQjYklMTaGMee2hJgPMB09YOm0P8pFh/BUG2oWG?= =?us-ascii?Q?JS2mw0E7jJ+RDpOcJJEKP5gvSflmNobTbWNlMi+xpaQGMQjK01wfsgwFd51K?= =?us-ascii?Q?WaUQxdNmgHtltmdJfe2VZislxUufdYR3k/6Ne67hKhmVX3qrd4c7QvdrQlIv?= =?us-ascii?Q?tsvvNLzD7hH7Wsfj+BuTKEQqRVabwaaSwQzz82AHSht1nXH7y19WPP3JVPmK?= =?us-ascii?Q?IdO8cj1j1XFEH6m/hoW7aEr60sDrktAvUodkDYuFk1z3aG9MF220KZckepg3?= =?us-ascii?Q?LzSacAk6GtM1Zs2N/0dB8qpM58PVxuBX0Bqg3loxXhSmZBdCxSN9ih/hQpxM?= =?us-ascii?Q?wnJpqnfZ0ANd5/XyY4cD3FV7+Ip3BW9O/VKr5k08a/SFCmGEw86lNiT36hsC?= =?us-ascii?Q?CWRZ5aia1f8TfTXNND8htUCZxOQ8ADGhs57TyeavW6bNtGrjd3/2Wg2LkVCZ?= =?us-ascii?Q?MnEkE/wFkqKwQB9nGvBWEVzUSrJZMwnB+kAoe0DP6Vc1vd9T1gR7hU78viJ+?= =?us-ascii?Q?PAHjA+uvcoA3BgIOAIBiB6o1QPPFv+rZ/I4ynDetvVdrG74oA4ESoCg/eacj?= =?us-ascii?Q?709oTv6FNMXDScs2vVHSo/UHdG20qy/TP3hSRRTu8rb3BCJF6wDRbGttot7i?= =?us-ascii?Q?3GELUwOwLOIqs8XTH1X90/C3k345U2UYbQSCS6HQhNdG5wlkPXRK4Dejy8T8?= =?us-ascii?Q?b9Z4DHvpYA1esCcHD4ApQojwr+LKFkmcsW+aoa+cOZtsewD54Ra1BXEO7g+e?= =?us-ascii?Q?9Dst+dZUGIjibRT+aXJy4Kdl2S9aWbHICx+QGEqiPpcTA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM2PR05MB0866;5:aXUIdahRQv4LbjQp8kO01i2qR7LAhcWSmdUigWDYbsUhJJncBg/TEpomYunjdQkdk538Mcv1r9xpkXr6FPEqK+eYuC5iEfULVGe8eFl3Z43bOwCfULsBbeqGV2aTV96+cMio/WtP2rAlC8dSuFqPGQ==;24:3d147QK8xjG7yueM304Dnq+QegEorgE2ukH9kCArMwHUyQSzpn95kNtpPJ738s7WkKY2+yEFcaDoQv7X4GlX2xvE7Yf/MeaA5WhamGe5hFM=;7:s0POvQM/7gSwqrWjXadcs3ubopZa6zNPUKxTHA9FGE2HEa1Z/6wPnCeYKzJBxoRQS84xfjzqXy+SlzAtI36GwJT7MK8bsugTazF2zGQEB5z40OOMIKB5BaL/0Tjjl7VXq2YInO5yl6gtUBQliNoKAd+rqsiW9wAOiMRN9VCw/z2dZZFZLDaSo/Fr4D1cIRs/ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2016 17:13:46.2595 (UTC) X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a652971c-7d2e-4d9b-a6a4-d149256f461b;Ip=[193.47.165.134];Helo=[mtlcas13.mtl.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR05MB0866 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Elad Kanfi The tx interrupt is of edge type, and in case such interrupt is triggered while it is masked it will not be handled even after tx interrupts are re-enabled in the end of NAPI poll. This will cause tx network to stop in the following scenario: * Rx is being handled, hence interrupts are masked. * Tx interrupt is triggered after checking if there is some tx to handle and before re-enabling the interrupts. In this situation only rx transaction will release tx requests. In order to handle the tx that was missed( if there was one ), a NAPI reschdule was added after enabling the interrupts. Signed-off-by: Elad Kanfi Acked-by: Noam Camus Acked-by: Gilad Ben-Yossef --- drivers/net/ethernet/ezchip/nps_enet.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c index 25ac2de..085f912 100644 --- a/drivers/net/ethernet/ezchip/nps_enet.c +++ b/drivers/net/ethernet/ezchip/nps_enet.c @@ -183,6 +183,9 @@ static int nps_enet_poll(struct napi_struct *napi, int budget) work_done = nps_enet_rx_handler(ndev); if (work_done < budget) { u32 buf_int_enable_value = 0; + u32 tx_ctrl_value = nps_enet_reg_get(priv, NPS_ENET_REG_TX_CTL); + u32 tx_ctrl_ct = + (tx_ctrl_value & TX_CTL_CT_MASK) >> TX_CTL_CT_SHIFT; napi_complete(napi); @@ -192,6 +195,18 @@ static int nps_enet_poll(struct napi_struct *napi, int budget) nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE, buf_int_enable_value); + + /* in case we will get a tx interrupt while interrupts + * are masked, we will lose it since the tx is edge interrupt. + * specifically, while executing the code section above, + * between nps_enet_tx_handler and the interrupts enable, all + * tx requests will be stuck until we will get an rx interrupt. + * the two code lines below will solve this situation by + * re-adding ourselves to the poll list. + */ + + if (priv->tx_skb && !tx_ctrl_ct) + napi_reschedule(napi); } return work_done; -- 1.7.1