From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D958DC433DB for ; Tue, 2 Feb 2021 22:50:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6200864F68 for ; Tue, 2 Feb 2021 22:50:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6200864F68 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l74Us-0004cg-7w for qemu-devel@archiver.kernel.org; Tue, 02 Feb 2021 17:50:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l74Qt-0007Z0-NL for qemu-devel@nongnu.org; Tue, 02 Feb 2021 17:46:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l74Qd-0005th-FJ for qemu-devel@nongnu.org; Tue, 02 Feb 2021 17:46:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612305946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CkgNGGGCbW6jGEmuUZWm70s6fIWw/oKgzH3bQagpJNQ=; b=h7ICnQ+eXZOqDVL5f3vLq4xlO4mutJbueYwDw5HVJz+lKPFhcholi5L2kdIQ+VeNd9d2db VID31VmLfY8axlUqML/XM+5h9VkXpjzfHMC5r8zjXjET05E77x6qEnka7C5m5y2us7X+Rc WfLGJic/7r9oiiqoXH777GHRm/sDWj4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-280-Uw_wwXPaMdiqC7Fn-c2W9g-1; Tue, 02 Feb 2021 17:45:43 -0500 X-MC-Unique: Uw_wwXPaMdiqC7Fn-c2W9g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3AEF4107ACE4; Tue, 2 Feb 2021 22:45:42 +0000 (UTC) Received: from blue.redhat.com (ovpn-112-103.phx2.redhat.com [10.3.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTP id A458C10016F5; Tue, 2 Feb 2021 22:45:41 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 09/20] block: use int64_t as bytes type in tracked requests Date: Tue, 2 Feb 2021 16:45:18 -0600 Message-Id: <20210202224529.642055-10-eblake@redhat.com> In-Reply-To: <20210202224529.642055-1-eblake@redhat.com> References: <20210202224529.642055-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=63.128.21.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.386, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Vladimir Sementsov-Ogievskiy , "open list:Block I/O path" , Max Reitz , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Vladimir Sementsov-Ogievskiy We are generally moving to int64_t for both offset and bytes parameters on all io paths. Main motivation is realization of 64-bit write_zeroes operation for fast zeroing large disk chunks, up to the whole disk. We chose signed type, to be consistent with off_t (which is signed) and with possibility for signed return type (where negative value means error). All requests in block/io must not overflow BDRV_MAX_LENGTH, all external users of BdrvTrackedRequest already have corresponding assertions, so we are safe. Add some assertions still. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20201211183934.169161-9-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake Signed-off-by: Eric Blake --- include/block/block_int.h | 4 ++-- block/io.c | 14 +++++++---- block/io.c.rej | 50 ++++++++++----------------------------- 3 files changed, 24 insertions(+), 44 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 5bbbf9ee0af9..7f41f0990cc0 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -79,12 +79,12 @@ enum BdrvTrackedRequestType { typedef struct BdrvTrackedRequest { BlockDriverState *bs; int64_t offset; - uint64_t bytes; + int64_t bytes; enum BdrvTrackedRequestType type; bool serialising; int64_t overlap_offset; - uint64_t overlap_bytes; + int64_t overlap_bytes; QLIST_ENTRY(BdrvTrackedRequest) list; Coroutine *co; /* owner, used for deadlock detection */ diff --git a/block/io.c b/block/io.c index b56db913da30..1c23587d18c6 100644 --- a/block/io.c +++ b/block/io.c @@ -717,10 +717,10 @@ static void tracked_request_end(BdrvTrackedRequest *req) static void tracked_request_begin(BdrvTrackedRequest *req, BlockDriverState *bs, int64_t offset, - uint64_t bytes, + int64_t bytes, enum BdrvTrackedRequestType type) { - assert(bytes <= INT64_MAX && offset <= INT64_MAX - bytes); + bdrv_check_request(offset, bytes, &error_abort); *req = (BdrvTrackedRequest){ .bs = bs, @@ -741,8 +741,10 @@ static void tracked_request_begin(BdrvTrackedRequest *req, } static bool tracked_request_overlaps(BdrvTrackedRequest *req, - int64_t offset, uint64_t bytes) + int64_t offset, int64_t bytes) { + bdrv_check_request(offset, bytes, &error_abort); + /* aaaa bbbb */ if (offset >= req->overlap_offset + req->overlap_bytes) { return false; @@ -810,8 +812,10 @@ static void tracked_request_set_serialising(BdrvTrackedRequest *req, uint64_t align) { int64_t overlap_offset = req->offset & ~(align - 1); - uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align) - - overlap_offset; + int64_t overlap_bytes = + ROUND_UP(req->offset + req->bytes, align) - overlap_offset; + + bdrv_check_request(req->offset, req->bytes, &error_abort); if (!req->serialising) { qatomic_inc(&req->bs->serialising_in_flight); diff --git a/block/io.c.rej b/block/io.c.rej index f52df016263b..ae2f972d1af9 100644 --- a/block/io.c.rej +++ b/block/io.c.rej @@ -1,40 +1,16 @@ diff a/block/io.c b/block/io.c (rejected hunks) -@@ -2138,20 +2139,32 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child, - return 0; - } +@@ -798,10 +800,12 @@ bool bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align) + { + BlockDriverState *bs = req->bs; + int64_t overlap_offset = req->offset & ~(align - 1); +- uint64_t overlap_bytes = ROUND_UP(req->offset + req->bytes, align) +- - overlap_offset; ++ int64_t overlap_bytes = ++ ROUND_UP(req->offset + req->bytes, align) - overlap_offset; + bool waited; -+ if (!(flags & BDRV_REQ_ZERO_WRITE)) { -+ /* -+ * Pad request for following read-modify-write cycle. -+ * bdrv_co_do_zero_pwritev() does aligning by itself, so, we do -+ * alignment only if there is no ZERO flag. -+ */ -+ padded = bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, -+ &pad); -+ } ++ bdrv_check_request(req->offset, req->bytes, &error_abort); + - bdrv_inc_in_flight(bs); -- /* -- * Align write if necessary by performing a read-modify-write cycle. -- * Pad qiov with the read parts and be sure to have a tracked request not -- * only for bdrv_aligned_pwritev, but also for the reads of the RMW cycle. -- */ - tracked_request_begin(&req, bs, offset, bytes, BDRV_TRACKED_WRITE); - - if (flags & BDRV_REQ_ZERO_WRITE) { -+ assert(!padded); - ret = bdrv_co_do_zero_pwritev(child, offset, bytes, flags, &req); - goto out; - } - -- if (bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad)) { -+ if (padded) { -+ /* -+ * Request was unaligned to request_alignment and therefore padded. -+ * We are going to do read-modify-write. User is not prepared to widened -+ * request intersections with other requests, so we serialize the -+ * request. -+ */ - bdrv_mark_request_serialising(&req, align); - bdrv_padding_rmw_read(child, &req, &pad, false); - } + qemu_co_mutex_lock(&bs->reqs_lock); + if (!req->serialising) { + qatomic_inc(&req->bs->serialising_in_flight); -- 2.30.0