X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FDiskmanage.pm;h=9f482af036ef4c5d4b21837e1c862aadc4218f23;hb=d3a5e30963b9c519b80cd7ab154a64048929b11c;hp=0deb1a6eea7c57726e225e1a871020f8485e3426;hpb=79f4a7bfd39c59dc35545f90d37e080afc2153dc;p=pve-storage.git

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 0deb1a6..9f482af 100644
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -2,10 +2,13 @@ package PVE::Diskmanage;
 
 use strict;
 use warnings;
+
 use PVE::ProcFSTools;
 use Data::Dumper;
 use Cwd qw(abs_path);
 use Fcntl ':mode';
+use File::stat;
+use JSON;
 
 use PVE::Tools qw(extract_param run_command file_get_contents file_read_firstline dir_glob_regex dir_glob_foreach trim);
 
@@ -14,7 +17,7 @@ my $ZPOOL = "/sbin/zpool";
 my $SGDISK = "/sbin/sgdisk";
 my $PVS = "/sbin/pvs";
 my $LVS = "/sbin/lvs";
-my $UDEVADM = "/bin/udevadm";
+my $LSBLK = "/bin/lsblk";
 
 sub verify_blockdev_path {
     my ($rel_path) = @_;
@@ -105,7 +108,6 @@ sub get_smart_data {
 	    if (defined($type) && $type eq 'ata' && $line =~ m/^([ \d]{2}\d)\s+(\S+)\s+(\S{6})\s+(\d+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(.*)$/) {
 		my $entry = {};
 
-
 		$entry->{name} = $2 if defined $2;
 		$entry->{flags} = $3 if defined $3;
 		# the +0 makes a number out of the strings
@@ -131,8 +133,8 @@ sub get_smart_data {
 	    } elsif (defined($type) && $type eq 'text') {
 		$smartdata->{text} = '' if !defined $smartdata->{text};
 		$smartdata->{text} .= "$line\n";
-		# extract wearout from nvme text, allow for decimal values
-		if ($line =~ m/Percentage Used:.*(\d+(?:\.\d+)?)\%/i) {
+		# extract wearout from nvme/sas text, allow for decimal values
+		if ($line =~ m/Percentage Used(?: endurance indicator)?:\s*(\d+(?:\.\d+)?)\%/i) {
 		    $smartdata->{wearout} = 100 - $1;
 		}
 	    } elsif ($line =~ m/SMART Disabled/) {
@@ -154,8 +156,48 @@ sub get_smart_data {
     return $smartdata;
 }
 
+sub get_parttype_info() {
+    my $cmd = [$LSBLK, '--json', '-o', 'path,parttype'];
+    my $output = "";
+    my $res = {};
+    eval {
+	run_command($cmd, outfunc => sub {
+	    my ($line) = @_;
+	    $output .= "$line\n";
+	});
+    };
+    warn "$@\n" if $@;
+    return $res if $output eq '';
+
+    my $parsed = eval { decode_json($output) };
+    warn "$@\n" if $@;
+    my $list = $parsed->{blockdevices} // [];
+
+    foreach my $dev (@$list) {
+	next if !($dev->{parttype});
+	my $type = $dev->{parttype};
+	$res->{$type} = [] if !defined($res->{$type});
+	push @{$res->{$type}}, $dev->{path};
+    }
+
+    return $res;
+}
+
+my $get_devices_by_partuuid = sub {
+    my ($parttype_map, $uuids, $res) = @_;
+
+    $res = {} if !defined($res);
+
+    foreach my $uuid (sort keys %$uuids) {
+       map { $res->{$_} = $uuids->{$uuid} } @{$parttype_map->{$uuid}};
+    }
+
+    return $res;
+};
+
 sub get_zfs_devices {
-    my $list = {};
+    my ($parttype_map) = @_;
+    my $res = {};
 
     return {} if ! -x $ZPOOL;
 
@@ -167,7 +209,7 @@ sub get_zfs_devices {
 	     my ($line) = @_;
 
 	     if ($line =~ m|^\t([^\t]+)\t|) {
-		$list->{$1} = 1;
+		$res->{$1} = 1;
 	     }
 	});
     };
@@ -176,26 +218,26 @@ sub get_zfs_devices {
     # because maybe zfs tools are not installed
     warn "$@\n" if $@;
 
-    my $applezfsuuid = "6a898cc3-1dd2-11b2-99a6-080020736631";
-    my $bsdzfsuuid = "516e7cba-6ecf-11d6-8ff8-00022d09712b";
+    my $uuids = {
+	"6a898cc3-1dd2-11b2-99a6-080020736631" => 1, # apple
+	"516e7cba-6ecf-11d6-8ff8-00022d09712b" => 1, # bsd
+    };
+
 
-    dir_glob_foreach('/dev/disk/by-parttypeuuid', "($applezfsuuid|$bsdzfsuuid)\..+", sub {
-	my ($entry) = @_;
-	my $real_dev = abs_path("/dev/disk/by-parttypeuuid/$entry");
-	$list->{$real_dev} = 1;
-    });
+    $res = $get_devices_by_partuuid->($parttype_map, $uuids, $res);
 
-    return $list;
+    return $res;
 }
 
 sub get_lvm_devices {
-    my $list = {};
+    my ($parttype_map) = @_;
+    my $res = {};
     eval {
 	run_command([$PVS, '--noheadings', '--readonly', '-o', 'pv_name'], outfunc => sub{
 	    my ($line) = @_;
 	    $line = trim($line);
 	    if ($line =~ m|^/dev/|) {
-		$list->{$line} = 1;
+		$res->{$line} = 1;
 	    }
 	});
     };
@@ -204,40 +246,29 @@ sub get_lvm_devices {
     # to give up, but indicate an error has occured
     warn "$@\n" if $@;
 
-    my $lvmuuid = "e6d6d379-f507-44c2-a23c-238f2a3df928";
+    my $uuids = {
+	"e6d6d379-f507-44c2-a23c-238f2a3df928" => 1,
+    };
 
-    dir_glob_foreach('/dev/disk/by-parttypeuuid', "$lvmuuid\..+", sub {
-	my ($entry) = @_;
-	my $real_dev = abs_path("/dev/disk/by-parttypeuuid/$entry");
-	$list->{$real_dev} = 1;
-    });
+    $res = $get_devices_by_partuuid->($parttype_map, $uuids, $res);
 
-    return $list;
+    return $res;
 }
 
 sub get_ceph_journals {
-    my $journalhash = {};
-
-    my $journal_uuid = '45b0969e-9b03-4f30-b4c6-b4b80ceff106';
-    my $db_uuid = '30cd0809-c2b2-499c-8879-2d6b78529876';
-    my $wal_uuid = '5ce17fce-4087-4169-b7ff-056cc58473f9';
-    my $block_uuid = 'cafecafe-9b03-4f30-b4c6-b4b80ceff106';
-
-    dir_glob_foreach('/dev/disk/by-parttypeuuid', "($journal_uuid|$db_uuid|$wal_uuid|$block_uuid)\..+", sub {
-	my ($entry, $type) = @_;
-	my $real_dev = abs_path("/dev/disk/by-parttypeuuid/$entry");
-	if ($type eq $journal_uuid) {
-	    $journalhash->{$real_dev} = 1;
-	} elsif ($type eq $db_uuid) {
-	    $journalhash->{$real_dev} = 2;
-	} elsif ($type eq $wal_uuid) {
-	    $journalhash->{$real_dev} = 3;
-	} elsif ($type eq $block_uuid) {
-	    $journalhash->{$real_dev} = 4;
-	}
-    });
+    my ($parttype_map) = @_;
+    my $res = {};
+
+    my $uuids = {
+	'45b0969e-9b03-4f30-b4c6-b4b80ceff106' => 1, # journal
+	'30cd0809-c2b2-499c-8879-2d6b78529876' => 2, # db
+	'5ce17fce-4087-4169-b7ff-056cc58473f9' => 3, # wal
+	'cafecafe-9b03-4f30-b4c6-b4b80ceff106' => 4, # block
+    };
 
-    return $journalhash;
+    $res = $get_devices_by_partuuid->($parttype_map, $uuids, $res);
+
+    return $res;
 }
 
 # reads the lv_tags and matches them with the devices
@@ -261,6 +292,9 @@ sub get_ceph_volume_infos {
 	    if (($type eq 'block' || $type eq 'data') && $fields->[2] =~ m/ceph.osd_id=([^,]+)/) {
 		$result->{$dev}->{osdid} = $1;
 		$result->{$dev}->{bluestore} = ($type eq 'block');
+		if ($fields->[2] =~ m/ceph\.encrypted=1/) {
+		    $result->{$dev}->{encrypted} = 1;
+		}
 	    } else {
 		# undef++ becomes '1' (see `perldoc perlop`: Auto-increment)
 		$result->{$dev}->{$type}++;
@@ -277,7 +311,7 @@ sub get_udev_info {
     my $info = "";
     my $data = {};
     eval {
-	run_command([$UDEVADM, 'info', '-p', $dev, '--query', 'all'], outfunc => sub {
+	run_command(['udevadm', 'info', '-p', $dev, '--query', 'all'], outfunc => sub {
 	    my ($line) = @_;
 	    $info .= "$line\n";
 	});
@@ -324,6 +358,11 @@ sub get_udev_info {
 	$data->{wwn} = $1;
     }
 
+    if ($info =~ m/^E: DEVLINKS=(.+)$/m) {
+	my @devlinks = grep(m#^/dev/disk/by-id/(ata|scsi|nvme(?!-eui))#, split (/ /, $1));
+	$data->{by_id_link} = $devlinks[0] if defined($devlinks[0]);
+    }
+
     return $data;
 }
 
@@ -356,7 +395,7 @@ sub get_sysdir_info {
 }
 
 sub get_wear_leveling_info {
-    my ($smartdata, $model) = @_;
+    my ($smartdata) = @_;
     my $attributes = $smartdata->{attributes};
 
     if (defined($smartdata->{wearout})) {
@@ -365,37 +404,35 @@ sub get_wear_leveling_info {
 
     my $wearout;
 
-    my $vendormap = {
-	'kingston' => 231,
-	'samsung' => 177,
-	'intel' => 233,
-	'sandisk' => 233,
-	'crucial' => 202,
-	'default' => 233,
-    };
-
-    # find target attr id
-
-    my $attrid;
-
-    foreach my $vendor (keys %$vendormap) {
-	if ($model =~ m/$vendor/i) {
-	    $attrid = $vendormap->{$vendor};
-	    # found the attribute
-	    last;
+    # Common register names that represent percentage values of potential
+    # failure indicators used in drivedb.h of smartmontool's. Order matters,
+    # as some drives may have multiple definitions
+    my @wearoutregisters = (
+	"Media_Wearout_Indicator",
+	"SSD_Life_Left",
+	"Wear_Leveling_Count",
+	"Perc_Write\/Erase_Ct_BC",
+	"Perc_Rated_Life_Remain",
+	"Remaining_Lifetime_Perc",
+	"Percent_Lifetime_Remain",
+	"Lifetime_Left",
+	"PCT_Life_Remaining",
+	"Lifetime_Remaining",
+	"Percent_Life_Remaining",
+	"Percent_Lifetime_Used",
+	"Perc_Rated_Life_Used"
+    );
+
+    # Search for S.M.A.R.T. attributes for known register
+    foreach my $register (@wearoutregisters) {
+	last if defined $wearout;
+	foreach my $attr (@$attributes) {
+	   next if $attr->{name} !~ m/$register/;
+	   $wearout = $attr->{value};
+	   last;
 	}
     }
 
-    if (!$attrid) {
-	$attrid = $vendormap->{default};
-    }
-
-    foreach my $attr (@$attributes) {
-	next if $attr->{id} != $attrid;
-	$wearout = $attr->{value};
-	last;
-    }
-
     return $wearout;
 }
 
@@ -424,6 +461,11 @@ sub is_iscsi {
     return 0;
 }
 
+my sub is_ssdlike {
+    my ($type) = @_;
+    return $type eq 'ssd' || $type eq 'nvme';
+}
+
 sub get_disks {
     my ($disks, $nosmart) = @_;
     my $disklist = {};
@@ -442,12 +484,14 @@ sub get_disks {
 	return $mounted->{$dev};
     };
 
-    my $journalhash = get_ceph_journals();
+    my $parttype_map = get_parttype_info();
+
+    my $journalhash = get_ceph_journals($parttype_map);
     my $ceph_volume_infos = get_ceph_volume_infos();
 
-    my $zfslist = get_zfs_devices();
+    my $zfshash = get_zfs_devices($parttype_map);
 
-    my $lvmlist = get_lvm_devices();
+    my $lvmhash = get_lvm_devices($parttype_map);
 
     my $disk_regex = ".*";
     if (defined($disks)) {
@@ -457,7 +501,7 @@ sub get_disks {
 	    die "disks is not a string or array reference\n";
 	}
 	# we get cciss/c0d0 but need cciss!c0d0
-	map { s|cciss/|cciss!| } @$disks;
+	$_ =~ s|cciss/|cciss!| for @$disks;
 
 	$disk_regex = "(?:" . join('|', @$disks) . ")";
     }
@@ -491,6 +535,7 @@ sub get_disks {
 
 	if ($sysdata->{rotational} == 0) {
 	    $type = 'ssd';
+	    $type = 'nvme' if $dev =~ m/^nvme\d+n\d+$/;
 	    $data->{rpm} = 0;
 	} elsif ($sysdata->{rotational} == 1) {
 	    if ($data->{rpm} != -1) {
@@ -506,12 +551,12 @@ sub get_disks {
 
 	if (!$nosmart) {
 	    eval {
-		my $smartdata = get_smart_data($devpath, ($type ne 'ssd'));
+		my $smartdata = get_smart_data($devpath, !is_ssdlike($type));
 		$health = $smartdata->{health} if $smartdata->{health};
 
-		if ($type eq 'ssd') {
+		if (is_ssdlike($type)) {
 		    # if we have an ssd we try to get the wearout indicator
-		    my $wearval = get_wear_leveling_info($smartdata, $data->{model} || $sysdata->{model});
+		    my $wearval = get_wear_leveling_info($smartdata);
 		    $wearout = $wearval if defined($wearval);
 		}
 	    };
@@ -519,11 +564,11 @@ sub get_disks {
 
 	my $used;
 
-	$used = 'LVM' if $lvmlist->{$devpath};
+	$used = 'LVM' if $lvmhash->{$devpath};
 
 	$used = 'mounted' if &$dev_is_mounted($devpath);
 
-	$used = 'ZFS' if $zfslist->{$devpath};
+	$used = 'ZFS' if $zfshash->{$devpath};
 
 	# we replaced cciss/ with cciss! above
 	# but in the result we need cciss/ again
@@ -547,8 +592,12 @@ sub get_disks {
 	    wearout => $wearout,
 	};
 
+	my $by_id_link = $data->{by_id_link};
+	$disklist->{$dev}->{by_id_link} = $by_id_link if defined($by_id_link);
+
 	my $osdid = -1;
 	my $bluestore = 0;
+	my $osdencrypted = 0;
 
 	my $journal_count = 0;
 	my $db_count = 0;
@@ -578,11 +627,11 @@ sub get_disks {
 		}
 	    }
 
-	    if ($lvmlist->{"$partpath/$part"}) {
+	    if ($lvmhash->{"$partpath/$part"}) {
 		$found_lvm = 1;
 	    }
 
-	    if ($zfslist->{"$partpath/$part"}) {
+	    if ($zfshash->{"$partpath/$part"}) {
 		$found_zfs = 1;
 	    }
 
@@ -605,6 +654,7 @@ sub get_disks {
 	    if (defined($ceph_volume->{osdid})) {
 		$osdid = $ceph_volume->{osdid};
 		$bluestore = 1 if $ceph_volume->{bluestore};
+		$osdencrypted = 1 if $ceph_volume->{encrypted};
 	    }
 	}
 
@@ -623,6 +673,7 @@ sub get_disks {
 	$disklist->{$dev}->{osdid} = $osdid;
 	$disklist->{$dev}->{journals} = $journal_count if $journal_count;
 	$disklist->{$dev}->{bluestore} = $bluestore if $osdid != -1;
+	$disklist->{$dev}->{osdencrypted} = $osdencrypted if $osdid != -1;
 	$disklist->{$dev}->{db} = $db_count if $db_count;
 	$disklist->{$dev}->{wal} = $wal_count if $wal_count;
     });
@@ -634,18 +685,18 @@ sub get_disks {
 sub get_partnum {
     my ($part_path) = @_;
 
-    my ($mode, $rdev) = (stat($part_path))[2,6];
+    my $st = stat($part_path);
 
-    next if !$mode || !S_ISBLK($mode) || !$rdev;
-    my $major = PVE::Tools::dev_t_major($rdev);
-    my $minor = PVE::Tools::dev_t_minor($rdev);
+    next if !$st->mode || !S_ISBLK($st->mode) || !$st->rdev;
+    my $major = PVE::Tools::dev_t_major($st->rdev);
+    my $minor = PVE::Tools::dev_t_minor($st->rdev);
     my $partnum_path = "/sys/dev/block/$major:$minor/";
 
     my $partnum;
 
     $partnum = file_read_firstline("${partnum_path}partition");
 
-    die "Partition does not exists\n" if !defined($partnum);
+    die "Partition does not exist\n" if !defined($partnum);
 
     #untaint and ensure it is a int
     if ($partnum =~ m/(\d+)/) {
@@ -661,9 +712,12 @@ sub get_partnum {
 sub get_blockdev {
     my ($part_path) = @_;
 
-    my $dev = $1 if $part_path =~ m|^/dev/(.*)$|;
-    my $link = readlink "/sys/class/block/$dev";
-    my $block_dev = $1 if $link =~ m|([^/]*)/$dev$|;
+    my ($dev, $block_dev);
+    if ($part_path =~ m|^/dev/(.*)$|) {
+	$dev = $1;
+	my $link = readlink "/sys/class/block/$dev";
+	$block_dev = $1 if $link =~ m|([^/]*)/$dev$|;
+    }
 
     die "Can't parse parent device\n" if !defined($block_dev);
     die "No valid block device\n" if index($dev, $block_dev) == -1;