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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 6473CC43381 for ; Thu, 21 Mar 2019 20:23:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31FF4218D3 for ; Thu, 21 Mar 2019 20:23:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PcwTx6MU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728876AbfCUUXZ (ORCPT ); Thu, 21 Mar 2019 16:23:25 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42056 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728316AbfCUUXZ (ORCPT ); Thu, 21 Mar 2019 16:23:25 -0400 Received: by mail-wr1-f66.google.com with SMTP id g3so2720399wrx.9 for ; Thu, 21 Mar 2019 13:23:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=a38GKnKPb3xONzJQnc3CIwim40y5qP+6Ag1OCPfAyNk=; b=PcwTx6MUH6X4i/Kq0jURhisZ5PDNnc62N27PeUpmix3jgdZvpvPatrorzZ1N4gDUeG n2nZYk0vVWXHNkJea1WoFPkQeZKGe5PyXNI220DW5103keUv44e1WFdSkNXCmVA5mTZG 5CkF6pNTpR8LfJboZF/nEjvxQ/HKQpXzfaZVLihApzbcVy6NALrKWfLeSDEUzvJEOLcq R/O+LF5Zw9ZifM1tpQGA8meGwZ72J91bID2pg4rmFPngonSyeZ8K0hW3JJNH2SXgjH6Y VHWH1a+uOKh5AvA4qf+h8eJlNNYSHtg6UoZxgkg4xaHhDYJrY3+78zcWxn4Stdg6rY21 PwvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=a38GKnKPb3xONzJQnc3CIwim40y5qP+6Ag1OCPfAyNk=; b=NbuUpFLtlu3AcAAwhQBaCrsGrtQn5K2S7nfoF3UTxDo8ws1Aup7BbH6O++DW/eH6et h/W8h5CKyAOJjSCvMRZdw+imJ1IKQNgRagOP2Xsay91uijUYmBXFk5SxnS/H3tuORUdw y1SrNnSWyO8PuTDPFhE9FgPKXTP7W5U6Z30mGlSvsDMBbcQPhgqemwbE/t/bbYGddj02 tu1SoP0lLf82C5QihSb2UEBjGmxdHyFKJ04KeMtWS97tuyu9YgPyeCegj1P7fBTeYMtJ i+SpBtHAYyO2Y1a8R7saLXhdccUXL1fLf6Dfo1id9FWXx2qlDXkrGO074Cse/Yay5aZo ZYDg== X-Gm-Message-State: APjAAAWXwUAktK+hx9hDnIFYtNPwyNMhvlyWN8+WaUtbP0asVX4NLLQE KXFgEXzzR8fZaLLyAZkdsXc= X-Google-Smtp-Source: APXvYqwESepfTkFL0688lI9gUKrW7b2ZrABfEIIIE0+6H5NnPlp13hOfDgAZqXbRtk11CksaFOyCqA== X-Received: by 2002:a5d:4a4d:: with SMTP id v13mr3708806wrs.169.1553199803694; Thu, 21 Mar 2019 13:23:23 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc4:dc00:8497:d0ab:971a:d627? (p200300EA8BC4DC008497D0AB971AD627.dip0.t-ipconnect.de. [2003:ea:8bc4:dc00:8497:d0ab:971a:d627]) by smtp.googlemail.com with ESMTPSA id v13sm4534128wmj.43.2019.03.21.13.23.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 13:23:23 -0700 (PDT) To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" , VDR User , Alexander Duyck From: Heiner Kallweit Subject: [PATCH net] r8169: don't read interrupt mask register in interrupt handler Message-ID: Date: Thu, 21 Mar 2019 21:23:14 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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)) { -- 2.21.0