From nobody Sat Nov 15 18:27:37 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=1595938162; cv=none; d=zohomail.com; s=zohoarc; b=bJA7PEydmug6yfQFxCBUreI6dakQRFRv9dZsyX2YrsbQgz0HGHP2y2msQKfgQi9Tjs/vbgxS5m4iQTzawrhhB0daPXjzqTT+Yw/MQlUslvGnuYMKn4U6MbZjItUe7GnV8kYd+NSm1fnyZilGSXDo7jS54VryGU+iOUs6KVE7HZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595938162; 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=GkFU7XQqzErmywaN2FDrnnVSpqyXImZjhBFs9rCnQGE=; b=CEWo6nhoHMbfTkz0mWcV6sMtYpKLlVhHqOs3eYgb6P3wy1xLrS9/sbN+X1jtx/tQ5XTbFppBi3rv6d6v+xd7/ymi/b/Rn/g0u2RhZA3pdAcn7WqeYoFfwbcAX8ekjEavoYlV4kqBkJNVxJYA9Ij4WRN/Kc2zAdfvXP2Pw/9brcQ= 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 1595938162859605.3428363066554; Tue, 28 Jul 2020 05:09:22 -0700 (PDT) Received: from localhost ([::1]:45476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0OQ5-0008Jm-Ts for importer@patchew.org; Tue, 28 Jul 2020 08:09:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0OP9-0006z3-KA for qemu-devel@nongnu.org; Tue, 28 Jul 2020 08:08:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60565 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0OP8-0006YC-2i for qemu-devel@nongnu.org; Tue, 28 Jul 2020 08:08:23 -0400 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-81-_V5vf65VNLCRwVfwxvavEQ-1; Tue, 28 Jul 2020 08:08:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 320F11005504; Tue, 28 Jul 2020 12:08:16 +0000 (UTC) Received: from localhost (ovpn-112-145.ams2.redhat.com [10.36.112.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E32AB712EC; Tue, 28 Jul 2020 12:08:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595938101; 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=GkFU7XQqzErmywaN2FDrnnVSpqyXImZjhBFs9rCnQGE=; b=Ntcpcv18+UgY6NbNIVCT3tFfvMgzZbDKWp2JBPsOs83E4T7uLM6J8zv/Gj0BHXksWFa8eL 3JzE9AHh8Qw8N82wPDQhzRfxr6+s5BN22XgmvHAbXtkI/fjbQN7Wqr1dcsAndyHNgKrnqi 1Z2Ft4FhBRoOEEiZLyn+Os662ZoRvxs= X-MC-Unique: _V5vf65VNLCRwVfwxvavEQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.1 1/2] block: Fix bdrv_aligned_p*v() for qiov_offset != 0 Date: Tue, 28 Jul 2020 14:08:04 +0200 Message-Id: <20200728120806.265916-2-mreitz@redhat.com> In-Reply-To: <20200728120806.265916-1-mreitz@redhat.com> References: <20200728120806.265916-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=207.211.31.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/27 23:55:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , Bruce Rogers , Vladimir Sementsov-Ogievskiy , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Claudio Fontana , Stefan Hajnoczi , 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" Since these functions take a @qiov_offset, they must always take it into account when working with @qiov. There are a couple of places where they do not, but they should. Fixes: 65cd4424b9df03bb5195351c33e04cbbecc0705c Fixes: 28c4da28695bdbe04b336b2c9c463876cc3aaa6d Reported-by: Claudio Fontana Reported-by: Bruce Rogers Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy Tested-by: Bruce Rogers Tested-by: Claudio Fontana --- block/io.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index b6564e34c5..ad3a51ed53 100644 --- a/block/io.c +++ b/block/io.c @@ -1524,12 +1524,13 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChi= ld *child, assert(num); =20 ret =3D bdrv_driver_preadv(bs, offset + bytes - bytes_remainin= g, - num, qiov, bytes - bytes_remaining, 0= ); + num, qiov, + qiov_offset + bytes - bytes_remaining= , 0); max_bytes -=3D num; } else { num =3D bytes_remaining; - ret =3D qemu_iovec_memset(qiov, bytes - bytes_remaining, 0, - bytes_remaining); + ret =3D qemu_iovec_memset(qiov, qiov_offset + bytes - bytes_re= maining, + 0, bytes_remaining); } if (ret < 0) { goto out; @@ -2032,7 +2033,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChil= d *child, } =20 ret =3D bdrv_driver_pwritev(bs, offset + bytes - bytes_remaini= ng, - num, qiov, bytes - bytes_remaining, + num, qiov, + qiov_offset + bytes - bytes_remainin= g, local_flags); if (ret < 0) { break; --=20 2.26.2 From nobody Sat Nov 15 18:27:37 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=1595938165; cv=none; d=zohomail.com; s=zohoarc; b=GuHK4LAgDP1zbN7sbKgtQ/kLcAJO035R6KfRx3lnzgapseVeom5lsVk3Rfs7Rup9ToCXn6T3sXNhoJoLuMHYGeXTzRmJb3Gy2IdYp1cJ5bPa207V4lrtC0e323mHzPNwkrDAV13hD5hfwy3TdzNYi45tbcLKHHi9PLAupP0nmOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595938165; 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=oSpe9pTqo7BzNs/hDMNPOd8c7glVrVneoUOM7xjk9wY=; b=Hnm2kADMsFWzhF2T6JEiWyZioc/fhGnClJxFBHBHoUS+uAryJNNvm1BdLZOfG4dHBN/sXZAynNeX2PhAB2ntfP0RDH9BMzvZmfbOxjDMq8vujc6JXGb2vZpSAAShIs3Hyu+GfGBBJ595uSJj+AwxCFAG8vwG011Dr/S8KbJ/QE4= 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 1595938165654350.5284578527875; Tue, 28 Jul 2020 05:09:25 -0700 (PDT) Received: from localhost ([::1]:45776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0OQ8-0008SD-SB for importer@patchew.org; Tue, 28 Jul 2020 08:09:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0OPC-00076f-TR for qemu-devel@nongnu.org; Tue, 28 Jul 2020 08:08:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38027 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0OPB-0006Ya-6x for qemu-devel@nongnu.org; Tue, 28 Jul 2020 08:08:26 -0400 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-471-w_zQl8HJNd6sFojPYDhHHQ-1; Tue, 28 Jul 2020 08:08:22 -0400 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 7D00519057A1; Tue, 28 Jul 2020 12:08:21 +0000 (UTC) Received: from localhost (ovpn-112-145.ams2.redhat.com [10.36.112.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D0A710013C1; Tue, 28 Jul 2020 12:08:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595938104; 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=oSpe9pTqo7BzNs/hDMNPOd8c7glVrVneoUOM7xjk9wY=; b=EqgeGLROcSJGyKWqNKTCWUicIW9PRYpD/KN1gQSXfoUx9OQq5WRlJoh0AIEF5x8yIXRxoE dbbq/PWK7FNLMO6+uhvK3poFC8ZHkr5Yq3Vt1oSiSaPh+sdf+mCU2gRlfb2wzu6Z0NaFe0 cy9+SXy7UaTz8pr7M+Yh/sinuJSh+yw= X-MC-Unique: w_zQl8HJNd6sFojPYDhHHQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.1 2/2] iotests/028: Add test for cross-base-EOF reads Date: Tue, 28 Jul 2020 14:08:05 +0200 Message-Id: <20200728120806.265916-3-mreitz@redhat.com> In-Reply-To: <20200728120806.265916-1-mreitz@redhat.com> References: <20200728120806.265916-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=207.211.31.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/27 23:55:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 , Bruce Rogers , Vladimir Sementsov-Ogievskiy , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Claudio Fontana , Stefan Hajnoczi , 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" Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy Tested-by: Claudio Fontana Tested-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/028 | 19 +++++++++++++++++++ tests/qemu-iotests/028.out | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 5d043cef92..6dd3ae09a3 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -142,6 +142,25 @@ TEST_IMG=3D"${TEST_IMG}.copy" io_zero readv $(( offset= + 32 * 1024 )) 512 1024 32 =20 _check_test_img =20 +echo +echo '=3D=3D=3D Reading across backing EOF in one operation =3D=3D=3D' +echo + +# Use a cluster boundary as the base end here +base_size=3D$((3 * 1024 * 1024 * 1024)) + +TEST_IMG=3D"$TEST_IMG.base" _make_test_img $base_size +_make_test_img -b "$TEST_IMG.base" -F $IMGFMT $image_size + +# Write 16 times 42 at the end of the base image +$QEMU_IO -c "write -P 42 $((base_size - 16)) 16" "$TEST_IMG.base" \ + | _filter_qemu_io + +# Read 32 bytes across the base EOF from the top; +# should be 16 times 0x2a, then 16 times 0x00 +$QEMU_IO -c "read -v $((base_size - 16)) 32" "$TEST_IMG" \ + | _filter_qemu_io + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out index 12f82c6a6c..5a68de5c46 100644 --- a/tests/qemu-iotests/028.out +++ b/tests/qemu-iotests/028.out @@ -730,4 +730,15 @@ read 512/512 bytes at offset 3221257728 read 512/512 bytes at offset 3221258752 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) No errors were found on the image. + +=3D=3D=3D Reading across backing EOF in one operation =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D3221225472 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4294968832 backing_fil= e=3DTEST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT +wrote 16/16 bytes at offset 3221225456 +16 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +bffffff0: 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a 2a ..............= .. +c0000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ..............= .. +read 32/32 bytes at offset 3221225456 +32 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done --=20 2.26.2