drop absolute udevadm path

[pve-storage.git] / PVE / Diskmanage.pm

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 0339177681f972f9fe75d6ee46315f90d6e57c8d..9f482af036ef4c5d4b21837e1c862aadc4218f23 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -17,7 +17,6 @@ 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 {
@@ -134,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:\s*(\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/) {
@@ -312,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";
        });
@@ -396,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})) {
@@ -405,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;
 }
 
@@ -464,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 = {};
@@ -499,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) . ")";
     }
@@ -533,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) {
@@ -548,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);
                }
            };
@@ -709,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;