[PATCH v3 storage 18/76] iscsi: factor out session device map from device list

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

From: Dietmar Maurer <dietmar@proxmox.com>

Checking whether a disk belongs to configured iSCSI storage needs the
session-to-device information collected by device listing. Expose it
separately as a map from kernel device names to targets and addresses.
This does not change behavior.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
[TL: drop redundant comments; keep the per-session LUN walk and read
 block devices below the sysfs root of the listing]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 src/PVE/Storage/ISCSIPlugin.pm | 70 ++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
index 81f06979..22f6c44f 100644
--- a/src/PVE/Storage/ISCSIPlugin.pm
+++ b/src/PVE/Storage/ISCSIPlugin.pm
@@ -306,14 +306,12 @@ my sub foreach_session_lun {
     );
 }
 
-sub iscsi_device_list {
+sub iscsi_session_device_map {
 
     my $res = {};
 
     my $dirname = "$SYSFS/class/iscsi_session";
 
-    my $stable_paths = load_stable_scsi_paths();
-
     dir_glob_foreach(
         $dirname,
         'session(\d+)',
@@ -339,28 +337,11 @@ sub iscsi_device_list {
                     }
                     return if !$bdev;
 
-                    #check multipath
-                    if (-d "$SYSFS/block/$bdev/holders") {
-                        my $multipathdev =
-                            dir_glob_regex("$SYSFS/block/$bdev/holders", '[A-Za-z]\S*');
-                        $bdev = $multipathdev if $multipathdev;
-                    }
-
-                    my $blockdev = $stable_paths->{$bdev};
-                    return if !$blockdev;
-
-                    my $size = file_read_firstline("$SYSFS/block/$bdev/size");
-                    return if !$size;
-
-                    my $volid = "$channel.$id.$lun.$blockdev";
-
-                    $res->{$target}->{$volid} = {
-                        'format' => 'raw',
-                        'size' => int($size * 512),
-                        'vmid' => 0, # not assigned to any vm
-                        'channel' => int($channel),
-                        'id' => int($id),
-                        'lun' => int($lun),
+                    $res->{$bdev} = {
+                        target => $target,
+                        channel => int($channel),
+                        id => int($id),
+                        lun => int($lun),
                     };
                 },
             );
@@ -371,6 +352,45 @@ sub iscsi_device_list {
     return $res;
 }
 
+sub iscsi_device_list {
+
+    my $res = {};
+
+    my $stable_paths = load_stable_scsi_paths();
+
+    my $device_map = iscsi_session_device_map();
+
+    for my $bdev (sort keys %$device_map) {
+        my $info = $device_map->{$bdev};
+        my ($channel, $id, $lun) = $info->@{qw(channel id lun)};
+
+        #check multipath
+        if (-d "$SYSFS/block/$bdev/holders") {
+            my $multipathdev = dir_glob_regex("$SYSFS/block/$bdev/holders", '[A-Za-z]\S*');
+            $bdev = $multipathdev if $multipathdev;
+        }
+
+        my $blockdev = $stable_paths->{$bdev};
+        next if !$blockdev;
+
+        my $size = file_read_firstline("$SYSFS/block/$bdev/size");
+        next if !$size;
+
+        my $volid = "$channel.$id.$lun.$blockdev";
+
+        $res->{ $info->{target} }->{$volid} = {
+            'format' => 'raw',
+            'size' => int($size * 512),
+            'vmid' => 0, # not assigned to any vm
+            'channel' => $channel,
+            'id' => $id,
+            'lun' => $lun,
+        };
+    }
+
+    return $res;
+}
+
 # Configuration
 
 sub type {
-- 
2.47.3