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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5005BC388F7 for ; Tue, 3 Nov 2020 21:26:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16C2F206F9 for ; Tue, 3 Nov 2020 21:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438800; bh=cBv7bCa5DN5GL0FC9D07roe0em+cEVL62V6/umXO+GM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DngQ0UbLgjbCqEYBWoSH2hwJ1DcmF3wRO3GIV6DOqyKqDj3Czzqo5yj6ouNy3zr3u nYWC1F810z7R3aAu70Pk9cvDxwhp8m+zljgW7GUpLFxeqWq1k7VzIpPgG3He/6URDw o4spXxt53SOEc0PWLLOWyIDACZGIiQ7CWx54LScg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387497AbgKCV0i (ORCPT ); Tue, 3 Nov 2020 16:26:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:38290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387489AbgKCVBh (ORCPT ); Tue, 3 Nov 2020 16:01:37 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C90BD205ED; Tue, 3 Nov 2020 21:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437296; bh=cBv7bCa5DN5GL0FC9D07roe0em+cEVL62V6/umXO+GM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CYEuFqgoOZsmOidhlHCOw/PQNIHkd2Cp3uNZx/bpqJ/58DXlwGke464bp0WdoAnSL TLNqo/mM8mXz8YkJv1LBsNHbicze2t1XM/9dr/ZDwI3nh0HYg3DB0jZbyB4d5UN2i2 uCnLXbbY9/4PrhiLW1M4Ff/ouhTEzRTDz9zHttHQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Serge Belyshev , Heiner Kallweit , Jakub Kicinski Subject: [PATCH 4.19 016/191] r8169: fix issue with forced threading in combination with shared interrupts Date: Tue, 3 Nov 2020 21:35:08 +0100 Message-Id: <20201103203234.799035924@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiner Kallweit [ Upstream commit 2734a24e6e5d18522fbf599135c59b82ec9b2c9e ] As reported by Serge flag IRQF_NO_THREAD causes an error if the interrupt is actually shared and the other driver(s) don't have this flag set. This situation can occur if a PCI(e) legacy interrupt is used in combination with forced threading. There's no good way to deal with this properly, therefore we have to remove flag IRQF_NO_THREAD. For fixing the original forced threading issue switch to napi_schedule(). Fixes: 424a646e072a ("r8169: fix operation under forced interrupt threading") Link: https://www.spinics.net/lists/netdev/msg694960.html Reported-by: Serge Belyshev Signed-off-by: Heiner Kallweit Tested-by: Serge Belyshev Link: https://lore.kernel.org/r/b5b53bfe-35ac-3768-85bf-74d1290cf394@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6630,7 +6630,7 @@ static irqreturn_t rtl8169_interrupt(int return IRQ_NONE; rtl_irq_disable(tp); - napi_schedule_irqoff(&tp->napi); + napi_schedule(&tp->napi); return IRQ_HANDLED; } @@ -6886,7 +6886,7 @@ static int rtl_open(struct net_device *d rtl_request_firmware(tp); retval = request_irq(pci_irq_vector(pdev, 0), rtl8169_interrupt, - IRQF_NO_THREAD | IRQF_SHARED, dev->name, tp); + IRQF_SHARED, dev->name, tp); if (retval < 0) goto err_release_fw_2;