interfaces: simplify snap-confine by just loading pre-generated bpf code #3431
57
arch/arch.go
| @@ -22,6 +22,7 @@ package arch | ||
| import ( | ||
| "log" | ||
| "runtime" | ||
| + "syscall" | ||
| ) | ||
| // ArchitectureType is the type for a supported snappy architecture | ||
| @@ -38,6 +39,9 @@ func SetArchitecture(newArch ArchitectureType) { | ||
| arch = newArch | ||
| } | ||
| +// FIXME: rename all Ubuntu*Architecture() to SnapdArchitecture() | ||
| +// (or DpkgArchitecture) | ||
| + | ||
| // UbuntuArchitecture returns the debian equivalent architecture for the | ||
| // currently running architecture. | ||
| // | ||
| @@ -62,11 +66,62 @@ func ubuntuArchFromGoArch(goarch string) string { | ||
| "ppc64le": "ppc64el", | ||
| "s390x": "s390x", | ||
| "ppc": "powerpc", | ||
| + // available in debian and other distros | ||
| + "ppc64": "ppc64", | ||
|
|
||
| } | ||
| ubuntuArch := goArchMapping[goarch] | ||
| if ubuntuArch == "" { | ||
| - log.Panicf("unknown goarch %v", goarch) | ||
| + log.Panicf("unknown goarch %q", goarch) | ||
| + } | ||
| + | ||
| + return ubuntuArch | ||
| +} | ||
| + | ||
| +// UbuntuKernelArchitecture return the debian equivalent architecture | ||
| +// for the current running kernel. This is usually the same as the | ||
| +// UbuntuArchitecture - however there maybe cases that you run e.g. | ||
| +// a snapd:i386 on an amd64 kernel. | ||
| +func UbuntuKernelArchitecture() string { | ||
| + var utsname syscall.Utsname | ||
| + if err := syscall.Uname(&utsname); err != nil { | ||
| + log.Panicf("cannot get kernel architecture: %v", err) | ||
| + } | ||
| + | ||
| + // syscall.Utsname{} is using [65]int8 for all char[] inside it, | ||
| + // this makes converting it so awkward. The alternative would be | ||
| + // to use a unsafe.Pointer() to cast it to a [65]byte slice. | ||
| + // see https://github.com/golang/go/issues/20753 | ||
| + kernelArch := make([]byte, 0, len(utsname.Machine)) | ||
| + for _, c := range utsname.Machine { | ||
| + if c == 0 { | ||
| + break | ||
| + } | ||
| + kernelArch = append(kernelArch, byte(c)) | ||
| + } | ||
| + | ||
| + return ubuntuArchFromKernelArch(string(kernelArch)) | ||
| +} | ||
| + | ||
| +// ubuntuArchFromkernelArch maps the kernel architecture as reported | ||
| +// via uname() to the dpkg architecture | ||
| +func ubuntuArchFromKernelArch(utsMachine string) string { | ||
| + kernelArchMapping := map[string]string{ | ||
| + // kernel ubuntu | ||
| + "i686": "i386", | ||
| + "x86_64": "amd64", | ||
| + "armv7": "armhf", | ||
| + "aarch64": "arm64", | ||
| + "ppc64le": "ppc64el", | ||
| + "s390x": "s390x", | ||
| + "ppc": "powerpc", | ||
jdstrand
Contributor
|
||
| + // available in debian and other distros | ||
| + "ppc64": "ppc64", | ||
mvo5
Collaborator
|
||
| + } | ||
| + | ||
| + ubuntuArch := kernelArchMapping[utsMachine] | ||
| + if ubuntuArch == "" { | ||
| + log.Panicf("unknown kernel arch %q", utsMachine) | ||
| } | ||
| return ubuntuArch | ||
Oops, something went wrong.
I just noticed that arch_test.go is missing s390x and ppc64.