Skip to content

[Rosetta] Prioritize rosetta over qemu-user-static by creating binfmt.d(5) configuration #2474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 17, 2024
Merged

[Rosetta] Prioritize rosetta over qemu-user-static by creating binfmt.d(5) configuration #2474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2302641
Create `rosetta.conf` for `binfmt.d(5)`
norio-nomura Jul 7, 2024
ba11ab5
Mount the rosetta volume in `user-data`
norio-nomura Jul 7, 2024
50c10f3
Change comment to using template syntax
norio-nomura Jul 10, 2024
7c13a72
Remove mounting vz-rosetta from 05-rosetta-volume.sh
norio-nomura Jul 11, 2024
5ef067b
Unregister rosetta if `.rosetta.binfmt` is not true
norio-nomura Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions pkg/cidata/cidata.TEMPLATE.d/boot/05-rosetta-volume.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,20 @@ if [ -f /etc/alpine-release ]; then
rc-service qemu-binfmt stop --ifstarted
fi

mkdir -p /mnt/lima-rosetta
binfmt_entry=/proc/sys/fs/binfmt_misc/rosetta
binfmtd_conf=/usr/lib/binfmt.d/rosetta.conf
if [ "$LIMA_CIDATA_ROSETTA_BINFMT" = "true" ]; then
rosetta_binfmt=":rosetta:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00:\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/mnt/lima-rosetta/rosetta:OCF"

#Check selinux is enabled by kernel
if [ -d /sys/fs/selinux ]; then
##########################################################################################
## When using vz & virtiofs, initially container_file_t selinux label
## was considered which works perfectly for container work loads
## but it might break for other work loads if the process is running with
## different label. Also these are the remote mounts from the host machine,
## so keeping the label as nfs_t fits right. Package container-selinux by
## default adds rules for nfs_t context which allows container workloads to work as well.
## https://github.com/lima-vm/lima/pull/1965
##########################################################################################
mount -t virtiofs vz-rosetta /mnt/lima-rosetta -o context="system_u:object_r:nfs_t:s0"
else
mount -t virtiofs vz-rosetta /mnt/lima-rosetta
fi
# If rosetta is not registered in binfmt_misc, register it.
[ -f "$binfmt_entry" ] || echo "$rosetta_binfmt" >/proc/sys/fs/binfmt_misc/register

if [ "$LIMA_CIDATA_ROSETTA_BINFMT" = "true" ]; then
echo \
':rosetta:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00:\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/mnt/lima-rosetta/rosetta:OCF' \
>/proc/sys/fs/binfmt_misc/register
# Create binfmt.d(5) configuration to prioritize rosetta even if qemu-user-static is installed on systemd based systems.
# If the binfmt.d directory exists, consider systemd-binfmt.service(8) to be enabled and create the configuration file.
[ ! -d "$(dirname "$binfmtd_conf")" ] || [ -f "$binfmtd_conf" ] || echo "$rosetta_binfmt" >"$binfmtd_conf"
else
# unregister rosetta from binfmt_misc if it exists
[ ! -f "$binfmt_entry" ] || echo -1 | "$binfmt_entry"
# remove binfmt.d(5) configuration if it exists
[ ! -f "$binfmtd_conf" ] || rm "$binfmtd_conf"
fi
11 changes: 7 additions & 4 deletions pkg/cidata/cidata.TEMPLATE.d/user-data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ package_upgrade: true
package_reboot_if_required: true
{{- end }}

{{- if or (eq .MountType "9p") (eq .MountType "virtiofs") }}
{{- if .Mounts }}
{{- if or .RosettaEnabled (or (eq .MountType "9p") (eq .MountType "virtiofs")) }}
mounts:
{{- range $m := $.Mounts}}
{{- if .RosettaEnabled }}{{/* Mount the rosetta volume before systemd-binfmt.service(8) starts */}}
- [vz-rosetta, /mnt/lima-rosetta, virtiofs]
{{- end }}
{{- if .Mounts }}
{{- range $m := $.Mounts}}
- [{{$m.Tag}}, {{$m.MountPoint}}, {{$m.Type}}, "{{$m.Options}}", "0", "0"]
{{- end }}
{{- end }}
{{- end }}
{{- end }}

{{- if .TimeZone }}
timezone: {{.TimeZone}}
Expand Down
Loading