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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3817BEE4993 for ; Tue, 22 Aug 2023 14:47:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234229AbjHVOr6 (ORCPT ); Tue, 22 Aug 2023 10:47:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231997AbjHVOr6 (ORCPT ); Tue, 22 Aug 2023 10:47:58 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 121D110B; Tue, 22 Aug 2023 07:47:54 -0700 (PDT) Received: by mail.gandi.net (Postfix) with ESMTPSA id F1E14E000D; Tue, 22 Aug 2023 14:47:51 +0000 (UTC) Date: Tue, 22 Aug 2023 16:48:29 +0200 From: Remi Pommarel To: Jakub Kicinski Cc: Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Paolo Abeni , Sabrina Dubroca , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH net] net: stmmac: remove disable_irq() from ->ndo_poll_controller() Message-ID: References: <20230810083716.29653-1-repk@triplefau.lt> <20230811182025.7473bf63@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230811182025.7473bf63@kernel.org> X-GND-Sasl: repk@triplefau.lt Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, Aug 11, 2023 at 06:20:25PM -0700, Jakub Kicinski wrote: > On Thu, 10 Aug 2023 10:37:16 +0200 Remi Pommarel wrote: > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > index 4727f7be4f86..bbe509abc5dc 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > > @@ -5958,8 +5958,8 @@ static void stmmac_poll_controller(struct net_device *dev) > > for (i = 0; i < priv->plat->tx_queues_to_use; i++) > > stmmac_msi_intr_tx(0, &priv->dma_conf.tx_queue[i]); > > } else { > > - disable_irq(dev->irq); > > - stmmac_interrupt(dev->irq, dev); > > + if (disable_hardirq(dev->irq)) > > + stmmac_interrupt(dev->irq, dev); > > enable_irq(dev->irq); > > Implementing .ndo_poll_controller is only needed if driver doesn't use > NAPI. This driver seems to use NAPI on all paths, AFAICT you can simply > delete this function completely. Looks like since [0] you are right. Will send a new PATCH removing stmmac_poll_controller. Thanks. [0]: ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional") -- Remi