From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA17748BD34 for ; Wed, 29 Jul 2026 18:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785351554; cv=none; b=gc9J+d0zqyV74fntHZ0OyJfTt3uwvKh3nEIkhURCA+rVc8BO6Ojdb4N8uotKuSKqm/gWNp2Lb4dOYXDjT7QK4+ngLLoXPv01Y/bjHcGBIZ6MbwGPzg1d8QR20byMzaRiH7i0ylDc0kOpFt7fYrz/2B/B1twl69CeFsGV+jWm84o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785351554; c=relaxed/simple; bh=LINqEAjhBd1g3ddyfQvwFEgKvXuCbYGwNsK5S7WkpgU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fBbZE7uYznl0wMyya9QVqTBiRpBra6+uX+MddI4yZ0vnj7iEkpSdRAuaK82xCviTOmyXE+KI/9WpPQ+NoK3ldsz226gS/+LM7gdTE1bFFkd/2cPD5p4z4qjBbjY6vvDdSjd64fmPUmu8DL4rJBRC8EmPeKY50hNii18qlBLCRuM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Dks6aKjB; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dks6aKjB" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-8484f229529so1021441b3a.2 for ; Wed, 29 Jul 2026 11:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785351552; x=1785956352; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o0V32/dXsc54OzyFlhNUR5QdyRJlD72q6lujfqiekg8=; b=Dks6aKjB8MZRfMiMX/XHrClAMt/KcI0vR2m+V8uSPrZB61/EKuIJLpcIgreQnUZV1c D8C2TACFHgwihz2tPtDYkO/8hTdCreUSMpJ+FwgKfZzkcGgyb6BCj5fLe3WDgeVGbjiq 5IC3Jo125rrZUa8KJjfVvoXJtXTOvThrXksejJZnWphLo3RY1D4Dfjlxiig+KupkuNSz LNrKHUKgw4M88r1p4dm5TLfCznIDeDTKhbpgjStwbbW+Dj/8tyT5QaOpOyuzP65wCcGd 72AgM4lkTLhH967WAL44O2mndLrCQcFfyW1yAraV4Wl8IxFUtujfVtUHirBVvAmBynjS 3JVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785351552; x=1785956352; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=o0V32/dXsc54OzyFlhNUR5QdyRJlD72q6lujfqiekg8=; b=Wes2ZPFK9j0mgI3Y2N3p4DdCAsFAKzQXFfsB3kXunsZSsBjSn/PFc0SwnN4hdXYOcF 2M+ACUk2iC5aErVoyYVxh7mDcHglxsexlFlrV+dQ96siYZpVcIWAq+4oywzSeqhFfukQ sjyYTzRieobJXB9ykURNV+SERVDv6AnP3yf601W4jRvTBUwcqTycbASrvaB0VQHsOuca sE6Iw+fIBQRpEsILDNfJ6QtOGwfBmQqKDRm2Q9KrEgPYZccs7VW6IQyHfmoARMr6oLYT xecKHBOGzBVkSE/4nDB5EJTuaD3RwB15Gy6MxJ+qyVRsS/Qjrm7f5ArQeAGtIG/cdyD8 7+Ow== X-Forwarded-Encrypted: i=1; AHgh+Rq7w5zbebs2ClNEOatuN7zz0ujhojjxrzY/QyYfkeZ97L6t/pmW0qeg41HwTEn5AD8v3RjinQUJAYNCFuw=@vger.kernel.org X-Gm-Message-State: AOJu0YxkeDKxAsF33eF4X4zU1x3PS35qTZeFIBxJzlht5Y2/wPPXNrTP A10SjZZ+RDHzUVjVHW4nUZLtk7mURodz52z2F41MxNM5vycdokcUYSji X-Gm-Gg: AR+sD11yJKnYvrfmefZPFBvVcTXPWO6pDPpmXEDimI7bej3O+kFynZNVChrXOH0ic1s wMvacKeDegOVlnqv4ro5hJ59qeZqw179sqCzD8BneHeZksC9H3pZku5QNXF/ff6BnElpvMMbUeo q5m9Z1/7cDnrUdSRKotDCFopFgqZLSWRaB5qprtrpYUC3TMqvlOr+bIxWG2vQs4fMqCMG3PiHvS ce7faM3jYte+0s3CWetS0nKTMb7OnimaJBCuYG0awPdESDzuCuxDOo5/8axgecCbWzra34gjyuK +/gyEEZ4BCfzZ9ZEbPDj+KJ3j31G0nMKO4p8l9VjHcXWeDUV9N92ewFmSaEwqFHpwIyuIm+Tsbq nfjcuwNOx/vMV96PmxA109jvaSCXEgA09xwYuKAMixbSrFWJbrhYDDvxnh2pzMS2VZfromy19ZA 68mucYImwJ1917Bcp6tVlYLf4TEhiZiXeOPapDVTGkYvQCrfmVHH96lzOcWbONxyn0R587 X-Received: by 2002:a05:6a20:d52b:b0:3c4:5f94:f22c with SMTP id adf61e73a8af0-3c8ba5d871fmr9455053637.43.1785351551927; Wed, 29 Jul 2026 11:59:11 -0700 (PDT) Received: from bogon ([2408:8207:1832:1b44::c6b]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbdba447107sm1237829a12.21.2026.07.29.11.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 11:59:11 -0700 (PDT) Sender: Weiming Shi From: Weiming Shi To: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: virtualization@lists.linux.dev, kvm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Xiang Mei , Bobby Eshleman Subject: [PATCH v2 1/2] vsock/virtio: read virtqueues under worker locks Date: Wed, 29 Jul 2026 11:58:27 -0700 Message-ID: <20260729185831.3247971-2-bestswngs@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit bd50c5dc182b ("vsock/virtio: add support for device suspend/resume") made the *_run flags transition from false to true when restore installs replacement virtqueues. The RX, TX and event workers read their virtqueue before locking and checking the corresponding flag, so a worker delayed across freeze and restore can observe the replacement queue's running state while retaining a pointer to the deleted queue. Read each virtqueue under its mutex after checking the run flag, keeping the pointer and state in the same queue generation. Fixes: bd50c5dc182b ("vsock/virtio: add support for device suspend/resume") Cc: stable@vger.kernel.org Reported-by: Xiang Mei Link: https://lore.kernel.org/r/20260727035804.1860862-1-bestswngs@gmail.com Assisted-by: OpenAI-Codex:gpt-5 Signed-off-by: Weiming Shi --- net/vmw_vsock/virtio_transport.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c index 57f2d6ec3ffc..a8e1dd95ba8c 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -346,12 +346,13 @@ static void virtio_transport_tx_work(struct work_struct *work) struct virtqueue *vq; bool added = false; - vq = vsock->vqs[VSOCK_VQ_TX]; mutex_lock(&vsock->tx_lock); if (!vsock->tx_run) goto out; + vq = vsock->vqs[VSOCK_VQ_TX]; + do { struct sk_buff *skb; unsigned int len; @@ -451,13 +452,13 @@ static void virtio_transport_event_work(struct work_struct *work) container_of(work, struct virtio_vsock, event_work); struct virtqueue *vq; - vq = vsock->vqs[VSOCK_VQ_EVENT]; - mutex_lock(&vsock->event_lock); if (!vsock->event_run) goto out; + vq = vsock->vqs[VSOCK_VQ_EVENT]; + do { struct virtio_vsock_event *event; unsigned int len; @@ -634,13 +635,13 @@ static void virtio_transport_rx_work(struct work_struct *work) container_of(work, struct virtio_vsock, rx_work); struct virtqueue *vq; - vq = vsock->vqs[VSOCK_VQ_RX]; - mutex_lock(&vsock->rx_lock); if (!vsock->rx_run) goto out; + vq = vsock->vqs[VSOCK_VQ_RX]; + do { virtqueue_disable_cb(vq); for (;;) { -- 2.55.0