Skip to content

Commit e1045bf

Browse files
committed
image-index: Document Linux cpuinfo flags (on x86) for platform.features
Based on Akihiro Suda's proposal [1] and the subsequent discussion. Using the Linux kernel to define the values is very convenient on Linux, but will likely be a pain for folks on other OSes. If a comprehensive, OS-agnostic list is found, we could use that instead, but would want to provide a mapping from that list of values to the Linux cpuinfo slugs for convenience. Providing a mapping from the OS-agnostic list to the cpuinfo analog on non-Linux OSes would also be convenient. Until then, folks wondering what a given feature slug means but unwilling to dig through the Linux source may find the Stack Overflow post at [2] useful. This definition is not only Linux-centric, it is x86-centric. The x86 Linux implementation writes 'flags' out here [3], but arm uses 'Features' [4]. While we could suggest values for other architectures, this commit restricts itself to the x86 family (using their GOARCH names [5], as the runtime spec recommends [6]), because that's the scope Stephen is currently claiming [7]. Extending the field to other architectures can happen in follow-up work. [1]: #622 (comment) [2]: http://unix.stackexchange.com/questions/43539/what-do-the-flags-in-proc-cpuinfo-mean [3]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/x86/kernel/cpu/proc.c?id=refs/tags/v4.10.4#n96 [4]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/arm/kernel/setup.c?id=refs/tags/v4.10.4#n1234 [5]: https://golang.org/doc/install/source#environment [6]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc5/config.md#platform [7]: #622 (comment) Signed-off-by: W. Trevor King <[email protected]>
1 parent 8c4919e commit e1045bf

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

image-index.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
6767

6868
- **`features`** *array of strings*
6969

70-
This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature (for example `sse4` or `aes`).
70+
This OPTIONAL property specifies an array of strings, each specifying a mandatory CPU feature.
71+
72+
When `architecture` is `386` or `amd64`, image indexes SHOULD use, and implementations SHOULD understand, values [supported by Linux][cpufeatures.h] with the `X86_FEATURE_` prefix removed and the remainder lowercased (e.g. `fpu` for `X86_FEATURE_FPU` and `vme` for `X86_FEATURE_VME`).
73+
On Linux on these architectures, the features supported by host CPUs can be found in the `flags` entries in the `cpuinfo` file provided by the [proc filesystem][proc.5].
74+
75+
When `architecture` is neither `386` nor `amd64`, values are implementation-defined and SHOULD be submitted to this specification for standardization.
7176

7277
- **`annotations`** *string-string map*
7378

@@ -99,8 +104,8 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
99104
"platform": {
100105
"architecture": "amd64",
101106
"os": "linux",
102-
"os.features": [
103-
"sse4"
107+
"features": [
108+
"fpu"
104109
]
105110
}
106111
}
@@ -112,5 +117,7 @@ For the media type(s) that this document is compatible with, see the [matrix][ma
112117
}
113118
```
114119

120+
[cpufeatures.h]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/x86/include/asm/cpufeatures.h
121+
[proc.5]: http://man7.org/linux/man-pages/man5/proc.5.html
115122
[runtime-platform2]: https://github.com/opencontainers/runtime-spec/blob/v1.0.0-rc3/config.md#platform
116123
[matrix]: media-types.md#compatibility-matrix

schema/imageindex_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestImageIndex(t *testing.T) {
6161
"architecture": "amd64",
6262
"os": "linux",
6363
"features": [
64-
"sse4"
64+
"fpu"
6565
]
6666
}
6767
}
@@ -84,7 +84,7 @@ func TestImageIndex(t *testing.T) {
8484
"architecture": "amd64",
8585
"os": "linux",
8686
"features": [
87-
"sse4"
87+
"fpu"
8888
]
8989
}
9090
}
@@ -128,7 +128,7 @@ func TestImageIndex(t *testing.T) {
128128
"architecture": "amd64",
129129
"os": "linux",
130130
"features": [
131-
"sse4"
131+
"fpu"
132132
]
133133
}
134134
}
@@ -152,7 +152,7 @@ func TestImageIndex(t *testing.T) {
152152
"architecture": "amd64",
153153
"os": "linux",
154154
"features": [
155-
"sse4"
155+
"fpu"
156156
]
157157
}
158158
}
@@ -185,7 +185,7 @@ func TestImageIndex(t *testing.T) {
185185
"architecture": "amd64",
186186
"os": "linux",
187187
"features": [
188-
"sse4"
188+
"fpu"
189189
]
190190
}
191191
}

specs-go/v1/index.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type Platform struct {
3838
Variant string `json:"variant,omitempty"`
3939

4040
// Features is an optional field specifying an array of strings, each
41-
// listing a required CPU feature (for example `sse4` or `aes`).
41+
// listing a required CPU feature (for example `fpu` or `vme`).
4242
Features []string `json:"features,omitempty"`
4343
}
4444

0 commit comments

Comments
 (0)