Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp788643ybd; Wed, 26 Jun 2019 06:10:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqxQB/I4yhyZfhC8p0DO1XzDA7aqN9Y0xfS4deESpnArS6AfnS4ukgwEZaMAa8QL6YG/csGm X-Received: by 2002:a63:d551:: with SMTP id v17mr2965079pgi.365.1561554653372; Wed, 26 Jun 2019 06:10:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561554653; cv=none; d=google.com; s=arc-20160816; b=u7D5ujtuQPAvfDjhbxQ1DdvCluRVEFR4mJuqIKkknQLdBJ09kYhZLdxGDsiXxe5fFl iTvHS8hj7BGHSlqz1ITm8a2rvvm86Xtd7qJY9OhLvRin1yCwhRz1yvDfjLD6wvyyOeFC gLFtNJhZdLeHrtIqw07NwentQyZk3l0U6biF8oSOWyqf/9tl1wOChaXWf57FhZ64HzB8 Y+e9bQ/7uvFj7SXIaP0JVodfTqh/mcdnrJwHrHcUJlVA4Bed6STnFoDIioCehUO6a0un m3GUWuHflJJlanaKOvwCPHF+w/QU2FjfwnwheWt0r3wYa+G09eWFNNLFUzgmIaz5aH45 VrBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=UlAyafwoDWOEZg6jMds0rhcbFjBfyg8hnA1+xEC/Yao=; b=GMbFOM61q1chqqDHDG5nYJOBWE+9muiXBcOTDPe1GpxeZnGBbzcRV0qARMU4AaNjWk xfqudwFOmTeAthH691CCYLPNZp5djzyNPL+jrPMLr7eqH6auml3Rdk0n0j+oGrYPYshH ShYJRVLTT00vHGi08YFJ7wVvqdv1w3PpOWgAWgoIz64l1V9esqiMHTB5Q/BGSsBfXh1m /86dJILWacpQp+e7TDpnA7hr5yrzMwNpJuO0Iv9FOkVG3l5LPpqr4Fet/vAPY+ElF3XN bb2H0PgtsxHxsJOd/gmu/c9UfiYpsClm3gE9O19JOw9K6ne3vBnv+P74uFQ1R66d5qk5 Wm+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cogentembedded-com.20150623.gappssmtp.com header.s=20150623 header.b=D9jj2u8G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 74si15843621pgc.595.2019.06.26.06.10.36; Wed, 26 Jun 2019 06:10:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@cogentembedded-com.20150623.gappssmtp.com header.s=20150623 header.b=D9jj2u8G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727437AbfFZNJA (ORCPT + 99 others); Wed, 26 Jun 2019 09:09:00 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:53324 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726347AbfFZNI7 (ORCPT ); Wed, 26 Jun 2019 09:08:59 -0400 Received: by mail-wm1-f67.google.com with SMTP id x15so2041694wmj.3 for ; Wed, 26 Jun 2019 06:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=UlAyafwoDWOEZg6jMds0rhcbFjBfyg8hnA1+xEC/Yao=; b=D9jj2u8GMuzxKU98G6kRXnbV9c+RQt++kXvN4FEFtgycPae8cdS/Aq6nD+2tCgJ6Sz o42/OZOTQwjC+l7lSrgOJhdXQSQQzfMcEeCtJzNRik/ohayCwPAInW9bH/yq1KFnnNj8 JHOT/9wbnneNrrt67ZxJho/0B6j/eW1ng2C6MzdOTX+jGRVYoNKUSlsK7onoPoT1FH2N lw1wqztnx5cWqz2pl1ReVLa7b6vnHVO7zH8c27WNUzw4pribsjpFa53DFIQ8Ri2/CAp/ C91LYRzikIJlV+WC4SyaHKNhya/JXfsRH1sq+uNVUhPCfQiyAacRTPrFaDD+uNm7dt6y tZRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UlAyafwoDWOEZg6jMds0rhcbFjBfyg8hnA1+xEC/Yao=; b=hAgz1XEIMkuApiHTlFyQo8wA86LgxcbrPqzwCccvumWgrzaX9vlU6XbOUmm34W3qm6 B8ze9hlPqURSUwEXLfEgxngKpNpan93KJqFzR6llsPQO1Drj6k/GIMPjhFH4RQ7vakVQ mzSceJ5fe29Ex4oANWVPqq0812n9GUO4YnSMUaTrwWqw9Ld8+g7/WSBqZXIFcgbsS2bL TSPI43FV+wncQKLg951b1t3AcjY+e65cWF8uL5n1VE5HCNdOXNsvsuYv4Oz1KxHL7/XA K+95wCDuhPNHbMOirxHMixY4bGHxbIxPxZg0Bi2FC1ZsllrjcDGMAh+nq9JbGLIvWGMq xgJQ== X-Gm-Message-State: APjAAAU6cP21lBEc2gVuFI3lULGlplNu2E862z8gGiC/LqQray4yDoyH Pq/yHKUL7Td/H7hr63GhL37Q7Q== X-Received: by 2002:a1c:b706:: with SMTP id h6mr2640507wmf.119.1561554537502; Wed, 26 Jun 2019 06:08:57 -0700 (PDT) Received: from cobook.home (nikaet.starlink.ru. [94.141.168.29]) by smtp.gmail.com with ESMTPSA id n5sm1832855wmi.21.2019.06.26.06.08.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jun 2019 06:08:56 -0700 (PDT) From: Nikita Yushchenko To: Wolfgang Grandegger , Marc Kleine-Budde , "David S. Miller" , Simon Horman , Wolfram Sang Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Artemi Ivanov , Sergei Shtylyov , Nikita Yushchenko Subject: [PATCH resend] can: rcar_canfd: fix possible IRQ storm on high load Date: Wed, 26 Jun 2019 16:08:48 +0300 Message-Id: <20190626130848.6671-1-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have observed rcar_canfd driver entering IRQ storm under high load, with following scenario: - rcar_canfd_global_interrupt() in entered due to Rx available, - napi_schedule_prep() is called, and sets NAPIF_STATE_SCHED in state - Rx fifo interrupts are masked, - rcar_canfd_global_interrupt() is entered again, this time due to error interrupt (e.g. due to overflow), - since scheduled napi poller has not yet executed, condition for calling napi_schedule_prep() from rcar_canfd_global_interrupt() remains true, thus napi_schedule_prep() gets called and sets NAPIF_STATE_MISSED flag in state, - later, napi poller function rcar_canfd_rx_poll() gets executed, and calls napi_complete_done(), - due to NAPIF_STATE_MISSED flag in state, this call does not clear NAPIF_STATE_SCHED flag from state, - on return from napi_complete_done(), rcar_canfd_rx_poll() unmasks Rx interrutps, - Rx interrupt happens, rcar_canfd_global_interrupt() gets called and calls napi_schedule_prep(), - since NAPIF_STATE_SCHED is set in state at this time, this call returns false, - due to that false return, rcar_canfd_global_interrupt() returns without masking Rx interrupt - and this results into IRQ storm: unmasked Rx interrupt happens again and again is misprocessed in the same way. This patch fixes that scenario by unmasking Rx interrupts only when napi_complete_done() returns true, which means it has cleared NAPIF_STATE_SCHED in state. Signed-off-by: Nikita Yushchenko --- drivers/net/can/rcar/rcar_canfd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index 05410008aa6b..de34a4b82d4a 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -1508,10 +1508,11 @@ static int rcar_canfd_rx_poll(struct napi_struct *napi, int quota) /* All packets processed */ if (num_pkts < quota) { - napi_complete_done(napi, num_pkts); - /* Enable Rx FIFO interrupts */ - rcar_canfd_set_bit(priv->base, RCANFD_RFCC(ridx), - RCANFD_RFCC_RFIE); + if (napi_complete_done(napi, num_pkts)) { + /* Enable Rx FIFO interrupts */ + rcar_canfd_set_bit(priv->base, RCANFD_RFCC(ridx), + RCANFD_RFCC_RFIE); + } } return num_pkts; } -- 2.11.0