Changeset 90244 in vbox for trunk/src/VBox

Timestamp:

Jul 19, 2021 5:18:35 PM (4 years ago)

Author:

vboxsync

Message:

ValidationKit: Add support for testing IOMMU. Ubuntu 20.04 smoketest is prepared to test both Intel and AMD IOMMUs.

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vbox.py (modified) (3 diffs)
• testdriver/vboxtestvms.py (modified) (4 diffs)
• testdriver/vboxwrappers.py (modified) (1 diff)
• vms/t-ubuntu-20_04-64.txt (added)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2103 +2103 @@
                          % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType', oVM.graphicsControllerType),));              # pylint: disable=not-callable
         reporter.log("  Chipset:            %s" % (self.oVBoxMgr.getEnumValueName('ChipsetType', oVM.chipsetType),));             # pylint: disable=not-callable
+        if self.fpApiVer >= 6.2 and hasattr(vboxcon, 'IommuType_None'):
+            reporter.log("  IOMMU:              %s" % (self.oVBoxMgr.getEnumValueName('IommuType', oVM.iommuType),));             # pylint: disable=not-callable
         reporter.log("  Firmware:           %s" % (self.oVBoxMgr.getEnumValueName('FirmwareType', oVM.firmwareType),));           # pylint: disable=not-callable
         reporter.log("  HwVirtEx:           %s" % (oVM.getHWVirtExProperty(vboxcon.HWVirtExPropertyType_Enabled),));
@@ -2397 +2399 @@
                      sFirmwareType = 'bios',
                      sChipsetType = 'piix3',
+                     sIommuType = 'none',
                      sDvdControllerType = 'IDE Controller',
                      sCom1RawFile = None):
@@ -2461 +2464 @@
             if fRc and sCom1RawFile:
                 fRc = oSession.setupSerialToRawFile(0, sCom1RawFile);
+            if fRc and self.fpApiVer >= 6.2 and hasattr(vboxcon, 'IommuType_AMD') and sIommuType == 'amd':
+                fRc = oSession.setIommuType(vboxcon.IommuType_AMD);
+            elif fRc and self.fpApiVer >= 6.2 and hasattr(vboxcon, 'IommuType_Intel') and sIommuType == 'intel':
+                fRc = oSession.setIommuType(vboxcon.IommuType_Intel);
 
             if fRc: fRc = oSession.saveSettings();

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -955 +955 @@
                  sFirmwareType = 'bios',                    # type: str
                  sChipsetType = 'piix3',                    # type: str
+                 sIommuType = 'none',                       # type: str
                  sHddControllerType = 'IDE Controller',     # type: str
                  sDvdControllerType = 'IDE Controller'      # type: str
@@ -981 +982 @@
         self.sFirmwareType           = sFirmwareType;
         self.sChipsetType            = sChipsetType;
+        self.sIommuType              = sIommuType;
         self.fCom1RawFile            = False;
 
@@ -1179 +1181 @@
                                      sFirmwareType      = self.sFirmwareType,
                                      sChipsetType       = self.sChipsetType,
+                                     sIommuType         = self.sIommuType,
                                      sCom1RawFile       = self.sCom1RawFile if self.fCom1RawFile else None
                                      );
@@ -1930 +1933 @@
         TestVm('tst-ol76-64',   kfGrpStdSmoke,        sHd = '4.2/ol76/t-ol76-64.vdi',
                sKind = 'Oracle_64', acCpusSup = range(1, 33), fIoApic = True),
+        TestVm('tst-ubuntu-20_04-64-amdvi',     kfGrpStdSmoke,    sHd = '6.1/ubuntu-20_04-64.vdi',
+               sKind = 'Ubuntu_64', acCpusSup = range(1, 33), fIoApic = True,
+               asParavirtModesSup = [g_ksParavirtProviderKVM,], sNic0AttachType = 'nat', sChipsetType = 'ich9',
+               sIommuType = 'amd'),
+        TestVm('tst-ubuntu-20_04-64-vtd',     kfGrpStdSmoke,      sHd = '6.1/ubuntu-20_04-64.vdi',
+               sKind = 'Ubuntu_64', acCpusSup = range(1, 33), fIoApic = True,
+               asParavirtModesSup = [g_ksParavirtProviderKVM,], sNic0AttachType = 'nat', sChipsetType = 'ich9',
+               sIommuType = 'intel'),
 
         # Solaris

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1234 +1234 @@
         else:
             reporter.log('set chipsetType=%s for "%s"' % (eType, self.sName));
+        self.oTstDrv.processPendingEvents();
+        return fRc;
+
+    def setIommuType(self, eType):
+        """
+        Sets the IOMMU type.
+        Returns True on success and False on failure.  Error information is logged.
+        """
+        # Supported.
+        if self.fpApiVer < 6.2 or not hasattr(vboxcon, 'IommuType_Intel') or not hasattr(vboxcon, 'IommuType_AMD'):
+            return True;
+        fRc = True;
+        try:
+            self.o.machine.iommuType = eType;
+        except:
+            reporter.errorXcpt('failed to set iommuType=%s for "%s"' % (eType, self.sName));
+            fRc = False;
+        else:
+            reporter.log('set iommuType=%s for "%s"' % (eType, self.sName));
         self.oTstDrv.processPendingEvents();
         return fRc;