From: "Théo Lebrun" <theo.lebrun@bootlin.com>
To: "Kevin Hao" <haokexin@gmail.com>, <netdev@vger.kernel.org>
Cc: "Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Vineeth Karumanchi" <vineeth.karumanchi@amd.com>,
"Harini Katakam" <harini.katakam@amd.com>,
<stable@vger.kernel.org>
Subject: Re: [PATCH net 1/2] net: macb: Move devm_{free,request}_irq() out of spin lock area
Date: Mon, 16 Mar 2026 19:11:34 +0100 [thread overview]
Message-ID: <DH4ER021HKCB.23RHADC1HSCTF@bootlin.com> (raw)
In-Reply-To: <20260315-macb-irq-v1-1-0154104cbf61@gmail.com>
On Sun Mar 15, 2026 at 12:44 PM CET, Kevin Hao wrote:
> @@ -5962,6 +5962,7 @@ static int __maybe_unused macb_suspend(struct device *dev)
> /* write IP address into register */
> tmp |= MACB_BFEXT(IP, be32_to_cpu(ifa->ifa_local));
> }
> + spin_unlock_irqrestore(&bp->lock, flags);
>
> /* Change interrupt handler and
> * Enable WoL IRQ on queue 0
> @@ -5974,11 +5975,12 @@ static int __maybe_unused macb_suspend(struct device *dev)
> dev_err(dev,
> "Unable to request IRQ %d (error %d)\n",
> bp->queues[0].irq, err);
> - spin_unlock_irqrestore(&bp->lock, flags);
> return err;
> }
> + spin_lock_irqsave(&bp->lock, flags);
> queue_writel(bp->queues, IER, GEM_BIT(WOL));
> gem_writel(bp, WOL, tmp);
> + spin_unlock_irqrestore(&bp->lock, flags);
> } else {
> err = devm_request_irq(dev, bp->queues[0].irq, macb_wol_interrupt,
> IRQF_SHARED, netdev->name, bp->queues);
> @@ -5986,13 +5988,13 @@ static int __maybe_unused macb_suspend(struct device *dev)
> dev_err(dev,
> "Unable to request IRQ %d (error %d)\n",
> bp->queues[0].irq, err);
> - spin_unlock_irqrestore(&bp->lock, flags);
> return err;
> }
> + spin_lock_irqsave(&bp->lock, flags);
> queue_writel(bp->queues, IER, MACB_BIT(WOL));
> macb_writel(bp, WOL, tmp);
> + spin_unlock_irqrestore(&bp->lock, flags);
> }
> - spin_unlock_irqrestore(&bp->lock, flags);
>
> enable_irq_wake(bp->queues[0].irq);
> }
So it used to be that approximatively the whole macb_suspend() function
was ran under the bp->lock spinlock. Now you split it in two to avoid
calling IRQ functions in atomic context:
- (1) the disable queues & silence IRQs part and,
- (2) the enable WOL part (IER and WOL reg writes).
Why do you need to grab bp->lock for the 2nd part? All queues are
disabled anyway and IRQs masked. BH features like our work queues are
disabled during the dev_pm_ops.suspend() calls anyway. Maybe I am
forgetting? Or this was just out of caution?
Thanks,
--
Théo Lebrun, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2026-03-16 18:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-15 11:44 [PATCH net 0/2] net: macb: Fix two lock warnings when WOL is used Kevin Hao
2026-03-15 11:44 ` [PATCH net 1/2] net: macb: Move devm_{free,request}_irq() out of spin lock area Kevin Hao
2026-03-16 18:11 ` Théo Lebrun [this message]
2026-03-17 1:25 ` Kevin Hao
2026-03-17 16:01 ` Théo Lebrun
2026-03-15 11:44 ` [PATCH net 2/2] net: macb: Protect access to net_device::in_ptr with RCU lock Kevin Hao
2026-03-16 17:59 ` Théo Lebrun
2026-03-17 1:27 ` Kevin Hao
2026-03-17 15:54 ` Théo Lebrun
2026-03-18 6:31 ` Kevin Hao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DH4ER021HKCB.23RHADC1HSCTF@bootlin.com \
--to=theo.lebrun@bootlin.com \
--cc=andrew+netdev@lunn.ch \
--cc=claudiu.beznea@tuxon.dev \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=haokexin@gmail.com \
--cc=harini.katakam@amd.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
--cc=vineeth.karumanchi@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox