config: Define minimum memory requirement

Introduce a constant for minimum memory requirement in virtcontainers package, that can be used in config. Signed-off-by: Archana Shinde <[email protected]>
kata-containers · Oct 3, 2019 · 09129c1 · 09129c1
1 parent 8405b56
commit 09129c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/katautils/config.go b/pkg/katautils/config.go
@@ -304,7 +304,7 @@ func (h hypervisor) defaultMaxVCPUs() uint32 {
 }
 
 func (h hypervisor) defaultMemSz() uint32 {
-	if h.MemorySize < 8 {
+	if h.MemorySize < vc.MinHypervisorMemory {
 		return defaultMemSize // MiB
 	}
 

diff --git a/virtcontainers/hypervisor.go b/virtcontainers/hypervisor.go
@@ -63,6 +63,9 @@ const (
 	// port numbers below 1024 are called privileged ports. Only a process with
 	// CAP_NET_BIND_SERVICE capability may bind to these port numbers.
 	vSockPort = 1024
+
+	// MinHypervisorMemory is the minimum memory required for a VM.
+	MinHypervisorMemory = 256
 )
 
 // In some architectures the maximum number of vCPUs depends on the number of physical cores.

diff --git a/virtcontainers/pkg/oci/utils.go b/virtcontainers/pkg/oci/utils.go
@@ -446,10 +446,14 @@ func addHypervisorConfigOverrides(ocispec specs.Spec, config *vc.SandboxConfig)
 func addHypervisorMemoryOverrides(ocispec specs.Spec, sbConfig *vc.SandboxConfig) error {
 	if value, ok := ocispec.Annotations[vcAnnotations.DefaultMemory]; ok {
 		memorySz, err := strconv.ParseUint(value, 10, 32)
-		if err != nil || memorySz < 8 {
+		if err != nil {
 			return fmt.Errorf("Error encountered parsing annotation for default_memory: %v, please specify positive numeric value greater than 8", err)
 		}
 
+		if memorySz < vc.MinHypervisorMemory {
+			return fmt.Errorf("Memory specified in annotation %s is less than minimum required %d, please specify a larger value", vcAnnotations.DefaultMemory, vc.MinHypervisorMemory)
+		}
+
 		sbConfig.HypervisorConfig.MemorySize = uint32(memorySz)
 	}