From 2f4a34b88d18f7653934eaec25e99dba3bac5de6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 16 Sep 2016 21:34:42 +0200 Subject: fuel-library: nova: AArch64: enable hugepage supp This patch adds AArch64 to the hardcoded lists of valid architectures for hugepage support. Closes-bug: ARMBAND-90 Change-Id: I3765e6bc314393a58db70590f3890fde206e3feb Signed-off-by: Veena Lingadahalli Signed-off-by: Alexandru Avadanii --- ...te-vga-console-defaults-for-armv7-aarch64.patch | 98 ++++++++++++++++++++++ ...ga-console-defaults-for-armv7-and-aarch64.patch | 98 ---------------------- ...0009-nova-AArch64-enable-hugepage-support.patch | 93 ++++++++++++++++++++ 3 files changed, 191 insertions(+), 98 deletions(-) create mode 100644 patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch delete mode 100644 patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch create mode 100644 patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch (limited to 'patches/fuel-library') diff --git a/patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch b/patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch new file mode 100644 index 00000000..c289bd8d --- /dev/null +++ b/patches/fuel-library/0008-nova-Update-vga-console-defaults-for-armv7-aarch64.patch @@ -0,0 +1,98 @@ +From: Stanislaw Kardach +Date: Tue, 22 Mar 2016 12:05:09 +0100 +Subject: [PATCH] nova: Update vga, console defaults for armv7, aarch64 + +Nova hardcodes default options for both video=cirrus and console. +armv7 and aarch64 VMs require video=vga, and since most applications +use PL011 serial driver for guests, adding console=ttyAMA0 is also +a nice UX addition. +--- + .../openstack/files/nova-libvirt-vga-console.patch | 39 ++++++++++++++++++++++ + deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 19 +++++++++++ + 2 files changed, 58 insertions(+) + create mode 100644 deployment/puppet/openstack/files/nova-libvirt-vga-console.patch + +diff --git a/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch +new file mode 100644 +index 0000000..c5f8e5a +--- /dev/null ++++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch +@@ -0,0 +1,40 @@ ++From: Stanislaw Kardach ++Date: Tue, 22 Mar 2016 12:05:09 +0100 ++Subject: [PATCH] Update vga, console defaults for armv7 and aarch64 ++ ++Nova hardcodes default options for both video=cirrus and console. ++armv7 and aarch64 VMs require video=vga, and since most applications ++use PL011 serial driver for guests, adding console=ttyAMA0 is also ++a nice UX addition. ++ ++Signed-off-by: Stanislaw Kardach ++Signed-off-by: Alexandru Avadanii ++--- ++ ++diff --git a/virt/libvirt/driver.py b/virt/libvirt/driver.py ++index 920a283..751b140 100644 ++--- a/virt/libvirt/driver.py +++++ b/virt/libvirt/driver.py ++@@ -3834,7 +3834,11 @@ ++ if virt_type == "xen": ++ guest.os_cmdline = "ro root=%s" % root_device_name ++ else: +++ guestarch = libvirt_utils.get_arch(image_meta) ++ guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE)) +++ if guestarch in (arch.ARMV7, arch.AARCH64): +++ # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console +++ guest.os_cmdline += " console=ttyAMA0" ++ if virt_type == "qemu": ++ guest.os_cmdline += " no_timer_check" ++ if instance.ramdisk_id: ++@@ -3972,7 +3972,9 @@ class LibvirtDriver(driver.ComputeDriver): ++ video.type = 'xen' ++ elif CONF.libvirt.virt_type == 'parallels': ++ video.type = 'vga' ++- elif guestarch in (arch.PPC, arch.PPC64, arch.PPC64LE): +++ elif guestarch in (arch.ARMV7, arch.AARCH64, +++ arch.PPC, arch.PPC64, arch.PPC64LE): +++ # NOTE(armband): Added ARM v7/v8, same as on PPC. ++ # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default ++ # so use 'vga' instead when running on Power hardware. ++ video.type = 'vga' +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +index c0349dc..46b1801 100644 +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -157,4 +157,10 @@ class openstack::compute ( + + include ::nova::params ++ ++ if ! defined(Package['patch']) { ++ package { 'patch': ++ ensure => 'present', ++ } ++ } + + case $::osfamily { +@@ -250,3 +256,4 @@ class openstack::compute ( + + $notify_on_state_change = 'vm_and_task_state' ++ $nova_path = '/usr/lib/python2.7/dist-packages/nova' + +@@ -273,5 +280,17 @@ class openstack::compute ( + memcached_servers => $memcached_addresses, + cinder_catalog_info => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'), + rabbit_heartbeat_timeout_threshold => $::os_service_default, ++ } -> ++ # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver ++ file { "${nova_path}/libvirt-vga-console.patch": ++ ensure => "file", ++ source => "puppet:///modules/openstack/nova-libvirt-vga-console.patch", ++ } -> ++ exec { 'nova libvirt driver patch arm defaults': ++ path => ['/usr/bin'], ++ command => "patch -p1 < ${nova_path}/libvirt-vga-console.patch", ++ unless => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch", ++ cwd => $nova_path, ++ require => [Package['patch']], + } + diff --git a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch deleted file mode 100644 index 199ef122..00000000 --- a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch +++ /dev/null @@ -1,98 +0,0 @@ -From: Stanislaw Kardach -Date: Tue, 22 Mar 2016 12:05:09 +0100 -Subject: [PATCH] Update vga, console defaults for armv7 and aarch64 - -Nova hardcodes default options for both video=cirrus and console. -armv7 and aarch64 VMs require video=vga, and since most applications -use PL011 serial driver for guests, adding console=ttyAMA0 is also -a nice UX addition. ---- - .../openstack/files/nova-libvirt-vga-console.patch | 39 ++++++++++++++++++++++ - deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 19 +++++++++++ - 2 files changed, 58 insertions(+) - create mode 100644 deployment/puppet/openstack/files/nova-libvirt-vga-console.patch - -diff --git a/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch -new file mode 100644 -index 0000000..c5f8e5a ---- /dev/null -+++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch -@@ -0,0 +1,40 @@ -+From: Stanislaw Kardach -+Date: Tue, 22 Mar 2016 12:05:09 +0100 -+Subject: [PATCH] Update vga, console defaults for armv7 and aarch64 -+ -+Nova hardcodes default options for both video=cirrus and console. -+armv7 and aarch64 VMs require video=vga, and since most applications -+use PL011 serial driver for guests, adding console=ttyAMA0 is also -+a nice UX addition. -+ -+Signed-off-by: Stanislaw Kardach -+Signed-off-by: Alexandru Avadanii -+--- -+ -+diff --git a/virt/libvirt/driver.py b/virt/libvirt/driver.py -+index 920a283..751b140 100644 -+--- a/virt/libvirt/driver.py -++++ b/virt/libvirt/driver.py -+@@ -3834,7 +3834,11 @@ -+ if virt_type == "xen": -+ guest.os_cmdline = "ro root=%s" % root_device_name -+ else: -++ guestarch = libvirt_utils.get_arch(image_meta) -+ guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE)) -++ if guestarch in (arch.ARMV7, arch.AARCH64): -++ # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console -++ guest.os_cmdline += " console=ttyAMA0" -+ if virt_type == "qemu": -+ guest.os_cmdline += " no_timer_check" -+ if instance.ramdisk_id: -+@@ -3972,7 +3972,9 @@ class LibvirtDriver(driver.ComputeDriver): -+ video.type = 'xen' -+ elif CONF.libvirt.virt_type == 'parallels': -+ video.type = 'vga' -+- elif guestarch in (arch.PPC, arch.PPC64, arch.PPC64LE): -++ elif guestarch in (arch.ARMV7, arch.AARCH64, -++ arch.PPC, arch.PPC64, arch.PPC64LE): -++ # NOTE(armband): Added ARM v7/v8, same as on PPC. -+ # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default -+ # so use 'vga' instead when running on Power hardware. -+ video.type = 'vga' -diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp -index c0349dc..46b1801 100644 ---- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp -+++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp -@@ -157,4 +157,10 @@ class openstack::compute ( - - include ::nova::params -+ -+ if ! defined(Package['patch']) { -+ package { 'patch': -+ ensure => 'present', -+ } -+ } - - case $::osfamily { -@@ -250,3 +256,4 @@ class openstack::compute ( - - $notify_on_state_change = 'vm_and_task_state' -+ $nova_path = '/usr/lib/python2.7/dist-packages/nova' - -@@ -273,5 +280,17 @@ class openstack::compute ( - memcached_servers => $memcached_addresses, - cinder_catalog_info => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'), - rabbit_heartbeat_timeout_threshold => $::os_service_default, -+ } -> -+ # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver -+ file { "${nova_path}/libvirt-vga-console.patch": -+ ensure => "file", -+ source => "puppet:///modules/openstack/nova-libvirt-vga-console.patch", -+ } -> -+ exec { 'nova libvirt driver patch arm defaults': -+ path => ['/usr/bin'], -+ command => "patch -p1 < ${nova_path}/libvirt-vga-console.patch", -+ unless => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch", -+ cwd => $nova_path, -+ require => [Package['patch']], - } - diff --git a/patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch b/patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch new file mode 100644 index 00000000..16e06ba8 --- /dev/null +++ b/patches/fuel-library/0009-nova-AArch64-enable-hugepage-support.patch @@ -0,0 +1,93 @@ +From: Alexandru Avadanii +Date: Fri, 16 Sep 2016 21:31:56 +0200 +Subject: [PATCH] nova: AArch64: enable hugepage support + +This patch adds AArch64 to the hardcoded lists of valid +architectures for hugepage support. + +Closes-bug: ARMBAND-90 + +Signed-off-by: Veena Lingadahalli +Signed-off-by: Alexandru Avadanii +--- + .../nova-AArch64-enable-hugepage-support.patch | 47 ++++++++++++++++++++++ + .../openstack_tasks/manifests/roles/compute.pp | 12 ++++++ + 2 files changed, 59 insertions(+) + create mode 100644 deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch + +diff --git a/deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch b/deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch +new file mode 100644 +index 0000000..847cab6 +--- /dev/null ++++ b/deployment/puppet/openstack/files/nova-AArch64-enable-hugepage-support.patch +@@ -0,0 +1,47 @@ ++From: Veena Lingadahalli ++Date: Fri Sep 16 17:52:02 CEST 2016 ++Subject: [PATCH] nova: AArch64: enable hugepage support ++ ++This patch adds AArch64 to the hardcoded lists of valid ++architectures for hugepage support. ++ ++Signed-off-by: Veena Lingadahalli ++Acked-by: Alexandru Avadanii ++--- ++ ++diff --git a/compute/arch.py a/compute/arch.py ++index 265f853..6a4b4a3 100644 ++--- a/compute/arch.py +++++ a/compute/arch.py ++@@ -156,6 +156,9 @@ def canonicalize(name): ++ if newname == "amd64": ++ newname = X86_64 ++ +++ if newname == "aarch64": +++ newname = AARCH64 +++ ++ if not is_valid(newname): ++ raise exception.InvalidArchitectureName(arch=name) ++ ++diff --git a/virt/libvirt/driver.py a/virt/libvirt/driver.py ++index bac17cf..0e0bcae 100644 ++--- a/virt/libvirt/driver.py +++++ a/virt/libvirt/driver.py ++@@ -5206,7 +5206,7 @@ class LibvirtDriver(driver.ComputeDriver): ++ self._bad_libvirt_numa_version_warn = True ++ return False ++ ++- support_matrix = {(arch.I686, arch.X86_64): MIN_LIBVIRT_NUMA_VERSION, +++ support_matrix = {(arch.I686, arch.X86_64, arch.AARCH64): MIN_LIBVIRT_NUMA_VERSION, ++ (arch.PPC64, ++ arch.PPC64LE): MIN_LIBVIRT_NUMA_VERSION_PPC} ++ caps = self._host.get_capabilities() ++@@ -5222,7 +5222,7 @@ class LibvirtDriver(driver.ComputeDriver): ++ def _has_hugepage_support(self): ++ # This means that the host can support multiple values for the size ++ # field in LibvirtConfigGuestMemoryBackingPage ++- supported_archs = [arch.I686, arch.X86_64] +++ supported_archs = [arch.I686, arch.X86_64, arch.AARCH64] ++ caps = self._host.get_capabilities() ++ return ((caps.host.cpu.arch in supported_archs) and ++ self._host.has_min_version(MIN_LIBVIRT_HUGEPAGE_VERSION, +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +index 3647f9b..c53409c 100644 +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -347,6 +347,18 @@ class openstack_tasks::roles::compute { + unless => "patch -p1 -R -N --dry-run < ${nova_path}/libvirt-vga-console.patch", + cwd => $nova_path, + require => [Package['patch']], ++ } -> ++ # FIXME(armband): Add AArch64 to arch list for nova hugepage support ++ file { "${nova_path}/nova-AArch64-enable-hugepage-support.patch": ++ ensure => "file", ++ source => "puppet:///modules/openstack/nova-AArch64-enable-hugepage-support.patch", ++ } -> ++ exec { 'nova AArch64 enable hugepage support': ++ path => ['/usr/bin'], ++ command => "patch -p1 < ${nova_path}/nova-AArch64-enable-hugepage-support.patch", ++ unless => "patch -p1 -R -N --dry-run < ${nova_path}/nova-AArch64-enable-hugepage-support.patch", ++ cwd => $nova_path, ++ require => [Package['patch']], + } + + class { '::nova::availability_zone': -- cgit 1.2.3-korg