Allow arm64 to fallback to arm (v8, v7, v6, v5)

tianon · tianon · commit 4073aaa7a9df · 2021-01-13T09:19:08.000-08:00
This isn't supported by *all* arm64 chips, but it is common enough that I think it's worth an explicit fallback.  I think it will be more common for images to have arm64 support without arm support, but even if a user has an arm64 chip that does not support arm32, having it fail to run the arm32 image is an acceptable compromise (because it's non-trivial to detect arm32 support without running a binary, AFAIK).

Also, before this change the failure would've simply been "no such image" instead of "failed to run" so I think it's pretty reasonable to allow it to try the additional 32bit set of images just in case one of them actually does work (like it will on many popular chips like 64bit Raspberry Pis and AWS Graviton).

Signed-off-by: Tianon Gravi &lt;admwiggin@gmail.com&gt;
diff --git a/platforms/compare.go b/platforms/compare.go
@@ -57,6 +57,18 @@ func platformVector(platform specs.Platform) []specs.Platform {
 				})
 			}
 		}
+	case "arm64":
+		variant := platform.Variant
+		if variant == "" {
+			variant = "v8"
+		}
+		vector = append(vector, platformVector(specs.Platform{
+			Architecture: "arm",
+			OS:           platform.OS,
+			OSVersion:    platform.OSVersion,
+			OSFeatures:   platform.OSFeatures,
+			Variant:      variant,
+		})...)
 	}
 
 	return vector
diff --git a/platforms/compare_test.go b/platforms/compare_test.go
@@ -166,17 +166,17 @@ func TestOnly(t *testing.T) {
 			platform: "linux/arm64",
 			matches: map[bool][]string{
 				true: {
+					"linux/arm",
+					"linux/arm/v5",
+					"linux/arm/v6",
+					"linux/arm/v7",
+					"linux/arm/v8",
 					"linux/arm64",
 					"linux/arm64/v8",
 				},
 				false: {
 					"linux/amd64",
-					"linux/arm",
 					"linux/arm/v4",
-					"linux/arm/v5",
-					"linux/arm/v6",
-					"linux/arm/v7",
-					"linux/arm/v8",
 					"linux/arm/v9",
 					"linux/arm64/v9",
 					"windows/amd64",
diff --git a/platforms/cpuinfo.go b/platforms/cpuinfo.go
@@ -107,12 +107,7 @@ func getCPUVariant() string {
 
 	switch strings.ToLower(variant) {
 	case "8", "aarch64":
-		// special case: if running a 32-bit userspace on aarch64, the variant should be "v7"
-		if runtime.GOARCH == "arm" {
-			variant = "v7"
-		} else {
-			variant = "v8"
-		}
+		variant = "v8"
 	case "7", "7m", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)":
 		variant = "v7"
 	case "6", "6tej":

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,18 @@ func platformVector(platform specs.Platform) []specs.Platform {`
`57`	`57`	`})`
`58`	`58`	`}`
`59`	`59`	`}`
	`60`	`+ case "arm64":`
	`61`	`+ variant := platform.Variant`
	`62`	`+ if variant == "" {`
	`63`	`+ variant = "v8"`
	`64`	`+ }`
	`65`	`+ vector = append(vector, platformVector(specs.Platform{`
	`66`	`+ Architecture: "arm",`
	`67`	`+ OS: platform.OS,`
	`68`	`+ OSVersion: platform.OSVersion,`
	`69`	`+ OSFeatures: platform.OSFeatures,`
	`70`	`+ Variant: variant,`
	`71`	`+ })...)`
`60`	`72`	`}`
`61`	`73`
`62`	`74`	`return vector`