From nobody Mon May 6 05:26:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149158261797391.07117007709394; Fri, 7 Apr 2017 09:30:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF86C338844; Fri, 7 Apr 2017 16:30:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E78E18006; Fri, 7 Apr 2017 16:30:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6C82E4BB75; Fri, 7 Apr 2017 16:30:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37GUBeL018915 for ; Fri, 7 Apr 2017 12:30:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id E0403189CB; Fri, 7 Apr 2017 16:30:11 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F72C857B9 for ; Fri, 7 Apr 2017 16:30:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DF86C338844 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DF86C338844 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 12:30:03 -0400 Message-Id: <20170407163007.17702-2-jferlan@redhat.com> In-Reply-To: <20170407163007.17702-1-jferlan@redhat.com> References: <20170407163007.17702-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 1/5] storage: Modify storageBackendWipeLocal to allow zero from end of device X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Apr 2017 16:30:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add bool 'zero_end' and logic that would allow a caller to wipe specific portions of a target device either from the beginning (the default) or from the end when zero_end is true. This will allow for this code to wipe out partition table information from a device. Signed-off-by: John Ferlan --- src/storage/storage_util.c | 48 +++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a2d89af..c1734e7 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2516,24 +2516,44 @@ static int storageBackendWipeLocal(const char *path, int fd, unsigned long long wipe_len, - size_t writebuf_length) + size_t writebuf_length, + bool zero_end) { int ret =3D -1, written =3D 0; unsigned long long remaining =3D 0; + off_t size; size_t write_size =3D 0; char *writebuf =3D NULL; =20 - VIR_DEBUG("wiping start: 0 len: %llu", wipe_len); - if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) goto cleanup; =20 - if (lseek(fd, 0, SEEK_SET) < 0) { - virReportSystemError(errno, - _("Failed to seek to the start in volume " - "with path '%s'"), - path); - goto cleanup; + if (!zero_end) { + if (lseek(fd, 0, SEEK_SET) < 0) { + virReportSystemError(errno, + _("Failed to seek to the start in volume " + "with path '%s'"), + path); + goto cleanup; + } + VIR_DEBUG("wiping start: 0 len: %llu", wipe_len); + } else { + if ((size =3D lseek(fd, 0, SEEK_END)) =3D=3D (off_t)-1) { + virReportSystemError(errno, + _("Failed to seek to the end in volume " + "with path '%s'"), + path); + goto cleanup; + } + size -=3D wipe_len; + if (lseek(fd, size, SEEK_SET) < 0) { + virReportSystemError(errno, + _("Failed to seek to %zd bytes in volume " + "with path '%s'"), + size, path); + goto cleanup; + } + VIR_DEBUG("wiping start: %zd len: %llu", size, wipe_len); } =20 remaining =3D wipe_len; @@ -2573,7 +2593,8 @@ storageBackendWipeLocal(const char *path, static int storageBackendVolWipeLocalFile(const char *path, unsigned int algorithm, - unsigned long long allocation) + unsigned long long allocation, + bool zero_end) { int ret =3D -1, fd =3D -1; const char *alg_char =3D NULL; @@ -2648,7 +2669,8 @@ storageBackendVolWipeLocalFile(const char *path, if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)= ) { ret =3D storageBackendVolZeroSparseFileLocal(path, st.st_size,= fd); } else { - ret =3D storageBackendWipeLocal(path, fd, allocation, st.st_bl= ksize); + ret =3D storageBackendWipeLocal(path, fd, allocation, st.st_bl= ksize, + zero_end); } if (ret < 0) goto cleanup; @@ -2686,7 +2708,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, goto cleanup; =20 if (storageBackendVolWipeLocalFile(target_path, algorithm, - vol->target.allocation) < 0) + vol->target.allocation, false) < 0) goto cleanup; =20 if (virFileRemove(disk_desc, 0, 0) < 0) { @@ -2735,7 +2757,7 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTR= IBUTE_UNUSED, ret =3D storageBackendVolWipePloop(vol, algorithm); } else { ret =3D storageBackendVolWipeLocalFile(vol->target.path, algorithm, - vol->target.allocation); + vol->target.allocation, false= ); } =20 return ret; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 05:26:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149158261680544.83773244272845; Fri, 7 Apr 2017 09:30:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 056903DBDF; Fri, 7 Apr 2017 16:30:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC0269B916; Fri, 7 Apr 2017 16:30:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7266A4EBD7; Fri, 7 Apr 2017 16:30:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37GUCoo018920 for ; Fri, 7 Apr 2017 12:30:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 582CA189DE; Fri, 7 Apr 2017 16:30:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15D66189CB for ; Fri, 7 Apr 2017 16:30:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 056903DBDF Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 056903DBDF From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 12:30:04 -0400 Message-Id: <20170407163007.17702-3-jferlan@redhat.com> In-Reply-To: <20170407163007.17702-1-jferlan@redhat.com> References: <20170407163007.17702-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 2/5] storage: Introduce virStorageBackendZeroPartitionTable X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 07 Apr 2017 16:30:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Create a wrapper/helper that can be used to call the storage backend wipe helper - storageBackendVolWipeLocalFile for future use by logical and disk backends to clear out the partition table rather than having each open code the same algorithm. Signed-off-by: John Ferlan --- src/storage/storage_util.c | 22 ++++++++++++++++++++++ src/storage/storage_util.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index c1734e7..d7394d6 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -4111,3 +4111,25 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr po= ol, =20 return found; } + + +/* + * @path: Path to the device to initialize + * @size: Size to be cleared + * + * Zero out possible partition table information for the specified + * bytes from the start of the @path and from the end of @path + * + * Returns 0 on success, -1 on failure with error message set + */ +int +virStorageBackendZeroPartitionTable(const char *path, + unsigned long long size) +{ + if (storageBackendVolWipeLocalFile(path, VIR_STORAGE_VOL_WIPE_ALG_ZERO, + size, false) < 0) + return -1; + + return storageBackendVolWipeLocalFile(path, VIR_STORAGE_VOL_WIPE_ALG_Z= ERO, + size, true); +} diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index 602d3a0..a05c35d 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -167,4 +167,8 @@ virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr = conn, int virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool, uint32_t scanhost); =20 +int +virStorageBackendZeroPartitionTable(const char *path, + unsigned long long size); + #endif /* __VIR_STORAGE_UTIL_H__ */ --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 05:26:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 14915826229381011.5988392195419; Fri, 7 Apr 2017 09:30:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18B34C04BD44; Fri, 7 Apr 2017 16:30:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0ED7A6174; Fri, 7 Apr 2017 16:30:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8AE215EC64; Fri, 7 Apr 2017 16:30:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37GUCq5018925 for ; Fri, 7 Apr 2017 12:30:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id BF12A189DF; Fri, 7 Apr 2017 16:30:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EABF189CB for ; Fri, 7 Apr 2017 16:30:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 18B34C04BD44 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 18B34C04BD44 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 12:30:05 -0400 Message-Id: <20170407163007.17702-4-jferlan@redhat.com> In-Reply-To: <20170407163007.17702-1-jferlan@redhat.com> References: <20170407163007.17702-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 3/5] logical: Use virStorageBackendZeroPartitionTable X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 07 Apr 2017 16:30:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than open code it, use the new function which uses the wipe algorithm in order to zero the front and tail of the partition. Signed-off-by: John Ferlan --- src/storage/storage_backend_logical.c | 44 +------------------------------= ---- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index d87aaf0..a865036 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -92,9 +92,6 @@ virStorageBackendLogicalRemoveDevice(const char *path) static int virStorageBackendLogicalInitializeDevice(const char *path) { - int fd =3D -1; - char zeros[4 * PV_BLANK_SECTOR_SIZE] =3D {0}; - off_t size; int ret =3D -1; virCommandPtr pvcmd =3D NULL; =20 @@ -103,46 +100,8 @@ virStorageBackendLogicalInitializeDevice(const char *p= ath) * a whole disk as a PV. So we just blank them out regardless * rather than trying to figure out if we're a disk or partition */ - if ((fd =3D open(path, O_WRONLY)) < 0) { - virReportSystemError(errno, _("cannot open device '%s'"), path); + if (virStorageBackendZeroPartitionTable(path, 4 * PV_BLANK_SECTOR_SIZE= ) < 0) return -1; - } - - if ((size =3D lseek(fd, 0, SEEK_END)) =3D=3D (off_t)-1) { - virReportSystemError(errno, - _("failed to seek to end of %s"), path); - goto cleanup; - } - - if (size < 4 * PV_BLANK_SECTOR_SIZE) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("cannot initialize '%s' detected size=3D'%zd' les= s " - "than minimum required=3D'%d"), - path, (ssize_t) size, 4 * PV_BLANK_SECTOR_SIZE); - goto cleanup; - } - if ((size =3D lseek(fd, 0, SEEK_SET)) =3D=3D (off_t)-1) { - virReportSystemError(errno, - _("failed to seek to start of %s"), path); - goto cleanup; - } - - if (safewrite(fd, zeros, sizeof(zeros)) < 0) { - virReportSystemError(errno, _("cannot clear device header of '%s'"= ), - path); - goto cleanup; - } - - if (fsync(fd) < 0) { - virReportSystemError(errno, _("cannot flush header of device'%s'"), - path); - goto cleanup; - } - - if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("cannot close device '%s'"), path); - goto cleanup; - } =20 /* * Initialize the physical volume because vgcreate is not @@ -155,7 +114,6 @@ virStorageBackendLogicalInitializeDevice(const char *pa= th) ret =3D 0; =20 cleanup: - VIR_FORCE_CLOSE(fd); virCommandFree(pvcmd); =20 return ret; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 05:26:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491582622440982.0974323110653; Fri, 7 Apr 2017 09:30:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E2693DBC1; Fri, 7 Apr 2017 16:30:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0B8D9F648; Fri, 7 Apr 2017 16:30:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 88D6F5EC61; Fri, 7 Apr 2017 16:30:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37GUDID018933 for ; Fri, 7 Apr 2017 12:30:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 39D17189DE; Fri, 7 Apr 2017 16:30:13 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB328189CB for ; Fri, 7 Apr 2017 16:30:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1E2693DBC1 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1E2693DBC1 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 12:30:06 -0400 Message-Id: <20170407163007.17702-5-jferlan@redhat.com> In-Reply-To: <20170407163007.17702-1-jferlan@redhat.com> References: <20170407163007.17702-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 4/5] logical: Increase the size of the data to wipe X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 07 Apr 2017 16:30:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since a sector size may be larger than 512 bytes, let's just increase the size to wipe to 1MB rather than 2048KB Signed-off-by: John Ferlan --- src/storage/storage_backend_logical.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index a865036..ed26c24 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -100,7 +100,7 @@ virStorageBackendLogicalInitializeDevice(const char *pa= th) * a whole disk as a PV. So we just blank them out regardless * rather than trying to figure out if we're a disk or partition */ - if (virStorageBackendZeroPartitionTable(path, 4 * PV_BLANK_SECTOR_SIZE= ) < 0) + if (virStorageBackendZeroPartitionTable(path, 1024 * 1024) < 0) return -1; =20 /* --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 05:26:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491582622809612.2844893741151; Fri, 7 Apr 2017 09:30:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1CA2C7EBA7; Fri, 7 Apr 2017 16:30:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E165DA0770; Fri, 7 Apr 2017 16:30:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8BA1018523C8; Fri, 7 Apr 2017 16:30:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37GUEaO018945 for ; Fri, 7 Apr 2017 12:30:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 218B0189CB; Fri, 7 Apr 2017 16:30:14 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6714857B7 for ; Fri, 7 Apr 2017 16:30:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1CA2C7EBA7 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1CA2C7EBA7 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 12:30:07 -0400 Message-Id: <20170407163007.17702-6-jferlan@redhat.com> In-Reply-To: <20170407163007.17702-1-jferlan@redhat.com> References: <20170407163007.17702-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 5/5] disk: Use virStorageBackendZeroPartitionTable X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 07 Apr 2017 16:30:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1439132 During 'matrix' testing of all possible combinations I found that if device is formated with "gpt" first, then an attempt is made to format using "mac", a startup will fail. Deeper analysis by Peter Krempa indicates that the "mac" table fits into the first block on the disk. Since the GPT disklabel is stored at LBA address 1 it is not overwritten at all. Thus it's apparent that the (blkid) detection tool then prefers GPT over a older disklabel. The GPT disklabel has also a secondary copy at the last LBA of the disk. So, follow the same logic as the logical pool in clearing a 1MB swath at the beginning and end of the device to avoid potential issues with larger sector sizes for the device. Also fixed a minor formatting nit in virStorageBackendDeviceIsEmpty call. Signed-off-by: John Ferlan --- src/storage/storage_backend_disk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index 39371f2..e8f67bb 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -491,11 +491,15 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATT= RIBUTE_UNUSED, ok_to_mklabel =3D true; } else { if (virStorageBackendDeviceIsEmpty(pool->def->source.devices[0].pa= th, - fmt, true)) + fmt, true)) ok_to_mklabel =3D true; } =20 if (ok_to_mklabel) { + if (virStorageBackendZeroPartitionTable(pool->def->source.devices[= 0].path, + 1024 * 1024) < 0) + goto error; + /* eg parted /dev/sda mklabel --script msdos */ if (format =3D=3D VIR_STORAGE_POOL_DISK_UNKNOWN) format =3D pool->def->source.format =3D VIR_STORAGE_POOL_DISK_= DOS; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list