Added s390x Arch support for KVM

niyamsw · niyamsw · commit 0aa422f3709b · 2024-12-04T17:53:27.000+05:30
Signed-off-by: Niyam Siwach &lt;niyam@ibm.com&gt;
Signed-off-by: Himanshu Mishra &lt;Himanshu.Mishra2@ibm.com&gt;
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
@@ -209,7 +209,7 @@ hypervisor.type=kvm
 # the management server would send.
 # In case of arm64 (aarch64), this will change the machine type to 'virt' and
 # adds a SCSI and a USB controller in the domain xml.
-# Possible values: x86_64 | aarch64
+# Possible values: x86_64 | aarch64 | s390x
 # If null (default), defaults to the VM's OS architecture
 #guest.cpu.arch=
 
diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
@@ -383,7 +383,7 @@ public class AgentProperties{
     /**
      * This param will set the CPU architecture for the domain to override what the management server would send.<br>
      * In case of arm64 (aarch64), this will change the machine type to 'virt' and add a SCSI and a USB controller in the domain XML.<br>
-     * Possible values: x86_64 | aarch64 <br>
+     * Possible values: x86_64 | aarch64 | s390x <br>
      * Data type: String.<br>
      * Default value: <code>null</code> (will set use the architecture of the VM's OS).
      */
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -247,8 +247,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     /**
      * Machine type.
      */
-    private static final String PC = "pc";
-    private static final String VIRT = "virt";
+    private static final String PC = ("s390x".equals(System.getProperty("os.arch"))) ? "s390-ccw-virtio" : "pc";
+    private static final String VIRT = ("s390x".equals(System.getProperty("os.arch"))) ? "s390-ccw-virtio" : "virt";
 
     /**
      * Possible devices to add to VM.
@@ -305,6 +305,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
      * Constant that defines ARM64 (aarch64) guest architectures.
      */
     private static final String AARCH64 = "aarch64";
+    /**
+     * Constant that defines IBM Z Arch (s390x) guest architectures.
+     */
+    private static final String S390X = "s390x";
 
     public static final String RESIZE_NOTIFY_ONLY = "NOTIFYONLY";
     public static final String BASEPATH = "/usr/share/cloudstack-common/vms/";
@@ -1796,7 +1800,8 @@ private String matchPifFileInDirectory(final String bridgeName) {
             "^dummy",
             "^lo",
             "^p\\d+p\\d+",
-            "^vni"
+            "^vni",
+            "^enc"
     };
 
     /**
@@ -2642,12 +2647,15 @@ protected DevicesDef createDevicesDef(VirtualMachineTO vmTO, GuestDef guest, int
         }
 
         devices.addDevice(createChannelDef(vmTO));
-        devices.addDevice(createWatchDogDef());
+        if (!isGuestS390x()) {
+            devices.addDevice(createWatchDogDef());
+        }
         devices.addDevice(createVideoDef(vmTO));
         devices.addDevice(createConsoleDef());
         devices.addDevice(createGraphicDef(vmTO));
-        devices.addDevice(createTabletInputDef());
-
+        if (!isGuestS390x()) {
+            devices.addDevice(createTabletInputDef());
+        }
         if (isGuestAarch64()) {
             createArm64UsbDef(devices);
         }
@@ -2754,7 +2762,9 @@ protected FeaturesDef createFeaturesDef(Map<String, String> customParams, boolea
         FeaturesDef features = new FeaturesDef();
         features.addFeatures(PAE);
         features.addFeatures(APIC);
-        features.addFeatures(ACPI);
+        if (!"s390x".equals(System.getProperty("os.arch"))) {
+            features.addFeatures(ACPI);
+        }
         if (isUefiEnabled && isSecureBoot) {
             features.addFeatures(SMM);
         }
@@ -2846,6 +2856,10 @@ private boolean isGuestAarch64() {
         return AARCH64.equals(guestCpuArch);
     }
 
+    private boolean isGuestS390x() {
+        return S390X.equals(guestCpuArch);
+    }
+
     /**
      * Creates a guest definition from a VM specification.
      */
@@ -2856,7 +2870,7 @@ protected GuestDef createGuestFromSpec(VirtualMachineTO vmTO, LibvirtVMDef vm, S
         guest.setManufacturer(vmTO.getMetadataManufacturer());
         guest.setProduct(vmTO.getMetadataProductName());
         guest.setGuestArch(guestCpuArch != null ? guestCpuArch : vmTO.getArch());
-        guest.setMachineType(isGuestAarch64() ? VIRT : PC);
+        guest.setMachineType((isGuestAarch64() || isGuestS390x()) ? VIRT : PC);
         guest.setBootType(GuestDef.BootType.BIOS);
         if (MapUtils.isNotEmpty(customParams)) {
             if (customParams.containsKey(GuestDef.BootType.UEFI.toString())) {
@@ -2870,7 +2884,9 @@ protected GuestDef createGuestFromSpec(VirtualMachineTO vmTO, LibvirtVMDef vm, S
             guest.setIothreads(customParams.containsKey(VmDetailConstants.IOTHREADS));
         }
         guest.setUuid(uuid);
-        guest.setBootOrder(GuestDef.BootOrder.CDROM);
+        if(!isGuestS390x()) {
+            guest.setBootOrder(GuestDef.BootOrder.CDROM);
+        }
         guest.setBootOrder(GuestDef.BootOrder.HARDISK);
         return guest;
     }
@@ -3110,7 +3126,7 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
                 final DiskDef.DiskType diskType = getDiskType(physicalDisk);
                 disk.defISODisk(volPath, devId, isUefiEnabled, diskType);
 
-                if (guestCpuArch != null && guestCpuArch.equals("aarch64")) {
+                if (guestCpuArch != null && (guestCpuArch.equals("aarch64") || guestCpuArch.equals("s390x"))) {
                     disk.setBusType(DiskDef.DiskBus.SCSI);
                 }
             } else {
@@ -3208,7 +3224,7 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
         if (vmSpec.getType() != VirtualMachine.Type.User) {
             final DiskDef iso = new DiskDef();
             iso.defISODisk(sysvmISOPath, DiskDef.DiskType.FILE);
-            if (guestCpuArch != null && guestCpuArch.equals("aarch64")) {
+            if (guestCpuArch != null && (guestCpuArch.equals("aarch64") || guestCpuArch.equals("s390x"))) {
                 iso.setBusType(DiskDef.DiskBus.SCSI);
             }
             vm.getDevices().addDevice(iso);
@@ -4276,7 +4292,7 @@ private DiskDef.DiskBus getGuestDiskModel(final String platformEmulator, boolean
             return DiskDef.DiskBus.VIRTIO;
         } else if (isUefiEnabled && StringUtils.startsWithAny(platformEmulator, "Windows", "Other")) {
             return DiskDef.DiskBus.SATA;
-        } else if (guestCpuArch != null && guestCpuArch.equals("aarch64")) {
+        } else if (guestCpuArch != null && (guestCpuArch.equals("aarch64") || guestCpuArch.equals("s390x"))) {
             return DiskDef.DiskBus.SCSI;
         } else {
             return DiskDef.DiskBus.IDE;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -248,7 +248,9 @@ public String toString() {
                         guestDef.append("<boot dev='" + bo + "'/>\n");
                     }
                 }
-                guestDef.append("<smbios mode='sysinfo'/>\n");
+                if (!(_arch != null && _arch.equals("s390x"))) {
+                    guestDef.append("<smbios mode='sysinfo'/>\n");
+                }
                 guestDef.append("</os>\n");
                 if (iothreads) {
                     guestDef.append(String.format("<iothreads>%s</iothreads>", NUMBER_OF_IOTHREADS));
@@ -580,7 +582,7 @@ public String toString() {
                 }
             }
 
-            if (_emulator != null && _emulator.endsWith("aarch64")) {
+            if (_emulator != null && (_emulator.endsWith("aarch64") || _emulator.endsWith("s390x"))) {
                 devicesBuilder.append("<controller type='pci' model='pcie-root'/>\n");
                 for (int i = 0; i < 32; i++) {
                   devicesBuilder.append("<controller type='pci' model='pcie-root-port'/>\n");
@@ -1652,7 +1654,7 @@ public String getContent() {
             if (_scriptPath != null) {
                 netBuilder.append("<script path='" + _scriptPath + "'/>\n");
             }
-            if (_pxeDisable) {
+            if (_pxeDisable && !"s390x".equals(System.getProperty("os.arch"))) {
                 netBuilder.append("<rom bar='off' file=''/>");
             }
             if (_virtualPortType != null) {
diff --git a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/KVMHostInfo.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/KVMHostInfo.java
@@ -137,6 +137,9 @@ private static long getCpuSpeedFromCommandLscpu() {
         try {
             LOGGER.info("Fetching CPU speed from command \"lscpu\".");
             String command = "lscpu | grep -i 'Model name' | head -n 1 | egrep -o '[[:digit:]].[[:digit:]]+GHz' | sed 's/GHz//g'";
+            if("s390x".equals(System.getProperty("os.arch"))) {
+                command = "lscpu | grep 'CPU dynamic MHz' | cut -d ':' -f 2 | tr -d ' ' | awk '{printf \"%.1f\\n\", $1 / 1000}'";
+            }
             String result = Script.runSimpleBashScript(command);
             long speed = (long) (Float.parseFloat(result) * 1000);
             LOGGER.info(String.format("Command [%s] resulted in the value [%s] for CPU speed.", command, speed));
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -401,7 +401,7 @@ public void testCreateGuestFromSpecWithoutCustomParam() {
         VirtualMachineTO to = createDefaultVM(false);
         LibvirtVMDef vm = new LibvirtVMDef();
         GuestDef guestDef = libvirtComputingResourceSpy.createGuestFromSpec(to, vm, to.getUuid(), null);
-        verifySysInfo(guestDef, "smbios", to.getUuid(), "pc");
+        verifySysInfo(guestDef, "smbios", to.getUuid(), "s390x".equals(System.getProperty("os.arch")) ? "s390-ccw-virtio" : "pc");
         Assert.assertEquals(GuestDef.BootType.BIOS, guestDef.getBootType());
         Assert.assertNull(guestDef.getBootMode());
     }
@@ -826,7 +826,7 @@ private void verifyOsBoot(Document domainDoc) {
     }
 
     private void verifyOsType(Document domainDoc) {
-        assertXpath(domainDoc, "/domain/os/type/@machine", "pc");
+        assertXpath(domainDoc, "/domain/os/type/@machine", "s390x".equals(System.getProperty("os.arch")) ? "s390-ccw-virtio" : "pc");
         assertXpath(domainDoc, "/domain/os/type/text()", "hvm");
     }
 
diff --git a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -309,6 +309,8 @@ protected VirtualMachineTO toVirtualMachineTO(VirtualMachineProfile vmProfile) {
 
         if (vmProfile.getTemplate().getBits() == 32) {
             to.setArch("i686");
+        } else if("s390x".equals(System.getProperty("os.arch"))) {
+            to.setArch("s390x");
         } else {
             to.setArch("x86_64");
         }

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,9 @@ public String toString() {`
`248`	`248`	`guestDef.append("<boot dev='" + bo + "'/>\n");`
`249`	`249`	`}`
`250`	`250`	`}`
`251`		`- guestDef.append("<smbios mode='sysinfo'/>\n");`
	`251`	`+ if (!(_arch != null && _arch.equals("s390x"))) {`
	`252`	`+ guestDef.append("<smbios mode='sysinfo'/>\n");`
	`253`	`+ }`
`252`	`254`	`guestDef.append("</os>\n");`
`253`	`255`	`if (iothreads) {`
`254`	`256`	`guestDef.append(String.format("<iothreads>%s</iothreads>", NUMBER_OF_IOTHREADS));`
`@@ -580,7 +582,7 @@ public String toString() {`
`580`	`582`	`}`
`581`	`583`	`}`
`582`	`584`
`583`		`- if (_emulator != null && _emulator.endsWith("aarch64")) {`
	`585`	`+ if (_emulator != null && (_emulator.endsWith("aarch64") \|\| _emulator.endsWith("s390x"))) {`
`584`	`586`	`devicesBuilder.append("<controller type='pci' model='pcie-root'/>\n");`
`585`	`587`	`for (int i = 0; i < 32; i++) {`
`586`	`588`	`devicesBuilder.append("<controller type='pci' model='pcie-root-port'/>\n");`
`@@ -1652,7 +1654,7 @@ public String getContent() {`
`1652`	`1654`	`if (_scriptPath != null) {`
`1653`	`1655`	`netBuilder.append("<script path='" + _scriptPath + "'/>\n");`
`1654`	`1656`	`}`
`1655`		`- if (_pxeDisable) {`
	`1657`	`+ if (_pxeDisable && !"s390x".equals(System.getProperty("os.arch"))) {`
`1656`	`1658`	`netBuilder.append("<rom bar='off' file=''/>");`
`1657`	`1659`	`}`
`1658`	`1660`	`if (_virtualPortType != null) {`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ public void testCreateGuestFromSpecWithoutCustomParam() {`
`401`	`401`	`VirtualMachineTO to = createDefaultVM(false);`
`402`	`402`	`LibvirtVMDef vm = new LibvirtVMDef();`
`403`	`403`	`GuestDef guestDef = libvirtComputingResourceSpy.createGuestFromSpec(to, vm, to.getUuid(), null);`
`404`		`- verifySysInfo(guestDef, "smbios", to.getUuid(), "pc");`
	`404`	`+ verifySysInfo(guestDef, "smbios", to.getUuid(), "s390x".equals(System.getProperty("os.arch")) ? "s390-ccw-virtio" : "pc");`
`405`	`405`	`Assert.assertEquals(GuestDef.BootType.BIOS, guestDef.getBootType());`
`406`	`406`	`Assert.assertNull(guestDef.getBootMode());`
`407`	`407`	`}`
`@@ -826,7 +826,7 @@ private void verifyOsBoot(Document domainDoc) {`
`826`	`826`	`}`
`827`	`827`
`828`	`828`	`private void verifyOsType(Document domainDoc) {`
`829`		`- assertXpath(domainDoc, "/domain/os/type/@machine", "pc");`
	`829`	`+ assertXpath(domainDoc, "/domain/os/type/@machine", "s390x".equals(System.getProperty("os.arch")) ? "s390-ccw-virtio" : "pc");`
`830`	`830`	`assertXpath(domainDoc, "/domain/os/type/text()", "hvm");`
`831`	`831`	`}`
`832`	`832`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,8 @@ protected VirtualMachineTO toVirtualMachineTO(VirtualMachineProfile vmProfile) {`
`309`	`309`
`310`	`310`	`if (vmProfile.getTemplate().getBits() == 32) {`
`311`	`311`	`to.setArch("i686");`
	`312`	`+ } else if("s390x".equals(System.getProperty("os.arch"))) {`
	`313`	`+ to.setArch("s390x");`
`312`	`314`	`} else {`
`313`	`315`	`to.setArch("x86_64");`
`314`	`316`	`}`