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=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 C0EDDC388F9 for ; Sat, 31 Oct 2020 11:47:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 732DF2065D for ; Sat, 31 Oct 2020 11:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144878; bh=M+jpXNXNPmknru+Jm+5EFNKuxeKMqVoqCC0ltI7AFfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KE1KblCGbKeke/x+AmPgQznfVmw8o7HcjHLFZA21ZC9tyqrFZJENFua+t3M7YviDo hEKzaIrecPlM/fcXSihflw1u2DgIjoo/Tu7f8mq+ZXmWaHC76FCsuuRNnewSjTf3g0 1EIOOA0jR9xPAY+aIzFOD7G9x7vFHRKxtGYg27RU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728170AbgJaLr5 (ORCPT ); Sat, 31 Oct 2020 07:47:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:45468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbgJaLoy (ORCPT ); Sat, 31 Oct 2020 07:44:54 -0400 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 2F70820731; Sat, 31 Oct 2020 11:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144693; bh=M+jpXNXNPmknru+Jm+5EFNKuxeKMqVoqCC0ltI7AFfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mkcLVIklGckrOn5uGwkcO4BBJO4ekmsD5Usj6AImDzj6JaiywhTkD9dSGRyVtqtaC FeRtYXLnf4rHkvFKjvI4eeEzCvmByG1ga6j517b9PLCetsbF4Pi405UiSlsF3BohTk znImDf8bzEb9quuGJLtvCA1/s6S5zkWVfDpu3aek= 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 5.9 45/74] r8169: fix issue with forced threading in combination with shared interrupts Date: Sat, 31 Oct 2020 12:36:27 +0100 Message-Id: <20201031113502.205463969@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113500.031279088@linuxfoundation.org> References: <20201031113500.031279088@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_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4563,7 +4563,7 @@ static irqreturn_t rtl8169_interrupt(int } rtl_irq_disable(tp); - napi_schedule_irqoff(&tp->napi); + napi_schedule(&tp->napi); out: rtl_ack_events(tp, status); @@ -4738,7 +4738,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;