Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813846/?format=api
{ "id": 813846, "url": "http://patchwork.ozlabs.org/api/patches/813846/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-8-eblake@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": "<20170914144032.14945-8-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-14T14:40:19", "name": "[v3,07/20] iscsi: Switch to .bdrv_co_block_status()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ef1421531efa02ba4cbb3a6f419e0061484a6961", "submitter": { "id": 6591, "url": "http://patchwork.ozlabs.org/api/people/6591/?format=api", "name": "Eric Blake", "email": "eblake@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-8-eblake@redhat.com/mbox/", "series": [ { "id": 3114, "url": "http://patchwork.ozlabs.org/api/series/3114/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3114", "date": "2017-09-14T14:40:12", "name": "add byte-based block_status driver callbacks", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/3114/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/813846/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813846/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@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 3xtLpn01q9z9sPk\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Sep 2017 00:42:25 +1000 (AEST)", "from localhost ([::1]:48175 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 1dsVLT-0006Et-37\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:42:23 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:46555)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dsVKR-0005x5-9g\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:20 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dsVKM-0002fd-Rt\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:19 -0400", "from mx1.redhat.com ([209.132.183.28]:49224)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>)\n\tid 1dsVK9-0002UP-OC; Thu, 14 Sep 2017 10:41:01 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 B74DE80472;\n\tThu, 14 Sep 2017 14:41:00 +0000 (UTC)", "from red.redhat.com (ovpn-123-70.rdu2.redhat.com [10.10.123.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2EEBD17AC7;\n\tThu, 14 Sep 2017 14:40:58 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com B74DE80472", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Thu, 14 Sep 2017 09:40:19 -0500", "Message-Id": "<20170914144032.14945-8-eblake@redhat.com>", "In-Reply-To": "<20170914144032.14945-1-eblake@redhat.com>", "References": "<20170914144032.14945-1-eblake@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tThu, 14 Sep 2017 14:41:00 +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 07/20] iscsi: Switch to\n\t.bdrv_co_block_status()", "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": "kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org,\n\tPeter Lieven <pl@kamp.de>, Max Reitz <mreitz@redhat.com>,\n\tRonnie Sahlberg <ronniesahlberg@gmail.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>, jsnow@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": "We are gradually moving away from sector-based interfaces, towards\nbyte-based. Update the iscsi driver accordingly. In this case,\nit is handy to teach iscsi_co_block_status() to handle a NULL file\nparameter, even though the block layer passes a non-NULL value,\nbecause we also call the function directly. For now, there are\nno optimizations done based on the mapping flag.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv2: rebase to mapping parameter\n---\n block/iscsi.c | 54 ++++++++++++++++++++++++++----------------------------\n 1 file changed, 26 insertions(+), 28 deletions(-)", "diff": "diff --git a/block/iscsi.c b/block/iscsi.c\nindex 5af145194d..ab125a6340 100644\n--- a/block/iscsi.c\n+++ b/block/iscsi.c\n@@ -680,9 +680,10 @@ out_unlock:\n\n\n\n-static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,\n- int64_t sector_num,\n- int nb_sectors, int *pnum,\n+static int64_t coroutine_fn iscsi_co_block_status(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t bytes, int64_t *pnum,\n BlockDriverState **file)\n {\n IscsiLun *iscsilun = bs->opaque;\n@@ -693,15 +694,15 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,\n\n iscsi_co_init_iscsitask(iscsilun, &iTask);\n\n- if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {\n+ if (!is_byte_request_lun_aligned(offset, bytes, iscsilun)) {\n ret = -EINVAL;\n goto out;\n }\n\n /* default to all sectors allocated */\n ret = BDRV_BLOCK_DATA;\n- ret |= (sector_num << BDRV_SECTOR_BITS) | BDRV_BLOCK_OFFSET_VALID;\n- *pnum = nb_sectors;\n+ ret |= (offset & BDRV_BLOCK_OFFSET_MASK) | BDRV_BLOCK_OFFSET_VALID;\n+ *pnum = bytes;\n\n /* LUN does not support logical block provisioning */\n if (!iscsilun->lbpme) {\n@@ -711,7 +712,7 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,\n qemu_mutex_lock(&iscsilun->mutex);\n retry:\n if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun,\n- sector_qemu2lun(sector_num, iscsilun),\n+ offset / iscsilun->block_size,\n 8 + 16, iscsi_co_generic_cb,\n &iTask) == NULL) {\n ret = -ENOMEM;\n@@ -750,12 +751,12 @@ retry:\n\n lbasd = &lbas->descriptors[0];\n\n- if (sector_qemu2lun(sector_num, iscsilun) != lbasd->lba) {\n+ if (offset / iscsilun->block_size != lbasd->lba) {\n ret = -EIO;\n goto out_unlock;\n }\n\n- *pnum = sector_lun2qemu(lbasd->num_blocks, iscsilun);\n+ *pnum = lbasd->num_blocks * iscsilun->block_size;\n\n if (lbasd->provisioning == SCSI_PROVISIONING_TYPE_DEALLOCATED ||\n lbasd->provisioning == SCSI_PROVISIONING_TYPE_ANCHORED) {\n@@ -766,15 +767,13 @@ retry:\n }\n\n if (ret & BDRV_BLOCK_ZERO) {\n- iscsi_allocmap_set_unallocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n- *pnum * BDRV_SECTOR_SIZE);\n+ iscsi_allocmap_set_unallocated(iscsilun, offset, *pnum);\n } else {\n- iscsi_allocmap_set_allocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n- *pnum * BDRV_SECTOR_SIZE);\n+ iscsi_allocmap_set_allocated(iscsilun, offset, *pnum);\n }\n\n- if (*pnum > nb_sectors) {\n- *pnum = nb_sectors;\n+ if (*pnum > bytes) {\n+ *pnum = bytes;\n }\n out_unlock:\n qemu_mutex_unlock(&iscsilun->mutex);\n@@ -782,7 +781,7 @@ out:\n if (iTask.task != NULL) {\n scsi_free_scsi_task(iTask.task);\n }\n- if (ret > 0 && ret & BDRV_BLOCK_OFFSET_VALID) {\n+ if (ret > 0 && ret & BDRV_BLOCK_OFFSET_VALID && file) {\n *file = bs;\n }\n return ret;\n@@ -821,25 +820,24 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs,\n nb_sectors * BDRV_SECTOR_SIZE) &&\n !iscsi_allocmap_is_allocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n nb_sectors * BDRV_SECTOR_SIZE)) {\n- int pnum;\n- BlockDriverState *file;\n+ int64_t pnum;\n /* check the block status from the beginning of the cluster\n * containing the start sector */\n- int cluster_sectors = iscsilun->cluster_size >> BDRV_SECTOR_BITS;\n- int head;\n+ int64_t head;\n int64_t ret;\n\n- assert(cluster_sectors);\n- head = sector_num % cluster_sectors;\n- ret = iscsi_co_get_block_status(bs, sector_num - head,\n- BDRV_REQUEST_MAX_SECTORS, &pnum,\n- &file);\n+ assert(iscsilun->cluster_size);\n+ head = (sector_num * BDRV_SECTOR_SIZE) % iscsilun->cluster_size;\n+ ret = iscsi_co_block_status(bs, false,\n+ sector_num * BDRV_SECTOR_SIZE - head,\n+ BDRV_REQUEST_MAX_BYTES, &pnum, NULL);\n if (ret < 0) {\n return ret;\n }\n /* if the whole request falls into an unallocated area we can avoid\n * reading and directly return zeroes instead */\n- if (ret & BDRV_BLOCK_ZERO && pnum >= nb_sectors + head) {\n+ if (ret & BDRV_BLOCK_ZERO &&\n+ pnum >= nb_sectors * BDRV_SECTOR_SIZE + head) {\n qemu_iovec_memset(iov, 0, 0x00, iov->size);\n return 0;\n }\n@@ -2225,7 +2223,7 @@ static BlockDriver bdrv_iscsi = {\n .bdrv_truncate = iscsi_truncate,\n .bdrv_refresh_limits = iscsi_refresh_limits,\n\n- .bdrv_co_get_block_status = iscsi_co_get_block_status,\n+ .bdrv_co_block_status = iscsi_co_block_status,\n .bdrv_co_pdiscard = iscsi_co_pdiscard,\n .bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,\n .bdrv_co_readv = iscsi_co_readv,\n@@ -2260,7 +2258,7 @@ static BlockDriver bdrv_iser = {\n .bdrv_truncate = iscsi_truncate,\n .bdrv_refresh_limits = iscsi_refresh_limits,\n\n- .bdrv_co_get_block_status = iscsi_co_get_block_status,\n+ .bdrv_co_block_status = iscsi_co_block_status,\n .bdrv_co_pdiscard = iscsi_co_pdiscard,\n .bdrv_co_pwrite_zeroes = iscsi_co_pwrite_zeroes,\n .bdrv_co_readv = iscsi_co_readv,\n", "prefixes": [ "v3", "07/20" ] }