Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812800/?format=api
{ "id": 812800, "url": "http://patchwork.ozlabs.org/api/patches/812800/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912112855.24269-6-berrange@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170912112855.24269-6-berrange@redhat.com>", "list_archive_url": null, "date": "2017-09-12T11:28:53", "name": "[v3,5/7] block: convert crypto driver to bdrv_co_preadv|pwritev", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1ba0cc2d4e2ff3bb69ff44c276a08bb9518a53d6", "submitter": { "id": 2694, "url": "http://patchwork.ozlabs.org/api/people/2694/?format=api", "name": "Daniel P. Berrangé", "email": "berrange@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912112855.24269-6-berrange@redhat.com/mbox/", "series": [ { "id": 2673, "url": "http://patchwork.ozlabs.org/api/series/2673/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2673", "date": "2017-09-12T11:28:48", "name": "Misc improvements to crypto block driver", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/2673/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812800/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812800/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xs2hw51ypz9s7B\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 21:32:48 +1000 (AEST)", "from localhost ([::1]:35021 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1drjQs-0005Zb-4w\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 07:32:46 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:53893)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <berrange@redhat.com>) id 1drjNV-00035Y-Io\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:18 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <berrange@redhat.com>) id 1drjNU-0004UE-8P\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:17 -0400", "from mx1.redhat.com ([209.132.183.28]:38578)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <berrange@redhat.com>)\n\tid 1drjNQ-0004RW-7w; Tue, 12 Sep 2017 07:29:12 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 3D8E980F75;\n\tTue, 12 Sep 2017 11:29:11 +0000 (UTC)", "from localhost.localdomain.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 065D56C41C;\n\tTue, 12 Sep 2017 11:29:09 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 3D8E980F75", "From": "\"Daniel P. Berrange\" <berrange@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 12:28:53 +0100", "Message-Id": "<20170912112855.24269-6-berrange@redhat.com>", "In-Reply-To": "<20170912112855.24269-1-berrange@redhat.com>", "References": "<20170912112855.24269-1-berrange@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tTue, 12 Sep 2017 11:29:11 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v3 5/7] block: convert crypto driver to\n\tbdrv_co_preadv|pwritev", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org,\n\tStefan Hajnoczi <stefanha@gmail.com>, Max Reitz <mreitz@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Make the crypto driver implement the bdrv_co_preadv|pwritev\ncallbacks, and also use bdrv_co_preadv|pwritev for I/O\nwith the protocol driver beneath.\n\nSigned-off-by: Daniel P. Berrange <berrange@redhat.com>\n---\n block/crypto.c | 104 +++++++++++++++++++++++++++++++--------------------------\n 1 file changed, 56 insertions(+), 48 deletions(-)", "diff": "diff --git a/block/crypto.c b/block/crypto.c\nindex 49d6d4c058..d004e9cef4 100644\n--- a/block/crypto.c\n+++ b/block/crypto.c\n@@ -383,19 +383,23 @@ static void block_crypto_close(BlockDriverState *bs)\n #define BLOCK_CRYPTO_MAX_SECTORS 2048\n \n static coroutine_fn int\n-block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n- int remaining_sectors, QEMUIOVector *qiov)\n+block_crypto_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n+ QEMUIOVector *qiov, int flags)\n {\n BlockCrypto *crypto = bs->opaque;\n- int cur_nr_sectors; /* number of sectors in current iteration */\n+ uint64_t cur_bytes; /* number of bytes in current iteration */\n uint64_t bytes_done = 0;\n uint8_t *cipher_data = NULL;\n QEMUIOVector hd_qiov;\n int ret = 0;\n uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);\n- uint64_t payload_offset =\n- qcrypto_block_get_payload_offset(crypto->block) / sector_size;\n- assert(payload_offset < (INT64_MAX / 512));\n+ size_t payload_offset = qcrypto_block_get_payload_offset(crypto->block);\n+ uint64_t sector_num = offset / sector_size;\n+\n+ assert(!flags);\n+ assert(payload_offset < INT64_MAX);\n+ assert(QEMU_IS_ALIGNED(offset, sector_size));\n+ assert(QEMU_IS_ALIGNED(bytes, sector_size));\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n \n@@ -410,37 +414,33 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n goto cleanup;\n }\n \n- while (remaining_sectors) {\n- cur_nr_sectors = remaining_sectors;\n+ while (bytes) {\n+ cur_bytes = bytes;\n \n- if (cur_nr_sectors > BLOCK_CRYPTO_MAX_SECTORS) {\n- cur_nr_sectors = BLOCK_CRYPTO_MAX_SECTORS;\n+ if (cur_bytes > (BLOCK_CRYPTO_MAX_SECTORS * sector_size)) {\n+ cur_bytes = BLOCK_CRYPTO_MAX_SECTORS * sector_size;\n }\n \n qemu_iovec_reset(&hd_qiov);\n- qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * sector_size);\n+ qemu_iovec_add(&hd_qiov, cipher_data, cur_bytes);\n \n- ret = bdrv_co_readv(bs->file,\n- payload_offset + sector_num,\n- cur_nr_sectors, &hd_qiov);\n+ ret = bdrv_co_preadv(bs->file, payload_offset + offset + bytes_done,\n+ cur_bytes, &hd_qiov, 0);\n if (ret < 0) {\n goto cleanup;\n }\n \n- if (qcrypto_block_decrypt(crypto->block,\n- sector_num,\n- cipher_data, cur_nr_sectors * sector_size,\n- NULL) < 0) {\n+ if (qcrypto_block_decrypt(crypto->block, sector_num, cipher_data,\n+ cur_bytes, NULL) < 0) {\n ret = -EIO;\n goto cleanup;\n }\n \n- qemu_iovec_from_buf(qiov, bytes_done,\n- cipher_data, cur_nr_sectors * sector_size);\n+ qemu_iovec_from_buf(qiov, bytes_done, cipher_data, cur_bytes);\n \n- remaining_sectors -= cur_nr_sectors;\n- sector_num += cur_nr_sectors;\n- bytes_done += cur_nr_sectors * sector_size;\n+ sector_num += cur_bytes / sector_size;\n+ bytes -= cur_bytes;\n+ bytes_done += cur_bytes;\n }\n \n cleanup:\n@@ -452,19 +452,23 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n \n \n static coroutine_fn int\n-block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n- int remaining_sectors, QEMUIOVector *qiov)\n+block_crypto_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,\n+ QEMUIOVector *qiov, int flags)\n {\n BlockCrypto *crypto = bs->opaque;\n- int cur_nr_sectors; /* number of sectors in current iteration */\n+ uint64_t cur_bytes; /* number of bytes in current iteration */\n uint64_t bytes_done = 0;\n uint8_t *cipher_data = NULL;\n QEMUIOVector hd_qiov;\n int ret = 0;\n uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);\n- uint64_t payload_offset =\n- qcrypto_block_get_payload_offset(crypto->block) / sector_size;\n- assert(payload_offset < (INT64_MAX / 512));\n+ uint64_t payload_offset = qcrypto_block_get_payload_offset(crypto->block);\n+ uint64_t sector_num = offset / sector_size;\n+\n+ assert(!flags);\n+ assert(payload_offset < INT64_MAX);\n+ assert(QEMU_IS_ALIGNED(offset, sector_size));\n+ assert(QEMU_IS_ALIGNED(bytes, sector_size));\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n \n@@ -479,37 +483,33 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n goto cleanup;\n }\n \n- while (remaining_sectors) {\n- cur_nr_sectors = remaining_sectors;\n+ while (bytes) {\n+ cur_bytes = bytes;\n \n- if (cur_nr_sectors > BLOCK_CRYPTO_MAX_SECTORS) {\n- cur_nr_sectors = BLOCK_CRYPTO_MAX_SECTORS;\n+ if (cur_bytes > (BLOCK_CRYPTO_MAX_SECTORS * sector_size)) {\n+ cur_bytes = BLOCK_CRYPTO_MAX_SECTORS * sector_size;\n }\n \n- qemu_iovec_to_buf(qiov, bytes_done,\n- cipher_data, cur_nr_sectors * sector_size);\n+ qemu_iovec_to_buf(qiov, bytes_done, cipher_data, cur_bytes);\n \n- if (qcrypto_block_encrypt(crypto->block,\n- sector_num,\n- cipher_data, cur_nr_sectors * sector_size,\n- NULL) < 0) {\n+ if (qcrypto_block_encrypt(crypto->block, sector_num, cipher_data,\n+ cur_bytes, NULL) < 0) {\n ret = -EIO;\n goto cleanup;\n }\n \n qemu_iovec_reset(&hd_qiov);\n- qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * sector_size);\n+ qemu_iovec_add(&hd_qiov, cipher_data, cur_bytes);\n \n- ret = bdrv_co_writev(bs->file,\n- payload_offset + sector_num,\n- cur_nr_sectors, &hd_qiov);\n+ ret = bdrv_co_pwritev(bs->file, payload_offset + offset + bytes_done,\n+ cur_bytes, &hd_qiov, 0);\n if (ret < 0) {\n goto cleanup;\n }\n \n- remaining_sectors -= cur_nr_sectors;\n- sector_num += cur_nr_sectors;\n- bytes_done += cur_nr_sectors * sector_size;\n+ sector_num += cur_bytes / sector_size;\n+ bytes -= cur_bytes;\n+ bytes_done += cur_bytes;\n }\n \n cleanup:\n@@ -519,6 +519,13 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n return ret;\n }\n \n+static void block_crypto_refresh_limits(BlockDriverState *bs, Error **errp)\n+{\n+ BlockCrypto *crypto = bs->opaque;\n+ uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);\n+ bs->bl.request_alignment = sector_size; /* No sub-sector I/O */\n+}\n+\n \n static int64_t block_crypto_getlength(BlockDriverState *bs)\n {\n@@ -618,8 +625,9 @@ BlockDriver bdrv_crypto_luks = {\n .bdrv_truncate = block_crypto_truncate,\n .create_opts = &block_crypto_create_opts_luks,\n \n- .bdrv_co_readv = block_crypto_co_readv,\n- .bdrv_co_writev = block_crypto_co_writev,\n+ .bdrv_refresh_limits = block_crypto_refresh_limits,\n+ .bdrv_co_preadv = block_crypto_co_preadv,\n+ .bdrv_co_pwritev = block_crypto_co_pwritev,\n .bdrv_getlength = block_crypto_getlength,\n .bdrv_get_info = block_crypto_get_info_luks,\n .bdrv_get_specific_info = block_crypto_get_specific_info_luks,\n", "prefixes": [ "v3", "5/7" ] }