From nobody Mon Apr 29 21:39:32 2024 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.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517896259506653.7341965658665; Mon, 5 Feb 2018 21:50:59 -0800 (PST) Received: from localhost ([::1]:57451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiw9a-0006mK-Na for importer@patchew.org; Tue, 06 Feb 2018 00:50:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiw8b-0006Co-2b for qemu-devel@nongnu.org; Tue, 06 Feb 2018 00:49:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiw8Z-000115-HG for qemu-devel@nongnu.org; Tue, 06 Feb 2018 00:49:49 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:40042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eiw8T-0000xN-FU; Tue, 06 Feb 2018 00:49:41 -0500 Received: by mail-pl0-x242.google.com with SMTP id g18so632264plo.7; Mon, 05 Feb 2018 21:49:41 -0800 (PST) Received: from localhost ([40.83.124.139]) by smtp.gmail.com with ESMTPSA id r8sm5085847pfh.153.2018.02.05.21.49.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 21:49:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=oBmxCJYZuQO4yDbGmwLL+M0mZ998kW87EqO00yZ0ycY=; b=oNS/h+H9Mt/Uou59XegF7qBzeMUCRFaUhbCpAHkZBcGhEtMyLA9SyqluzYw5XN28fW w2V4Xe97zrQ7w8SeQ2mRBW613vEmGGp3HzGIo1Q3I16OOoMQIUXum/7d+GIogsoSpaT0 N0iv110L8emENdZy9t+XMMEYry4CJcDG/fhKSilu63sKUsJR1/LhgLkyDsRTOrRs53WI LSs19kjek7UnPOAsLcsoJeR6XqRoFedmW6RUeTDHA/iaih7GhOmUplTZaWJKKyi57iOd qyxfrqEcdnYuhk3xWKdsZDck8mx+GFfzfddDl0D9FWXb6QwfKGyfykr+prE+rkSMFTu8 c9xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=oBmxCJYZuQO4yDbGmwLL+M0mZ998kW87EqO00yZ0ycY=; b=HyPAX+avduZSO8m/XYmPPEXvfB2MivLMfPMKGRFq0OwmvKS1Td7X3anj/fiF2fCU3c A9QdN19E/VNuzvrJdp/Q8ZFOJw7FXX9GjHPXEJaSgAs957+GYEFbp4NTo98o8sL/DxTh 05BZo1TOsufJ56BQl1oRcbfhC1e1HbT+DcMspNOT7CNDsxYt8ncPaQ+NxR2miwtOQtUS uxee9vtuW8nFh3mJDoY9DIbHzyhPAzix9mjg7Q3Vy8ISbxLDulxSEBKR8MJplA4oQ3jc qL+9+vRy6gSZEUjOG1EOPV3NFxeqktW4olB8rEza0S1Pct4lgcDU9GbgsG0Gj0NXVCQC iryA== X-Gm-Message-State: APf1xPDIXVHrka1YaQcER+PzVv4cozzrjwqe6B+/kMPD7X/mSm/l9BxE vKhw+6UiMETU43NbneEYWKs= X-Google-Smtp-Source: AH8x2241jbqZoqNA1PzjAAKC1BPO2GwV3/t3g4uv7frGVY74ESKJK1QDAKNkey1PKsNpNCLxZNmYBA== X-Received: by 2002:a17:902:8:: with SMTP id 8-v6mr1268737pla.415.1517896180274; Mon, 05 Feb 2018 21:49:40 -0800 (PST) From: Liang Li X-Google-Original-From: Liang Li Date: Tue, 6 Feb 2018 13:49:33 +0800 To: "Dr. David Alan Gilbert" , Markus Armbruster , Jeff Cody , kwolf@redhat.com, Paolo Bonzini , qemu-block@nongnu.org, qemu-devel@nongnu.org, John Snow , Eric Blake Message-ID: <20180206054929.GA76768@localhost> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.7.2 (2016-11-26) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH v2] block/mirror: change the semantic of 'force' of block-job-cancel 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: Liang Li , Liang Li , Huaitong Han Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When doing drive mirror to a low speed shared storage, if there was heavy BLK IO write workload in VM after the 'ready' event, drive mirror block job can't be canceled immediately, it would keep running until the heavy BLK IO workload stopped in the VM. Libvirt depends on the current block-job-cancel semantics, which is that when used without a flag after the 'ready' event, the command blocks until data is in sync. However, these semantics are awkward in other situations, for example, people may use drive mirror for realtime backups while still wanting to use block live migration. Libvirt cannot start a block live migration while another drive mirror is in progress, but the user would rather abandon the backup attempt as broken and proceed with the live migration than be stuck waiting for the current drive mirror backup to finish. The drive-mirror command already includes a 'force' flag, which libvirt does not use, although it documented the flag as only being useful to quit a job which is paused. However, since quitting a paused job has the same effect as abandoning a backup in a non-paused job (namely, the destination file is not in sync, and the command completes immediately), we can just improve the documentation to make the force flag obviously useful. Cc: Paolo Bonzini Cc: Jeff Cody Cc: Kevin Wolf Cc: Max Reitz Cc: Eric Blake Cc: John Snow Reported-by: Huaitong Han Signed-off-by: Huaitong Han Signed-off-by: Liang Li --- block/mirror.c | 10 ++++------ blockdev.c | 4 ++-- blockjob.c | 12 +++++++----- hmp-commands.hx | 3 ++- include/block/blockjob.h | 9 ++++++++- qapi/block-core.json | 5 +++-- tests/test-blockjob-txn.c | 8 ++++---- 7 files changed, 30 insertions(+), 21 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index c9badc1..9190b1c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -869,11 +869,8 @@ static void coroutine_fn mirror_run(void *opaque) =20 ret =3D 0; trace_mirror_before_sleep(s, cnt, s->synced, delay_ns); - if (!s->synced) { - block_job_sleep_ns(&s->common, delay_ns); - if (block_job_is_cancelled(&s->common)) { - break; - } + if (block_job_is_cancelled(&s->common) && s->common.force) { + break; } else if (!should_complete) { delay_ns =3D (s->in_flight =3D=3D 0 && cnt =3D=3D 0 ? SLICE_TI= ME : 0); block_job_sleep_ns(&s->common, delay_ns); @@ -887,7 +884,8 @@ immediate_exit: * or it was cancelled prematurely so that we do not guarantee that * the target is a copy of the source. */ - assert(ret < 0 || (!s->synced && block_job_is_cancelled(&s->common= ))); + assert(ret < 0 || ((s->common.force || !s->synced) && + block_job_is_cancelled(&s->common))); assert(need_drain); mirror_wait_for_all_io(s); } diff --git a/blockdev.c b/blockdev.c index 8e977ee..039f156 100644 --- a/blockdev.c +++ b/blockdev.c @@ -145,7 +145,7 @@ void blockdev_mark_auto_del(BlockBackend *blk) aio_context_acquire(aio_context); =20 if (bs->job) { - block_job_cancel(bs->job); + block_job_cancel(bs->job, false); } =20 aio_context_release(aio_context); @@ -3802,7 +3802,7 @@ void qmp_block_job_cancel(const char *device, } =20 trace_qmp_block_job_cancel(job); - block_job_cancel(job); + block_job_cancel(job, force); out: aio_context_release(aio_context); } diff --git a/blockjob.c b/blockjob.c index f5cea84..9b0b1a4 100644 --- a/blockjob.c +++ b/blockjob.c @@ -365,7 +365,7 @@ static void block_job_completed_single(BlockJob *job) block_job_unref(job); } =20 -static void block_job_cancel_async(BlockJob *job) +static void block_job_cancel_async(BlockJob *job, bool force) { if (job->iostatus !=3D BLOCK_DEVICE_IO_STATUS_OK) { block_job_iostatus_reset(job); @@ -376,6 +376,8 @@ static void block_job_cancel_async(BlockJob *job) job->pause_count--; } job->cancelled =3D true; + /* To prevent 'force =3D=3D false' overriding a previous 'force =3D=3D= true' */ + job->force |=3D force; } =20 static int block_job_finish_sync(BlockJob *job, @@ -437,7 +439,7 @@ static void block_job_completed_txn_abort(BlockJob *job) * on the caller, so leave it. */ QLIST_FOREACH(other_job, &txn->jobs, txn_list) { if (other_job !=3D job) { - block_job_cancel_async(other_job); + block_job_cancel_async(other_job, false); } } while (!QLIST_EMPTY(&txn->jobs)) { @@ -542,10 +544,10 @@ void block_job_user_resume(BlockJob *job) } } =20 -void block_job_cancel(BlockJob *job) +void block_job_cancel(BlockJob *job, bool force) { if (block_job_started(job)) { - block_job_cancel_async(job); + block_job_cancel_async(job, force); block_job_enter(job); } else { block_job_completed(job, -ECANCELED); @@ -557,7 +559,7 @@ void block_job_cancel(BlockJob *job) * function pointer casts there. */ static void block_job_cancel_err(BlockJob *job, Error **errp) { - block_job_cancel(job); + block_job_cancel(job, false); } =20 int block_job_cancel_sync(BlockJob *job) diff --git a/hmp-commands.hx b/hmp-commands.hx index 15620c9..603941f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -106,7 +106,8 @@ ETEXI .args_type =3D "force:-f,device:B", .params =3D "[-f] device", .help =3D "stop an active background block operation (use -f" - "\n\t\t\t if the operation is currently paused)", + "\n\t\t\t if you want to abort the operation immedia= tely" + "\n\t\t\t instead of keep running until data is in s= ync)", .cmd =3D hmp_block_job_cancel, }, =20 diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 00403d9..f5a8ad1 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -63,6 +63,12 @@ typedef struct BlockJob { bool cancelled; =20 /** + * Set to true if the job should abort immediately without waiting + * for data to be in sync. + */ + bool force; + + /** * Counter for pause request. If non-zero, the block job is either pau= sed, * or if busy =3D=3D true will pause itself as soon as possible. */ @@ -218,10 +224,11 @@ void block_job_start(BlockJob *job); /** * block_job_cancel: * @job: The job to be canceled. + * @force: Quit a job without waiting for data to be in sync. * * Asynchronously cancel the specified job. */ -void block_job_cancel(BlockJob *job); +void block_job_cancel(BlockJob *job, bool force); =20 /** * block_job_complete: diff --git a/qapi/block-core.json b/qapi/block-core.json index 8225308..aeb0780 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2098,8 +2098,9 @@ # the name of the parameter), but since QEMU 2.7 it can have # other values. # -# @force: whether to allow cancellation of a paused job (default -# false). Since 1.3. +# @force: If true, and the job has already emitted the event BLOCK_JOB_REA= DY, +# abandon the job immediately (even if it is paused) instead of wa= iting +# for the destination to complete its final synchronization (since= 1.3) # # Returns: Nothing on success # If no background operation is active on this device, DeviceNotA= ctive diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 3591c96..53daadb 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -125,7 +125,7 @@ static void test_single_job(int expected) block_job_start(job); =20 if (expected =3D=3D -ECANCELED) { - block_job_cancel(job); + block_job_cancel(job, false); } =20 while (result =3D=3D -EINPROGRESS) { @@ -173,10 +173,10 @@ static void test_pair_jobs(int expected1, int expecte= d2) block_job_txn_unref(txn); =20 if (expected1 =3D=3D -ECANCELED) { - block_job_cancel(job1); + block_job_cancel(job1, false); } if (expected2 =3D=3D -ECANCELED) { - block_job_cancel(job2); + block_job_cancel(job2, false); } =20 while (result1 =3D=3D -EINPROGRESS || result2 =3D=3D -EINPROGRESS) { @@ -231,7 +231,7 @@ static void test_pair_jobs_fail_cancel_race(void) block_job_start(job1); block_job_start(job2); =20 - block_job_cancel(job1); + block_job_cancel(job1, false); =20 /* Now make job2 finish before the main loop kicks jobs. This simulat= es * the race between a pending kick and another job completing. --=20 1.8.3.1