github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Improve ARM platform matching

Browse Source 
This commit improves ARM platform matching in two instances:

* Some old kernels reported the CPU architecture of arm64 cpus as
  Aarch64 [1].
* In cases where the user is running with armv8 cpu and kernel but amrhf
  user land (so armhf containerd), a possibility given the compatibility
  of armv8 with armv7.

[1] https://elixir.bootlin.com/linux/v3.14.29/source/arch/arm64/kernel/setup.c#L420

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>
This commit is contained in:
Jaime Caamaño Ruiz 2019-05-09 14:23:17 +02:00
parent d68b593de4
commit ad25c1a9c3
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
platforms/compare.go
View File

@ -29,11 +29,48 @@ type MatchComparer interface {
// Only returns a match comparer for a single platform // Only returns a match comparer for a single platform
// using default resolution logic for the platform. // using default resolution logic for the platform.
// //
// For ARMv8, will also match ARMv7, ARMv6 and ARMv5 (for 32bit runtimes)
// For ARMv7, will also match ARMv6 and ARMv5 // For ARMv7, will also match ARMv6 and ARMv5
// For ARMv6, will also match ARMv5 // For ARMv6, will also match ARMv5
func Only(platform specs.Platform) MatchComparer { func Only(platform specs.Platform) MatchComparer {
platform = Normalize(platform) platform = Normalize(platform)
if platform.Architecture == "arm" { if platform.Architecture == "arm" {
if platform.Variant == "v8" {
return orderedPlatformComparer{
matchers: []Matcher{
&matcher{
Platform: platform,
},
&matcher{
Platform: specs.Platform{
Architecture: platform.Architecture,
OS: platform.OS,
OSVersion: platform.OSVersion,
OSFeatures: platform.OSFeatures,
Variant: "v7",
},
},
&matcher{
Platform: specs.Platform{
Architecture: platform.Architecture,
OS: platform.OS,
OSVersion: platform.OSVersion,
OSFeatures: platform.OSFeatures,
Variant: "v6",
},
},
&matcher{
Platform: specs.Platform{
Architecture: platform.Architecture,
OS: platform.OS,
OSVersion: platform.OSVersion,
OSFeatures: platform.OSFeatures,
Variant: "v5",
},
},
},
}
}
if platform.Variant == "v7" { if platform.Variant == "v7" {
return orderedPlatformComparer{ return orderedPlatformComparer{
matchers: []Matcher{ matchers: []Matcher{

2
platforms/cpuinfo.go
View File

@ -97,7 +97,7 @@ func getCPUVariant() string {
} }
switch variant { switch variant {
case "8": case "8", "AArch64":
variant = "v8" variant = "v8"
case "7", "7M", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)": case "7", "7M", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)":
variant = "v7" variant = "v7"