Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813862/?format=api
{ "id": 813862, "url": "http://patchwork.ozlabs.org/api/patches/813862/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-7-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-7-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-14T14:40:18", "name": "[v3,06/20] iscsi: Switch iscsi_allocmap_update() to byte-based", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4ce30af226de5e07d31ec8d673581ac0afd4c4aa", "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-7-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/813862/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813862/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=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 3xtM562t7qz9sRW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Sep 2017 00:54:50 +1000 (AEST)", "from localhost ([::1]:48240 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 1dsVXU-0003yl-IJ\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:54:48 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:46416)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dsVKG-0005lV-A6\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:10 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dsVKD-0002Y2-IK\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:08 -0400", "from mx1.redhat.com ([209.132.183.28]:50468)\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 1dsVK7-0002Sw-58; Thu, 14 Sep 2017 10:40:59 -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 34EC07E427;\n\tThu, 14 Sep 2017 14:40:58 +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 D27D360841;\n\tThu, 14 Sep 2017 14:40:51 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 34EC07E427", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Thu, 14 Sep 2017 09:40:18 -0500", "Message-Id": "<20170914144032.14945-7-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.27]);\n\tThu, 14 Sep 2017 14:40:58 +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 06/20] iscsi: Switch iscsi_allocmap_update()\n\tto byte-based", "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 converting to byte-based interfaces, as they are\neasier to reason about than sector-based. Convert all uses of\nthe allocmap (no semantic change). Callers that already had bytes\navailable are simpler, and callers that now scale to bytes will be\neasier to switch to byte-based in the future.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv2: rebase to count/bytes rename\n---\n block/iscsi.c | 90 +++++++++++++++++++++++++++++------------------------------\n 1 file changed, 44 insertions(+), 46 deletions(-)", "diff": "diff --git a/block/iscsi.c b/block/iscsi.c\nindex 08f43ddb0c..5af145194d 100644\n--- a/block/iscsi.c\n+++ b/block/iscsi.c\n@@ -488,24 +488,22 @@ static int iscsi_allocmap_init(IscsiLun *iscsilun, int open_flags)\n }\n\n static void\n-iscsi_allocmap_update(IscsiLun *iscsilun, int64_t sector_num,\n- int nb_sectors, bool allocated, bool valid)\n+iscsi_allocmap_update(IscsiLun *iscsilun, int64_t offset,\n+ int64_t bytes, bool allocated, bool valid)\n {\n int64_t cl_num_expanded, nb_cls_expanded, cl_num_shrunk, nb_cls_shrunk;\n- int cluster_sectors = iscsilun->cluster_size >> BDRV_SECTOR_BITS;\n\n if (iscsilun->allocmap == NULL) {\n return;\n }\n /* expand to entirely contain all affected clusters */\n- assert(cluster_sectors);\n- cl_num_expanded = sector_num / cluster_sectors;\n- nb_cls_expanded = DIV_ROUND_UP(sector_num + nb_sectors,\n- cluster_sectors) - cl_num_expanded;\n+ assert(iscsilun->cluster_size);\n+ cl_num_expanded = offset / iscsilun->cluster_size;\n+ nb_cls_expanded = DIV_ROUND_UP(offset + bytes, iscsilun->cluster_size)\n+ - cl_num_expanded;\n /* shrink to touch only completely contained clusters */\n- cl_num_shrunk = DIV_ROUND_UP(sector_num, cluster_sectors);\n- nb_cls_shrunk = (sector_num + nb_sectors) / cluster_sectors\n- - cl_num_shrunk;\n+ cl_num_shrunk = DIV_ROUND_UP(offset, iscsilun->cluster_size);\n+ nb_cls_shrunk = (offset + bytes) / iscsilun->cluster_size - cl_num_shrunk;\n if (allocated) {\n bitmap_set(iscsilun->allocmap, cl_num_expanded, nb_cls_expanded);\n } else {\n@@ -528,26 +526,26 @@ iscsi_allocmap_update(IscsiLun *iscsilun, int64_t sector_num,\n }\n\n static void\n-iscsi_allocmap_set_allocated(IscsiLun *iscsilun, int64_t sector_num,\n- int nb_sectors)\n+iscsi_allocmap_set_allocated(IscsiLun *iscsilun, int64_t offset,\n+ int64_t bytes)\n {\n- iscsi_allocmap_update(iscsilun, sector_num, nb_sectors, true, true);\n+ iscsi_allocmap_update(iscsilun, offset, bytes, true, true);\n }\n\n static void\n-iscsi_allocmap_set_unallocated(IscsiLun *iscsilun, int64_t sector_num,\n- int nb_sectors)\n+iscsi_allocmap_set_unallocated(IscsiLun *iscsilun, int64_t offset,\n+ int64_t bytes)\n {\n /* Note: if cache.direct=on the fifth argument to iscsi_allocmap_update\n * is ignored, so this will in effect be an iscsi_allocmap_set_invalid.\n */\n- iscsi_allocmap_update(iscsilun, sector_num, nb_sectors, false, true);\n+ iscsi_allocmap_update(iscsilun, offset, bytes, false, true);\n }\n\n-static void iscsi_allocmap_set_invalid(IscsiLun *iscsilun, int64_t sector_num,\n- int nb_sectors)\n+static void iscsi_allocmap_set_invalid(IscsiLun *iscsilun, int64_t offset,\n+ int64_t bytes)\n {\n- iscsi_allocmap_update(iscsilun, sector_num, nb_sectors, false, false);\n+ iscsi_allocmap_update(iscsilun, offset, bytes, false, false);\n }\n\n static void iscsi_allocmap_invalidate(IscsiLun *iscsilun)\n@@ -561,34 +559,30 @@ static void iscsi_allocmap_invalidate(IscsiLun *iscsilun)\n }\n\n static inline bool\n-iscsi_allocmap_is_allocated(IscsiLun *iscsilun, int64_t sector_num,\n- int nb_sectors)\n+iscsi_allocmap_is_allocated(IscsiLun *iscsilun, int64_t offset,\n+ int64_t bytes)\n {\n unsigned long size;\n if (iscsilun->allocmap == NULL) {\n return true;\n }\n assert(iscsilun->cluster_size);\n- size = DIV_ROUND_UP(sector_num + nb_sectors,\n- iscsilun->cluster_size >> BDRV_SECTOR_BITS);\n+ size = DIV_ROUND_UP(offset + bytes, iscsilun->cluster_size);\n return !(find_next_bit(iscsilun->allocmap, size,\n- sector_num * BDRV_SECTOR_SIZE /\n- iscsilun->cluster_size) == size);\n+ offset / iscsilun->cluster_size) == size);\n }\n\n static inline bool iscsi_allocmap_is_valid(IscsiLun *iscsilun,\n- int64_t sector_num, int nb_sectors)\n+ int64_t offset, int64_t bytes)\n {\n unsigned long size;\n if (iscsilun->allocmap_valid == NULL) {\n return false;\n }\n assert(iscsilun->cluster_size);\n- size = DIV_ROUND_UP(sector_num + nb_sectors,\n- iscsilun->cluster_size >> BDRV_SECTOR_BITS);\n+ size = DIV_ROUND_UP(offset + bytes, iscsilun->cluster_size);\n return (find_next_zero_bit(iscsilun->allocmap_valid, size,\n- sector_num * BDRV_SECTOR_SIZE /\n- iscsilun->cluster_size) == size);\n+ offset / iscsilun->cluster_size) == size);\n }\n\n static int coroutine_fn\n@@ -670,12 +664,14 @@ retry:\n }\n\n if (iTask.status != SCSI_STATUS_GOOD) {\n- iscsi_allocmap_set_invalid(iscsilun, sector_num, nb_sectors);\n+ iscsi_allocmap_set_invalid(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE);\n r = iTask.err_code;\n goto out_unlock;\n }\n\n- iscsi_allocmap_set_allocated(iscsilun, sector_num, nb_sectors);\n+ iscsi_allocmap_set_allocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE);\n\n out_unlock:\n qemu_mutex_unlock(&iscsilun->mutex);\n@@ -770,9 +766,11 @@ retry:\n }\n\n if (ret & BDRV_BLOCK_ZERO) {\n- iscsi_allocmap_set_unallocated(iscsilun, sector_num, *pnum);\n+ iscsi_allocmap_set_unallocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n+ *pnum * BDRV_SECTOR_SIZE);\n } else {\n- iscsi_allocmap_set_allocated(iscsilun, sector_num, *pnum);\n+ iscsi_allocmap_set_allocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n+ *pnum * BDRV_SECTOR_SIZE);\n }\n\n if (*pnum > nb_sectors) {\n@@ -810,15 +808,19 @@ static int coroutine_fn iscsi_co_readv(BlockDriverState *bs,\n /* if cache.direct is off and we have a valid entry in our allocation map\n * we can skip checking the block status and directly return zeroes if\n * the request falls within an unallocated area */\n- if (iscsi_allocmap_is_valid(iscsilun, sector_num, nb_sectors) &&\n- !iscsi_allocmap_is_allocated(iscsilun, sector_num, nb_sectors)) {\n+ if (iscsi_allocmap_is_valid(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE) &&\n+ !iscsi_allocmap_is_allocated(iscsilun, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE)) {\n qemu_iovec_memset(iov, 0, 0x00, iov->size);\n return 0;\n }\n\n if (nb_sectors >= ISCSI_CHECKALLOC_THRES &&\n- !iscsi_allocmap_is_valid(iscsilun, sector_num, nb_sectors) &&\n- !iscsi_allocmap_is_allocated(iscsilun, sector_num, nb_sectors)) {\n+ !iscsi_allocmap_is_valid(iscsilun, sector_num * BDRV_SECTOR_SIZE,\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 /* check the block status from the beginning of the cluster\n@@ -1187,8 +1189,7 @@ retry:\n goto out_unlock;\n }\n\n- iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,\n- bytes >> BDRV_SECTOR_BITS);\n+ iscsi_allocmap_set_invalid(iscsilun, offset, bytes);\n\n out_unlock:\n qemu_mutex_unlock(&iscsilun->mutex);\n@@ -1286,18 +1287,15 @@ retry:\n }\n\n if (iTask.status != SCSI_STATUS_GOOD) {\n- iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,\n- bytes >> BDRV_SECTOR_BITS);\n+ iscsi_allocmap_set_invalid(iscsilun, offset, bytes);\n r = iTask.err_code;\n goto out_unlock;\n }\n\n if (flags & BDRV_REQ_MAY_UNMAP) {\n- iscsi_allocmap_set_invalid(iscsilun, offset >> BDRV_SECTOR_BITS,\n- bytes >> BDRV_SECTOR_BITS);\n+ iscsi_allocmap_set_invalid(iscsilun, offset, bytes);\n } else {\n- iscsi_allocmap_set_allocated(iscsilun, offset >> BDRV_SECTOR_BITS,\n- bytes >> BDRV_SECTOR_BITS);\n+ iscsi_allocmap_set_allocated(iscsilun, offset, bytes);\n }\n\n out_unlock:\n", "prefixes": [ "v3", "06/20" ] }