Changeset 86134 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2020 3:39:09 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9224: Added NVME drives enumeration on Linux. Fixed the showing the model of the drive if additional info is not available

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-server/linux/HostHardwareLinux.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -1602 +1602 @@
     {
         ComPtr<IHostDrive> pHostDrive = apHostDrives[i];
-
+        /*
+         * The drive path and the model are obtained using different way
+         * outside of the IHostDrive object, therefore, they are defined
+         * even if another info is not available.
+         */
         com::Bstr bstrDrivePath;
         CHECK_ERROR(pHostDrive,COMGETTER(DrivePath)(bstrDrivePath.asOutParam()));
@@ -1608 +1612 @@
 
         com::Bstr bstrModel;
+        CHECK_ERROR(pHostDrive,COMGETTER(Model)(bstrModel.asOutParam()));
+        if (bstrModel.isNotEmpty())
+            RTPrintf("Model:       %ls\n", bstrModel.raw());
+        else
+            RTPrintf("Model:       Unknown\n");
+
         com::Bstr bstrUuidDisk;
         ULONG cbSectorSize = 0;
@@ -1613 +1623 @@
         PartitioningType_T partitioningType;
         HRESULT hrc;
-        if (   SUCCEEDED(hrc = pHostDrive->COMGETTER(Model)(bstrModel.asOutParam()))
-            && SUCCEEDED(hrc = pHostDrive->COMGETTER(Uuid)(bstrUuidDisk.asOutParam()))
+        if (   SUCCEEDED(hrc = pHostDrive->COMGETTER(Uuid)(bstrUuidDisk.asOutParam()))
             && SUCCEEDED(hrc = pHostDrive->COMGETTER(SectorSize)(&cbSectorSize))
             && SUCCEEDED(hrc = pHostDrive->COMGETTER(Size)(&cbSize))
             && SUCCEEDED(hrc = pHostDrive->COMGETTER(PartitioningType)(&partitioningType)))
         {
-            if (bstrModel.isNotEmpty())
-                RTPrintf("Model:       %ls\n", bstrModel.raw());
-            else
-                RTPrintf("Model:       Unknown\n");
-
             if (partitioningType == PartitioningType_GPT || com::Guid(bstrUuidDisk).isZero())
                 RTPrintf("UUID:        %ls\n", bstrUuidDisk.raw());

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -10650 +10650 @@
     </attribute>
 
-    <attribute name="model" type="wstring" readonly="yes">
+    <attribute name="model" type="wstring" readonly="yes" wrap-hint-server="limitedcaller">
      <desc>
        The model string of the drive if available.

trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp

@@ -38 +38 @@
 #include <linux/fd.h>
 #include <linux/major.h>
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+# include <linux/nvme_ioctl.h>
+#else
+# include <linux/nvme.h>
+#endif
 #include <scsi/scsi.h>
 
@@ -349 +356 @@
     AssertReturnVoid(!pszUdi || cbUdi > 0);
 
-    size_t cchVendor = strLenStripped(pcszVendor);
     size_t cchModel = strLenStripped(pcszModel);
+    /*
+     * Vendor and Model strings can contain trailing spaces.
+     * Create trimmed copy of them because we should not modify
+     * original strings.
+     */
+    char* pszStartTrimmed = RTStrStripL(pcszVendor);
+    char* pszVendor = RTStrDup(pszStartTrimmed);
+    RTStrStripR(pszVendor);
+    pszStartTrimmed = RTStrStripL(pcszModel);
+    char* pszModel = RTStrDup(pszStartTrimmed);
+    RTStrStripR(pszModel);
+
+    size_t cbVendor = strlen(pszVendor);
 
     /* Create a cleaned version of the model string for the UDI string. */
@@ -365 +384 @@
     if (pszDesc)
     {
-        if (cchVendor > 0)
-        {
-            RTStrPrintf(pszDesc, cbDesc, "%.*s %s", cchVendor, pcszVendor, cchModel > 0 ? pcszModel : "(unknown drive model)");
+        if (cbVendor > 0)
+        {
+            RTStrPrintf(pszDesc, cbDesc, "%.*s %s", cbVendor, pszVendor, strlen(pszModel) > 0 ? pszModel : "(unknown drive model)");
             RTStrPurgeEncoding(pszDesc);
         }
         else
-            RTStrCopy(pszDesc, cbDesc, pcszModel);
+            RTStrCopy(pszDesc, cbDesc, pszModel);
     }
     /* Construct the UDI string */
@@ -383 +402 @@
 }
 
+/**
+ * Check whether the device is the NVME device.
+ * @returns true on success, false if the name was not available (i.e. the
+ *          device was not readable, or the file name wasn't a NVME device)
+ * @param  pcszNode     the path to the device node for the device
+ */
+static bool probeNVME(const char *pcszNode) RT_NOTHROW_DEF
+{
+    AssertPtrReturn(pcszNode, false);
+    RTFILE File;
+    int rc = RTFileOpen(&File, pcszNode, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_NON_BLOCK);
+    if (RT_SUCCESS(rc))
+    {
+        int rcIoCtl;
+        rc = RTFileIoCtl(File, NVME_IOCTL_ID, NULL, 0, &rcIoCtl);
+        RTFileClose(File);
+        if (RT_SUCCESS(rc) && rcIoCtl >= 0)
+            return true;
+    }
+    return false;
+}
 
 /**
@@ -736 +776 @@
         int64_t type = 0;
         int rc = RTLinuxSysFsReadIntFile(10, &type, "block/%s/device/type", mpcszName);
-        if (RT_SUCCESS(rc) && type != TYPE_DISK)
-            return;
+        if (!RT_SUCCESS(rc) || type != TYPE_DISK)
+        {
+            if (noProbe() || !probeNVME(mszNode))
+            {
+                char szDriver[16];
+                rc = RTLinuxSysFsGetLinkDest(szDriver, sizeof(szDriver), NULL, "block/%s/%s",
+                                                 mpcszName, "device/device/driver");
+                if (RT_FAILURE(rc) || RTStrCmp(szDriver, "nvme"))
+                        return;
+            }
+        }
         char szVendor[128];
-        rc = RTLinuxSysFsReadStrFile(szVendor, sizeof(szVendor), NULL, "block/%s/device/vendor", mpcszName);
+        char szModel[128];
+        size_t cbRead = 0;
+        rc = RTLinuxSysFsReadStrFile(szVendor, sizeof(szVendor), &cbRead, "block/%s/device/vendor", mpcszName);
+        szVendor[cbRead] = '\0';
+        /* Assume the model is always present. Vendor is not present for NVME disks */
+        cbRead = 0;
+        rc = RTLinuxSysFsReadStrFile(szModel, sizeof(szModel), &cbRead, "block/%s/device/model", mpcszName);
+        szModel[cbRead] = '\0';
         if (RT_SUCCESS(rc))
         {
-            char szModel[128];
-            rc = RTLinuxSysFsReadStrFile(szModel, sizeof(szModel), NULL, "block/%s/device/model", mpcszName);
-            if (RT_SUCCESS(rc))
-            {
-                misValid = true;
-                dvdCreateDeviceStrings(szVendor, szModel, mszDesc, sizeof(mszDesc), mszUdi, sizeof(mszUdi));
-                return;
-            }
+            misValid = true;
+            dvdCreateDeviceStrings(szVendor, szModel, mszDesc, sizeof(mszDesc), mszUdi, sizeof(mszUdi));
         }
     }