From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 2BCEF3B3898 for ; Wed, 29 Jul 2026 19:17:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785352653; cv=none; b=K+fzwXCYEeVjeWSDV5iQK84KYgTkGcHHPCQATbxhPJr8EcrbibtCMsumyn12F6rUaMjyW6hcd+THmsOODW9ZKem/S8E2YM25QtDrMDC5koEeBqd8Ux31pBXd0MYArkejRSxgovmBoqfjLXrzuQ7/DRiYYeB7bAnGi5LO1UzXPu4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785352653; c=relaxed/simple; bh=LINqEAjhBd1g3ddyfQvwFEgKvXuCbYGwNsK5S7WkpgU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FuwTpuOvLagODm6SrWPduSQgZKFGdFtP1XIOMqyc18lFt2nK1dxhFFVpqjjZuKZa9Bs3IOmUChE3Q6Mc+1mxPwrUnjHhx64IOUUc8ir8ne2ZX7EV36q66wEQk8hcz2pMyVpp2L4TZVzgumOMXAvxg3hahlPEcKJm1jbebmQ0HEs= 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=fML5nRua; arc=none smtp.client-ip=209.85.216.54 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="fML5nRua" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38e69bdb0fcso1044053a91.1 for ; Wed, 29 Jul 2026 12:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785352650; x=1785957450; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to:content-type; bh=o0V32/dXsc54OzyFlhNUR5QdyRJlD72q6lujfqiekg8=; b=fML5nRuaAysa5wKWhZc6KuGRNDU70tugqgeFlIhBRO//duA5bLbfOlBNnVFgI62mEd CZvNM9Ehxsv4jpKpnuYNBeNxpGoP4e9ULXZyQzZ19qIjoHpLunDUm/rnplIxDW75A4eW Y82DypjsB+oSjh0GNTkSYivd6FiIKXtBVkFF4SQAwaquk3T8BqNCY7o+YPlAp6UrArw5 wMC+U9glTL38tJoStqFWX41fBsAQlfZFd34GN3t+s6C1rv2Q42HW+zSRNKjR8ib1uaiK 6bBhAhcdkroK2cL+letE/q74cQvnfGtYf7Thf7ElCHKogQKUjij8sU1hS8JWWce3h8w5 dL7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785352650; x=1785957450; h=content-transfer-encoding:mime-version:references:in-reply-to :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=N6/xVmbxKEimC9uOXT/kYqa7WUwfXLs59QiKDPnC4B/ygdenVrXWsBcMfT5VslvA/6 n1ASK/fezxDIBuvoomGAnN75btKpl3BIL8EMK5PoMjr2dHXFQNGoiFUoBC/OZR+hI0zN zko0Ges+9HCrnOBXvQttS+0AOuueUt3kWXQJRHscaeKYORdubYnTJnCfZlKU5icmzN4M r/bWuEFdeIFzVqS+fM4TP6wpAkLwzkMWyfZy4UDNKc0NAjv716zTRbuxMTY1rITnd4UH bRHe3h8uEDdSo+QDIq0AXYpTtVWvOfppLTXhIfIt2J2rbiojxOe4xr9u5FEMRytt3nJK ekQA== X-Forwarded-Encrypted: i=1; AHgh+Rr43zGDEWL4P6xoklOaThM8D2clpi+A0fkRBHDu+4K6qUEXP2AiAAEVa6YEIZ/6f0kBp+pRuoCqSA+X+ug=@vger.kernel.org X-Gm-Message-State: AOJu0YwJs5SD1QvM7SiqoHhTTlCWBNSEj6FlWvWflXxxJ6Mtevb9JhE3 1v2gDkg/ujfEM079q/M1mxGacOT2xg1HcoS5m0QM8lSKxtbwE3Y7fXXS X-Gm-Gg: AR+sD13ASmHTIIb3Fo/p0F9PxxNcfCZLo2PXQcEk6jjIhoWC908H0QPFeOBIXxOgJP+ wpeXV+uSXakhHpNFyfNY1kyHpJGZc/o/el3k/KzNZ2Hwc6KhQp3McfelGNciwHfMJhAu9sQXCFa 04WAXwyyT5MQNeuvMsP0c8uL4CCl/EAgVRrt0yJ1e/Ycn0eJcDB+C2WthB4/2Z5DtRT4MzHLxmb nWJplqwEx4ZZFkw011rZxMHrXzs7xkN+H5QJgUE3I4Z1Cua0BKAOLKKVuGcVBfaiLt12A/4/wch R45Oqnj2wWFxwT2Zqr26zfTip1L3+YgSQf8HfCosYh3gPYWV5Gpey6U+RJ0Q7SYBfgpV02UsnE2 ec1K7oDr/VQThzraoIzYETP7i3fL8g+nZiWdB+uFlZFek1ujVCNNJ90HwRBn5LGQnIYw7wYbOX6 nzyjqImB1Zeu+sgZ1ToQbEJ2OnmE5OCmjclr3WZNY7eMs385tggpP82lbeUOlWMBXBnov8 X-Received: by 2002:a17:90b:37c7:b0:37f:f4ae:5f25 with SMTP id 98e67ed59e1d1-38f99253d52mr124443a91.20.1785352650000; Wed, 29 Jul 2026 12:17:30 -0700 (PDT) Received: from bogon ([2408:8207:1832:1b44::c6b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f81543abfsm833349a91.4.2026.07.29.12.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 12:17:28 -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 v3 1/2] vsock/virtio: read virtqueues under worker locks Date: Wed, 29 Jul 2026 12:16:54 -0700 Message-ID: X-Mailer: git-send-email 2.55.0 In-Reply-To: References: <20260729185831.3247971-1-bestswngs@gmail.com> 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