Merge pull request kata-containers#8250 from amshinde/runtime-rs-clh-…

…config

runtime-rs: Add default configuration file for cloud-hypervisor

src/runtime-rs/Makefile

@@ -76,6 +76,7 @@ PREFIXDEPS := $(PREFIX)
 LIBEXECDIR := $(PREFIXDEPS)/libexec
 SHAREDIR := $(PREFIX)/share
 DEFAULTSDIR := $(SHAREDIR)/defaults
+CLHBINDIR := $(PREFIXDEPS)/bin
 PROJECT_DIR = $(PROJECT_TAG)
 IMAGENAME = $(PROJECT_TAG).img
 TARGET = $(PROJECT_COMPONENT)
@@ -93,6 +94,9 @@ DEFAULT_HYPERVISOR ?= $(HYPERVISOR_DB)
 ##VAR HYPERVISOR=<hypervisor_name> List of hypervisors this build system can generate configuration for.
 HYPERVISORS := $(HYPERVISOR_DB) $(HYPERVISOR_ACRN) $(HYPERVISOR_FC) $(HYPERVISOR_QEMU) $(HYPERVISOR_CLH)
 
+CLHPATH := $(CLHBINDIR)/$(CLHCMD)
+CLHVALIDHYPERVISORPATHS := [\"$(CLHPATH)\"]
+
 DBVALIDHYPERVISORPATHS := []
 PKGDATADIR := $(PREFIXDEPS)/share/$(PROJECT_DIR)
 KERNELDIR := $(PKGDATADIR)
@@ -160,6 +164,7 @@ DEFMSIZE9P := 8192
 DEFVFIOMODE := guest-kernel
 ##VAR DEFSANDBOXCGROUPONLY=<bool> Default cgroup model
 DEFSANDBOXCGROUPONLY ?= false
+DEFSTATICRESOURCEMGMT ?= false
 DEFSTATICRESOURCEMGMT_DB ?= false
 DEFBINDMOUNTS := []
 DEFDANCONF := /run/kata-containers/dans
@@ -173,6 +178,7 @@ MONITOR_OUTPUT = $(CURDIR)/$(MONITOR)
 MONITOR_DIR = $(CLI_DIR)/kata-monitor
 SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$')
 VERSION := ${shell cat ./VERSION}
+KERNELPARAMS := ""
 
 # List of configuration files to build and install
 CONFIGS =
@@ -207,7 +213,7 @@ ifneq (,$(DBCMD))
     DEFMAXVCPUS_DB := 1
     DEFBLOCKSTORAGEDRIVER_DB := virtio-blk-mmio
     DEFNETWORKMODEL_DB := tcfilter
-    KERNELPARAMS = console=ttyS1 agent.log_vport=1025
+    KERNELPARAMS_DB = console=ttyS1 agent.log_vport=1025
 	KERNELTYPE_DB = uncompressed
     KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME_DB,$(KERNELTYPE_DB))
     KERNELPATH_DB = $(KERNELDIR)/$(KERNEL_NAME_DB)
@@ -217,6 +223,30 @@ ifneq (,$(DBCMD))
 	DBSHAREDFS := inline-virtio-fs
 endif
 
+ifneq (,$(CLHCMD))
+    KNOWN_HYPERVISORS += $(HYPERVISOR_CLH)
+
+    CONFIG_FILE_CLH = configuration-cloud-hypervisor.toml
+    CONFIG_CLH = config/$(CONFIG_FILE_CLH)
+    CONFIG_CLH_IN = $(CONFIG_CLH).in
+
+    CONFIG_PATH_CLH = $(abspath $(CONFDIR)/$(CONFIG_FILE_CLH))
+    CONFIG_PATHS += $(CONFIG_PATH_CLH)
+
+    SYSCONFIG_CLH = $(abspath $(SYSCONFDIR)/$(CONFIG_FILE_CLH))
+    SYSCONFIG_PATHS += $(SYSCONFIG_CLH)
+
+    CONFIGS += $(CONFIG_CLH)
+
+    # CLH-specific options (all should be suffixed by "_CLH")
+    # currently, huge pages are required for virtiofsd support
+    DEFNETWORKMODEL_CLH := tcfilter
+    KERNELTYPE_CLH = uncompressed
+    KERNEL_NAME_CLH = $(call MAKE_KERNEL_NAME,$(KERNELTYPE_CLH))
+    KERNELPATH_CLH = $(KERNELDIR)/$(KERNEL_NAME_CLH)
+    VMROOTFSDRIVER_CLH := virtio-pmem
+endif
+
 ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_DB))
     DEFAULT_HYPERVISOR_CONFIG = $(CONFIG_FILE_DB)
 endif
@@ -233,11 +263,16 @@ USER_VARS += DBPATH
 USER_VARS += DBVALIDHYPERVISORPATHS
 USER_VARS += DBCTLPATH
 USER_VARS += DBVALIDCTLPATHS
+USER_VARS += CLHPATH
+USER_VARS += CLHVALIDHYPERVISORPATHS
+USER_VARS += FIRMWAREPATH_CLH
+USER_VARS += KERNELPATH_CLH
 USER_VARS += SYSCONFIG
 USER_VARS += IMAGENAME
 USER_VARS += IMAGEPATH
 USER_VARS += DEFROOTFSTYPE
 USER_VARS += VMROOTFSDRIVER_DB
+USER_VARS += VMROOTFSDRIVER_CLH
 USER_VARS += MACHINETYPE
 USER_VARS += KERNELDIR
 USER_VARS += KERNELTYPE
@@ -250,6 +285,7 @@ USER_VARS += MACHINEACCELERATORS
 USER_VARS += CPUFEATURES
 USER_VARS += DEFMACHINETYPE_CLH
 USER_VARS += KERNELPARAMS
+USER_VARS += KERNELPARAMS_DB
 USER_VARS += LIBEXECDIR
 USER_VARS += LOCALSTATEDIR
 USER_VARS += PKGDATADIR
@@ -273,6 +309,7 @@ USER_VARS += DEFMEMSZ
 USER_VARS += DEFMEMSLOTS
 USER_VARS += DEFBRIDGES
 USER_VARS += DEFNETWORKMODEL_DB
+USER_VARS += DEFNETWORKMODEL_CLH
 USER_VARS += DEFDISABLEGUESTEMPTYDIR
 USER_VARS += DEFDISABLEGUESTSECCOMP
 USER_VARS += DEFDISABLESELINUX
@@ -298,12 +335,14 @@ USER_VARS += DEFMSIZE9P
 USER_VARS += DEFENTROPYSOURCE
 USER_VARS += DEFVALIDENTROPYSOURCES
 USER_VARS += DEFSANDBOXCGROUPONLY
+USER_VARS += DEFSTATICRESOURCEMGMT
 USER_VARS += DEFSTATICRESOURCEMGMT_DB
 USER_VARS += DEFBINDMOUNTS
 USER_VARS += DEFVFIOMODE
 USER_VARS += BUILDFLAGS
 USER_VARS += RUNTIMENAME
 USER_VARS += HYPERVISOR_DB
+USER_VARS += HYPERVISOR_CLH
 USER_VARS += PIPESIZE
 USER_VARS += DBSHAREDFS
 USER_VARS += KATA_INSTALL_GROUP
@@ -383,6 +422,12 @@ define MAKE_KERNEL_NAME_DB
 $(if $(findstring uncompressed,$1),vmlinux-dragonball-experimental.container,vmlinuz-dragonball-experimental.container)
 endef
 
+# Returns the name of the kernel file to use based on the provided KERNELTYPE.
+#   # $1 : KERNELTYPE (compressed or uncompressed)
+define MAKE_KERNEL_NAME
+$(if $(findstring uncompressed,$1),vmlinux.container,vmlinuz.container)
+endef
+
 .DEFAULT_GOAL := default
 
 GENERATED_FILES += $(CONFIGS)

src/runtime-rs/arch/x86_64-options.mk

@@ -13,3 +13,6 @@ QEMUCMD := qemu-system-x86_64
 
 # dragonball binary name
 DBCMD := dragonball
+
+# cloud-hypervisor binary name
+CLHCMD := cloud-hypervisor