From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBDBBC2D0DB for ; Tue, 28 Jan 2020 19:45:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 89848206A2 for ; Tue, 28 Jan 2020 19:45:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="F2Ph4oRp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 89848206A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwWo1-0004Cz-Pc for qemu-devel@archiver.kernel.org; Tue, 28 Jan 2020 14:45:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwVrs-000495-TD for qemu-devel@nongnu.org; Tue, 28 Jan 2020 13:45:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwVrl-0004mn-BL for qemu-devel@nongnu.org; Tue, 28 Jan 2020 13:45:44 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51680 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwVrk-0004ka-RW for qemu-devel@nongnu.org; Tue, 28 Jan 2020 13:45:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580237136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=//OPQMYIIL8FX6VvWWkcpVZqyUAuETIBp0TOUprAVB4=; b=F2Ph4oRpiKTzfusTjQNZJJGdG6zLSKynC+RPqv5D3y0PxnlJeO1ZndhpA1EroAyDIbyEh8 6uCnBQ5Hf7tDes/ra+SoCS/PE6KwWVJnpip1Y5WqSAyxcg2vr796P4x30Mg2ciYeVhlcF1 SbwmotkIkfndFdzyN749tqXjm6Ixukc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303--4l_umlRNYaD1Devpr--Gw-1; Tue, 28 Jan 2020 13:45:30 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4C00A1800D41; Tue, 28 Jan 2020 18:45:29 +0000 (UTC) Received: from work-vm (unknown [10.36.118.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD66060BE0; Tue, 28 Jan 2020 18:45:24 +0000 (UTC) Date: Tue, 28 Jan 2020 18:45:22 +0000 From: "Dr. David Alan Gilbert" To: Maxim Levitsky Subject: Re: [PATCH v3 09/13] monitor/hmp: move remaining hmp_block* functions to block-hmp-cmds.c Message-ID: <20200128184522.GA3215@work-vm> References: <20200127103647.17761-1-mlevitsk@redhat.com> <20200127103647.17761-10-mlevitsk@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200127103647.17761-10-mlevitsk@redhat.com> User-Agent: Mutt/1.13.3 (2020-01-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: -4l_umlRNYaD1Devpr--Gw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Maxim Levitsky (mlevitsk@redhat.com) wrote: > Signed-off-by: Maxim Levitsky Reviewed-by: Dr. David Alan Gilbert > --- > block/monitor/block-hmp-cmds.c | 138 +++++++++++++++++++++++++++++ > include/block/block-hmp-commands.h | 9 ++ > include/monitor/hmp.h | 6 -- > monitor/hmp-cmds.c | 137 ---------------------------- > 4 files changed, 147 insertions(+), 143 deletions(-) >=20 > diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmd= s.c > index df0178d0f9..60d63bfe18 100644 > --- a/block/monitor/block-hmp-cmds.c > +++ b/block/monitor/block-hmp-cmds.c > @@ -29,6 +29,7 @@ > #include "block/block_int.h" > #include "block/block-hmp-commands.h" > #include "monitor/hmp.h" > +#include "qemu-io.h" > =20 > void hmp_drive_add(Monitor *mon, const QDict *qdict) > { > @@ -415,3 +416,140 @@ void hmp_nbd_server_stop(Monitor *mon, const QDict = *qdict) > qmp_nbd_server_stop(&err); > hmp_handle_error(mon, err); > } > + > +void hmp_block_resize(Monitor *mon, const QDict *qdict) > +{ > + const char *device =3D qdict_get_str(qdict, "device"); > + int64_t size =3D qdict_get_int(qdict, "size"); > + Error *err =3D NULL; > + > + qmp_block_resize(true, device, false, NULL, size, &err); > + hmp_handle_error(mon, err); > +} > + > +void hmp_block_stream(Monitor *mon, const QDict *qdict) > +{ > + Error *error =3D NULL; > + const char *device =3D qdict_get_str(qdict, "device"); > + const char *base =3D qdict_get_try_str(qdict, "base"); > + int64_t speed =3D qdict_get_try_int(qdict, "speed", 0); > + > + qmp_block_stream(true, device, device, base !=3D NULL, base, false, = NULL, > + false, NULL, qdict_haskey(qdict, "speed"), speed, t= rue, > + BLOCKDEV_ON_ERROR_REPORT, false, false, false, fals= e, > + &error); > + > + hmp_handle_error(mon, error); > +} > + > +void hmp_block_passwd(Monitor *mon, const QDict *qdict) > +{ > + const char *device =3D qdict_get_str(qdict, "device"); > + const char *password =3D qdict_get_str(qdict, "password"); > + Error *err =3D NULL; > + > + qmp_block_passwd(true, device, false, NULL, password, &err); > + hmp_handle_error(mon, err); > +} > + > +void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict) > +{ > + Error *err =3D NULL; > + char *device =3D (char *) qdict_get_str(qdict, "device"); > + BlockIOThrottle throttle =3D { > + .bps =3D qdict_get_int(qdict, "bps"), > + .bps_rd =3D qdict_get_int(qdict, "bps_rd"), > + .bps_wr =3D qdict_get_int(qdict, "bps_wr"), > + .iops =3D qdict_get_int(qdict, "iops"), > + .iops_rd =3D qdict_get_int(qdict, "iops_rd"), > + .iops_wr =3D qdict_get_int(qdict, "iops_wr"), > + }; > + > + /* qmp_block_set_io_throttle has separate parameters for the > + * (deprecated) block device name and the qdev ID but the HMP > + * version has only one, so we must decide which one to pass. */ > + if (blk_by_name(device)) { > + throttle.has_device =3D true; > + throttle.device =3D device; > + } else { > + throttle.has_id =3D true; > + throttle.id =3D device; > + } > + > + qmp_block_set_io_throttle(&throttle, &err); > + hmp_handle_error(mon, err); > +} > + > +void hmp_eject(Monitor *mon, const QDict *qdict) > +{ > + bool force =3D qdict_get_try_bool(qdict, "force", false); > + const char *device =3D qdict_get_str(qdict, "device"); > + Error *err =3D NULL; > + > + qmp_eject(true, device, false, NULL, true, force, &err); > + hmp_handle_error(mon, err); > +} > + > +void hmp_qemu_io(Monitor *mon, const QDict *qdict) > +{ > + BlockBackend *blk; > + BlockBackend *local_blk =3D NULL; > + bool qdev =3D qdict_get_try_bool(qdict, "qdev", false); > + const char* device =3D qdict_get_str(qdict, "device"); > + const char* command =3D qdict_get_str(qdict, "command"); > + Error *err =3D NULL; > + int ret; > + > + if (qdev) { > + blk =3D blk_by_qdev_id(device, &err); > + if (!blk) { > + goto fail; > + } > + } else { > + blk =3D blk_by_name(device); > + if (!blk) { > + BlockDriverState *bs =3D bdrv_lookup_bs(NULL, device, &err); > + if (bs) { > + blk =3D local_blk =3D blk_new(bdrv_get_aio_context(bs), > + 0, BLK_PERM_ALL); > + ret =3D blk_insert_bs(blk, bs, &err); > + if (ret < 0) { > + goto fail; > + } > + } else { > + goto fail; > + } > + } > + } > + > + /* > + * Notably absent: Proper permission management. This is sad, but it= seems > + * almost impossible to achieve without changing the semantics and t= hereby > + * limiting the use cases of the qemu-io HMP command. > + * > + * In an ideal world we would unconditionally create a new BlockBack= end for > + * qemuio_command(), but we have commands like 'reopen' and want the= m to > + * take effect on the exact BlockBackend whose name the user passed = instead > + * of just on a temporary copy of it. > + * > + * Another problem is that deleting the temporary BlockBackend invol= ves > + * draining all requests on it first, but some qemu-iotests cases wa= nt to > + * issue multiple aio_read/write requests and expect them to complet= e in > + * the background while the monitor has already returned. > + * > + * This is also what prevents us from saving the original permission= s and > + * restoring them later: We can't revoke permissions until all reque= sts > + * have completed, and we don't know when that is nor can we really = let > + * anything else run before we have revoken them to avoid race condi= tions. > + * > + * What happens now is that command() in qemu-io-cmds.c can extend t= he > + * permissions if necessary for the qemu-io command. And they simply= stay > + * extended, possibly resulting in a read-only guest device keeping = write > + * permissions. Ugly, but it appears to be the lesser evil. > + */ > + qemuio_command(blk, command); > + > +fail: > + blk_unref(local_blk); > + hmp_handle_error(mon, err); > +} > diff --git a/include/block/block-hmp-commands.h b/include/block/block-hmp= -commands.h > index 721b9a1978..99145c8fcf 100644 > --- a/include/block/block-hmp-commands.h > +++ b/include/block/block-hmp-commands.h > @@ -26,4 +26,13 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdi= ct); > void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict); > void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); > =20 > +void hmp_block_resize(Monitor *mon, const QDict *qdict); > +void hmp_block_stream(Monitor *mon, const QDict *qdict); > +void hmp_block_passwd(Monitor *mon, const QDict *qdict); > +void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict); > +void hmp_eject(Monitor *mon, const QDict *qdict); > + > +void hmp_qemu_io(Monitor *mon, const QDict *qdict); > + > + > #endif > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index 736a969131..47a7cad734 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -58,9 +58,7 @@ void hmp_cont(Monitor *mon, const QDict *qdict); > void hmp_system_wakeup(Monitor *mon, const QDict *qdict); > void hmp_nmi(Monitor *mon, const QDict *qdict); > void hmp_set_link(Monitor *mon, const QDict *qdict); > -void hmp_block_passwd(Monitor *mon, const QDict *qdict); > void hmp_balloon(Monitor *mon, const QDict *qdict); > -void hmp_block_resize(Monitor *mon, const QDict *qdict); > void hmp_loadvm(Monitor *mon, const QDict *qdict); > void hmp_savevm(Monitor *mon, const QDict *qdict); > void hmp_delvm(Monitor *mon, const QDict *qdict); > @@ -80,10 +78,7 @@ void hmp_migrate_start_postcopy(Monitor *mon, const QD= ict *qdict); > void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict); > void hmp_set_password(Monitor *mon, const QDict *qdict); > void hmp_expire_password(Monitor *mon, const QDict *qdict); > -void hmp_eject(Monitor *mon, const QDict *qdict); > void hmp_change(Monitor *mon, const QDict *qdict); > -void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict); > -void hmp_block_stream(Monitor *mon, const QDict *qdict); > void hmp_migrate(Monitor *mon, const QDict *qdict); > void hmp_device_add(Monitor *mon, const QDict *qdict); > void hmp_device_del(Monitor *mon, const QDict *qdict); > @@ -98,7 +93,6 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict); > void hmp_chardev_change(Monitor *mon, const QDict *qdict); > void hmp_chardev_remove(Monitor *mon, const QDict *qdict); > void hmp_chardev_send_break(Monitor *mon, const QDict *qdict); > -void hmp_qemu_io(Monitor *mon, const QDict *qdict); > void hmp_cpu_add(Monitor *mon, const QDict *qdict); > void hmp_object_add(Monitor *mon, const QDict *qdict); > void hmp_object_del(Monitor *mon, const QDict *qdict); > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 67d2ca8a4c..c224e0f338 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -46,7 +46,6 @@ > #include "qom/object_interfaces.h" > #include "ui/console.h" > #include "block/qapi.h" > -#include "qemu-io.h" > #include "qemu/cutils.h" > #include "qemu/error-report.h" > #include "exec/ramlist.h" > @@ -1307,16 +1306,6 @@ void hmp_set_link(Monitor *mon, const QDict *qdict= ) > hmp_handle_error(mon, err); > } > =20 > -void hmp_block_passwd(Monitor *mon, const QDict *qdict) > -{ > - const char *device =3D qdict_get_str(qdict, "device"); > - const char *password =3D qdict_get_str(qdict, "password"); > - Error *err =3D NULL; > - > - qmp_block_passwd(true, device, false, NULL, password, &err); > - hmp_handle_error(mon, err); > -} > - > void hmp_balloon(Monitor *mon, const QDict *qdict) > { > int64_t value =3D qdict_get_int(qdict, "value"); > @@ -1326,16 +1315,6 @@ void hmp_balloon(Monitor *mon, const QDict *qdict) > hmp_handle_error(mon, err); > } > =20 > -void hmp_block_resize(Monitor *mon, const QDict *qdict) > -{ > - const char *device =3D qdict_get_str(qdict, "device"); > - int64_t size =3D qdict_get_int(qdict, "size"); > - Error *err =3D NULL; > - > - qmp_block_resize(true, device, false, NULL, size, &err); > - hmp_handle_error(mon, err); > -} > - > void hmp_loadvm(Monitor *mon, const QDict *qdict) > { > int saved_vm_running =3D runstate_is_running(); > @@ -1818,15 +1797,6 @@ void hmp_expire_password(Monitor *mon, const QDict= *qdict) > hmp_handle_error(mon, err); > } > =20 > -void hmp_eject(Monitor *mon, const QDict *qdict) > -{ > - bool force =3D qdict_get_try_bool(qdict, "force", false); > - const char *device =3D qdict_get_str(qdict, "device"); > - Error *err =3D NULL; > - > - qmp_eject(true, device, false, NULL, true, force, &err); > - hmp_handle_error(mon, err); > -} > =20 > #ifdef CONFIG_VNC > static void hmp_change_read_arg(void *opaque, const char *password, > @@ -1884,49 +1854,6 @@ void hmp_change(Monitor *mon, const QDict *qdict) > hmp_handle_error(mon, err); > } > =20 > -void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict) > -{ > - Error *err =3D NULL; > - char *device =3D (char *) qdict_get_str(qdict, "device"); > - BlockIOThrottle throttle =3D { > - .bps =3D qdict_get_int(qdict, "bps"), > - .bps_rd =3D qdict_get_int(qdict, "bps_rd"), > - .bps_wr =3D qdict_get_int(qdict, "bps_wr"), > - .iops =3D qdict_get_int(qdict, "iops"), > - .iops_rd =3D qdict_get_int(qdict, "iops_rd"), > - .iops_wr =3D qdict_get_int(qdict, "iops_wr"), > - }; > - > - /* qmp_block_set_io_throttle has separate parameters for the > - * (deprecated) block device name and the qdev ID but the HMP > - * version has only one, so we must decide which one to pass. */ > - if (blk_by_name(device)) { > - throttle.has_device =3D true; > - throttle.device =3D device; > - } else { > - throttle.has_id =3D true; > - throttle.id =3D device; > - } > - > - qmp_block_set_io_throttle(&throttle, &err); > - hmp_handle_error(mon, err); > -} > - > -void hmp_block_stream(Monitor *mon, const QDict *qdict) > -{ > - Error *error =3D NULL; > - const char *device =3D qdict_get_str(qdict, "device"); > - const char *base =3D qdict_get_try_str(qdict, "base"); > - int64_t speed =3D qdict_get_try_int(qdict, "speed", 0); > - > - qmp_block_stream(true, device, device, base !=3D NULL, base, false, = NULL, > - false, NULL, qdict_haskey(qdict, "speed"), speed, t= rue, > - BLOCKDEV_ON_ERROR_REPORT, false, false, false, fals= e, > - &error); > - > - hmp_handle_error(mon, error); > -} > - > typedef struct HMPMigrationStatus > { > QEMUTimer *timer; > @@ -2219,70 +2146,6 @@ void hmp_chardev_send_break(Monitor *mon, const QD= ict *qdict) > hmp_handle_error(mon, local_err); > } > =20 > -void hmp_qemu_io(Monitor *mon, const QDict *qdict) > -{ > - BlockBackend *blk; > - BlockBackend *local_blk =3D NULL; > - bool qdev =3D qdict_get_try_bool(qdict, "qdev", false); > - const char* device =3D qdict_get_str(qdict, "device"); > - const char* command =3D qdict_get_str(qdict, "command"); > - Error *err =3D NULL; > - int ret; > - > - if (qdev) { > - blk =3D blk_by_qdev_id(device, &err); > - if (!blk) { > - goto fail; > - } > - } else { > - blk =3D blk_by_name(device); > - if (!blk) { > - BlockDriverState *bs =3D bdrv_lookup_bs(NULL, device, &err); > - if (bs) { > - blk =3D local_blk =3D blk_new(bdrv_get_aio_context(bs), > - 0, BLK_PERM_ALL); > - ret =3D blk_insert_bs(blk, bs, &err); > - if (ret < 0) { > - goto fail; > - } > - } else { > - goto fail; > - } > - } > - } > - > - /* > - * Notably absent: Proper permission management. This is sad, but it= seems > - * almost impossible to achieve without changing the semantics and t= hereby > - * limiting the use cases of the qemu-io HMP command. > - * > - * In an ideal world we would unconditionally create a new BlockBack= end for > - * qemuio_command(), but we have commands like 'reopen' and want the= m to > - * take effect on the exact BlockBackend whose name the user passed = instead > - * of just on a temporary copy of it. > - * > - * Another problem is that deleting the temporary BlockBackend invol= ves > - * draining all requests on it first, but some qemu-iotests cases wa= nt to > - * issue multiple aio_read/write requests and expect them to complet= e in > - * the background while the monitor has already returned. > - * > - * This is also what prevents us from saving the original permission= s and > - * restoring them later: We can't revoke permissions until all reque= sts > - * have completed, and we don't know when that is nor can we really = let > - * anything else run before we have revoken them to avoid race condi= tions. > - * > - * What happens now is that command() in qemu-io-cmds.c can extend t= he > - * permissions if necessary for the qemu-io command. And they simply= stay > - * extended, possibly resulting in a read-only guest device keeping = write > - * permissions. Ugly, but it appears to be the lesser evil. > - */ > - qemuio_command(blk, command); > - > -fail: > - blk_unref(local_blk); > - hmp_handle_error(mon, err); > -} > - > void hmp_object_del(Monitor *mon, const QDict *qdict) > { > const char *id =3D qdict_get_str(qdict, "id"); > --=20 > 2.17.2 >=20 -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK