From nobody Wed Apr 23 01:43:12 2025
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: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 153123856155489.68081831995653;
Tue, 10 Jul 2018 09:02:41 -0700 (PDT)
Received: from localhost ([::1]:48568 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1fcv68-0004fD-Go
for importer@patchew.org; Tue, 10 Jul 2018 12:02:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44558)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1fcunm-0005Lf-6E
for qemu-devel@nongnu.org; Tue, 10 Jul 2018 11:43:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1fcunl-0001lI-7g
for qemu-devel@nongnu.org; Tue, 10 Jul 2018 11:43:42 -0400
Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38824 helo=mx1.redhat.com)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1fcunf-0001i7-V7; Tue, 10 Jul 2018 11:43:36 -0400
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
[10.11.54.4])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 7ED0985629;
Tue, 10 Jul 2018 15:43:35 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-116-156.ams2.redhat.com
[10.36.116.156])
by smtp.corp.redhat.com (Postfix) with ESMTP id ACC122026D6B;
Tue, 10 Jul 2018 15:43:34 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Tue, 10 Jul 2018 17:42:58 +0200
Message-Id: <20180710154304.18304-19-kwolf@redhat.com>
In-Reply-To: <20180710154304.18304-1-kwolf@redhat.com>
References: <20180710154304.18304-1-kwolf@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.11.55.2]);
Tue, 10 Jul 2018 15:43:35 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]);
Tue, 10 Jul 2018 15:43:35 +0000 (UTC) for IP:'10.11.54.4'
DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com'
HELO:'smtp.corp.redhat.com' FROM:'kwolf@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 18/24] block: Use uint64_t for
BdrvTrackedRequest byte fields
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>,
<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>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
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: Fam Zheng <famz@redhat.com>
This matches the types used for bytes in the rest parts of block layer.
In the case of bdrv_co_truncate, new_bytes can be the image size which
probably doesn't fit in a 32 bit int.
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block_int.h | 4 ++--
block/io.c | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 920d3d122b..903b9c1034 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -69,12 +69,12 @@ enum BdrvTrackedRequestType {
typedef struct BdrvTrackedRequest {
BlockDriverState *bs;
int64_t offset;
- unsigned int bytes;
+ uint64_t bytes;
enum BdrvTrackedRequestType type;
=20
bool serialising;
int64_t overlap_offset;
- unsigned int overlap_bytes;
+ uint64_t overlap_bytes;
=20
QLIST_ENTRY(BdrvTrackedRequest) list;
Coroutine *co; /* owner, used for deadlock detection */
diff --git a/block/io.c b/block/io.c
index fbcd93304b..6293612e73 100644
--- a/block/io.c
+++ b/block/io.c
@@ -601,9 +601,11 @@ static void tracked_request_end(BdrvTrackedRequest *re=
q)
static void tracked_request_begin(BdrvTrackedRequest *req,
BlockDriverState *bs,
int64_t offset,
- unsigned int bytes,
+ uint64_t bytes,
enum BdrvTrackedRequestType type)
{
+ assert(bytes <=3D INT64_MAX && offset <=3D INT64_MAX - bytes);
+
*req =3D (BdrvTrackedRequest){
.bs =3D bs,
.offset =3D offset,
@@ -625,7 +627,7 @@ static void tracked_request_begin(BdrvTrackedRequest *r=
eq,
static void mark_request_serialising(BdrvTrackedRequest *req, uint64_t ali=
gn)
{
int64_t overlap_offset =3D req->offset & ~(align - 1);
- unsigned int overlap_bytes =3D ROUND_UP(req->offset + req->bytes, alig=
n)
+ uint64_t overlap_bytes =3D ROUND_UP(req->offset + req->bytes, align)
- overlap_offset;
=20
if (!req->serialising) {
@@ -683,7 +685,7 @@ static int bdrv_get_cluster_size(BlockDriverState *bs)
}
=20
static bool tracked_request_overlaps(BdrvTrackedRequest *req,
- int64_t offset, unsigned int bytes)
+ int64_t offset, uint64_t bytes)
{
/* aaaa bbbb */
if (offset >=3D req->overlap_offset + req->overlap_bytes) {
--=20
2.13.6