From nobody Fri May 17 08:39:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1561022578; cv=none; d=zoho.com; s=zohoarc; b=EmGjKAE/fvA+P9eAUdfg3yJ7aYVaNdk8CbXYptV+QcyZu8/5mFPEIGeT7rR/e75tVnQ+ampwbq4kA8w3VYQ7a9gJuHyBLUFm8yRDPbEe5fresbsOUGLrSxv/+q0fEUal22iYGJxI2b3iajgn/5xyJUrzLCGvgMOTRndiMkJ2xnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561022578; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=h+mba0+eNWHBSHqCqhd4pFi93/ujCsDGO0cw1r+phXc=; b=OBymyZN9gI2sjK1kTUdL/81AhLs6ogTrDf8ZcZpmshKUx6WPTNK4XXz2mxXmt8jS7GlApJWrv6bBVe/X5MwJVx8ailu0twLq/LraOkxHDxstzaL5z2TEgky09uUrTafWcVugsvyMil1RSIk4uZZ5yxn/kTh1pfupporsnJdH4Qg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 156102257854345.42975454850773; Thu, 20 Jun 2019 02:22:58 -0700 (PDT) Received: from localhost ([::1]:45188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtHV-0006O5-I1 for importer@patchew.org; Thu, 20 Jun 2019 05:22:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49717) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtDQ-00033V-Rz for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:18:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtBo-00053E-NC for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:17:07 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:55976) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtBn-00050l-8C; Thu, 20 Jun 2019 05:17:03 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5K93dWa079117; Thu, 20 Jun 2019 09:17:02 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2t7809g0wu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jun 2019 09:17:02 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5K9FCrp022018; Thu, 20 Jun 2019 09:17:01 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 2t77ynhcgc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jun 2019 09:17:01 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x5K9H0OP018612; Thu, 20 Jun 2019 09:17:00 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 20 Jun 2019 02:11:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=h+mba0+eNWHBSHqCqhd4pFi93/ujCsDGO0cw1r+phXc=; b=YYzfBK350OyXC664pBG3GAuAYkAwm0QxWBZqlkBrWBKHfO2UITVpKcmYek/WMUzQwyEv qoO0dT6mnupYlP+jrocsJUw3GlpvdMFrAY6/6b2YAVayFqYVLKrUIPQJziWc7nezXYhK R1QOPyy9x22qIvBY6noOmwxIIw0us9RsuL4mlu1Qozj+WoI4EVqH9QqlXuVf4vYNheTs xlGoIYVvTUNnfby4rTyBLgEf9DqgTPjX+TxC4CEdUkK7NLaDVucJlzB3YVA2nKd1JmTm bYD56GCQdlBCZ55j+4eoR+fz+ik4m4mfxQh7otvqMjuy1hl10WbBqK4QVPNgm1jGtryP uA== From: Sam Eiderman To: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com Date: Thu, 20 Jun 2019 12:10:55 +0300 Message-Id: <20190620091057.47441-2-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20190620091057.47441-1-shmuel.eiderman@oracle.com> References: <20190620091057.47441-1-shmuel.eiderman@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9293 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200068 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9293 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200068 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH v3 1/3] vmdk: Fix comment regarding max l1_size coverage 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: liran.alon@oracle.com, shmuel.eiderman@oracle.com, karl.heubaum@oracle.com, arbel.moshe@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit b0651b8c246d ("vmdk: Move l1_size check into vmdk_add_extent") extended the l1_size check from VMDK4 to VMDK3 but did not update the default coverage in the moved comment. The previous vmdk4 calculation: (512 * 1024 * 1024) * 512(l2 entries) * 65536(grain) =3D 16PB The added vmdk3 calculation: (512 * 1024 * 1024) * 4096(l2 entries) * 512(grain) =3D 1PB Adding the calculation of vmdk3 to the comment. In any case, VMware does not offer virtual disks more than 2TB for vmdk4/vmdk3 or 64TB for the new undocumented seSparse format which is not implemented yet in qemu. Reviewed-by: Karl Heubaum Reviewed-by: Eyal Moscovici Reviewed-by: Liran Alon Reviewed-by: Arbel Moshe Signed-off-by: Sam Eiderman --- block/vmdk.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 51067c774f..0f2e453bf5 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -426,10 +426,15 @@ static int vmdk_add_extent(BlockDriverState *bs, return -EFBIG; } if (l1_size > 512 * 1024 * 1024) { - /* Although with big capacity and small l1_entry_sectors, we can g= et a + /* + * Although with big capacity and small l1_entry_sectors, we can g= et a * big l1_size, we don't want unbounded value to allocate the tabl= e. - * Limit it to 512M, which is 16PB for default cluster and L2 table - * size */ + * Limit it to 512M, which is: + * 16PB - for default "Hosted Sparse Extent" (VMDK4) + * cluster size: 64KB, L2 table size: 512 entries + * 1PB - for default "ESXi Host Sparse Extent" (VMDK3/vmfsSpa= rse) + * cluster size: 512B, L2 table size: 4096 entries + */ error_setg(errp, "L1 size too big"); return -EFBIG; } --=20 2.13.3 From nobody Fri May 17 08:39:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1561022701; cv=none; d=zoho.com; s=zohoarc; b=KZcuFpINAR9cmWudrAMa0ZyIQPAWIc00S1nK/fU9nrULsRkOh5SWbd9K/DC+JQKGkMGwRrg3du73YU3j5qt+xZTtYeOHIImEf4Djxer5pG6TAY1/JhsKlSZVgMtBKHmFlTg8Eq/9UZyClJyZhKe3t//G/GZYmLV5brtgevIvo3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561022701; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=r8ORzcEb/eyuf4HLxGpD0OePgE1pHG8c+mq42TaI/tU=; b=lKG7Sn1N7wm+dhrnn19/ascVyVWU0g8+s0ee+A8vtbA9JwhdtID8LsWrOBz4FQlAaLDceoeXnOviE2R+SkE/E3frw7LxlwhWmRXo0SUmgdU7c9R8VrOIOBd2L5DchBUwh2twXVPqhy50sMbNJdA7UNc1Gl64pTOl2Nz67OduExo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1561022701013946.8815469203868; Thu, 20 Jun 2019 02:25:01 -0700 (PDT) Received: from localhost ([::1]:45212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtJU-0000QN-31 for importer@patchew.org; Thu, 20 Jun 2019 05:25:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49721) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtDN-00033W-S6 for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:18:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtC0-0005J7-KJ for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:17:17 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:56132) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtBy-0005EN-Jd; Thu, 20 Jun 2019 05:17:14 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5K93drG079107; Thu, 20 Jun 2019 09:17:12 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 2t7809g0y2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jun 2019 09:17:12 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5K9HBWF026381; Thu, 20 Jun 2019 09:17:12 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 2t77ynhchw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jun 2019 09:17:11 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x5K9H8eV025835; Thu, 20 Jun 2019 09:17:08 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 20 Jun 2019 02:11:19 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=r8ORzcEb/eyuf4HLxGpD0OePgE1pHG8c+mq42TaI/tU=; b=5YoNw1dib9IxNtn4XPE8mtP+jXpLlrHkQgu9IW3NDL4n8cClVezGfs977nnyEBiqDzFO zkNInVb0dzKcbCi9g3F4GIKtv6ikDEDNbhUlNBBnm12y99WAG2bN8WIAOkgffj5O86ue lFyP/mcDuKIIsimybIDfXQSt/nWN/0gM7gjivToMmO1S7ZHv+8KGuLPUx+Xnyq/QzEXl /wf+F7TU5LdITpaRqO4jekBsm4D+JzQ88QtJHCIxOGoIlEjYuu5ZwMBEHN7KFGuYXRm3 /ZyXYltWiq7o8NMwIIIjlnfJbM4ipQL4ERs337kcleWDW32ydDddSRsJrAagU+byB9jF PQ== From: Sam Eiderman To: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com Date: Thu, 20 Jun 2019 12:10:56 +0300 Message-Id: <20190620091057.47441-3-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20190620091057.47441-1-shmuel.eiderman@oracle.com> References: <20190620091057.47441-1-shmuel.eiderman@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9293 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200068 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9293 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200068 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH v3 2/3] vmdk: Reduce the max bound for L1 table size 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: liran.alon@oracle.com, shmuel.eiderman@oracle.com, karl.heubaum@oracle.com, arbel.moshe@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 512M of L1 entries is a very loose bound, only 32M are required to store the maximal supported VMDK file size of 2TB. Fixed qemu-iotest 59# - now failure occures before on impossible L1 table size. Reviewed-by: Karl Heubaum Reviewed-by: Eyal Moscovici Reviewed-by: Liran Alon Reviewed-by: Arbel Moshe Signed-off-by: Sam Eiderman --- block/vmdk.c | 13 +++++++------ tests/qemu-iotests/059.out | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 0f2e453bf5..931eb2759c 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -425,15 +425,16 @@ static int vmdk_add_extent(BlockDriverState *bs, error_setg(errp, "Invalid granularity, image may be corrupt"); return -EFBIG; } - if (l1_size > 512 * 1024 * 1024) { + if (l1_size > 32 * 1024 * 1024) { /* * Although with big capacity and small l1_entry_sectors, we can g= et a * big l1_size, we don't want unbounded value to allocate the tabl= e. - * Limit it to 512M, which is: - * 16PB - for default "Hosted Sparse Extent" (VMDK4) - * cluster size: 64KB, L2 table size: 512 entries - * 1PB - for default "ESXi Host Sparse Extent" (VMDK3/vmfsSpa= rse) - * cluster size: 512B, L2 table size: 4096 entries + * Limit it to 32M, which is enough to store: + * 8TB - for both VMDK3 & VMDK4 with + * minimal cluster size: 512B + * minimal L2 table size: 512 entries + * 8 TB is still more than the maximal value supported = for + * VMDK3 & VMDK4 which is 2TB. */ error_setg(errp, "L1 size too big"); return -EFBIG; diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index f51394ae8e..4fab42a28c 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2358,5 +2358,5 @@ Offset Length Mapped to File 0x140000000 0x10000 0x50000 TEST_DIR/t-s003.vmdk =20 =3D=3D=3D Testing afl image with a very large capacity =3D=3D=3D -qemu-img: Can't get image size 'TEST_DIR/afl9.IMGFMT': File too large +qemu-img: Could not open 'TEST_DIR/afl9.IMGFMT': L1 size too big *** done --=20 2.13.3 From nobody Fri May 17 08:39:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1561022972; cv=none; d=zoho.com; s=zohoarc; b=f0Ekh00kgjLnk1Rsvx8spdIkoB9/JUa4BEHiSv+oq6hazcfG5t7pscjXisMcOMAVHZjGzlnNW7VPdS8yOQfqJqr0PMlM091YkCq2Bg4biFxVg69pfHkwjJv8RwS/o2XcP4/6UJpS3celpTG/tFQH/qSIwa6gQtAkzbiifSLudLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561022972; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SPMJSGBNg/Vp/xx6lMaoujuw9xlEXBsU+vWA10M5TVQ=; b=XyRXK5o4KoxeejzpND4sOcDIkXv8T10oi5rm15q8keRBbpdfKva8YPQdd+BTH2c51pcJXWCSbfr5SnDt3F5oxx13hYleTmHnMETzo6t1XCiQ3SSdpUJyfcJM1GPrRdA4Egq3cCaYxdX81+rOmFeVcCzRAvQnGZ3SR4JdPoJinv0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 156102297293783.27604302281884; Thu, 20 Jun 2019 02:29:32 -0700 (PDT) Received: from localhost ([::1]:45250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtNr-0004Yv-RJ for importer@patchew.org; Thu, 20 Jun 2019 05:29:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49717) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtDM-00033V-Mj for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:18:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdtC2-0005LI-Gl for qemu-devel@nongnu.org; Thu, 20 Jun 2019 05:17:21 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:60266) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdtBy-0005G2-N5; Thu, 20 Jun 2019 05:17:14 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5K93ee1175194; Thu, 20 Jun 2019 09:17:11 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 2t7809fyu0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jun 2019 09:17:11 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x5K9FGHJ083443; Thu, 20 Jun 2019 09:17:10 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3030.oracle.com with ESMTP id 2t7rdx2qky-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Jun 2019 09:17:10 +0000 Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x5K9H9Xg014158; Thu, 20 Jun 2019 09:17:09 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 20 Jun 2019 02:11:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=SPMJSGBNg/Vp/xx6lMaoujuw9xlEXBsU+vWA10M5TVQ=; b=wgvVOJGlxkEqLEZ4o35m9rQ4sHTgNtLfAVorbPLJNEBZevo+jr/JubV4vpqNj/r0kHC1 hm6tA12u+HNbfXczdSX4QoqHYYkegoizKBGwAfrSZH23JwP3At2I79rhJC0n9+JQupNE NJK+YDV1jHIGZH2dHkSFsqoPn/ZNZmJ0FjXfYbJqcDePNMPX4ZIxd5gMCX2/2aiAfgYj Eb1FLMdtSM0r8BeFtdsbGxjvg+RYKtwLVEH564hjv4xpr+i21LdYXCycouhsWeebUaeV nTkyy7KJCbL090eH29zPBbU0RIKGhK3+kkWoH1OMNTEDWFF8sW8J5kgFXMgNH5eNU6V7 2w== From: Sam Eiderman To: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com Date: Thu, 20 Jun 2019 12:10:57 +0300 Message-Id: <20190620091057.47441-4-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20190620091057.47441-1-shmuel.eiderman@oracle.com> References: <20190620091057.47441-1-shmuel.eiderman@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9293 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200068 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9293 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906200068 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.78 Subject: [Qemu-devel] [PATCH v3 3/3] vmdk: Add read-only support for seSparse snapshots 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: liran.alon@oracle.com, shmuel.eiderman@oracle.com, karl.heubaum@oracle.com, arbel.moshe@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Until ESXi 6.5 VMware used the vmfsSparse format for snapshots (VMDK3 in QEMU). This format was lacking in the following: * Grain directory (L1) and grain table (L2) entries were 32-bit, allowing access to only 2TB (slightly less) of data. * The grain size (default) was 512 bytes - leading to data fragmentation and many grain tables. * For space reclamation purposes, it was necessary to find all the grains which are not pointed to by any grain table - so a reverse mapping of "offset of grain in vmdk" to "grain table" must be constructed - which takes large amounts of CPU/RAM. The format specification can be found in VMware's documentation: https://www.vmware.com/support/developer/vddk/vmdk_50_technote.pdf In ESXi 6.5, to support snapshot files larger than 2TB, a new format was introduced: SESparse (Space Efficient). This format fixes the above issues: * All entries are now 64-bit. * The grain size (default) is 4KB. * Grain directory and grain tables are now located at the beginning of the file. + seSparse format reserves space for all grain tables. + Grain tables can be addressed using an index. + Grains are located in the end of the file and can also be addressed with an index. - seSparse vmdks of large disks (64TB) have huge preallocated headers - mainly due to L2 tables, even for empty snapshots. * The header contains a reverse mapping ("backmap") of "offset of grain in vmdk" to "grain table" and a bitmap ("free bitmap") which specifies for each grain - whether it is allocated or not. Using these data structures we can implement space reclamation efficiently. * Due to the fact that the header now maintains two mappings: * The regular one (grain directory & grain tables) * A reverse one (backmap and free bitmap) These data structures can lose consistency upon crash and result in a corrupted VMDK. Therefore, a journal is also added to the VMDK and is replayed when the VMware reopens the file after a crash. Since ESXi 6.7 - SESparse is the only snapshot format available. Unfortunately, VMware does not provide documentation regarding the new seSparse format. This commit is based on black-box research of the seSparse format. Various in-guest block operations and their effect on the snapshot file were tested. The only VMware provided source of information (regarding the underlying implementation) was a log file on the ESXi: /var/log/hostd.log Whenever an seSparse snapshot is created - the log is being populated with seSparse records. Relevant log records are of the form: [...] Const Header: [...] constMagic =3D 0xcafebabe [...] version =3D 2.1 [...] capacity =3D 204800 [...] grainSize =3D 8 [...] grainTableSize =3D 64 [...] flags =3D 0 [...] Extents: [...] Header : <1 : 1> [...] JournalHdr : <2 : 2> [...] Journal : <2048 : 2048> [...] GrainDirectory : <4096 : 2048> [...] GrainTables : <6144 : 2048> [...] FreeBitmap : <8192 : 2048> [...] BackMap : <10240 : 2048> [...] Grain : <12288 : 204800> [...] Volatile Header: [...] volatileMagic =3D 0xcafecafe [...] FreeGTNumber =3D 0 [...] nextTxnSeqNumber =3D 0 [...] replayJournal =3D 0 The sizes that are seen in the log file are in sectors. Extents are of the following format: This commit is a strict implementation which enforces: * magics * version number 2.1 * grain size of 8 sectors (4KB) * grain table size of 64 sectors * zero flags * extent locations Additionally, this commit proivdes only a subset of the functionality offered by seSparse's format: * Read-only * No journal replay * No space reclamation * No unmap support Hence, journal header, journal, free bitmap and backmap extents are unused, only the "classic" (L1 -> L2 -> data) grain access is implemented. However there are several differences in the grain access itself. Grain directory (L1): * Grain directory entries are indexes (not offsets) to grain tables. * Valid grain directory entries have their highest nibble set to 0x1. * Since grain tables are always located in the beginning of the file - the index can fit into 32 bits - so we can use its low part if it's valid. Grain table (L2): * Grain table entries are indexes (not offsets) to grains. * If the highest nibble of the entry is: 0x0: The grain in not allocated. The rest of the bytes are 0. 0x1: The grain is unmapped - guest sees a zero grain. The rest of the bits point to the previously mapped grain, see 0x3 case. 0x2: The grain is zero. 0x3: The grain is allocated - to get the index calculate: ((entry & 0x0fff000000000000) >> 48) | ((entry & 0x0000ffffffffffff) << 12) * The difference between 0x1 and 0x2 is that 0x1 is an unallocated grain which results from the guest using sg_unmap to unmap the grain - but the grain itself still exists in the grain extent - a space reclamation procedure should delete it. Unmapping a zero grain has no effect (0x2 will not change to 0x1) but unmapping an unallocated grain will (0x0 to 0x1) - naturally. In order to implement seSparse some fields had to be changed to support both 32-bit and 64-bit entry sizes. Reviewed-by: Karl Heubaum Reviewed-by: Eyal Moscovici Reviewed-by: Arbel Moshe Signed-off-by: Sam Eiderman --- block/vmdk.c | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 342 insertions(+), 16 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 931eb2759c..bd36ece125 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -91,6 +91,44 @@ typedef struct { uint16_t compressAlgorithm; } QEMU_PACKED VMDK4Header; =20 +typedef struct VMDKSESparseConstHeader { + uint64_t magic; + uint64_t version; + uint64_t capacity; + uint64_t grain_size; + uint64_t grain_table_size; + uint64_t flags; + uint64_t reserved1; + uint64_t reserved2; + uint64_t reserved3; + uint64_t reserved4; + uint64_t volatile_header_offset; + uint64_t volatile_header_size; + uint64_t journal_header_offset; + uint64_t journal_header_size; + uint64_t journal_offset; + uint64_t journal_size; + uint64_t grain_dir_offset; + uint64_t grain_dir_size; + uint64_t grain_tables_offset; + uint64_t grain_tables_size; + uint64_t free_bitmap_offset; + uint64_t free_bitmap_size; + uint64_t backmap_offset; + uint64_t backmap_size; + uint64_t grains_offset; + uint64_t grains_size; + uint8_t pad[304]; +} QEMU_PACKED VMDKSESparseConstHeader; + +typedef struct VMDKSESparseVolatileHeader { + uint64_t magic; + uint64_t free_gt_number; + uint64_t next_txn_seq_number; + uint64_t replay_journal; + uint8_t pad[480]; +} QEMU_PACKED VMDKSESparseVolatileHeader; + #define L2_CACHE_SIZE 16 =20 typedef struct VmdkExtent { @@ -99,19 +137,23 @@ typedef struct VmdkExtent { bool compressed; bool has_marker; bool has_zero_grain; + bool sesparse; + uint64_t sesparse_l2_tables_offset; + uint64_t sesparse_clusters_offset; + int32_t entry_size; int version; int64_t sectors; int64_t end_sector; int64_t flat_start_offset; int64_t l1_table_offset; int64_t l1_backup_table_offset; - uint32_t *l1_table; + void *l1_table; uint32_t *l1_backup_table; unsigned int l1_size; uint32_t l1_entry_sectors; =20 unsigned int l2_size; - uint32_t *l2_cache; + void *l2_cache; uint32_t l2_cache_offsets[L2_CACHE_SIZE]; uint32_t l2_cache_counts[L2_CACHE_SIZE]; =20 @@ -435,6 +477,11 @@ static int vmdk_add_extent(BlockDriverState *bs, * minimal L2 table size: 512 entries * 8 TB is still more than the maximal value supported = for * VMDK3 & VMDK4 which is 2TB. + * 64TB - for "ESXi seSparse Extent" + * minimal cluster size: 512B (default is 4KB) + * L2 table size: 4096 entries (const). + * 64TB is more than the maximal value supported for + * seSparse VMDKs (which is slightly less than 64TB) */ error_setg(errp, "L1 size too big"); return -EFBIG; @@ -460,6 +507,7 @@ static int vmdk_add_extent(BlockDriverState *bs, extent->l2_size =3D l2_size; extent->cluster_sectors =3D flat ? sectors : cluster_sectors; extent->next_cluster_sector =3D ROUND_UP(nb_sectors, cluster_sectors); + extent->entry_size =3D sizeof(uint32_t); =20 if (s->num_extents > 1) { extent->end_sector =3D (*(extent - 1)).end_sector + extent->sector= s; @@ -481,7 +529,7 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkE= xtent *extent, int i; =20 /* read the L1 table */ - l1_size =3D extent->l1_size * sizeof(uint32_t); + l1_size =3D extent->l1_size * extent->entry_size; extent->l1_table =3D g_try_malloc(l1_size); if (l1_size && extent->l1_table =3D=3D NULL) { return -ENOMEM; @@ -499,10 +547,16 @@ static int vmdk_init_tables(BlockDriverState *bs, Vmd= kExtent *extent, goto fail_l1; } for (i =3D 0; i < extent->l1_size; i++) { - le32_to_cpus(&extent->l1_table[i]); + if (extent->entry_size =3D=3D sizeof(uint64_t)) { + le64_to_cpus((uint64_t *)extent->l1_table + i); + } else { + assert(extent->entry_size =3D=3D sizeof(uint32_t)); + le32_to_cpus((uint32_t *)extent->l1_table + i); + } } =20 if (extent->l1_backup_table_offset) { + assert(!extent->sesparse); extent->l1_backup_table =3D g_try_malloc(l1_size); if (l1_size && extent->l1_backup_table =3D=3D NULL) { ret =3D -ENOMEM; @@ -525,7 +579,7 @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkE= xtent *extent, } =20 extent->l2_cache =3D - g_new(uint32_t, extent->l2_size * L2_CACHE_SIZE); + g_malloc(extent->entry_size * extent->l2_size * L2_CACHE_SIZE); return 0; fail_l1b: g_free(extent->l1_backup_table); @@ -571,6 +625,205 @@ static int vmdk_open_vmfs_sparse(BlockDriverState *bs, return ret; } =20 +#define SESPARSE_CONST_HEADER_MAGIC UINT64_C(0x00000000cafebabe) +#define SESPARSE_VOLATILE_HEADER_MAGIC UINT64_C(0x00000000cafecafe) + +/* Strict checks - format not officially documented */ +static int check_se_sparse_const_header(VMDKSESparseConstHeader *header, + Error **errp) +{ + header->magic =3D le64_to_cpu(header->magic); + header->version =3D le64_to_cpu(header->version); + header->grain_size =3D le64_to_cpu(header->grain_size); + header->grain_table_size =3D le64_to_cpu(header->grain_table_size); + header->flags =3D le64_to_cpu(header->flags); + header->reserved1 =3D le64_to_cpu(header->reserved1); + header->reserved2 =3D le64_to_cpu(header->reserved2); + header->reserved3 =3D le64_to_cpu(header->reserved3); + header->reserved4 =3D le64_to_cpu(header->reserved4); + + header->volatile_header_offset =3D + le64_to_cpu(header->volatile_header_offset); + header->volatile_header_size =3D le64_to_cpu(header->volatile_header_s= ize); + + header->journal_header_offset =3D le64_to_cpu(header->journal_header_o= ffset); + header->journal_header_size =3D le64_to_cpu(header->journal_header_siz= e); + + header->journal_offset =3D le64_to_cpu(header->journal_offset); + header->journal_size =3D le64_to_cpu(header->journal_size); + + header->grain_dir_offset =3D le64_to_cpu(header->grain_dir_offset); + header->grain_dir_size =3D le64_to_cpu(header->grain_dir_size); + + header->grain_tables_offset =3D le64_to_cpu(header->grain_tables_offse= t); + header->grain_tables_size =3D le64_to_cpu(header->grain_tables_size); + + header->free_bitmap_offset =3D le64_to_cpu(header->free_bitmap_offset); + header->free_bitmap_size =3D le64_to_cpu(header->free_bitmap_size); + + header->backmap_offset =3D le64_to_cpu(header->backmap_offset); + header->backmap_size =3D le64_to_cpu(header->backmap_size); + + header->grains_offset =3D le64_to_cpu(header->grains_offset); + header->grains_size =3D le64_to_cpu(header->grains_size); + + if (header->magic !=3D SESPARSE_CONST_HEADER_MAGIC) { + error_setg(errp, "Bad const header magic: 0x%016" PRIx64, + header->magic); + return -EINVAL; + } + + if (header->version !=3D 0x0000000200000001) { + error_setg(errp, "Unsupported version: 0x%016" PRIx64, + header->version); + return -ENOTSUP; + } + + if (header->grain_size !=3D 8) { + error_setg(errp, "Unsupported grain size: %" PRIu64, + header->grain_size); + return -ENOTSUP; + } + + if (header->grain_table_size !=3D 64) { + error_setg(errp, "Unsupported grain table size: %" PRIu64, + header->grain_table_size); + return -ENOTSUP; + } + + if (header->flags !=3D 0) { + error_setg(errp, "Unsupported flags: 0x%016" PRIx64, + header->flags); + return -ENOTSUP; + } + + if (header->reserved1 !=3D 0 || header->reserved2 !=3D 0 || + header->reserved3 !=3D 0 || header->reserved4 !=3D 0) { + error_setg(errp, "Unsupported reserved bits:" + " 0x%016" PRIx64 " 0x%016" PRIx64 + " 0x%016" PRIx64 " 0x%016" PRIx64, + header->reserved1, header->reserved2, + header->reserved3, header->reserved4); + return -ENOTSUP; + } + + /* check that padding is 0 */ + if (!buffer_is_zero(header->pad, sizeof(header->pad))) { + error_setg(errp, "Unsupported non-zero const header padding"); + return -ENOTSUP; + } + + return 0; +} + +static int check_se_sparse_volatile_header(VMDKSESparseVolatileHeader *hea= der, + Error **errp) +{ + header->magic =3D le64_to_cpu(header->magic); + header->free_gt_number =3D le64_to_cpu(header->free_gt_number); + header->next_txn_seq_number =3D le64_to_cpu(header->next_txn_seq_numbe= r); + header->replay_journal =3D le64_to_cpu(header->replay_journal); + + if (header->magic !=3D SESPARSE_VOLATILE_HEADER_MAGIC) { + error_setg(errp, "Bad volatile header magic: 0x%016" PRIx64, + header->magic); + return -EINVAL; + } + + if (header->replay_journal) { + error_setg(errp, "Image is dirty, Replaying journal not supported"= ); + return -ENOTSUP; + } + + /* check that padding is 0 */ + if (!buffer_is_zero(header->pad, sizeof(header->pad))) { + error_setg(errp, "Unsupported non-zero volatile header padding"); + return -ENOTSUP; + } + + return 0; +} + +static int vmdk_open_se_sparse(BlockDriverState *bs, + BdrvChild *file, + int flags, Error **errp) +{ + int ret; + VMDKSESparseConstHeader const_header; + VMDKSESparseVolatileHeader volatile_header; + VmdkExtent *extent; + + ret =3D bdrv_apply_auto_read_only(bs, + "No write support for seSparse images available", errp); + if (ret < 0) { + return ret; + } + + assert(sizeof(const_header) =3D=3D SECTOR_SIZE); + + ret =3D bdrv_pread(file, 0, &const_header, sizeof(const_header)); + if (ret < 0) { + bdrv_refresh_filename(file->bs); + error_setg_errno(errp, -ret, + "Could not read const header from file '%s'", + file->bs->filename); + return ret; + } + + /* check const header */ + ret =3D check_se_sparse_const_header(&const_header, errp); + if (ret < 0) { + return ret; + } + + assert(sizeof(volatile_header) =3D=3D SECTOR_SIZE); + + ret =3D bdrv_pread(file, + const_header.volatile_header_offset * SECTOR_SIZE, + &volatile_header, sizeof(volatile_header)); + if (ret < 0) { + bdrv_refresh_filename(file->bs); + error_setg_errno(errp, -ret, + "Could not read volatile header from file '%s'", + file->bs->filename); + return ret; + } + + /* check volatile header */ + ret =3D check_se_sparse_volatile_header(&volatile_header, errp); + if (ret < 0) { + return ret; + } + + ret =3D vmdk_add_extent(bs, file, false, + const_header.capacity, + const_header.grain_dir_offset * SECTOR_SIZE, + 0, + const_header.grain_dir_size * + SECTOR_SIZE / sizeof(uint64_t), + const_header.grain_table_size * + SECTOR_SIZE / sizeof(uint64_t), + const_header.grain_size, + &extent, + errp); + if (ret < 0) { + return ret; + } + + extent->sesparse =3D true; + extent->sesparse_l2_tables_offset =3D const_header.grain_tables_offset; + extent->sesparse_clusters_offset =3D const_header.grains_offset; + extent->entry_size =3D sizeof(uint64_t); + + ret =3D vmdk_init_tables(bs, extent, errp); + if (ret) { + /* free extent allocated by vmdk_add_extent */ + vmdk_free_last_extent(bs); + } + + return ret; +} + static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, QDict *options, Error **errp); =20 @@ -848,6 +1101,7 @@ static int vmdk_parse_extents(const char *desc, BlockD= riverState *bs, * RW [size in sectors] SPARSE "file-name.vmdk" * RW [size in sectors] VMFS "file-name.vmdk" * RW [size in sectors] VMFSSPARSE "file-name.vmdk" + * RW [size in sectors] SESPARSE "file-name.vmdk" */ flat_offset =3D -1; matches =3D sscanf(p, "%10s %" SCNd64 " %10s \"%511[^\n\r\"]\" %" = SCNd64, @@ -870,7 +1124,8 @@ static int vmdk_parse_extents(const char *desc, BlockD= riverState *bs, =20 if (sectors <=3D 0 || (strcmp(type, "FLAT") && strcmp(type, "SPARSE") && - strcmp(type, "VMFS") && strcmp(type, "VMFSSPARSE")) || + strcmp(type, "VMFS") && strcmp(type, "VMFSSPARSE") && + strcmp(type, "SESPARSE")) || (strcmp(access, "RW"))) { continue; } @@ -923,6 +1178,13 @@ static int vmdk_parse_extents(const char *desc, Block= DriverState *bs, return ret; } extent =3D &s->extents[s->num_extents - 1]; + } else if (!strcmp(type, "SESPARSE")) { + ret =3D vmdk_open_se_sparse(bs, extent_file, bs->open_flags, e= rrp); + if (ret) { + bdrv_unref_child(bs, extent_file); + return ret; + } + extent =3D &s->extents[s->num_extents - 1]; } else { error_setg(errp, "Unsupported extent type '%s'", type); bdrv_unref_child(bs, extent_file); @@ -957,6 +1219,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, i= nt flags, char *buf, if (strcmp(ct, "monolithicFlat") && strcmp(ct, "vmfs") && strcmp(ct, "vmfsSparse") && + strcmp(ct, "seSparse") && strcmp(ct, "twoGbMaxExtentSparse") && strcmp(ct, "twoGbMaxExtentFlat")) { error_setg(errp, "Unsupported image type '%s'", ct); @@ -1207,10 +1470,12 @@ static int get_cluster_offset(BlockDriverState *bs, { unsigned int l1_index, l2_offset, l2_index; int min_index, i, j; - uint32_t min_count, *l2_table; + uint32_t min_count; + void *l2_table; bool zeroed =3D false; int64_t ret; int64_t cluster_sector; + unsigned int l2_size_bytes =3D extent->l2_size * extent->entry_size; =20 if (m_data) { m_data->valid =3D 0; @@ -1225,7 +1490,36 @@ static int get_cluster_offset(BlockDriverState *bs, if (l1_index >=3D extent->l1_size) { return VMDK_ERROR; } - l2_offset =3D extent->l1_table[l1_index]; + if (extent->sesparse) { + uint64_t l2_offset_u64; + + assert(extent->entry_size =3D=3D sizeof(uint64_t)); + + l2_offset_u64 =3D ((uint64_t *)extent->l1_table)[l1_index]; + if (l2_offset_u64 =3D=3D 0) { + l2_offset =3D 0; + } else if ((l2_offset_u64 & 0xffffffff00000000) !=3D 0x10000000000= 00000) { + /* + * Top most nibble is 0x1 if grain table is allocated. + * strict check - top most 4 bytes must be 0x10000000 since max + * supported size is 64TB for disk - so no more than 64TB / 16= MB + * grain directories which is smaller than uint32, + * where 16MB is the only supported default grain table covera= ge. + */ + return VMDK_ERROR; + } else { + l2_offset_u64 =3D l2_offset_u64 & 0x00000000ffffffff; + l2_offset_u64 =3D extent->sesparse_l2_tables_offset + + l2_offset_u64 * l2_size_bytes / SECTOR_SIZE; + if (l2_offset_u64 > 0x00000000ffffffff) { + return VMDK_ERROR; + } + l2_offset =3D (unsigned int)(l2_offset_u64); + } + } else { + assert(extent->entry_size =3D=3D sizeof(uint32_t)); + l2_offset =3D ((uint32_t *)extent->l1_table)[l1_index]; + } if (!l2_offset) { return VMDK_UNALLOC; } @@ -1237,7 +1531,7 @@ static int get_cluster_offset(BlockDriverState *bs, extent->l2_cache_counts[j] >>=3D 1; } } - l2_table =3D extent->l2_cache + (i * extent->l2_size); + l2_table =3D (char *)extent->l2_cache + (i * l2_size_bytes); goto found; } } @@ -1250,13 +1544,13 @@ static int get_cluster_offset(BlockDriverState *bs, min_index =3D i; } } - l2_table =3D extent->l2_cache + (min_index * extent->l2_size); + l2_table =3D (char *)extent->l2_cache + (min_index * l2_size_bytes); BLKDBG_EVENT(extent->file, BLKDBG_L2_LOAD); if (bdrv_pread(extent->file, (int64_t)l2_offset * 512, l2_table, - extent->l2_size * sizeof(uint32_t) - ) !=3D extent->l2_size * sizeof(uint32_t)) { + l2_size_bytes + ) !=3D l2_size_bytes) { return VMDK_ERROR; } =20 @@ -1264,16 +1558,45 @@ static int get_cluster_offset(BlockDriverState *bs, extent->l2_cache_counts[min_index] =3D 1; found: l2_index =3D ((offset >> 9) / extent->cluster_sectors) % extent->l2_si= ze; - cluster_sector =3D le32_to_cpu(l2_table[l2_index]); =20 - if (extent->has_zero_grain && cluster_sector =3D=3D VMDK_GTE_ZEROED) { - zeroed =3D true; + if (extent->sesparse) { + cluster_sector =3D le64_to_cpu(((uint64_t *)l2_table)[l2_index]); + switch (cluster_sector & 0xf000000000000000) { + case 0x0000000000000000: + /* unallocated grain */ + if (cluster_sector !=3D 0) { + return VMDK_ERROR; + } + break; + case 0x1000000000000000: + /* scsi-unmapped grain - fallthrough */ + case 0x2000000000000000: + /* zero grain */ + zeroed =3D true; + break; + case 0x3000000000000000: + /* allocated grain */ + cluster_sector =3D (((cluster_sector & 0x0fff000000000000) >> = 48) | + ((cluster_sector & 0x0000ffffffffffff) << 12= )); + cluster_sector =3D extent->sesparse_clusters_offset + + cluster_sector * extent->cluster_sectors; + break; + default: + return VMDK_ERROR; + } + } else { + cluster_sector =3D le32_to_cpu(((uint32_t *)l2_table)[l2_index]); + + if (extent->has_zero_grain && cluster_sector =3D=3D VMDK_GTE_ZEROE= D) { + zeroed =3D true; + } } =20 if (!cluster_sector || zeroed) { if (!allocate) { return zeroed ? VMDK_ZEROED : VMDK_UNALLOC; } + assert(!extent->sesparse); =20 if (extent->next_cluster_sector >=3D VMDK_EXTENT_MAX_SECTORS) { return VMDK_ERROR; @@ -1297,7 +1620,7 @@ static int get_cluster_offset(BlockDriverState *bs, m_data->l1_index =3D l1_index; m_data->l2_index =3D l2_index; m_data->l2_offset =3D l2_offset; - m_data->l2_cache_entry =3D &l2_table[l2_index]; + m_data->l2_cache_entry =3D ((uint32_t *)l2_table) + l2_index; } } *cluster_offset =3D cluster_sector << BDRV_SECTOR_BITS; @@ -1623,6 +1946,9 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_= t offset, if (!extent) { return -EIO; } + if (extent->sesparse) { + return -ENOTSUP; + } offset_in_cluster =3D vmdk_find_offset_in_cluster(extent, offset); n_bytes =3D MIN(bytes, extent->cluster_sectors * BDRV_SECTOR_SIZE - offset_in_cluster); --=20 2.13.3