From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01A1C4B7A4A for ; Mon, 28 Sep 2026 11:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790596729; cv=none; b=qbkUCPCmjS7mhcEUmydAHZLUKX29ez6V8fw7tohZv3O+gFERIFkWroBv6TJ7C4eprALaFy9nHH7XrkNEnzz0wMyGtwyRCXg4KtMwRyfXR6BkXfF9SamJ+qqePsfqCu70OydnehJ4UusDQqu8hZMItVLfMp8myQ9bTNc6t/pxfpI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790596729; c=relaxed/simple; bh=a5KcPfO/lVWvSV/4F80VAySM5Pi85YzX0n3tROeq3fI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=dsxvdJAaI7ciuMvgx9Zwvi+bPTXZJ7oN1NKoCxbHENcEsOjz2T83JsuPiKZ/TcLtz2hWVQ/D1I4wQv72gmEaSN94AKsG4u8SBxUkW+hUEEHIGp81VYd4B+dK4IPIpl1gFtr3tcD5SayNmP9Z3jFVvjWvCf23Kk5F+9H//uObINM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=aMpjLb6s; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=aytE3pu5; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="aMpjLb6s"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="aytE3pu5" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68SBABAe1189373 for ; Mon, 28 Sep 2026 11:58:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=GWvcEfZFoPLDafBzTdcCM2 UQzqRP8Ydg4Kuy7k8AJBs=; b=aMpjLb6sF5zwjCIthlnlTSZP7LWcH2cdRXg7MK 6ut+DkS9JJNrkQr17zR1WNVAPzqT0O3S+On6sVE1oAH4aOR/ltSjg5g/Ggib+1uh syhfQ6b9FlfDYV2QzduiMEskG/5n5zDO2zzqDkSKOhzS6Gs0qKVDXps1lrr8gBFT YSWNSchv78a+eEi5miyUtJr68Rb9P/7iPUeBUjCEULtKRl2OUNS8u9Y0/cznwcAK 1cZLr50+tfmJoXd9+gd220/Y3qw1Libj9a0Tvk9XLhIU//3uY9Tc2dG9uCFnypXo Ux9XoHWkZZ4Pw2uYvSPVQ/3abT/om7NXqIQ5xj5144DPgKHg== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gynbc0jn6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 28 Sep 2026 11:58:46 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3a0f55a3941so1877631a91.3 for ; Mon, 28 Sep 2026 04:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1790596726; x=1791201526; darn=lists.linux.dev; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=GWvcEfZFoPLDafBzTdcCM2UQzqRP8Ydg4Kuy7k8AJBs=; b=aytE3pu5tEYTxJlJgByC7iLqBM4Adjka5V+KVL2XPvDTONtT8s1n3kxpY/WXf9VdBx wWSXA5+NRcFjbcFNvOEk3piUEyTp8GFQBEdDR86P6UmkU4vzsbtaqUvk3lUEusTfV61t NHEw9YA60tQkvpAjMec1mbYPkL+jv092OawD+oPFb364BV+Il3qbJxlWtkHi23/UCvjn mxf4WJSW6UoAG0U9OVSO73cn/jsqUtGtlKs4ojsn17pKWYskcww4DTiyB6AfwLbBwoh2 OvOf8svY6VrcLTZ9Nz7+mARjDIKDWAXhwAK1Z8kGDq7rUVIFyrlt5jSL69ZFdhLUuHGU 7jHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790596726; x=1791201526; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=GWvcEfZFoPLDafBzTdcCM2UQzqRP8Ydg4Kuy7k8AJBs=; b=jutBUdYMZwRQ8A3KjsrN5Ybq28YCvgXzPW+bAyXJleqfqWZGqauNES7JZrOE+oAhhD RAKQV/uqZqSpQmJ82CbBpMqbpZwhRExJI30u7qLvjUsWtrjYwaz0JXqLX8Meox+j37Ln xiG4x2a1ZsfgfpCcD0UzJbpU1V16GehXxCRWytyPCCgpilVpPU+ZeVihY1tUD5/GDbGa pFNTl0SCYsNNhdYEfvZAfDL3349CboNWP6oTCmNPLEKowAEeqlNH25MvSDknm5vHGA/S dN8d43eqmVOD0AD15YyDnbNKg20MpS71YZRtI0Hm+j2lpoVDrajTW/kAwEptcDIEWGNo IVAg== X-Forwarded-Encrypted: i=1; AKwUvBw6PXi5xhJGW1b2ZF3JRJVRP+tQr3qa60BY6Wu5fs6NpvCcomqeoqhC9vDXpFGqgP+htDD24h5EUs6ichJS0g==@lists.linux.dev X-Gm-Message-State: AFq9FYIrOOwijpS/Gjj5RtpD+kXfMmf4dEW4smr2skSjkHTRX26kZdQ9 WqPRsf6hcoS7owGjTMjDMRpl8iuzRIv1Z9RyCE4A0aVnFptK9KZ/7Wsh4FzFTcfv7NNHqqdBPQe 10lkNLW/PTjv4xLC/3h/DN7JY91vtid0WtdVtm6AVznBXcwpRnh+v+cPMGITCHbVov0GvxA== X-Gm-Gg: AYBFou0PEx+Yvf7lRiRf9qGv7EZVjxJUJvDWLLfQ+gIY1CV4KvzphiZvUpGI7xa+BMF IBtxbUThQFhTYQprwXegfjZCNYzH1LizEvfJ4rDD4BkVDnoo/NlQgfQKM3PukpqS2Y2mw7lWL9F 61wz8UpedENFJJpP7srAXWmLW5Gp/wRCB02sw/noDjoX4/lHJXesEs+J9Xv6Olz3ZzJuV/Zx8y7 IZOiZEte6esEbv3n6UGHpP81/VFwlcqkEidRaXd6Ne0jKu8mwNEFf5P0QZeJKX3x7gQVaXhQ09W G2Ue6UIFCG7ySft/AlzajyT56lCD8bGy4gly5Rtq8MS4LkcWCyFrFEc8vMiT0sfHul8yyYXiEsb 7OzsaxFLwhWFIAj4d3ce9YVPYL6A9ekrlpoqGI2+s+/3sM1BmFlqcWEUSoQY3tcSUk8RLc/4= X-Received: by 2002:a17:90b:4a91:b0:3a0:bf26:f24a with SMTP id 98e67ed59e1d1-3a0bf26fc15mr7372233a91.45.1790596725709; Mon, 28 Sep 2026 04:58:45 -0700 (PDT) X-Received: by 2002:a17:90b:4a91:b0:3a0:bf26:f24a with SMTP id 98e67ed59e1d1-3a0bf26fc15mr7372213a91.45.1790596725186; Mon, 28 Sep 2026 04:58:45 -0700 (PDT) Received: from congzhan02.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0b8efb156sm22054562a91.1.2026.09.28.04.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 04:58:44 -0700 (PDT) From: Cong Zhang Date: Mon, 28 Sep 2026 19:58:38 +0800 Subject: [PATCH v3] virtio_blk: use synchronous quiesce in virtblk_freeze_priv() Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260928-virtblk_sync_quiesce-v3-1-a037e6e2fdf5@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAG1WumoC/3WN3Q6CIACFX8VxHQ7wJ+yq92jNAWJSKgnKcs53D 2xtXdjN2c52zvctwEqjpAWnaAFGOmWV7n1JDhEQDetvEqrKd0AQyVGBEXTKjLx9lHbuRTlM/is kLDgRlFZpluIc+OvTyFq9Nuzl+ul24ncpxsAKi0bZUZt58zocdl8F3lc4DDFklCY1rRNMMnrW1 sbDxFqhuy72AYLJkV8W+cMinoUKhhDO0oIfyQ5rXdc3ejIhdB0BAAA= X-Change-ID: 20260910-virtblk_sync_quiesce-9b2c88d45416 To: "Michael S. Tsirkin" , Jason Wang , Eugenio Perez , Xuan Zhuo , Paolo Bonzini , Stefan Hajnoczi , Jens Axboe , Ming Lei Cc: linux-arm-msm@vger.kernel.org, virtualization@lists.linux.dev, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Cong Zhang X-Mailer: b4 0.15-dev-38bf1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1790596722; l=2486; i=cong.zhang@oss.qualcomm.com; s=20250926; h=from:subject:message-id; bh=a5KcPfO/lVWvSV/4F80VAySM5Pi85YzX0n3tROeq3fI=; b=KMwGuSH+3ziApXG5QlvjxI5qXg+XS3sB7eaaGysM93gcZmk2lo8uADbhVuFwfleEvAg51bq7p 5GaiSm4r5+CCauqVc4qPd2kBSoQBiy/axVIbTxwOXVqwOhEVB6UpdcD X-Developer-Key: i=cong.zhang@oss.qualcomm.com; a=ed25519; pk=8SBh3ey5igz2nlW+UFC6khFvaNPgG7MmbWtAeO2s6n8= X-Authority-Analysis: v=2.4 cv=Sq4Fe/O0 c=1 sm=1 tr=0 ts=6aba5676 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=kkXLOB11zRU5SlhL2XgA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-GUID: T0YwB-_qDVyQ8ruq9seeW2zH5KRTzqD2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTI4MDA0NyBTYWx0ZWRfX1urcqXLdV0n5 0S/S91uhPNcAgb115Ec580nsN/IKHMxZRe4g3asH9qLGYuqGPAatxxXcGyFmyDexnjmFSDYV9Kr utds/dGKUwsyXQtUICIuZOkQwGntc+U4uWvuPfUIqIpqSEIyw7Mh/9esa4Uxlx6fOTHqxXlYaz/ zMzHekn1cZm7zNNBN4sB5VLoM89QVzP4S06tZI4AQx6OWhANv1/4SQMK8yCH8WGEefQpCThpotv LNKdIq3aUertPGO8XeowXYdR2G0+U0Rf1srh28oSReLLVxDlVUbZ7Pyfb5i0WR1+K4MzUzEoFVd X7mGvZqi4c5Qd/RpV/iUUqbKe8jSF+4iUCansacNyWQPo/jZcpBwLBCgbYkmQFnAPwPIp3lOnf0 E4WIWA3iXGedT8GChAgJNvt/m5K2iWkon0m0AHdgEqo8zO8qWCb2klSX+T01nNAyJR9GU+L4uZZ 6LSuR1//iqJCPy+2MUw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTI4MDA0NyBTYWx0ZWRfXx3q3SIOWYvlq sHQtqRnl1yZRq1N6MFBV8BNX2w1iswwT0/xWdfK5hYpA4T2AIV7KwiDWYqtYaMIBceY2eqa7NVG YY55NAj6mJDtlngAEUPwX6Oq2ocS92k= X-Proofpoint-ORIG-GUID: T0YwB-_qDVyQ8ruq9seeW2zH5KRTzqD2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-28_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 malwarescore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609280047 blk_mq_run_work_fn() can call blk_mq_sched_dispatch_requests() through blk_mq_run_dispatch_ops(). The dispatcher checks QUEUE_FLAG_QUIESCED while the flag is clear. It can then be preempted before it gets a request. At that time, it has no queue usage reference, so blk_mq_freeze_queue() does not wait for it. virtblk_freeze_priv() then calls blk_mq_quiesce_queue_nowait() and blk_mq_unfreeze_queue(). A new request can enter the queue. The old dispatcher can run again, use its old flag check, get the new request, and call virtio_queue_rq(). At the same time, virtblk_freeze_priv() can reset the device, delete the virtqueues, and free vblk->vqs. The old dispatcher can then use a deleted virtqueue or a NULL vblk->vqs, and the kernel can crash. Fix this by using blk_mq_quiesce_queue(), which waits for dispatch code that was already running. Keep the existing freeze and unfreeze order. The queue remains quiesced until virtblk_restore_priv() calls blk_mq_unquiesce_queue(). Fixes: 7678abee0867 ("virtio-blk: don't keep queue frozen during system suspend") Cc: stable@vger.kernel.org Acked-by: Jason Wang Reviewed-by: Stefan Hajnoczi Signed-off-by: Cong Zhang --- Changes in v3: - Move the race description into the commit log. - Remove the blank line between tags. - Add Cc: stable@vger.kernel.org to the commit trailers. - Link to v2: https://lore.kernel.org/20260912-virtblk_sync_quiesce-v2-1-09a001549b72@oss.qualcomm.com Changes in v2: - Cc stable@vger.kernel.org. - Link to v1: https://lore.kernel.org/20260911-virtblk_sync_quiesce-v1-1-a883f8f31258@oss.qualcomm.com --- drivers/block/virtio_blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 32bf3ba07a9d..7a570591e040 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1595,7 +1595,7 @@ static int virtblk_freeze_priv(struct virtio_device *vdev) /* Ensure no requests in virtqueues before deleting vqs. */ memflags = blk_mq_freeze_queue(q); - blk_mq_quiesce_queue_nowait(q); + blk_mq_quiesce_queue(q); blk_mq_unfreeze_queue(q, memflags); /* Ensure we don't receive any more interrupts */ --- base-commit: 50d05c7c76c96b90462f24debacca971d2e86713 change-id: 20260910-virtblk_sync_quiesce-9b2c88d45416 Best regards, -- Cong Zhang