From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E98C7C43381 for ; Thu, 21 Mar 2019 20:30:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B840121925 for ; Thu, 21 Mar 2019 20:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729017AbfCUUa3 (ORCPT ); Thu, 21 Mar 2019 16:30:29 -0400 Received: from mga06.intel.com ([134.134.136.31]:6536 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728822AbfCUUa3 (ORCPT ); Thu, 21 Mar 2019 16:30:29 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2019 13:30:28 -0700 X-IronPort-AV: E=Sophos;i="5.60,254,1549958400"; d="scan'208";a="127493206" Received: from ahduyck-desk1.jf.intel.com ([10.7.198.76]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 21 Mar 2019 13:30:28 -0700 Message-ID: Subject: Re: [PATCH net] r8169: don't read interrupt mask register in interrupt handler From: Alexander Duyck To: Heiner Kallweit , Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" , VDR User Date: Thu, 21 Mar 2019 13:30:26 -0700 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5 (3.30.5-1.fc29) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 2019-03-21 at 21:23 +0100, Heiner Kallweit wrote: > After the original patch network starts to crash on heavy load. > It's not fully clear why this additional register read has such side > effects, but removing it fixes the issue. > > Thanks also to Alex for his contribution and hints. > > [0] https://marc.info/?t=155268170400002&r=1&w=2 > > Fixes: e782410ed237 ("r8169: improve spurious interrupt detection") > Reported-by: VDR User > Tested-by: VDR User > Signed-off-by: Heiner Kallweit Looks good to me. Reviewed-by: Alexander Duyck > --- > drivers/net/ethernet/realtek/r8169.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c > index c29dde064..9dd1cd2c0 100644 > --- a/drivers/net/ethernet/realtek/r8169.c > +++ b/drivers/net/ethernet/realtek/r8169.c > @@ -678,6 +678,7 @@ struct rtl8169_private { > struct work_struct work; > } wk; > > + unsigned irq_enabled:1; > unsigned supports_gmii:1; > dma_addr_t counters_phys_addr; > struct rtl8169_counters *counters; > @@ -1293,6 +1294,7 @@ static void rtl_ack_events(struct rtl8169_private *tp, u16 bits) > static void rtl_irq_disable(struct rtl8169_private *tp) > { > RTL_W16(tp, IntrMask, 0); > + tp->irq_enabled = 0; > } > > #define RTL_EVENT_NAPI_RX (RxOK | RxErr) > @@ -1301,6 +1303,7 @@ static void rtl_irq_disable(struct rtl8169_private *tp) > > static void rtl_irq_enable(struct rtl8169_private *tp) > { > + tp->irq_enabled = 1; > RTL_W16(tp, IntrMask, tp->irq_mask); > } > > @@ -6520,9 +6523,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) > { > struct rtl8169_private *tp = dev_instance; > u16 status = RTL_R16(tp, IntrStatus); > - u16 irq_mask = RTL_R16(tp, IntrMask); > > - if (status == 0xffff || !(status & irq_mask)) > + if (!tp->irq_enabled || status == 0xffff || !(status & tp->irq_mask)) > return IRQ_NONE; > > if (unlikely(status & SYSErr)) {