virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: mst@redhat.com
Cc: "Yongji Xie" <xieyongji@bytedance.com>,
	virtualization@lists.linux.dev, linux-kernel@vger.kernel.org,
	"Eugenio Pérez" <eperezma@redhat.com>,
	"Maxime Coquelin" <mcoqueli@redhat.com>,
	"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
	"Dragos Tatulea DE" <dtatulea@nvidia.com>,
	jasowang@redhat.com
Subject: [RFC 1/2] virtio_net: timeout control virtqueue commands
Date: Tue,  7 Oct 2025 15:06:21 +0200	[thread overview]
Message-ID: <20251007130622.144762-2-eperezma@redhat.com> (raw)
In-Reply-To: <20251007130622.144762-1-eperezma@redhat.com>

An userland device implemented through VDUSE could take rtnl forever if
the virtio-net driver is running on top of virtio_vdpa.  Let's break the
device if it does not return the buffer in a longer-than-assumible
timeout.

A less agressive path can be taken to recover the device, like only
resetting the control virtqueue.  However, the state of the device after
this action is taken races, as the vq could be reset after the device
writes the OK.  Leaving TODO anyway.

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
---
 drivers/net/virtio_net.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 31bd32bdecaf..ed68ad69a019 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -3576,6 +3576,7 @@ static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd
 {
 	struct scatterlist *sgs[5], hdr, stat;
 	u32 out_num = 0, tmp, in_num = 0;
+	unsigned long end_time;
 	bool ok;
 	int ret;
 
@@ -3614,11 +3615,20 @@ static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd
 
 	/* Spin for a response, the kick causes an ioport write, trapping
 	 * into the hypervisor, so the request should be handled immediately.
+	 *
+	 * Long timeout so a malicious device is not able to lock rtnl forever.
 	 */
+	end_time = jiffies + 30 * HZ;
 	while (!virtqueue_get_buf(vi->cvq, &tmp) &&
 	       !virtqueue_is_broken(vi->cvq)) {
 		cond_resched();
 		cpu_relax();
+
+		if (time_after(end_time, jiffies)) {
+			/* TODO Reset vq if possible? */
+			virtio_break_device(vi->vdev);
+			break;
+		}
 	}
 
 unlock:
-- 
2.51.0


  reply	other threads:[~2025-10-07 13:06 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-07 13:06 [RFC 0/2] Lift restriction about VDUSE net devices with CVQ Eugenio Pérez
2025-10-07 13:06 ` Eugenio Pérez [this message]
2025-10-11  7:44   ` [RFC 1/2] virtio_net: timeout control virtqueue commands Jason Wang
2025-10-14  7:30     ` Eugenio Perez Martin
2025-10-14  8:29   ` Michael S. Tsirkin
2025-10-14  9:14     ` Maxime Coquelin
2025-10-14  9:25       ` Michael S. Tsirkin
2025-10-14 10:21         ` Maxime Coquelin
2025-10-15  4:44           ` Jason Wang
2025-10-15  6:07             ` Michael S. Tsirkin
2025-10-15  6:08         ` Eugenio Perez Martin
2025-10-15  6:33           ` Michael S. Tsirkin
2025-10-15  6:52             ` Eugenio Perez Martin
2025-10-15  7:04               ` Michael S. Tsirkin
2025-10-15  7:45                 ` Eugenio Perez Martin
2025-10-15  8:03                   ` Maxime Coquelin
2025-10-15  8:09                     ` Michael S. Tsirkin
2025-10-15  9:16                       ` Maxime Coquelin
2025-10-15 10:36                       ` Eugenio Perez Martin
2025-10-16  5:39                         ` Jason Wang
2025-10-16  5:45                           ` Michael S. Tsirkin
2025-10-16  6:03                             ` Jason Wang
2025-10-16  6:22                               ` Michael S. Tsirkin
2025-10-16  6:25                                 ` Eugenio Perez Martin
2025-10-17  6:36                                   ` Eugenio Perez Martin
2025-10-17  6:39                                     ` Michael S. Tsirkin
2025-10-17  7:21                                       ` Eugenio Perez Martin
2025-10-22  9:46                                         ` Eugenio Perez Martin
2025-10-22 10:06                                         ` Michael S. Tsirkin
2025-10-22 10:09                         ` Michael S. Tsirkin
2025-10-22 10:50                           ` Eugenio Perez Martin
2025-10-22 11:43                             ` Michael S. Tsirkin
2025-10-22 12:55                               ` Eugenio Perez Martin
2025-10-28 14:09                                 ` Michael S. Tsirkin
2025-10-28 14:37                                   ` Eugenio Perez Martin
2025-10-28 14:42                                     ` Michael S. Tsirkin
2025-10-28 14:57                                       ` Eugenio Perez Martin
2025-10-29  0:36                                         ` Jason Wang
2025-11-05  9:02                                         ` Eugenio Perez Martin
2025-11-09 21:46                                           ` Michael S. Tsirkin
2025-10-07 13:06 ` [RFC 2/2] vduse: lift restriction about net devices with CVQ Eugenio Pérez
2025-10-09 13:14   ` Maxime Coquelin
2025-10-15  6:11     ` Eugenio Perez Martin
2025-10-14  8:31   ` Michael S. Tsirkin
2025-10-15  6:25     ` Eugenio Perez Martin

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=20251007130622.144762-2-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=dtatulea@nvidia.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mcoqueli@redhat.com \
    --cc=mst@redhat.com \
    --cc=virtualization@lists.linux.dev \
    --cc=xieyongji@bytedance.com \
    --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;
as well as URLs for NNTP newsgroup(s).