From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 B2A90381B0F for ; Thu, 10 Sep 2026 16:31:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057872; cv=none; b=ZciULjqeiXBvLplA3GalCwPFC4mfcJBVzB9UIpHCDBM03oMXjsXSfQPw/NkJmz/eqKyA2RXPG0cVxP6pk4JjB2WsVkCyocBC806000Bi3LFtLH6j5BLbwdWlVbMEjodiaCoLQasFjshAu/ReZZZ5+AqAVaoSDiJtZDbxErSSEZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789057872; c=relaxed/simple; bh=kcJgGBv43uV4lQuuDHe4VjFldBPqvQ8pUtSwWNQ1PIE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=t2IJeHrt5Ovi/+DIbrJoLiQ1GYRdWg1FnWYOraiA8CZtjUUxPHEipelsxGJTHfBglzHca3iwlNSQ9DqRjwLECTyRh8SxwVlpbVI02uz6q1KiRiIzxMMxhVogZqkgNlDLwy+cO5eDHr/AzwY55J8H/MTDvyhtc0ZlA8b8IQm4Uho= 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=k46jxYaJ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ks85O+sp; arc=none smtp.client-ip=205.220.168.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="k46jxYaJ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ks85O+sp" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68AF4XVH107113 for ; Thu, 10 Sep 2026 16:31:09 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=m7yzWTdFaMYpCscxPwImij Ly8JVKI4jHgQ7Y/ei13oU=; b=k46jxYaJTuZcphY9IGriGaTx8KR/eHKegwy7iF mT3YB1cvTGLVdkkeJ5pk+eNt0AJhUzGvnklQlbKL8d9m3JJt4azqWnBN3SZd71j6 tyqfPd+Kvh4tz3X+3tB+vpMKnq3+5YqNhwMiDTOQt9m7Z+BCdJbEaB/z/6I0+9FX fGCPs7h9qfaJWEZ9NO/daV7x9IqUSEGRLP9rkrFxfr9E+TbJwaXxG72c8+KhfI1P b9CDepIUA0arxpn62PiV8OPdbzSJMfvKGuaz0WLa+T7Xjx2Rx6Ve57MZQJMwfd58 cN3g3qfJY5QKbv8L6co1n6IdAO8Q1U7QCppRIznbQa+7Rfqg== 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 4gksh8t2k2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 10 Sep 2026 16:31:09 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-398e1f7d1a5so5286788a91.0 for ; Thu, 10 Sep 2026 09:31:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1789057869; x=1789662669; darn=vger.kernel.org; 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=m7yzWTdFaMYpCscxPwImijLy8JVKI4jHgQ7Y/ei13oU=; b=ks85O+sp3zLzzbqZWdG/F8MCP4hN9OmTojOOa2H2w5vhHEOrHBc0UijtfeMmdNSeDy 76Xj73gO3vjnibznEwwtOTU7iPaZy5BVzV9C/hywrLWW7QvslbayiD+jOQw06tc2Wweb rC+tfaMtuNnj08Am4Zll5vCW36K/S6+n8p817gkgEsOFTQy1084Ecjwjmmwzst1yUDcT JdIuKYySMic0N0GBRAwDhPs2bjp5TSqqgH+cLB2B2tmci2N4wvMcwFaOuFYDiD3g52D3 WKevWuz2zqzy8YeVNrYVd0BSH+7bHNt1jAzdNpk1WcEvsb4Zxeep6hjtgUfzwDYqU8AB yElA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789057869; x=1789662669; 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=m7yzWTdFaMYpCscxPwImijLy8JVKI4jHgQ7Y/ei13oU=; b=U1KY40OTqqLW+/XvY9D+SEbeoAgQ8fS0SgduZwDItQYkz1RaGWOuzVB2YqNUqlU6AH ScJ5BbbSvookmbZcJIgLQxs2c0ha5LUYUjNYKfjM2zj9y5NcmkiyvxoGiyHCI3nHhH7I KccLaHVqrjAArGAv9/19qiMOm1JE6Y2jDGbDaEkSCBGUByAZtdDUgfswOpqOMD95WQM0 KDdbJtLfkqRZ4gW7Ac1Mg3NRmG3jp7n8Nl+SYQV/Y0qvNKE6BzRAGEfJSTSvxoFLaxV3 7Gqyn+K9a+7X9fWWkVGhEr23pgkIrYDaVhg2C39xn2ieOsZ0R/8pdX/0D5D0nd8ZoQgs K4XA== X-Forwarded-Encrypted: i=1; AKwUvBw9XD/PLRvvKB/TJxcQKhvEZQaPnNf8yJP8tgUHbriUI0/jS04Pd4VqZOGBrS6boq1qg1Y88nli7fcnSA==@vger.kernel.org X-Gm-Message-State: AFuF++mc3PuriFZFAIVJ3owFJQTnEKHfA8yWkwOBg0fHjt2FcjD5JQjq WcpcUtRpfQ+e981XtqnkIXNjl+dSCaIS9+jQKcHgMaNb8srbLG18VTY9A8yagVhP/fuN1CK0/O1 W9KQz18roqHzbvbsgCjRIxaijERmEV8fF6akg4xvwe+7LpQYNn9nUQcm4y7vO0vBL7Q== X-Gm-Gg: AYBFou3QVtzIag8sbqqrKV4nPo+Q0ySTipoUzLxYGVRD7bn0OFm+wTLp4M9dYZFWaOQ u87rzKQnNYYxcBK8SDuaZ1doDvMRb2NmxAmDkwYHDqSmgO5qHIL1MY5AAgFXW67gFhMkITkDLu+ drUfbQh9nr9eeIO/5fMuKfhGRMUtV1wWewyA2kRdxZ3Y2pt9WOQzYGTGcSDWyU0I4Vawk2fHueL CckRRjJAt2up09GeQGzFOHCEFpjs1nfPf42ewCcNVsS4Y+QuxiTB0zW6YhNDr6279nGR5NURFDU lbPH7k4LKSEt7mZzk+HSZzduaAX3MpDaoMo0selaTKGgjqDNN9YIzm2WYgr2SOiVceskZCQXVmG hn46IGSiMMiGR6eKPoq8HdUb5LOGGNaqRKpBYjMhfKtzaGrToM6WBEG3i8XfFSHirXUKfZzg= X-Received: by 2002:a17:90b:2542:b0:398:9beb:5c17 with SMTP id 98e67ed59e1d1-39b2620a2bfmr59984542a91.18.1789057869012; Thu, 10 Sep 2026 09:31:09 -0700 (PDT) X-Received: by 2002:a17:90b:2542:b0:398:9beb:5c17 with SMTP id 98e67ed59e1d1-39b2620a2bfmr59984483a91.18.1789057868409; Thu, 10 Sep 2026 09:31:08 -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-39d94bafb3bsm424320a91.1.2026.09.10.09.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 09:31:07 -0700 (PDT) From: Cong Zhang Date: Fri, 11 Sep 2026 00:31:01 +0800 Subject: [PATCH] virtio_blk: use synchronous quiesce in virtblk_freeze_priv() Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260911-virtblk_sync_quiesce-v1-1-a883f8f31258@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAETbomoC/yXMQQ6CMBBA0auQWdukbbABrkIMsdNRR0mVDhAN4 e4UXL7F/wsIJSaBplgg0czC75hhTgXg4xrvpDhkg9XW6dpoNXMaff/q5BexG6bcIqnaW6yqUJ5 L4yCnn0Q3/h7b9vK3TP5JOO4vWNcN0oUde3gAAAA= X-Change-ID: 20260910-virtblk_sync_quiesce-9b2c88d45416 To: "Michael S. Tsirkin" , Jason Wang , =?utf-8?q?Eugenio_P=C3=A9rez?= , 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, Cong Zhang X-Mailer: b4 0.15-dev-38bf1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789057863; l=2010; i=cong.zhang@oss.qualcomm.com; s=20250926; h=from:subject:message-id; bh=kcJgGBv43uV4lQuuDHe4VjFldBPqvQ8pUtSwWNQ1PIE=; b=n62tXsCZlwo3B+DeASbqVIAWgz6tguB52thgCTLihVpIEtl7yEH7lwlKoXMLJgcunsnLFSFho hgTCaG1bfqqC9qqcQSpc+BLyUiPxSdgV0tmhJCYlBGxIekBRGveLDX0 X-Developer-Key: i=cong.zhang@oss.qualcomm.com; a=ed25519; pk=8SBh3ey5igz2nlW+UFC6khFvaNPgG7MmbWtAeO2s6n8= X-Proofpoint-GUID: lGG1VR5N1RVghMuqiKUNM2PL1KUF7jFX X-Proofpoint-ORIG-GUID: lGG1VR5N1RVghMuqiKUNM2PL1KUF7jFX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTEwMDIwMCBTYWx0ZWRfX/isC4wMOSghD PRJzRNO4pxxyLZKMmoaQ4uC9Fnj463N7pSJpMsZo7ICBEMQ/ftUdMq5bQm/j29tRvCk4X7RWdqx //bgi88TkZXnFvt4lplWsKUqgwc1VvGQGDhcRc4HA98cOvp1zjLiR3zmEExzaewip4TKVR5ae65 /2p9m5PYofVxitYHmF++mQ1+l6Ggsoa9Mox8IUgQ7K/zyioQdcRb08NpJXaxP7M7Fk/DanCbAlX T07csa3Tr1InA3Con2Y20w0QVf1zNRDPX+qYms78cd+0mfgzgsd25dCcJLiAWg+VuymitnZxbtf WQGEu9bOpGcpdNMmMdzri6POZNOmU3fEtx/x5syBqsyG/9t4WpFPb85ThwfP0Ee7qxIxasy5cz5 +fsmZz80g2+NThNYfUfjaf45RmdIPQzRxFUExYTS0qWn/zSsfnSMN0wboN8HTFQAl8X0NDt/TsT 2dFcDoZou30cm9qKuvg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTEwMDIwMCBTYWx0ZWRfXz6kHw/8Zl1MH Y4iJo6MimMGkZMV5PPmiNK/XIF8yIyO1UA+LnjZj+S+gpmsdv6qkP8UAx1SErqi3ndjGaY7unAw i82nAqdf2mR3x/VJuc1IqKWiu3T6f84= X-Authority-Analysis: v=2.4 cv=a56lZkSF c=1 sm=1 tr=0 ts=6aa2db4d 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=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=cmBj7K86vS66_wzKDlEA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 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-10_05,2026-09-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 phishscore=0 bulkscore=0 clxscore=1011 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609100200 Replace blk_mq_quiesce_queue_nowait() with blk_mq_quiesce_queue() in virtblk_freeze_priv(). Keep the existing freeze and unfreeze order. The synchronous call waits for dispatch code that was already running. 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") Signed-off-by: Cong Zhang --- 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. --- 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