kvm: add more options for cpu, auto-ballooning and disk cache

software/kvm/common.cfg

@@ -101,7 +101,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 8b8d6410ca93314d5ee15d3db9f13aa5
+md5sum = 7abec10f8e24e7a75935a0637a006329
 download-only = true
 on-update = true
 
@@ -110,7 +110,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 51b5664e103e5c663895cb4d324719fd
+md5sum = d29f02443f48096f176c8ae78cc5596c
 download-only = true
 on-update = true
 
@@ -197,7 +197,7 @@ ignore-existing = true
 url = ${:_profile_base_location_}/template/template-kvm-run.in
 mode = 644
 filename = template-kvm-run.in
-md5sum = 24b09d68f7cd0e81630c685cc679676b
+md5sum = 178a24cdad77cb6c2e519ac629dd0e74
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster-input-schema.json

@@ -196,6 +196,12 @@
               "minimum": 128,
               "multipleOf": 128
             },
+            "auto-ballooning": {
+              "title": "Enable qemu auto ballooning.",
+              "description": "Enable virtio balloon device to allows KVM guests to reduce/re-increase their memory size.",
+              "type": "boolean",
+              "default": true
+            },
             "disk-size": {
               "title": "Disk size",
               "description": "Disk size, in GB.",
@@ -219,6 +225,20 @@
                 "virtio"
               ]
             },
+            "disk-cache": {
+              "title": "Cache option to use with Disk.",
+              "description": "Disk cache controls how the host cache is used to access block data.",
+              "type": "string",
+              "default": "writeback",
+              "enum": ["none", "writeback", "unsafe", "directsync", "writethrough"]
+            },
+            "disk-aio": {
+              "title": "Disk aio to use.",
+              "description": "Selects between pthread based disk I/O and native Linux AIO.",
+              "type": "string",
+              "default": "threads",
+              "enum": ["threads", "native"]
+            },
             "cpu-count": {
               "title": "CPU count",
               "description": "Number of CPU cores.",
@@ -235,6 +255,16 @@
               "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",
               "type": "string"
             },
+            "machine-options": {
+              "title": "Machine options.",
+              "description": "Select the emulated machine by name. Ex: pc-i440fx-2.4,accel=kvm",
+              "type": "string"
+            },
+            "cpu-model": {
+              "title": "CPU model.",
+              "description": "Select the emulated CPU model. Ex: SandyBridge,+erms,+smep,+smx,+vmx",
+              "type": "string"
+            },
             "keyboard-layout-language": {
               "title": "Use keyboard layout language",
               "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -51,6 +51,11 @@ config-disk-type = {{ dumps(kvm_parameter_dict.get('disk-type', 'virtio')) }}
 config-cpu-count = {{ dumps(kvm_parameter_dict.get('cpu-count', 1)) }}
 config-cpu-options = {{ dumps(kvm_parameter_dict.get('cpu-options', '')) }}
 config-numa = {{ dumps(kvm_parameter_dict.get('numa', '')) }}
+config-disk-cache = {{ dumps(kvm_parameter_dict.get('disk-cache', '')) }}
+config-disk-aio = {{ dumps(kvm_parameter_dict.get('disk-aio', '')) }}
+config-auto-ballooning = {{ dumps(kvm_parameter_dict.get('auto-ballooning', True)) }}
+config-machine-options = {{ dumps(kvm_parameter_dict.get('machine-options', '')) }}
+config-cpu-model = {{ dumps(kvm_parameter_dict.get('cpu-model', '')) }}
 
 {% set nat_rules_list = kvm_parameter_dict.get('nat-rules', []) -%}
 config-nat-rules = {{ nat_rules_list | join(' ') }}

software/kvm/instance-kvm-input-schema.json

@@ -12,6 +12,12 @@
       "minimum": 128,
       "multipleOf": 128
     },
+    "auto-ballooning": {
+      "title": "Enable qemu auto ballooning.",
+      "description": "Enable virtio balloon device to allows KVM guests to reduce/re-increase their memory size.",
+      "type": "boolean",
+      "default": true
+    },
     "disk-size": {
       "title": "Disk size",
       "description": "Disk size, in GB.",
@@ -27,6 +33,20 @@
       "default": "virtio",
       "enum": ["ide", "scsi", "sd", "mtd", "floppy", "pflash", "virtio"]
     },
+    "disk-cache": {
+      "title": "Cache option to use with Disk.",
+      "description": "Disk cache controls how the host cache is used to access block data.",
+      "type": "string",
+      "default": "writeback",
+      "enum": ["none", "writeback", "unsafe", "directsync", "writethrough"]
+    },
+    "disk-aio": {
+      "title": "Disk aio to use.",
+      "description": "Selects between pthread based disk I/O and native Linux AIO.",
+      "type": "string",
+      "default": "threads",
+      "enum": ["threads", "native"]
+    },
 
     "cpu-count": {
       "title": "CPU count",
@@ -44,6 +64,17 @@
       "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",
       "type": "string"
     },
+    "machine-options": {
+      "title": "Machine options.",
+      "description": "Select the emulated machine by name. Ex: pc-i440fx-2.4,accel=kvm",
+      "type": "string"
+    },
+    "cpu-model": {
+      "title": "CPU model.",
+      "description": "Select the emulated CPU model. Ex: SandyBridge,+erms,+smep,+smx,+vmx",
+      "type": "string"
+    },
+
     "keyboard-layout-language": {
       "title": "Use keyboard layout language",
       "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",

software/kvm/instance-kvm.cfg.jinja2

@@ -142,6 +142,15 @@ cluster-doc-port = 0
 netcat-binary = {{ netcat_bin }}
 language = ${slap-parameter:keyboard-layout-language}
 
+name = {{ slapparameter_dict.get('name', 'Single KVM') }}
+disk-cache = ${slap-parameter:disk-cache}
+disk-aio = ${slap-parameter:disk-aio}
+auto-ballooning = ${slap-parameter:auto-ballooning}
+machine-options = ${slap-parameter:machine-options}
+cpu-options = ${slap-parameter:cpu-model}
+
+log-file = ${directory:log}/qemu.log
+
 [kvm-run]
 recipe = slapos.recipe.template:jinja2
 template = {{ template_kvm_run }}
@@ -428,8 +437,10 @@ mode = {{ mode }}
 # write vm-data into file public/data
 {{ writefile('vm-data-content', '${directory:public}/data', slapparameter_dict.get('data-to-vm', ''), '700') }}
 
+{% if slapparameter_dict.get('authorized-key', '') -%}
 # write public key for vms to public/authorized_keys
 {{   writefile('get-authorized-key', '${directory:public}/authorized_keys', slapparameter_dict.get('authorized-key', ''), '700') }}
+{% endif -%}
 
 {% if use_tap == 'true' and nat_restrict == 'true' -%}
 # Ask to set default to tap interface in the vm
@@ -546,6 +557,11 @@ cpu-count = 1
 cpu-options = 
 # list of numa options separate by space: node,nodeid=1,cpus=9-15 node,nodeid=2,cpus=1,3,7
 numa = 
+disk-cache = writeback
+disk-aio = native
+auto-ballooning = True
+machine-options = 
+cpu-model = 
 
 nat-rules = 22 80 443
 use-nat = True

software/kvm/template/template-kvm-run.in

@@ -61,6 +61,18 @@ language_list = ['ar', 'da', 'de', 'de-ch', 'en-gb', 'en-us', 'es', 'et', 'fi',
     'lv', 'mk', 'nl', 'nl-be', 'no', 'pl', 'pt', 'pt-br', 'ru', 'sl', 'sv',
     'th', 'tr']
 url_check_certificate = '{{ parameter_dict.get("hard-drive-url-check-certificate", "true") }}'.lower()
+auto_ballooning = '{{ parameter_dict.get("auto-ballooning") }}' in ('true', 'True', '1')
+vm_name = '{{ parameter_dict.get("name") }}'
+disk_cache = '{{ parameter_dict.get("disk-cache") }}'.strip()
+disk_cache = disk_cache if disk_cache in ["none", "writeback", "unsafe", 
+              "directsync", "writethrough"] else "writeback"
+disk_aio = '{{ parameter_dict.get("disk-aio") }}'.strip()
+disk_aio = disk_aio if disk_aio in ["threads", "native"] and \
+              disk_cache == "directsync" else "threads"
+machine_options = '{{ parameter_dict.get("machine-options", "") }}'.strip()
+cpu_model = '{{ parameter_dict.get("cpu-model", "") }}'.strip()
+
+logfile = '{{ parameter_dict.get("log-file") }}'
 
 if hasattr(ssl, '_create_unverified_context') and url_check_certificate == 'false':
   opener = urllib.FancyURLopener(context=ssl._create_unverified_context())
@@ -250,13 +262,14 @@ if smp_options:
     if key in ('cores', 'threads', 'sockets', 'maxcpus') and val.isdigit():
       smp += ',%s=%s' % (key, val)
 kvm_argument_list = [qemu_path,
-  '-enable-kvm', '-smp', smp,
+  '-enable-kvm', '-smp', smp, '-name', vm_name,
   '-m', ram_size, '-vga', 'std',
-  '-drive', 'file=%s,if=%s' % (disk_path, disk_type),
+  '-drive', 'file=%s,if=%s,cache=%s,aio=%s' % (disk_path, disk_type, disk_cache, disk_aio),
   '-vnc', '%s:1,ipv4,password' % listen_ip,
   '-boot', 'order=cd,menu=on',
   '-qmp', 'unix:%s,server' % socket_path,
-  '-pidfile', pid_file_path,
+  '-pidfile', pid_file_path, '-msg', 'timestamp=on',
+  '-D', logfile,
 ]
 
 rgx = re.compile('^[\w*\,][\=\d+\-\,\w]*$')
@@ -275,6 +288,31 @@ if language in language_list:
 for disk in additional_disk_list:
   kvm_argument_list.extend([
             '-drive', 'file=%s,if=%s' % (disk, disk_type)])
+
+if auto_ballooning:
+  kvm_argument_list.extend(['-device', 'virtio-balloon-pci,id=balloon0'])
+
+machine_option_list = machine_options.split(',')
+if machine_options and len(machine_option_list) > 0:
+  name = 'type'
+  if '=' in machine_option_list[0]:
+    name, val = machine_option_list[0].split('=')
+  else:
+    val = machine_option_list[0]
+  machine_option_list[0] = 'type=%s' % val
+  if name == 'type':
+    machine = ''
+    for option in machine_option_list:
+      key, val = option.split('=')
+      machine += ',%s=%s' % (key, val)
+
+    kvm_argument_list.extend(['-machine', machine])
+
+if cpu_model:
+  rgx = re.compile('^[\w*\,-_][\=\d+\-\,\w]*$')
+  if rgx.match(cpu_model):
+    kvm_argument_list.extend(['-cpu', cpu_model])
+
 # Try to connect to NBD server (and second nbd if defined).
 # If not available, don't even specify it in qemu command line parameters.
 # Reason: if qemu starts with unavailable NBD drive, it will just crash.