From nobody Thu Dec 18 13:36:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611671510; cv=none; d=zohomail.com; s=zohoarc; b=FP+oEBmUo5KQc1LASSYiGwK6yRDi+ynvcnvVMBZOttST17ZaW/7/2k+j8VlEGRP4JL88rP+SECZFZF1W9f0r9Q81DJBodAR20NIHjRZLEfYe/QEV3/LDLOmRKcdi712X0WfHh6vXl1dfM98+QAnzU4+enellrbSvuU5wi8FFFw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611671510; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6u5XuKpnFvlV6hWdWF7PutInEzQT7S6RUBNrhH/aCpQ=; b=ZKNyeGY0CInsxvEpG7TfDnLhDwRw9Nul1k2UWUaeqDJePeP9cl+5XYa8tqYwXXQw5YnU1YUgvoQKgMFtzYtFdvkCbVSp/gYLgrVSzqAgOauZYidIBcruMaKX09Ua+sGeLrwn67wmy+36hqJW/CE8m0J/0tREeazvkGvxoeZBVbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16116715100191010.101697095894; Tue, 26 Jan 2021 06:31:50 -0800 (PST) Received: from localhost ([::1]:35234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4PNk-0004oP-UT for importer@patchew.org; Tue, 26 Jan 2021 09:31:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4PDR-0008JR-39 for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:21:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4PDL-00064P-45 for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:21:07 -0500 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-113-hZMu84OmNLu8yRMg2ip70g-1; Tue, 26 Jan 2021 09:21:00 -0500 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 0730610AB040; Tue, 26 Jan 2021 14:20:37 +0000 (UTC) Received: from localhost (ovpn-114-175.ams2.redhat.com [10.36.114.175]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C7FF10023AB; Tue, 26 Jan 2021 14:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611670862; 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=6u5XuKpnFvlV6hWdWF7PutInEzQT7S6RUBNrhH/aCpQ=; b=UCkBJiA+iDSjps/QUqSOmefgIaL1wAsR6+RF2dGyQGMrVqoYut2pA6rOKn+OSCofHg1zMQ WhKH358eQ+Egwsv4BWvTJ86l8BYz1zs80fhUQf/KbFO14ixd6vRMft0nUX5r0TV+6fr3p7 Ocarx2UZb4h87uaZEvmaj4RHgwg6POI= X-MC-Unique: hZMu84OmNLu8yRMg2ip70g-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 08/53] block: include supported_read_flags into BDS structure Date: Tue, 26 Jan 2021 15:19:31 +0100 Message-Id: <20210126142016.806073-9-mreitz@redhat.com> In-Reply-To: <20210126142016.806073-1-mreitz@redhat.com> References: <20210126142016.806073-1-mreitz@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=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, 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_H3=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: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Andrey Shinkevich Add the new member supported_read_flags to the BlockDriverState structure. It will control the flags set for copy-on-read operations. Make the block generic layer evaluate supported read flags before they go to a block driver. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Andrey Shinkevich Signed-off-by: Vladimir Sementsov-Ogievskiy [vsementsov: use assert instead of abort] Reviewed-by: Max Reitz Message-Id: <20201216061703.70908-8-vsementsov@virtuozzo.com> Signed-off-by: Max Reitz --- include/block/block_int.h | 4 ++++ block/io.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index f3d0a0e60a..92d3754ead 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -881,6 +881,10 @@ struct BlockDriverState { /* I/O Limits */ BlockLimits bl; =20 + /* + * Flags honored during pread + */ + unsigned int supported_read_flags; /* Flags honored during pwrite (so far: BDRV_REQ_FUA, * BDRV_REQ_WRITE_UNCHANGED). * If a driver does not support BDRV_REQ_WRITE_UNCHANGED, those diff --git a/block/io.c b/block/io.c index 95b1c56c06..d203435a73 100644 --- a/block/io.c +++ b/block/io.c @@ -1453,6 +1453,9 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild= *child, if (flags & BDRV_REQ_COPY_ON_READ) { int64_t pnum; =20 + /* The flag BDRV_REQ_COPY_ON_READ has reached its addressee */ + flags &=3D ~BDRV_REQ_COPY_ON_READ; + ret =3D bdrv_is_allocated(bs, offset, bytes, &pnum); if (ret < 0) { goto out; @@ -1474,9 +1477,11 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChil= d *child, goto out; } =20 + assert(!(flags & ~bs->supported_read_flags)); + max_bytes =3D ROUND_UP(MAX(0, total_bytes - offset), align); if (bytes <=3D max_bytes && bytes <=3D max_transfer) { - ret =3D bdrv_driver_preadv(bs, offset, bytes, qiov, qiov_offset, 0= ); + ret =3D bdrv_driver_preadv(bs, offset, bytes, qiov, qiov_offset, f= lags); goto out; } =20 @@ -1489,7 +1494,8 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild= *child, =20 ret =3D bdrv_driver_preadv(bs, offset + bytes - bytes_remainin= g, num, qiov, - qiov_offset + bytes - bytes_remaining= , 0); + qiov_offset + bytes - bytes_remaining, + flags); max_bytes -=3D num; } else { num =3D bytes_remaining; --=20 2.29.2