diff --git a/tools/fex/build-in-arch.sh b/tools/fex/build-in-arch.sh index d36445a8a..2e5d9cff3 100755 --- a/tools/fex/build-in-arch.sh +++ b/tools/fex/build-in-arch.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash # Runs INSIDE an Arch Linux ARM container (menci/archlinuxarm:base-devel) on an arm64 runner. -# Builds FEX for the runtime (Arch Linux ARM ships no package and FEX publishes no Linux +# Builds FEX for the runtime, with tools/fex/patches, (Arch Linux ARM ships no package and FEX publishes no Linux # binaries), plus the runtime's own unsquashfs to unpack FEX's x86 rootfs image, and packs both # as fex.tzst (usr/local/...) for bannerlator-steam-x64 to stage. No thunks: they need an x86 # cross toolchain, and the x86-64 Steam client only needs FEX to run, not host GPU drivers. @@ -15,6 +15,9 @@ mv /etc/pacman.d/mirrorlist.new /etc/pacman.d/mirrorlist pacman -Syu --noconfirm --needed git zstd binutils cmake ninja clang lld llvm python squashfs-tools file rm -rf fex-src out && git clone -q --depth 1 --branch "$VERSION" --recurse-submodules --shallow-submodules https://github.com/FEX-Emu/FEX.git fex-src +# Our proot answers openat2 with ENOSYS (tools/proot/PATCHES.md, 0008); FEX opened every rootfs +# path with openat2 and fell through to the arm64 guest's files on anything but EXDEV. +for p in tools/fex/patches/*.patch; do patch -d fex-src -p1 --no-backup-if-mismatch < "$p"; done # TUNE_CPU none: the default (native) would tune for the runner's Neoverse cores, not the device. cmake -S fex-src -B fex-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ diff --git a/tools/fex/patches/0001-openat2-enosys-fallback.patch b/tools/fex/patches/0001-openat2-enosys-fallback.patch new file mode 100644 index 000000000..e780de47b --- /dev/null +++ b/tools/fex/patches/0001-openat2-enosys-fallback.patch @@ -0,0 +1,42 @@ +diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp +index 7172460..d566e3b 100644 +--- a/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp ++++ b/Source/Tools/LinuxEmulation/LinuxSyscalls/FileManagement.cpp +@@ -674,9 +674,10 @@ uint64_t FileManager::Open(const char* pathname, int flags, uint32_t mode) { + }; + fd = ::syscall(SYSCALL_DEF(openat2), Path.FD, Path.Path, &how, sizeof(how)); + +- if (fd == -1 && errno == EXDEV) { +- // This means a magic symlink (/proc/foo) was involved. In this case we +- // just punt and do the access without RESOLVE_IN_ROOT. ++ if (fd == -1 && (errno == EXDEV || errno == ENOSYS)) { ++ // EXDEV: a magic symlink (/proc/foo) was involved. ENOSYS: no openat2 here (proot). ++ // Either way, do the access without RESOLVE_IN_ROOT; GetEmulatedFDPath has already ++ // followed absolute symlinks inside the rootfs. + fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode); + } + } +@@ -927,9 +928,10 @@ uint64_t FileManager::Openat([[maybe_unused]] int dirfs, const char* pathname, i + .resolve = (Path.FD == AT_FDCWD) ? 0u : RESOLVE_IN_ROOT, // AT_FDCWD means it's a thunk and not via RootFS + }; + fd = ::syscall(SYSCALL_DEF(openat2), Path.FD, Path.Path, &how, sizeof(how)); +- if (fd == -1 && errno == EXDEV) { +- // This means a magic symlink (/proc/foo) was involved. In this case we +- // just punt and do the access without RESOLVE_IN_ROOT. ++ if (fd == -1 && (errno == EXDEV || errno == ENOSYS)) { ++ // EXDEV: a magic symlink (/proc/foo) was involved. ENOSYS: no openat2 here (proot). ++ // Either way, do the access without RESOLVE_IN_ROOT; GetEmulatedFDPath has already ++ // followed absolute symlinks inside the rootfs. + fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, flags, mode); + } + } +@@ -967,6 +969,9 @@ uint64_t FileManager::Openat2(int dirfs, const char* pathname, FEX::HLE::open_ho + // This means a magic symlink (/proc/foo) was involved. In this case we + // just punt and do the access without RESOLVE_IN_ROOT. + fd = ::syscall(SYSCALL_DEF(openat2), Path.FD, Path.Path, how, usize); ++ } else if (fd == -1 && errno == ENOSYS && how->resolve == 0) { ++ // No openat2 here (proot): the plain openat inside the rootfs, as above. ++ fd = ::syscall(SYSCALL_DEF(openat), Path.FD, Path.Path, (int)how->flags, (int)how->mode); + } + } + diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 index b4cde092b..a049c2e50 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 @@ -14,8 +14,8 @@ # First run downloads FEX (this repo's release), FEX's Ubuntu 24.04 x86 rootfs (~525 MB, unpacked # ~1.5 GB) and the x86 client (~600 MB). Log: $X64_HOME/steam-x64.log. set -eu -FEX_TAG=fex-2609-r1 -FEX_SHA256=bcc578c87a4d38680881e5d7564e31444467b5ce48f6dedf369536e57819afea +FEX_TAG=fex-2609-r2 +FEX_SHA256=PENDING FEX_URL=https://github.com/Droid-Deck/DroidDeck/releases/download/$FEX_TAG/fex.tzst ROOTFS_URL=https://rootfs.fex-emu.gg/Ubuntu_24_04/2026-08-11/Ubuntu_24_04.sqsh CDN=https://client-update.fastly.steamstatic.com @@ -59,6 +59,11 @@ if [ ! -f "$ROOTFS/.droiddeck-complete" ]; then rm -f "$X64_HOME/rootfs.sqsh" touch "$ROOTFS/.droiddeck-complete" fi +# A path missing from the rootfs falls through to the guest: without its own, the x86 loader +# reads the guest's /etc/ld.so.preload and tries to load the session's arm64 preloads. +if [ ! -e "$ROOTFS/etc/ld.so.preload" ]; then + : > "$ROOTFS/etc/ld.so.preload" +fi # --- the x86-64 client ------------------------------------------------------------------------- if [ ! -x "$STEAM_X64/steamrt64/steam" ] || [ ! -f "$STEAM_X64/package/droiddeck-installed" ]; then