Skip to content

Improve ARM platform matching#3270

Merged
estesp merged 1 commit intocontainerd:masterfrom
jcaamano:master
May 10, 2019
Merged

Improve ARM platform matching#3270
estesp merged 1 commit intocontainerd:masterfrom
jcaamano:master

Conversation

@jcaamano
Copy link
Copy Markdown
Contributor

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

@codecov-io
Copy link
Copy Markdown

codecov-io commented May 10, 2019

Codecov Report

Merging #3270 into master will decrease coverage by 0.13%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #3270      +/-   ##
=========================================
- Coverage   44.53%   44.4%   -0.14%     
=========================================
  Files         113     113              
  Lines       12195   12231      +36     
=========================================
  Hits         5431    5431              
- Misses       5930    5966      +36     
  Partials      834     834
Flag Coverage Δ
#linux 48.33% <0%> (-0.18%) ⬇️
#windows 39.66% <0%> (-0.15%) ⬇️
Impacted Files Coverage Δ
platforms/compare.go 0% <0%> (ø) ⬆️
platforms/cpuinfo.go 4.61% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f80d285...ad25c1a. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

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>
@jcaamano
Copy link
Copy Markdown
Contributor Author

jcaamano commented May 10, 2019

Actually, transitively compatible with amrv6 and armv5 as well.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@estesp estesp merged commit 481103c into containerd:master May 10, 2019
@thaJeztah
Copy link
Copy Markdown
Member

do we need similar changes in the dockerd code as well?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants