Skip to content

Support RISC-V 64#6882

Merged
kzys merged 3 commits intocontainerd:mainfrom
AkihiroSuda:riscv64
May 2, 2022
Merged

Support RISC-V 64#6882
kzys merged 3 commits intocontainerd:mainfrom
AkihiroSuda:riscv64

Conversation

@AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Apr 30, 2022 •
edited
Loading

  • seccomp: support riscv64
  • release/Dockerfile: update Ubuntu to 22.04 for supporting riscv64
  • CI: add riscv64 builds

runc needs opencontainers/runc#3446 (opencontainers/runc@1d7b297)

AkihiroSuda added 2 commits May 1, 2022 02:52
@AkihiroSuda
seccomp: support riscv64
4b412b8 
Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda
release/Dockerfile: update Ubuntu to 22.04 for supporting riscv64
0e56e4f 
Also update xx to 1.1.0

Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Apr 30, 2022

cc @tonistiigi @crazy-max @kolyshkin @thaJeztah

@AkihiroSuda AkihiroSuda changed the title Support RISC-V64 Support RISC-V 64 Apr 30, 2022
@AkihiroSuda
CI: add riscv64 builds
d4127a9 
Signed-off-by: Akihiro Suda <[email protected]>
@crazy-max
Copy link
Contributor

crazy-max commented May 1, 2022

@AkihiroSuda

$ hwinfo --cpu
01: None 00.0: 10103 CPU                                        
  [Created at cpu.710]
  Unique ID: rdCR.j8NaKXDZtZ6
  Hardware Class: cpu
  Arch: RISC-V
  Vendor: "sifive,u74-mc"
  Model: 0.0.0 "rv64imafdc"
  Config Status: cfg=new, avail=yes, need=no, active=unknown
...

$ go version
go version go1.18.1 linux/riscv64

$ make binaries
+ bin/ctr
+ bin/containerd
+ bin/containerd-stress
+ bin/containerd-shim
+ bin/containerd-shim-runc-v1
+ bin/containerd-shim-runc-v2
+ binaries

$ file ./bin/containerd
./bin/containerd: ELF 64-bit LSB pie executable, UCB RISC-V, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-riscv64-lp64d.so.1, BuildID[sha1]=02ab1715d60fc1fffd287b9cfd3f309318faf8cb, for GNU/Linux 4.15.0, stripped

$ ./bin/containerd --version
containerd github.com/containerd/containerd v1.1.0-7029-gd4127a9f2 d4127a9f261a6c7365d509012544fc38015e8f2c

$ sudo ./bin/containerd
INFO[2022-05-01T23:32:47.965816236+02:00] starting containerd                           revision=d4127a9f261a6c7365d509012544fc38015e8f2c version=v1.1.0-7029-gd4127a9f2
INFO[2022-05-01T23:32:48.402219781+02:00] loading plugin "io.containerd.content.v1.content"...  type=io.containerd.content.v1
INFO[2022-05-01T23:32:48.402924781+02:00] loading plugin "io.containerd.snapshotter.v1.aufs"...  type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.415338768+02:00] skip loading plugin "io.containerd.snapshotter.v1.aufs"...  error="aufs is not supported (modprobe aufs failed: exit status 1 \"modprobe: FATAL: Module aufs not found in directory /lib/modules/5.11.0-1022-generic\\n\"): skip plugin" type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.415646767+02:00] loading plugin "io.containerd.snapshotter.v1.btrfs"...  type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.417315766+02:00] skip loading plugin "io.containerd.snapshotter.v1.btrfs"...  error="path /var/lib/containerd/io.containerd.snapshotter.v1.btrfs (ext4) must be a btrfs filesystem to be used with the btrfs snapshotter: skip plugin" type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.417526765+02:00] loading plugin "io.containerd.snapshotter.v1.devmapper"...  type=io.containerd.snapshotter.v1
WARN[2022-05-01T23:32:48.417703765+02:00] failed to load plugin io.containerd.snapshotter.v1.devmapper  error="devmapper not configured"
INFO[2022-05-01T23:32:48.417845765+02:00] loading plugin "io.containerd.snapshotter.v1.native"...  type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.418143765+02:00] loading plugin "io.containerd.snapshotter.v1.overlayfs"...  type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.419049764+02:00] loading plugin "io.containerd.snapshotter.v1.zfs"...  type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.420604762+02:00] skip loading plugin "io.containerd.snapshotter.v1.zfs"...  error="path /var/lib/containerd/io.containerd.snapshotter.v1.zfs must be a zfs filesystem to be used with the zfs snapshotter: skip plugin" type=io.containerd.snapshotter.v1
INFO[2022-05-01T23:32:48.420800762+02:00] loading plugin "io.containerd.metadata.v1.bolt"...  type=io.containerd.metadata.v1
WARN[2022-05-01T23:32:48.421028762+02:00] could not use snapshotter devmapper in metadata plugin  error="devmapper not configured"
INFO[2022-05-01T23:32:48.421174762+02:00] metadata content store policy set             policy=shared

@AkihiroSuda AkihiroSuda mentioned this pull request May 2, 2022
Merged
estesp
estesp approved these changes May 2, 2022
View reviewed changes
Copy link
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

@kzys kzys merged commit f3c1467 into containerd:main May 2, 2022
@AkihiroSuda AkihiroSuda added this to the 1.7 milestone May 2, 2022
@AkihiroSuda AkihiroSuda mentioned this pull request May 6, 2022
Merged
@AkihiroSuda AkihiroSuda mentioned this pull request Jul 16, 2022
Merged
@AkihiroSuda AkihiroSuda added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.6.x labels Jul 16, 2022
martinetd added a commit to martinetd/containers-common that referenced this pull request Jun 5, 2024
@martinetd
seccomp: riscv: add riscv_flush_icache
0415089 
apparently harmless and used

Link: systemd/systemd#25018
Link: containerd/containerd#6882
Link: moby/moby#43553
martinetd added a commit to martinetd/containers-common that referenced this pull request Jun 5, 2024
@martinetd
seccomp: riscv: add riscv_flush_icache
bf99073 
apparently harmless and used

Link: systemd/systemd#25018
Link: containerd/containerd#6882
Link: moby/moby#43553
Signed-off-by: Dominique Martinet <[email protected]>
openshift-merge-bot bot pushed a commit to containers/common that referenced this pull request Jun 7, 2024
@martinetd
seccomp: riscv: add riscv_flush_icache
b12e6be 
apparently harmless and used

Link: systemd/systemd#25018
Link: containerd/containerd#6882
Link: moby/moby#43553
Signed-off-by: Dominique Martinet <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@estesp estesp estesp approved these changes

@fuweid fuweid fuweid approved these changes

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

@thaJeztah thaJeztah Awaiting requested review from thaJeztah

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch impact/changelog

Projects

None yet

Milestone

1.7

Development

Successfully merging this pull request may close these issues.

5 participants

@AkihiroSuda @crazy-max @kzys @estesp @fuweid