github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 20:32:54 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Configure s390x specific flags for Makefile

Browse Source 
s390x supports a different machine type `s390-ccw-virtio` and it is
not required to configure cpu features by default for the platform.
A hypervisor `dragonball` is not supported on s390x so that `DBCMD`
is not necessary. `vm-rootfs_driver` should be set to `virtio-blk-ccw`.
This commit is to set the architecture-specific flags for Makefile.

Fixes: #9158

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi 2024-02-05 18:55:59 +01:00
parent ac27caf1b4
commit 1dac6b1357
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime-rs/Makefile
View File

@ -273,7 +273,11 @@ ifneq (,$(QEMUCMD))
# qemu-specific options # qemu-specific options
DEFSANDBOXCGROUPONLY_QEMU := false DEFSANDBOXCGROUPONLY_QEMU := false
ifeq ($(ARCH), s390x)
VMROOTFSDRIVER_QEMU := virtio-blk-ccw
else
VMROOTFSDRIVER_QEMU := virtio-pmem VMROOTFSDRIVER_QEMU := virtio-pmem
endif
DEFVCPUS_QEMU := 1 DEFVCPUS_QEMU := 1
DEFMAXVCPUS_QEMU := 0 DEFMAXVCPUS_QEMU := 0
DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs

7
src/runtime-rs/arch/s390x-options.mk
View File

@ -4,12 +4,9 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
MACHINETYPE := MACHINETYPE := s390-ccw-virtio
KERNELPARAMS := KERNELPARAMS :=
MACHINEACCELERATORS := MACHINEACCELERATORS :=
CPUFEATURES := pmu=off CPUFEATURES :=
QEMUCMD := qemu-system-s390x QEMUCMD := qemu-system-s390x
# dragonball binary name
DBCMD := dragonball

7
src/runtime-rs/crates/hypervisor/src/kernel_param.rs
View File

@ -7,8 +7,9 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use crate::{ use crate::{
VM_ROOTFS_DRIVER_BLK, VM_ROOTFS_DRIVER_MMIO, VM_ROOTFS_DRIVER_PMEM, VM_ROOTFS_FILESYSTEM_EROFS, VM_ROOTFS_DRIVER_BLK, VM_ROOTFS_DRIVER_BLK_CCW, VM_ROOTFS_DRIVER_MMIO, VM_ROOTFS_DRIVER_PMEM,
VM_ROOTFS_FILESYSTEM_EXT4, VM_ROOTFS_FILESYSTEM_XFS, VM_ROOTFS_ROOT_BLK, VM_ROOTFS_ROOT_PMEM, VM_ROOTFS_FILESYSTEM_EROFS, VM_ROOTFS_FILESYSTEM_EXT4, VM_ROOTFS_FILESYSTEM_XFS,
VM_ROOTFS_ROOT_BLK, VM_ROOTFS_ROOT_PMEM,
}; };
use kata_types::config::LOG_VPORT_OPTION; use kata_types::config::LOG_VPORT_OPTION;
@ -89,7 +90,7 @@ impl KernelParams {
} }
} }
} }
VM_ROOTFS_DRIVER_BLK | VM_ROOTFS_DRIVER_MMIO => { VM_ROOTFS_DRIVER_BLK | VM_ROOTFS_DRIVER_BLK_CCW | VM_ROOTFS_DRIVER_MMIO => {
params.push(Param::new("root", VM_ROOTFS_ROOT_BLK)); params.push(Param::new("root", VM_ROOTFS_ROOT_BLK));
match rootfs_type { match rootfs_type {
VM_ROOTFS_FILESYSTEM_EXT4 | VM_ROOTFS_FILESYSTEM_XFS => { VM_ROOTFS_FILESYSTEM_EXT4 | VM_ROOTFS_FILESYSTEM_XFS => {

1
src/runtime-rs/crates/hypervisor/src/lib.rs
View File

@ -34,6 +34,7 @@ pub use kata_types::config::hypervisor::HYPERVISOR_NAME_CH;
// Config which driver to use as vm root dev // Config which driver to use as vm root dev
const VM_ROOTFS_DRIVER_BLK: &str = "virtio-blk-pci"; const VM_ROOTFS_DRIVER_BLK: &str = "virtio-blk-pci";
const VM_ROOTFS_DRIVER_BLK_CCW: &str = "virtio-blk-ccw";
const VM_ROOTFS_DRIVER_PMEM: &str = "virtio-pmem"; const VM_ROOTFS_DRIVER_PMEM: &str = "virtio-pmem";
const VM_ROOTFS_DRIVER_MMIO: &str = "virtio-blk-mmio"; const VM_ROOTFS_DRIVER_MMIO: &str = "virtio-blk-mmio";