From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D96529E999 for ; Tue, 28 Nov 2023 11:40:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B876415050 for ; Tue, 28 Nov 2023 11:40:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 28 Nov 2023 11:40:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0188944D42 for ; Tue, 28 Nov 2023 11:40:08 +0100 (CET) From: Markus Frank To: pbs-devel@lists.proxmox.com Date: Tue, 28 Nov 2023 11:39:55 +0100 Message-Id: <20231128103959.159650-3-m.frank@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231128103959.159650-1-m.frank@proxmox.com> References: <20231128103959.159650-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 2/6] fix #3690: tools: add wipe_blockdev & change_parttype rust equivalent X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Nov 2023 10:40:10 -0000 The wipe_blockdev & change_parttype functions are similar to PVE::Diskmanage's wipe_blockdev & change_parttype functions. The partition_by_name & complete_partition_name functions are modified disk_by_name & complete_disk_name functions for partitions. Signed-off-by: Markus Frank --- src/tools/disks/mod.rs | 125 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/src/tools/disks/mod.rs b/src/tools/disks/mod.rs index 72e374ca..51919f9e 100644 --- a/src/tools/disks/mod.rs +++ b/src/tools/disks/mod.rs @@ -16,10 +16,12 @@ use ::serde::{Deserialize, Serialize}; use proxmox_lang::error::io_err_other; use proxmox_lang::{io_bail, io_format_err}; +use proxmox_rest_server::WorkerTask; use proxmox_schema::api; use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo}; +use proxmox_sys::task_log; -use pbs_api_types::BLOCKDEVICE_NAME_REGEX; +use pbs_api_types::{BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX, BLOCKDEVICE_NAME_REGEX}; mod zfs; pub use zfs::*; @@ -111,6 +113,12 @@ impl DiskManage { self.disk_by_sys_path(syspath) } + /// Get a `Disk` for a name in `/sys/class/block/`. + pub fn partition_by_name(self: Arc, name: &str) -> io::Result { + let syspath = format!("/sys/class/block/{}", name); + self.disk_by_sys_path(syspath) + } + /// Gather information about mounted disks: fn mounted_devices(&self) -> Result<&HashSet, Error> { self.mounted_devices @@ -1056,6 +1064,105 @@ pub fn inititialize_gpt_disk(disk: &Disk, uuid: Option<&str>) -> Result<(), Erro Ok(()) } +/// Wipes all labels and the first 200 MiB of a disk/partition (or the whole if it is smaller). +/// If called with a partition, also sets the partition type to 0x83 'Linux filesystem'. +pub fn wipe_blockdev(disk: &Disk, worker: Arc) -> Result<(), Error> { + let disk_path = match disk.device_path() { + Some(path) => path, + None => bail!("disk {:?} has no node in /dev", disk.syspath()), + }; + let disk_path_str = match disk_path.to_str() { + Some(path) => path, + None => bail!("disk {:?} could not transform into a str", disk.syspath()), + }; + + let mut is_partition = false; + for disk_info in get_lsblk_info()?.iter() { + if disk_info.path == disk_path_str && disk_info.partition_type.is_some() { + is_partition = true; + } + } + + let mut to_wipe: Vec = Vec::new(); + + let partitions_map = disk.partitions()?; + for part_disk in partitions_map.values() { + let part_path = match part_disk.device_path() { + Some(path) => path, + None => bail!("disk {:?} has no node in /dev", part_disk.syspath()), + }; + to_wipe.push(part_path.to_path_buf()); + } + + to_wipe.push(disk_path.to_path_buf()); + + task_log!(worker, "Wiping block device {}", disk_path.display()); + + let mut wipefs_command = std::process::Command::new("wipefs"); + wipefs_command.arg("--all").args(&to_wipe); + + let wipefs_output = proxmox_sys::command::run_command(wipefs_command, None)?; + task_log!(worker, "wipefs output: {}", wipefs_output); + + let size = disk.size().map(|size| size / 1024 / 1024)?; + let count = size.min(200); + + let mut dd_command = std::process::Command::new("dd"); + let mut of_path = OsString::from("of="); + of_path.push(disk_path); + let mut count_str = OsString::from("count="); + count_str.push(count.to_string()); + let args = [ + "if=/dev/zero".into(), + of_path, + "bs=1M".into(), + "conv=fdatasync".into(), + count_str.into(), + ]; + dd_command.args(args); + + let dd_output = proxmox_sys::command::run_command(dd_command, None)?; + task_log!(worker, "dd output: {}", dd_output); + + if is_partition { + // set the partition type to 0x83 'Linux filesystem' + change_parttype(&disk, "8300", worker)?; + } + + Ok(()) +} + +pub fn change_parttype( + part_disk: &Disk, + part_type: &str, + worker: Arc, +) -> Result<(), Error> { + let part_path = match part_disk.device_path() { + Some(path) => path, + None => bail!("disk {:?} has no node in /dev", part_disk.syspath()), + }; + if let Ok(stat) = nix::sys::stat::stat(part_path) { + let mut sgdisk_command = std::process::Command::new("sgdisk"); + let major = unsafe { libc::major(stat.st_rdev) }; + let minor = unsafe { libc::minor(stat.st_rdev) }; + let partnum_path = &format!("/sys/dev/block/{}:{}/partition", major, minor); + let partnum: u32 = std::fs::read_to_string(partnum_path)?.trim_end().parse()?; + sgdisk_command.arg(&format!("-t{}:{}", partnum, part_type)); + let part_disk_parent = match part_disk.parent() { + Some(disk) => disk, + None => bail!("disk {:?} has no node in /dev", part_disk.syspath()), + }; + let part_disk_parent_path = match part_disk_parent.device_path() { + Some(path) => path, + None => bail!("disk {:?} has no node in /dev", part_disk.syspath()), + }; + sgdisk_command.arg(part_disk_parent_path); + let sgdisk_output = proxmox_sys::command::run_command(sgdisk_command, None)?; + task_log!(worker, "sgdisk output: {}", sgdisk_output); + } + Ok(()) +} + /// Create a single linux partition using the whole available space pub fn create_single_linux_partition(disk: &Disk) -> Result { let disk_path = match disk.device_path() { @@ -1136,6 +1243,22 @@ pub fn complete_disk_name(_arg: &str, _param: &HashMap) -> Vec) -> Vec { + let dir = match proxmox_sys::fs::scan_subdir( + libc::AT_FDCWD, + "/sys/class/block", + &BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX, + ) { + Ok(dir) => dir, + Err(_) => return vec![], + }; + + dir.flatten() + .map(|item| item.file_name().to_str().unwrap().to_string()) + .collect() +} + /// Read the FS UUID (parse blkid output) /// /// Note: Calling blkid is more reliable than using the udev ID_FS_UUID property. -- 2.39.2