From nobody Wed Nov 5 16:36:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496469193698758.3277905529928; Fri, 2 Jun 2017 22:53:13 -0700 (PDT) Received: from localhost ([::1]:52595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dH1zr-0003oj-Lg for importer@patchew.org; Sat, 03 Jun 2017 01:53:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dH1yy-00033M-SE for qemu-devel@nongnu.org; Sat, 03 Jun 2017 01:52:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dH1yx-0003mH-Oy for qemu-devel@nongnu.org; Sat, 03 Jun 2017 01:52:16 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:3941) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dH1ys-0003f5-E6; Sat, 03 Jun 2017 01:52:10 -0400 Received: from 172.30.72.54 (EHLO dggeml406-hub.china.huawei.com) ([172.30.72.54]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AOR21988; Sat, 03 Jun 2017 13:51:58 +0800 (CST) Received: from localhost.localdomain (10.175.104.147) by dggeml406-hub.china.huawei.com (10.3.17.50) with Microsoft SMTP Server id 14.3.301.0; Sat, 3 Jun 2017 13:51:49 +0800 From: "sochin.jiang" To: , , , Date: Sat, 3 Jun 2017 13:48:37 +0800 Message-ID: <1496468917-7489-1-git-send-email-sochin.jiang@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.104.147] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090205.59324E7F.0057, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: e9eeb611623f39945d48fe6d047024e4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.188 Subject: [Qemu-devel] [PATCH] blockjob: cancel blockjobs before stopping all iothreads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xieyingtai@huawei.com, lina.lulina@huawei.com, lizhengui@huawei.com, qemu-block@nongnu.org, subo7@huawei.com, eric.fangyi@huawei.com, zhangshuai13@huawei.com, qemu-devel@nongnu.org, sochin.jiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "sochin.jiang" commit 88b062c and commit c9d1a56 introduce BDRV_POLL_WHILE, checking bs->in_flight in the main thread and exit till bs->in_flight reaches 0. This leaves a chance that BDRV_POLL_WHILE will hang until iothread complete the relative block job when bdrv_drain is called from outside the I/O thread, say call 'iothread_stop_all' when shutting down the vm. Cancelling blockjobs seems more reasonable before iothread_stop_all is called when vm shutdown. Signed-off-by: sochin.jiang --- block.c | 9 ++++++++- blockjob.c | 5 +++++ include/block/block.h | 1 + include/block/blockjob.h | 7 +++++++ vl.c | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index fa1d06d..b564c29 100644 --- a/block.c +++ b/block.c @@ -3084,9 +3084,16 @@ static void bdrv_close(BlockDriverState *bs) bdrv_drained_end(bs); } =20 +void bdrv_cancel_all(void) +{ + if (!block_jobs_is_empty()) { + block_job_cancel_sync_all(); + } +} + void bdrv_close_all(void) { - block_job_cancel_sync_all(); + bdrv_cancel_all(); nbd_export_close_all(); =20 /* Drop references from requests still in flight, such as canceled blo= ck diff --git a/blockjob.c b/blockjob.c index a0d7e29..c659994 100644 --- a/blockjob.c +++ b/blockjob.c @@ -539,6 +539,11 @@ void block_job_cancel_sync_all(void) } } =20 +bool block_jobs_is_empty(void) +{ + return QLIST_EMPTY(&block_jobs); +} + int block_job_complete_sync(BlockJob *job, Error **errp) { return block_job_finish_sync(job, &block_job_complete, errp); diff --git a/include/block/block.h b/include/block/block.h index 9b355e9..0ebbd50 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -376,6 +376,7 @@ int bdrv_inactivate_all(void); int bdrv_flush(BlockDriverState *bs); int coroutine_fn bdrv_co_flush(BlockDriverState *bs); int bdrv_flush_all(void); +void bdrv_cancel_all(void); void bdrv_close_all(void); void bdrv_drain(BlockDriverState *bs); void coroutine_fn bdrv_co_drain(BlockDriverState *bs); diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 09c7c69..d9ee58d 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -282,6 +282,13 @@ int block_job_cancel_sync(BlockJob *job); void block_job_cancel_sync_all(void); =20 /** + * block_jobs_is_empty: + * + * Check whether block_jobs is empty. + */ +bool block_jobs_is_empty(void); + +/** * block_job_complete_sync: * @job: The job to be completed. * @errp: Error object which may be set by block_job_complete(); this is n= ot diff --git a/vl.c b/vl.c index 80b86c0..cff6ec7 100644 --- a/vl.c +++ b/vl.c @@ -4751,6 +4751,7 @@ int main(int argc, char **argv, char **envp) =20 main_loop(); replay_disable_events(); + bdrv_cancel_all(); iothread_stop_all(); =20 bdrv_close_all(); --=20 1.8.3.1