From: "Théo Lebrun" <theo.lebrun@bootlin.com>
To: "Théo Lebrun" <theo.lebrun@bootlin.com>,
"Conor Dooley" <conor.dooley@microchip.com>,
"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>,
"Richard Cochran" <richardcochran@gmail.com>,
"Russell King" <linux@armlinux.org.uk>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
"Paolo Valerio" <pvalerio@redhat.com>,
"Nicolai Buchwitz" <nb@tipi-net.de>,
"Vladimir Kondratiev" <vladimir.kondratiev@mobileye.com>,
"Gregory CLEMENT" <gregory.clement@bootlin.com>,
"Benoît Monin" <benoit.monin@bootlin.com>,
"Tawfik Bayouk" <tawfik.bayouk@mobileye.com>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Maxime Chevallier" <maxime.chevallier@bootlin.com>
Subject: [PATCH net-next v8 15/17] net: macb: read ISR inside bp->lock critical section
Date: Wed, 05 Aug 2026 19:42:44 +0200 [thread overview]
Message-ID: <20260805-macb-context-v8-15-bc302ffd1174@bootlin.com> (raw)
In-Reply-To: <20260805-macb-context-v8-0-bc302ffd1174@bootlin.com>
The IRQ handler reads ISR register into the `status` stack variable.
If empty, it early returns. Else, it grabs bp->lock and iterates on
the status bits.
We risk a race on spinlock acquire; status might have changed.
Move the readl(ISR) inside the bp->lock critical section.
In practice, we protect ourselves from interpreting the same ISR status
twice. To understand issues, read macb_interrupt() body and imagine
each codepath being performed twice:
- Two napi_schedule_irqoff() are idempotent *if fast enough*.
- Two schedule_work(tx_error_task) are idempotent *if fast enough*.
- Double increment of rx_overruns.
- Two queue_work(hresp_err_bh_work) are idempotent *if fast enough*.
- Two pm_wakeup_event() is safe.
One risk remains with spurious interrupts that would, in addition to
taking excessive CPU time, also create lock contention. How bad is it?
Probably not too bad.
Reviewed-by: Nicolai Buchwitz <nb@tipi-net.de>
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
---
drivers/net/ethernet/cadence/macb_main.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 4bf55994420f..100159662336 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2193,13 +2193,14 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
bool hresp_err = false;
u32 status;
- status = queue_readl(queue, ISR);
-
- if (unlikely(!status))
- return IRQ_NONE;
-
spin_lock(&bp->lock);
+ status = queue_readl(queue, ISR);
+ if (unlikely(!status)) {
+ spin_unlock(&bp->lock);
+ return IRQ_NONE;
+ }
+
while (status) {
/* close possible race with dev_close */
if (unlikely(!netif_running(netdev))) {
--
2.55.0
next prev parent reply other threads:[~2026-08-05 17:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-05 17:42 [PATCH net-next v8 00/17] net: macb: implement context swapping Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 01/17] net: macb: drop "consistent" from alloc/free function names Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 02/17] net: macb: unify device pointer naming convention Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 03/17] net: macb: unify variable naming convention in at91ether functions Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 04/17] net: macb: unify queue index variable naming convention and types Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 05/17] net: macb: enforce reverse christmas tree (RCT) convention Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 06/17] net: macb: allocate tieoff descriptor once across device lifetime Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 07/17] net: macb: refuse set_ringparam on EMAC Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 08/17] net: macb: introduce macb_context struct for buffer management Théo Lebrun
2026-08-07 15:10 ` Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 09/17] net: macb: avoid macb_init_rx_buffer_size() modifying state Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 10/17] net: macb: make `struct macb` subset reachable from macb_context struct Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 11/17] net: macb: change caps helpers signatures Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 12/17] net: macb: change function signatures to take contexts Théo Lebrun
2026-08-07 15:16 ` Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 13/17] net: macb: introduce macb_context_alloc() helper Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 14/17] net: macb: move printk() calls out of bp->lock critical section Théo Lebrun
2026-08-11 0:08 ` Jakub Kicinski
2026-08-05 17:42 ` Théo Lebrun [this message]
2026-08-07 15:42 ` [PATCH net-next v8 15/17] net: macb: read ISR inside " Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 16/17] net: macb: use context swapping in .set_ringparam() Théo Lebrun
2026-08-05 17:42 ` [PATCH net-next v8 17/17] net: macb: use context swapping in .ndo_change_mtu() Théo Lebrun
2026-08-07 16:11 ` Théo Lebrun
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=20260805-macb-context-v8-15-bc302ffd1174@bootlin.com \
--to=theo.lebrun@bootlin.com \
--cc=andrew+netdev@lunn.ch \
--cc=benoit.monin@bootlin.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=conor.dooley@microchip.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregory.clement@bootlin.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maxime.chevallier@bootlin.com \
--cc=nb@tipi-net.de \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=pvalerio@redhat.com \
--cc=richardcochran@gmail.com \
--cc=tawfik.bayouk@mobileye.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vladimir.kondratiev@mobileye.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.