Changeset 24144 in vbox

Timestamp:

Oct 28, 2009 4:00:44 PM (15 years ago)

Author:

vboxsync

Message:

Storage/iSCSI: try to get the capacity with a command that supports 64bit sector numbers, and fall back to the old one which does only 32bit if that fails

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -309 +309 @@
     /** Number of re-login retries when a connection fails. */
     uint32_t            cISCSIRetries;
-    /** Size of volume in sectors. */
-    uint32_t            cVolume;
     /** Sector size on volume. */
     uint32_t            cbSector;
+    /** Size of volume in sectors. */
+    uint64_t            cVolume;
     /** Total volume size in bytes. Easiert that multiplying the above values all the time. */
     uint64_t            cbSize;
@@ -2463 +2463 @@
     uint8_t sense[32];
     uint8_t data8[8];
+    uint8_t data12[12];
 
     /*
@@ -2588 +2589 @@
      * Determine sector size and capacity of the volume immediately.
      */
-    uint8_t cdb_cap[10];
-
-    cdb_cap[0] = SCSI_READ_CAPACITY;
-    cdb_cap[1] = 0;         /* reserved */
-    cdb_cap[2] = 0;         /* reserved */
-    cdb_cap[3] = 0;         /* reserved */
-    cdb_cap[4] = 0;         /* reserved */
-    cdb_cap[5] = 0;         /* reserved */
-    cdb_cap[6] = 0;         /* reserved */
-    cdb_cap[7] = 0;         /* reserved */
-    cdb_cap[8] = 0;         /* reserved */
-    cdb_cap[9] = 0;         /* control */
+    uint8_t cdb_cap[16];
+
+    memset(cdb_cap, '\0', sizeof(cdb_cap));
+    cdb_cap[0] = SCSI_SERVICE_ACTION_IN_16;
+    cdb_cap[1] = SCSI_SVC_ACTION_IN_READ_CAPACITY_16;   /* subcommand */
 
     sr.enmXfer = SCSIXFER_FROM_TARGET;
@@ -2606 +2600 @@
     sr.cbI2TData = 0;
     sr.pcvI2TData = NULL;
-    sr.cbT2IData = sizeof(data8);
-    sr.pvT2IData = data8;
+    sr.cbT2IData = sizeof(data12);
+    sr.pvT2IData = data12;
     sr.cbSense = sizeof(sense);
     sr.pvSense = sense;
@@ -2614 +2608 @@
     if (RT_SUCCESS(rc))
     {
-        pImage->cVolume = (data8[0] << 24) | (data8[1] << 16) | (data8[2] << 8) | data8[3];
+        pImage->cVolume = RT_BE2H_U64(*(uint64_t *)&data12[0]);
         pImage->cVolume++;
-        pImage->cbSector = (data8[4] << 24) | (data8[5] << 16) | (data8[6] << 8) | data8[7];
-        pImage->cbSize = (uint64_t)(pImage->cVolume) * pImage->cbSector;
+        pImage->cbSector = RT_BE2H_U32(*(uint32_t *)&data12[8]);
+        pImage->cbSize = pImage->cVolume * pImage->cbSector;
         if (pImage->cVolume == 0 || pImage->cbSector == 0)
         {
@@ -2628 +2622 @@
     else
     {
-        LogRel(("iSCSI: Could not determine capacity of target %s, rc=%Rrc\n", pImage->pszTargetName, rc));
-        goto out;
+        uint8_t cdb_capfb[10];
+
+        cdb_capfb[0] = SCSI_READ_CAPACITY;
+        cdb_capfb[1] = 0;   /* reserved */
+        cdb_capfb[2] = 0;   /* reserved */
+        cdb_capfb[3] = 0;   /* reserved */
+        cdb_capfb[4] = 0;   /* reserved */
+        cdb_capfb[5] = 0;   /* reserved */
+        cdb_capfb[6] = 0;   /* reserved */
+        cdb_capfb[7] = 0;   /* reserved */
+        cdb_capfb[8] = 0;   /* reserved */
+        cdb_capfb[9] = 0;   /* control */
+
+        sr.enmXfer = SCSIXFER_FROM_TARGET;
+        sr.cbCmd = sizeof(cdb_capfb);
+        sr.pvCmd = cdb_capfb;
+        sr.cbI2TData = 0;
+        sr.pcvI2TData = NULL;
+        sr.cbT2IData = sizeof(data8);
+        sr.pvT2IData = data8;
+        sr.cbSense = sizeof(sense);
+        sr.pvSense = sense;
+
+        rc = iscsiCommand(pImage, &sr);
+        if (RT_SUCCESS(rc))
+        {
+            pImage->cVolume = (data8[0] << 24) | (data8[1] << 16) | (data8[2] << 8) | data8[3];
+            pImage->cVolume++;
+            pImage->cbSector = (data8[4] << 24) | (data8[5] << 16) | (data8[6] << 8) | data8[7];
+            pImage->cbSize = pImage->cVolume * pImage->cbSector;
+            if (pImage->cVolume == 0 || pImage->cbSector == 0)
+            {
+                rc = iscsiError(pImage, VERR_VD_ISCSI_INVALID_TYPE,
+                                RT_SRC_POS, N_("iSCSI: fallback capacity detectio for target address %s, target name %s, SCSI LUN %lld reports media sector count=%lu sector size=%lu"),
+                                pImage->pszTargetAddress, pImage->pszTargetName,
+                                pImage->LUN, pImage->cVolume, pImage->cbSector);
+            }
+        }
+        else
+        {
+            LogRel(("iSCSI: Could not determine capacity of target %s, rc=%Rrc\n", pImage->pszTargetName, rc));
+            goto out;
+        }
     }