Merge lp:~dannf/cpu-checker/arm-cortex-a15 into lp:cpu-checker

[dann frazier]

[Kees Cook (kees)]

On Wed, Jun 26, 2013 at 09:22:23PM -0000, dann frazier wrote:
> -Architecture: amd64 i386
> -Depends: msr-tools, ${shlibs:Depends}, ${misc:Depends}
> +Architecture: all
> +Depends: ${shlibs:Depends}, ${misc:Depends}
> +Recommends: msr-tools

On x86, lacking msr-tools means this package is unusable. How about making
this Arch: any, and using Depends: msr-tools [i386,amd64] instead?

--
Kees Cook @outflux.net

[lp:~dannf/cpu-checker/arm-cortex-a15]

45. By dann frazier on 2013-06-27

Make package "Architecture: any" to allow installation on ARM, but
restrict msr-tools dependency to x86

[dann frazier (dannf)]

> On Wed, Jun 26, 2013 at 09:22:23PM -0000, dann frazier wrote:
> > -Architecture: amd64 i386
> > -Depends: msr-tools, ${shlibs:Depends}, ${misc:Depends}
> > +Architecture: all
> > +Depends: ${shlibs:Depends}, ${misc:Depends}
> > +Recommends: msr-tools
>
> On x86, lacking msr-tools means this package is unusable. How about making
> this Arch: any, and using Depends: msr-tools [i386,amd64] instead?

Hi Kees! Thanks for the review. Resubmitted.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

Is there a way to make this support A50 which is basically the final target anyway?

review: Needs Information

[dann frazier (dannf)]

On Fri, Sep 13, 2013 at 5:02 AM, Zygmunt Krynicki
<email address hidden> wrote:
> Review: Needs Information
>
> Is there a way to make this support A50 which is basically the final target anyway?

I could certainly look at adding A50 support, but I don't see why
doing so should block this MP. My target for this patch is to really
to support A15.

[Zygmunt Krynicki (zyga)]

> On Fri, Sep 13, 2013 at 5:02 AM, Zygmunt Krynicki
> <email address hidden> wrote:
> > Review: Needs Information
> >
> > Is there a way to make this support A50 which is basically the final target
> anyway?
>
> I could certainly look at adding A50 support, but I don't see why
> doing so should block this MP. My target for this patch is to really
> to support A15.

Fair enough, no objections from me.

[Brendan Donegan (brendan-donegan)]

This works well as far as I can see - thanks!

[Brendan Donegan (brendan-donegan)]

I also tested this on Intel hardware which supports HW virtualization:

processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 23
model name : Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz
stepping : 6
microcode : 0x60c
cpu MHz : 800.000
cache size : 6144 KB
physical id : 0
siblings : 2
core id : 0
cpu cores : 2
apicid : 0
initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 10
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx lm constant_tsc arch_perfmon pebs bts nopl aperfmperf pni dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 lahf_lm dtherm tpr_shadow vnmi flexpriority
bogomips : 5054.15
clflush size : 64
cache_alignment : 64
address sizes : 36 bits physical, 48 bits virtual
power management:

processor : 1
vendor_id : GenuineIntel
cpu family : 6
model : 23
model name : Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz
stepping : 6
microcode : 0x60c
cpu MHz : 800.000
cache size : 6144 KB
physical id : 0
siblings : 2
core id : 1
cpu cores : 2
apicid : 1
initial apicid : 1
fpu : yes
fpu_exception : yes
cpuid level : 10
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx lm constant_tsc arch_perfmon pebs bts nopl aperfmperf pni dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 lahf_lm dtherm tpr_shadow vnmi flexpriority
bogomips : 5054.15
clflush size : 64
cache_alignment : 64
address sizes : 36 bits physical, 48 bits virtual
power management:

Outcome was:

INFO: /dev/kvm exists
KVM acceleration can be used

[Brendan Donegan (brendan-donegan)]

Also on an Intel Atom system which does not support HW virtualization:

processor : 0
vendor_id : GenuineIntel
cpu family : 6
model : 28
model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
stepping : 2
microcode : 0x20a
cpu MHz : 800.000
cache size : 512 KB
physical id : 0
siblings : 2
core id : 0
cpu cores : 1
apicid : 0
initial apicid : 0
fdiv_bug : no
f00f_bug : no
coma_bug : no
fpu : yes
fpu_exception : yes
cpuid level : 10
wp : yes
flags : fpu vme de tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx constant_tsc arch_perfmon pebs bts aperfmperf pni dtes64 monitor ds_cpl est tm2 ssse3 xtpr pdcm movbe lahf_lm dtherm
bogomips : 3192.07
clflush size : 64
cache_alignment : 64
address sizes : 32 bits physical, 32 bits virtual
power management:

processor : 1
vendor_id : GenuineIntel
cpu family : 6
model : 28
model name : Intel(R) Atom(TM) CPU N270 @ 1.60GHz
stepping : 2
microcode : 0x20a
cpu MHz : 1600.000
cache size : 512 KB
physical id : 0
siblings : 2
core id : 0
cpu cores : 1
apicid : 1
initial apicid : 1
fdiv_bug : no
f00f_bug : no
coma_bug : no
fpu : yes
fpu_exception : yes
cpuid level : 10
wp : yes
flags : fpu vme de tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe nx constant_tsc arch_perfmon pebs bts aperfmperf pni dtes64 monitor ds_cpl est tm2 ssse3 xtpr pdcm movbe lahf_lm dtherm
bogomips : 3192.07
clflush size : 64
cache_alignment : 64
address sizes : 32 bits physical, 32 bits virtual
power management:

The output is:

INFO: Your CPU does not support KVM extensions
KVM acceleration can NOT be used

Unmerged revisions

45. By dann frazier on 2013-06-27

Make package "Architecture: any" to allow installation on ARM, but
restrict msr-tools dependency to x86

44. By dann frazier on 2013-06-26

Avoid magic number

43. By dann frazier on 2013-06-26

Add support ARM Cortex-A15 systems (LP: #1194632)

42. By dann frazier on 2013-06-26

Return package to "Architecture: all" by demoting msr-tools to Recommends

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-18 18:44:31 +0000
+++ debian/changelog	2013-06-27 17:03:26 +0000
@@ -1,3 +1,11 @@
+cpu-checker (0.8-0ubuntu1) UNRELEASED; urgency=low
+
+  * Make package "Architecture: any" to allow installation on ARM, but
+    restrict msr-tools dependency to x86
+  * Add support ARM Cortex-A15 systems (LP: #1194632)
+
+ -- dann frazier <[e-mail]>  Wed, 26 Jun 2013 15:10:16 -0600
+
 cpu-checker (0.7-0ubuntu1) precise; urgency=low
 
   [ Colin Watson ]

=== modified file 'debian/control'
--- debian/control	2011-11-18 18:12:36 +0000
+++ debian/control	2013-06-27 17:03:26 +0000
@@ -9,8 +9,8 @@
 Vcs-Bzr: lp:~cpu-checker-dev/cpu-checker/trunk
 
 Package: cpu-checker
-Architecture: amd64 i386
-Depends: msr-tools, ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Depends: msr-tools [amd64 i386], ${shlibs:Depends}, ${misc:Depends}
 Conflicts: qemu-kvm (<< 0.12.3-0ubuntu13)
 Replaces: qemu-kvm (<< 0.12.3-0ubuntu13)
 Description: tools to help evaluate certain CPU (or BIOS) features

=== modified file 'kvm-ok'
--- kvm-ok	2011-09-07 23:21:19 +0000
+++ kvm-ok	2013-06-27 17:03:26 +0000
@@ -39,10 +39,20 @@
 	fi
 }
 
+ARM_CPU_PART_CORTEX_A15="0xc0f" # <asm/cputype.h>
+
 # check cpu flags for capability
-virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true
-[ "$virt" = "vmx" ] && brand="intel"
-[ "$virt" = "svm" ] && brand="amd"
+if [ "$(uname -m)" = "armv7l" ]; then
+    if egrep -m1 -w '^CPU part[[:blank:]]*:' /proc/cpuinfo | \
+	egrep -wq "$ARM_CPU_PART_CORTEX_A15"; then
+	virt="ARM"
+	kvm_mod="kvm"
+    fi
+else
+    virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true
+    [ "$virt" = "vmx" ] && kvm_mod="kvm_intel"
+    [ "$virt" = "svm" ] && kvm_mod="kvm_amd"
+fi
 
 if [ -z "$virt" ]; then
 	echo "INFO: Your CPU does not support KVM extensions"
@@ -56,7 +66,7 @@
 	verdict 0
 else
 	echo "INFO: /dev/kvm does not exist"
-	echo "HINT:   sudo modprobe kvm_$brand"
+	echo "HINT:   sudo modprobe $kvm_mod"
 fi
 
 assert_root
@@ -66,7 +76,7 @@
 if [ ! -r "$msr" ]; then
 	modprobe msr
 fi
-if [ ! -r "$msr" ]; then
+if [ -e "$msr" -a ! -r "$msr" ]; then
 	echo "You must be root to run this check." >&2
 	exit 2
 fi
@@ -90,6 +100,9 @@
         if [ "$BIT" = "1" ]; then
 		disabled=1
         fi
+elif [ "$virt" = "ARM" ]; then
+    # Should also test that we booted in HYP mode, if detectable
+    :
 else
 	echo "FAIL: Unknown virtualization extension: $virt"
 	verdict 1