From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jianlin Shi <shijianlin11@foxmail.com>
Cc: netdev@vger.kernel.org, virtualization@lists.linux.dev,
jasowangio@gmail.com, eperezma@redhat.com,
xuanzhuo@linux.alibaba.com, andrew+netdev@lunn.ch,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, talgi@nvidia.com, hengqi@linux.alibaba.com,
horms@kernel.org
Subject: Re: [PATCH 2/2] virtio-net: unwind VQs when irq moderation init fails
Date: Mon, 2 Nov 2026 08:46:38 -0500 [thread overview]
Message-ID: <20261102084624-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <4e21386a0840526578eac3dd10443758bf3b84e2.1790751008.git.shijianlin11@foxmail.com>
On Wed, Sep 30, 2026 at 04:19:52PM +0800, Jianlin Shi wrote:
> virtnet_probe() calls init_vqs() before virtnet_init_irq_moder().
> The failure path used "goto free", which only calls free_netdev() and
> skips virtio_reset_device() and virtnet_del_vqs(). The virtqueues and
> their DMA mappings leak.
>
> Use the existing free_irq_moder label, as virtnet_create_page_pools()
> already does. This is safe only after net_dim_init_irq_moder() clears
> dev->irq_moder on failure; otherwise virtnet_free_irq_moder() would
> free the dangling pointer.
>
> Fixes: dcb67f6a9ead6 ("virtio-net: support dim profile fine-tuning")
> Signed-off-by: Jianlin Shi <shijianlin11@foxmail.com>
I expect v2 of this.
> ---
> drivers/net/virtio_net.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index e34c52d059d3..ef61097c4404 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -6996,7 +6996,7 @@ static int virtnet_probe(struct virtio_device *vdev)
>
> err = virtnet_init_irq_moder(vi);
> if (err)
> - goto free;
> + goto free_irq_moder;
> }
>
> /* Create page pools for receive queues.
> --
> 2.43.0
next prev parent reply other threads:[~2026-11-02 13:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 8:19 [PATCH 0/2] virtio-net/dim: fix irq moderation init failure unwind Jianlin Shi
2026-09-30 8:19 ` [PATCH 1/2] dim: clear irq_moder on init failure Jianlin Shi
2026-10-06 1:53 ` Jakub Kicinski
2026-10-08 15:42 ` Jianlin Shi
2026-09-30 8:19 ` [PATCH 2/2] virtio-net: unwind VQs when irq moderation init fails Jianlin Shi
2026-11-02 13:46 ` Michael S. Tsirkin [this message]
2026-11-02 15:51 ` [PATCH v2 0/2] virtio-net/dim: fix irq moderation init failure unwind Jianlin Shi
2026-11-02 15:51 ` [PATCH v2 1/2] dim: clear irq_moder on init failure Jianlin Shi
2026-11-02 15:51 ` [PATCH v2 2/2] virtio-net: unwind VQs when irq moderation init fails Jianlin Shi
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=20261102084624-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eperezma@redhat.com \
--cc=hengqi@linux.alibaba.com \
--cc=horms@kernel.org \
--cc=jasowangio@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shijianlin11@foxmail.com \
--cc=talgi@nvidia.com \
--cc=virtualization@lists.linux.dev \
--cc=xuanzhuo@linux.alibaba.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