From nobody Sun May 5 19:37:48 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; 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=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518203633824829.7540406638842; Fri, 9 Feb 2018 11:13:53 -0800 (PST) Received: from localhost ([::1]:58611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekE7C-0002Eo-DR for importer@patchew.org; Fri, 09 Feb 2018 14:13:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekE2G-0006lE-38 for qemu-devel@nongnu.org; Fri, 09 Feb 2018 14:08:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekE2F-00007H-0r for qemu-devel@nongnu.org; Fri, 09 Feb 2018 14:08:36 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56292 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ekE28-0008Vo-6Y; Fri, 09 Feb 2018 14:08:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D809C26EDA; Fri, 9 Feb 2018 19:08:27 +0000 (UTC) Received: from red.redhat.com (ovpn-122-122.rdu2.redhat.com [10.10.122.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38E93100F9EC; Fri, 9 Feb 2018 19:08:27 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 9 Feb 2018 13:08:23 -0600 Message-Id: <20180209190824.32221-2-eblake@redhat.com> In-Reply-To: <20180209190824.32221-1-eblake@redhat.com> References: <20180209190824.32221-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 09 Feb 2018 19:08:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 09 Feb 2018 19:08:27 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 1/2] iotests: 205: support luks format 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , "open list:Block layer core" , Max Reitz 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Support default luks options in VM.add_drive and in new library function qemu_img_create. Use it in 205 iotests. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20180206182507.21753-1-vsementsov@virtuozzo.com> Reviewed-by: Daniel P. Berrange Signed-off-by: Eric Blake --- tests/qemu-iotests/205 | 4 ++-- tests/qemu-iotests/iotests.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205 index 10388920dc3..e7b2eae51d5 100644 --- a/tests/qemu-iotests/205 +++ b/tests/qemu-iotests/205 @@ -22,7 +22,7 @@ import os import sys import iotests import time -from iotests import qemu_img, qemu_io, filter_qemu_io, QemuIoInteractive +from iotests import qemu_img_create, qemu_io, filter_qemu_io, QemuIoIntera= ctive nbd_sock =3D 'nbd_sock' nbd_uri =3D 'nbd+unix:///exp?socket=3D' + nbd_sock @@ -31,7 +31,7 @@ disk =3D os.path.join(iotests.test_dir, 'disk') class TestNbdServerRemove(iotests.QMPTestCase): def setUp(self): - qemu_img('create', '-f', iotests.imgfmt, disk, '1M') + qemu_img_create('-f', iotests.imgfmt, disk, '1M') self.vm =3D iotests.VM().add_drive(disk) self.vm.launch() diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 5a10b2d5345..1bcc9ca57dc 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -58,6 +58,11 @@ qemu_default_machine =3D os.environ.get('QEMU_DEFAULT_MA= CHINE') socket_scm_helper =3D os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_help= er') debug =3D False +luks_default_secret_object =3D 'secret,id=3Dkeysec0,data=3D' + \ + os.environ['IMGKEYSECRET'] +luks_default_key_secret_opt =3D 'key-secret=3Dkeysec0' + + def qemu_img(*args): '''Run qemu-img and return the exit code''' devnull =3D open('/dev/null', 'r+') @@ -66,6 +71,25 @@ def qemu_img(*args): sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode,= ' '.join(qemu_img_args + list(args)))) return exitcode +def qemu_img_create(*args): + args =3D list(args) + + # default luks support + if '-f' in args and args[args.index('-f') + 1] =3D=3D 'luks': + if '-o' in args: + i =3D args.index('-o') + if 'key-secret' not in args[i + 1]: + args[i + 1].append(luks_default_key_secret_opt) + args.insert(i + 2, '--object') + args.insert(i + 3, luks_default_secret_object) + else: + args =3D ['-o', luks_default_key_secret_opt, + '--object', luks_default_secret_object] + args + + args.insert(0, 'create') + + return qemu_img(*args) + def qemu_img_verbose(*args): '''Run qemu-img without suppressing its output and return the exit cod= e''' exitcode =3D subprocess.call(qemu_img_args + list(args)) @@ -263,6 +287,13 @@ class VM(qtest.QEMUQtestMachine): if opts: options.append(opts) + if format =3D=3D 'luks' and 'key-secret' not in opts: + # default luks support + if luks_default_secret_object not in self._args: + self.add_object(luks_default_secret_object) + + options.append(luks_default_key_secret_opt) + self._args.append('-drive') self._args.append(','.join(options)) self._num_drives +=3D 1 --=20 2.14.3 From nobody Sun May 5 19:37:48 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; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518203762744614.9190457838117; Fri, 9 Feb 2018 11:16:02 -0800 (PST) Received: from localhost ([::1]:58863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekE9Q-0004L7-RC for importer@patchew.org; Fri, 09 Feb 2018 14:16:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekE2G-0006m9-Nh for qemu-devel@nongnu.org; Fri, 09 Feb 2018 14:08:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekE2F-00007M-1q for qemu-devel@nongnu.org; Fri, 09 Feb 2018 14:08:36 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56234 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ekE2A-00005Q-Qc; Fri, 09 Feb 2018 14:08:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7328140FB630; Fri, 9 Feb 2018 19:08:30 +0000 (UTC) Received: from red.redhat.com (ovpn-122-122.rdu2.redhat.com [10.10.122.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10E47100F9F1; Fri, 9 Feb 2018 19:08:28 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 9 Feb 2018 13:08:24 -0600 Message-Id: <20180209190824.32221-3-eblake@redhat.com> In-Reply-To: <20180209190824.32221-1-eblake@redhat.com> References: <20180209190824.32221-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 09 Feb 2018 19:08:30 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 09 Feb 2018 19:08:30 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 2/2] block: Simplify bdrv_can_write_zeroes_with_unmap() 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: Kevin Wolf , Ronnie Sahlberg , "open list:Block layer core" , Peter Lieven , Max Reitz , Stefan Hajnoczi , Paolo Bonzini 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We don't need the can_write_zeroes_with_unmap field in BlockDriverInfo, because it is redundant information with supported_zero_flags & BDRV_REQ_MAY_UNMAP. Note that BlockDriverInfo and supported_zero_flags are both per-device settings, rather than global state about the driver as a whole, which means one or both of these bits of information can already be conditional. Let's audit how they were set: crypto: always setting can_write_ to false is pointless (the struct starts life zero-initialized), no use of supported_ nbd: just recently fixed to set can_write_ if supported_ includes MAY_UNMAP (thus this commit effectively reverts bca80059e and solves the problem mentioned there in a more global way) file-posix, iscsi, qcow2: can_write_ is conditional, while supported_ was unconditional; but passing MAY_UNMAP would fail with ENOTSUP if the condition wasn't met qed: can_write_ is unconditional, but pwrite_zeroes lacks support for MAY_UNMAP and supported_ is not set. Perhaps support can be added later (since it would be similar to qcow2), but for now claiming false is no real loss all other drivers: can_write_ is not set, and supported_ is either unset or a passthrough Simplify the code by moving the conditional into supported_zero_flags for all drivers, then dropping the now-unused BDI field. For callers that relied on bdrv_can_write_zeroes_with_unmap(), we return the same per-device settings for drivers that had conditions (no observable change in behavior there); and can now return true (instead of false) for drivers that support passthrough (for example, the commit driver) which gives those drivers the same fix as nbd just got in bca80059e. For callers that relied on supported_zero_flags, we now have a few more places that can avoid a wasted call to pwrite_zeroes() that will just fail with ENOTSUP. Suggested-by: Paolo Bonzini Signed-off-by: Eric Blake Message-Id: <20180126193439.20219-1-eblake@redhat.com> Reviewed-by: Stefan Hajnoczi --- include/block/block.h | 11 ----------- block.c | 8 +------- block/crypto.c | 1 - block/file-posix.c | 3 +-- block/iscsi.c | 6 ++++-- block/nbd.c | 11 ----------- block/qcow2.c | 3 +-- block/qed.c | 1 - 8 files changed, 7 insertions(+), 37 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 24ef816960e..19b3ab9cb5e 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -26,17 +26,6 @@ typedef struct BlockDriverInfo { * to the LBPRZ flag in the SCSI logical block provisioning page. */ bool unallocated_blocks_are_zero; - /* - * True if the driver can optimize writing zeroes by unmapping - * sectors. This is equivalent to the BLKDISCARDZEROES ioctl in Linux - * with the difference that in qemu a discard is allowed to silently - * fail. Therefore we have to use bdrv_pwrite_zeroes with the - * BDRV_REQ_MAY_UNMAP flag for an optimized zero write with unmapping. - * After this call the driver has to guarantee that the contents read - * back as zero. It is additionally required that the block device is - * opened with BDRV_O_UNMAP flag for this to work. - */ - bool can_write_zeroes_with_unmap; /* * True if this block driver only supports compressed writes */ diff --git a/block.c b/block.c index f94585b2304..814e5a02da6 100644 --- a/block.c +++ b/block.c @@ -4010,17 +4010,11 @@ bool bdrv_unallocated_blocks_are_zero(BlockDriverSt= ate *bs) bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs) { - BlockDriverInfo bdi; - if (!(bs->open_flags & BDRV_O_UNMAP)) { return false; } - if (bdrv_get_info(bs, &bdi) =3D=3D 0) { - return bdi.can_write_zeroes_with_unmap; - } - - return false; + return bs->supported_zero_flags & BDRV_REQ_MAY_UNMAP; } const char *bdrv_get_encrypted_filename(BlockDriverState *bs) diff --git a/block/crypto.c b/block/crypto.c index 70e3691cd84..3df66947c5a 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -576,7 +576,6 @@ static int block_crypto_get_info_luks(BlockDriverState = *bs, } bdi->unallocated_blocks_are_zero =3D false; - bdi->can_write_zeroes_with_unmap =3D false; bdi->cluster_size =3D subbdi.cluster_size; return 0; diff --git a/block/file-posix.c b/block/file-posix.c index dd8d7cbbd21..ca49c1a98ae 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -549,7 +549,6 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, s->has_discard =3D true; s->has_write_zeroes =3D true; - bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP; if ((bs->open_flags & BDRV_O_NOCACHE) !=3D 0) { s->needs_alignment =3D true; } @@ -599,6 +598,7 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, } #endif + bs->supported_zero_flags =3D s->discard_zeroes ? BDRV_REQ_MAY_UNMAP : = 0; ret =3D 0; fail: if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) { @@ -2223,7 +2223,6 @@ static int raw_get_info(BlockDriverState *bs, BlockDr= iverInfo *bdi) BDRVRawState *s =3D bs->opaque; bdi->unallocated_blocks_are_zero =3D s->discard_zeroes; - bdi->can_write_zeroes_with_unmap =3D s->discard_zeroes; return 0; } diff --git a/block/iscsi.c b/block/iscsi.c index 9f99ae5e07b..421983dd6ff 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1877,7 +1877,6 @@ static int iscsi_open(BlockDriverState *bs, QDict *op= tions, int flags, if (iscsilun->dpofua) { bs->supported_write_flags =3D BDRV_REQ_FUA; } - bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP; /* Check the write protect flag of the LUN if we want to write */ if (iscsilun->type =3D=3D TYPE_DISK && (flags & BDRV_O_RDWR) && @@ -1961,6 +1960,10 @@ static int iscsi_open(BlockDriverState *bs, QDict *o= ptions, int flags, } } + if (iscsilun->lbprz && iscsilun->lbp.lbpws) { + bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP; + } + out: qemu_opts_del(opts); g_free(initiator_name); @@ -2160,7 +2163,6 @@ static int iscsi_get_info(BlockDriverState *bs, Block= DriverInfo *bdi) { IscsiLun *iscsilun =3D bs->opaque; bdi->unallocated_blocks_are_zero =3D iscsilun->lbprz; - bdi->can_write_zeroes_with_unmap =3D iscsilun->lbprz && iscsilun->lbp.= lbpws; bdi->cluster_size =3D iscsilun->cluster_sectors * BDRV_SECTOR_SIZE; return 0; } diff --git a/block/nbd.c b/block/nbd.c index 411eeb42a7d..ef81a9f53ba 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -566,14 +566,6 @@ static void nbd_refresh_filename(BlockDriverState *bs,= QDict *options) bs->full_open_options =3D opts; } -static int nbd_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) -{ - if (bs->supported_zero_flags & BDRV_REQ_MAY_UNMAP) { - bdi->can_write_zeroes_with_unmap =3D true; - } - return 0; -} - static BlockDriver bdrv_nbd =3D { .format_name =3D "nbd", .protocol_name =3D "nbd", @@ -591,7 +583,6 @@ static BlockDriver bdrv_nbd =3D { .bdrv_detach_aio_context =3D nbd_detach_aio_context, .bdrv_attach_aio_context =3D nbd_attach_aio_context, .bdrv_refresh_filename =3D nbd_refresh_filename, - .bdrv_get_info =3D nbd_get_info, }; static BlockDriver bdrv_nbd_tcp =3D { @@ -611,7 +602,6 @@ static BlockDriver bdrv_nbd_tcp =3D { .bdrv_detach_aio_context =3D nbd_detach_aio_context, .bdrv_attach_aio_context =3D nbd_attach_aio_context, .bdrv_refresh_filename =3D nbd_refresh_filename, - .bdrv_get_info =3D nbd_get_info, }; static BlockDriver bdrv_nbd_unix =3D { @@ -631,7 +621,6 @@ static BlockDriver bdrv_nbd_unix =3D { .bdrv_detach_aio_context =3D nbd_detach_aio_context, .bdrv_attach_aio_context =3D nbd_attach_aio_context, .bdrv_refresh_filename =3D nbd_refresh_filename, - .bdrv_get_info =3D nbd_get_info, }; static void bdrv_nbd_init(void) diff --git a/block/qcow2.c b/block/qcow2.c index a64a572785d..801e29fc56e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1479,7 +1479,7 @@ static int qcow2_do_open(BlockDriverState *bs, QDict = *options, int flags, /* Initialise locks */ qemu_co_mutex_init(&s->lock); - bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP; + bs->supported_zero_flags =3D header.version >=3D 3 ? BDRV_REQ_MAY_UNMA= P : 0; /* Repair image if dirty */ if (!(flags & (BDRV_O_CHECK | BDRV_O_INACTIVE)) && !bs->read_only && @@ -3771,7 +3771,6 @@ static int qcow2_get_info(BlockDriverState *bs, Block= DriverInfo *bdi) { BDRVQcow2State *s =3D bs->opaque; bdi->unallocated_blocks_are_zero =3D true; - bdi->can_write_zeroes_with_unmap =3D (s->qcow_version >=3D 3); bdi->cluster_size =3D s->cluster_size; bdi->vm_state_offset =3D qcow2_vm_state_offset(s); return 0; diff --git a/block/qed.c b/block/qed.c index 205dbf16e35..c6ff3ab015d 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1438,7 +1438,6 @@ static int bdrv_qed_get_info(BlockDriverState *bs, Bl= ockDriverInfo *bdi) bdi->cluster_size =3D s->header.cluster_size; bdi->is_dirty =3D s->header.features & QED_F_NEED_CHECK; bdi->unallocated_blocks_are_zero =3D true; - bdi->can_write_zeroes_with_unmap =3D true; return 0; } --=20 2.14.3