From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 86FFC480326 for ; Wed, 29 Jul 2026 18:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785351553; cv=none; b=NTKkNwJvcTaxr501Cc14rsRR3tDoMyjuaN7sGbb7y8AEehSGQLF0AFmyDdoMUThMiIzguuCyRngw87OwUTVxfHnlVotS73X5sE8qML6Z1JOOljXGGJeWGzjsmnt4C6Sjlzv5HHr/nZyMjT0BskcxFxPpRfeMp+6xjuErb7P4om8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785351553; c=relaxed/simple; bh=LINqEAjhBd1g3ddyfQvwFEgKvXuCbYGwNsK5S7WkpgU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YJhLOAuPlRr+Ap3By5bgRR9kKrHPi2+rRXaenYqvZhoeAFT2aNL6rOfRDGxOMMb9E/qCgHcFRV1m/vGb4cPTbyMeT6MniQ3g1jxBxsFfmHdIGb41chKDEXCcjclALd6ErDPMn595wDbHKfCyjPZChKNAoqwIVooyWP/sV7vQojg= 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.181 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-f181.google.com with SMTP id d2e1a72fcca58-8484f229529so1021439b3a.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=acZWLYa12s1MIGBSoQQktP+swf/2UuwxUPAH4j8fwt7o9PalWfLa0jhavpieAHS+6i mZJmgtph/NQbCnqxwrKMCD7Hv+MNkohUFInUDdM1q+rIGrm/gfYPxZgAgId20G+6KZms TUQ8ueQwQuY+1xxLs0JLU5mhsMWZ05fKfsjhLgF743wF7I6j6/mM9C+RwRpDP9E20Odd H0Jjec2D05wknDzQhs6Kb+DfrXJxvf4lNVmzpXXaOIKE7qN6q/k0fiubp7kaHVGscBLB nZSP71ACAHMPYnwHYeRFKah56EY7SHqnERMuF1viOKg3ih/1PblZkoKSGyY5ggL7D54p /RYQ== X-Forwarded-Encrypted: i=1; AHgh+RolkFlDm2mhrZ0IKH3KbPDgr9F6pYhYExqr/gYOd1Bk1s0kTGMicEOw6ZzQSppxmj7j7cY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw64fXidEQLYG60VGRsJ9P6rwIZNZm7fTaplOgvjFIAkmGSS1WD 5N0AB3TFZGm2SyHUhxVgMjTKRbf3OfzcVSBKa0N2U8bxTqbaz7t5xnn6 X-Gm-Gg: AR+sD10xFJ0CTGdDHXNcewcXlhsIIQOucHXe5e3leZ2R92iH6+AAFlgzgxkus5bQqOX 3AmDyvWOREJTxM07FwPwGB1h86Z7dKYofEAJi4jcgddoSVVPVIapb08OoWQk+xj9TcrciCkyupG 6WfpLDLoQTYMVymOFQFciz5EV5aGyM9Np7JaaOMOdGYPkM2vNy62hCNgSfopMCaSShPlsnUEX25 MzicJLXHcofjIRSvNel3pSahcl166ir+mUxmvIS2KxX8ovAbRvZfbJ+jG1vokXQOFRs1Ru0GdeH vU46nOFC/Is3MSPm328beMJ7JRWlq/SUMaC6ACcWJt5ksL+cEYCanrgb60H+gXw8HT/QG/wAhy2 vFTKEtzoQsJ5EmOul+9KgbW3b9HDQioXz4QID3IM2QOBzUoK3vlQRex9+8wdfxy9sJ38NRMMMXz RgadGTfXZtaZnpzYKVXGI1HhQOa13w0a8D39lQq6UuVmb+hPImqhWwa0M4Dh90/30AbdIn 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: kvm@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