* [PATCH net] virtio_net: mask callbacks before handing off NAPI ownership
@ 2026-11-19 17:13 Michael S. Tsirkin
2026-11-20 17:14 ` sashiko-bot
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2026-11-19 17:13 UTC (permalink / raw)
To: linux-kernel
Cc: Congjie Zhou, Jason Wang, Eugenio Pérez, Xuan Zhuo,
Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Simon Horman, netdev, virtualization
Virtio is special in that enabling or disabling callbacks (interrupts)
accesses shared virtqueue state and must be serialized with polling. It
therefore enables callbacks before completing NAPI, and disables them
again if completion returns false.
With napi_complete_done(), that false return can come after ownership has
passed to another poll. The first poll can then disable callbacks after
its successor has enabled them, leaving RX stalled. Virtio therefore
needs to disable callbacks before handing off NAPI ownership.
Add a prepare/finish NAPI completion API so virtio-net can mask interrupts
before handing ownership off.
Reported-by: Congjie Zhou <zcjie0802@qq.com>
Closes: https://lore.kernel.org/netdev/tencent_D0650F8CA2AAE4C258BFE5BCE805CDB4CA0A@qq.com/
Fixes: 6f8b12d661d0 ("net: napi: add hard irqs deferral feature")
Message-ID: <20261119064843-mutt-send-email-mst@kernel.org>
Assisted-by: LLM
Tested-by: Congjie Zhou <zcjie0802@qq.com>
---
This preserves interrupt suppression without a callback or an additional
data-path barrier. Ordinary napi_complete_done() compiles identically in
the tested configuration.
Tested on x86-64 KVM with lock debugging, including IRQ deferral, concurrent
scheduling, busy polling, netpoll, and threaded NAPI. Split and packed
virtqueue TCP RX tests with IRQ deferral and busy polling also passed.
drivers/net/virtio_net.c | 4 ++-
include/linux/netdevice.h | 9 +++++
net/core/dev.c | 69 +++++++++++++++++++++++++++++++++++++--
3 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index dd2c41ef6fbe7..de370a39bc8fa 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -730,16 +730,18 @@ static void virtqueue_napi_schedule(struct napi_struct *napi,
static bool virtqueue_napi_complete(struct napi_struct *napi,
struct virtqueue *vq, int processed)
{
+ struct napi_completion completion;
int opaque;
opaque = virtqueue_enable_cb_prepare(vq);
- if (napi_complete_done(napi, processed)) {
+ if (napi_complete_done_prepare(napi, processed, &completion)) {
if (unlikely(virtqueue_poll(vq, opaque)))
virtqueue_napi_schedule(napi, vq);
else
return true;
} else {
virtqueue_disable_cb(vq);
+ napi_complete_done_finish(napi, &completion);
}
return false;
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index c0ae442c4344b..a182882624d6a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -599,6 +599,15 @@ static inline void napi_schedule_irqoff(struct napi_struct *n)
*/
bool napi_complete_done(struct napi_struct *n, int work_done);
+struct napi_completion {
+ unsigned long timeout;
+};
+
+bool napi_complete_done_prepare(struct napi_struct *n, int work_done,
+ struct napi_completion *completion);
+void napi_complete_done_finish(struct napi_struct *n,
+ struct napi_completion *completion);
+
static inline bool napi_complete(struct napi_struct *n)
{
return napi_complete_done(n, 0);
diff --git a/net/core/dev.c b/net/core/dev.c
index 3ac700d37e596..fa9baa70e9d72 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6999,9 +6999,17 @@ void __napi_schedule_irqoff(struct napi_struct *n)
}
EXPORT_SYMBOL(__napi_schedule_irqoff);
-bool napi_complete_done(struct napi_struct *n, int work_done)
+static __always_inline bool
+__napi_complete_done_finish(struct napi_struct *n, unsigned long timeout,
+ bool ret, bool allow_pending,
+ struct napi_completion *completion);
+
+static __always_inline bool
+__napi_complete_done_prepare(struct napi_struct *n, int work_done,
+ bool allow_pending,
+ struct napi_completion *completion)
{
- unsigned long flags, val, new, timeout = 0;
+ unsigned long flags, timeout = 0;
bool ret = true;
/*
@@ -7041,10 +7049,25 @@ bool napi_complete_done(struct napi_struct *n, int work_done)
}
WRITE_ONCE(n->list_owner, -1);
- val = READ_ONCE(n->state);
+ return __napi_complete_done_finish(n, timeout, ret, allow_pending,
+ completion);
+}
+
+static __always_inline bool
+__napi_complete_done_finish(struct napi_struct *n, unsigned long timeout,
+ bool ret, bool allow_pending,
+ struct napi_completion *completion)
+{
+ unsigned long val = READ_ONCE(n->state), new;
+
do {
WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));
+ if (allow_pending && (!ret || (val & NAPIF_STATE_MISSED))) {
+ completion->timeout = timeout;
+ return false;
+ }
+
new = val & ~(NAPIF_STATE_MISSED | NAPIF_STATE_SCHED |
NAPIF_STATE_SCHED_THREADED |
NAPIF_STATE_PREFER_BUSY_POLL);
@@ -7067,8 +7090,48 @@ bool napi_complete_done(struct napi_struct *n, int work_done)
HRTIMER_MODE_REL_PINNED);
return ret;
}
+
+bool napi_complete_done(struct napi_struct *n, int work_done)
+{
+ return __napi_complete_done_prepare(n, work_done, false, NULL);
+}
EXPORT_SYMBOL(napi_complete_done);
+/**
+ * napi_complete_done_prepare - prepare NAPI completion
+ * @n: NAPI context
+ * @work_done: number of packets processed
+ * @completion: opaque completion token
+ *
+ * Return: true if NAPI is complete and interrupts may remain enabled;
+ * false if ownership is retained. On false, mask interrupts and call
+ * napi_complete_done_finish().
+ */
+bool napi_complete_done_prepare(struct napi_struct *n, int work_done,
+ struct napi_completion *completion)
+{
+ return __napi_complete_done_prepare(n, work_done, true, completion);
+}
+EXPORT_SYMBOL_GPL(napi_complete_done_prepare);
+
+/**
+ * napi_complete_done_finish - finish NAPI completion after masking interrupts
+ * @n: NAPI context
+ * @completion: token passed to napi_complete_done_prepare()
+ *
+ * The caller must provide any device-specific interrupt ordering.
+ */
+void napi_complete_done_finish(struct napi_struct *n,
+ struct napi_completion *completion)
+{
+ if (unlikely(n->state & (NAPIF_STATE_NPSVC |
+ NAPIF_STATE_IN_BUSY_POLL)))
+ return;
+
+ __napi_complete_done_finish(n, completion->timeout, false, false, NULL);
+}
+EXPORT_SYMBOL_GPL(napi_complete_done_finish);
+
static void __skb_defer_free_flush(struct skb_defer_node *sdn, int budget)
{
struct llist_node *free_list;
--
MST
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] virtio_net: mask callbacks before handing off NAPI ownership
2026-11-19 17:13 [PATCH net] virtio_net: mask callbacks before handing off NAPI ownership Michael S. Tsirkin
@ 2026-11-20 17:14 ` sashiko-bot
0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-20 17:14 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: virtualization, Eugenio Perez
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] virtio_net: missing Signed-off-by trailer in commit message
--
commit bb6f10cf4a15461d1ade131fedc7d9fe20a241f3
Author: Michael S. Tsirkin <mst@redhat.com>
> virtio_net: mask callbacks before handing off NAPI ownership
>
> Virtio is special in that enabling or disabling callbacks (interrupts)
> accesses shared virtqueue state and must be serialized with polling. It
> therefore enables callbacks before completing NAPI, and disables them
> again if completion returns false.
>
> With napi_complete_done(), that false return can come after ownership has
> passed to another poll. The first poll can then disable callbacks after
> its successor has enabled them, leaving RX stalled. Virtio therefore
> needs to disable callbacks before handing off NAPI ownership.
>
> Add a prepare/finish NAPI completion API so virtio-net can mask interrupts
> before handing ownership off.
>
> Reported-by: Congjie Zhou <zcjie0802@qq.com>
> Closes: https://lore.kernel.org/netdev/tencent_D0650F8CA2AAE4C258BFE5BCE805CDB4CA0A@qq.com/
> Fixes: 6f8b12d661d0 ("net: napi: add hard irqs deferral feature")
> Message-ID: <20261119064843-mutt-send-email-mst@kernel.org>
> Assisted-by: LLM
> Tested-by: Congjie Zhou <zcjie0802@qq.com>
[Severity: High]
The commit message is missing a Signed-off-by trailer.
--
Sashiko AI review · https://sashiko.dev/#/patchset/ad74886a8429a862c00d1e42f1dc746f2924b75f.1795108341.git.mst@redhat.com?part=1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-20 17:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 17:13 [PATCH net] virtio_net: mask callbacks before handing off NAPI ownership Michael S. Tsirkin
2026-11-20 17:14 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox