From 414bc09e3759fff88a577002f3be8247f4b66695 Mon Sep 17 00:00:00 2001 From: Friedrich Vock Date: Tue, 14 Jan 2025 11:29:11 +0100 Subject: [PATCH] steamcompmgr: Use cgroup VRAM protection for focused windows (cherry picked from commit 4b3da38aa5b8f6f555119919895adf53570f9263) --- src/meson.build | 5 +- src/steamcompmgr.cpp | 130 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 128 insertions(+), 7 deletions(-) diff --git a/src/meson.build b/src/meson.build index 63897dd2a..ecd103cd1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -13,6 +13,8 @@ dep_xi = dependency('xi') drm_dep = dependency('libdrm', version: '>= 2.4.113', required: get_option('drm_backend')) eis_dep = dependency('libeis-1.0', required : get_option('input_emulation')) +libsystemd_dep = dependency('libsystemd', required : false) + wayland_server = dependency('wayland-server', version: '>=1.21') wayland_protos = dependency('wayland-protocols', version: '>=1.17') xkbcommon = dependency('xkbcommon') @@ -149,6 +151,7 @@ gamescope_cpp_args += '-DHAVE_SDL2=@0@'.format(sdl2_dep.found().to_int()) gamescope_cpp_args += '-DHAVE_AVIF=@0@'.format(avif_dep.found().to_int()) gamescope_cpp_args += '-DHAVE_LIBCAP=@0@'.format(cap_dep.found().to_int()) gamescope_cpp_args += '-DHAVE_LIBEIS=@0@'.format(eis_dep.found().to_int()) +gamescope_cpp_args += '-DHAVE_LIBSYSTEMD=@0@'.format(libsystemd_dep.found().to_int()) gamescope_cpp_args += '-DHAVE_SCRIPTING=1' src += spirv_shaders @@ -196,7 +199,7 @@ gamescope_version = configure_file( xkbcommon, thread_dep, sdl2_dep, wlroots_dep, vulkan_dep, liftoff_dep, dep_xtst, dep_xmu, cap_dep, epoll_dep, pipewire_dep, librt_dep, stb_dep, displayinfo_dep, openvr_dep, dep_xcursor, avif_dep, dep_xi, - libdecor_dep, eis_dep, luajit_dep, libinput_dep, + libdecor_dep, eis_dep, luajit_dep, libinput_dep, libsystemd_dep, ], install: true, cpp_args: gamescope_cpp_args, diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp index f12b8a60c..f1907ee1a 100644 --- a/src/steamcompmgr.cpp +++ b/src/steamcompmgr.cpp @@ -119,6 +119,11 @@ static const int g_nBaseCursorScale = 36; #define GPUVIS_TRACE_IMPLEMENTATION #include "gpuvis_trace_utils.h" +#if HAVE_LIBSYSTEMD + +#include + +#endif LogScope xwm_log("xwm"); LogScope g_WaitableLog("waitable"); @@ -171,6 +176,82 @@ namespace gamescope extern std::shared_ptr GetX11HostCursor(); } +#if HAVE_LIBSYSTEMD +static sd_bus *g_dbus; +static std::unordered_map g_vramCapacities; + +static const char *unit_from_pid(pid_t pid) { + if (!pid) + return NULL; + + sd_bus_message *reply = NULL; + const char *path = NULL; + + if (sd_bus_call_method(g_dbus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", "GetUnitByPID", NULL, &reply, "u", pid) < 0) { + xwm_log.warnf("D-Bus call to get unit corresponding to pid %u failed!\n", pid); + goto fail; + } + + if (sd_bus_message_read(reply, "o", &path) < 0) + xwm_log.warnf("Failed to extract unit from D-Bus reply for PID %u!\n", pid); + + path = strdup(path); + fail: + sd_bus_message_unref(reply); + return path; +} + +static int set_memory_low(const char *unit_path, bool focused) { + sd_bus_message *message; + sd_bus_message *reply; + +#define CHECK_MESSAGE(expr) \ + ret = expr; \ + if (ret < 0) { \ + fprintf(stderr, #expr "failed with ret %d\n", ret); \ + goto fail_message; \ +} + + + int ret = sd_bus_message_new_method_call(g_dbus, &message, "org.freedesktop.systemd1", unit_path, + "org.freedesktop.systemd1.Unit", "SetProperties"); + if (ret < 0) + return ret; + CHECK_MESSAGE(sd_bus_message_append(message, "b", false)); + CHECK_MESSAGE(sd_bus_message_open_container(message, SD_BUS_TYPE_ARRAY, "(sv)")); + { + CHECK_MESSAGE(sd_bus_message_open_container(message, SD_BUS_TYPE_STRUCT, "sv")); + { + CHECK_MESSAGE(sd_bus_message_append(message, "s", "DevMemoryLow")); + CHECK_MESSAGE(sd_bus_message_open_container(message, SD_BUS_TYPE_VARIANT, "a(st)")); + { + CHECK_MESSAGE(sd_bus_message_open_container(message, SD_BUS_TYPE_ARRAY, "(st)")); + for (auto &cap: g_vramCapacities) { + CHECK_MESSAGE( + sd_bus_message_append(message, "(st)", cap.first.c_str(), focused ? cap.second : 0u)); + } + CHECK_MESSAGE(sd_bus_message_close_container(message)); + } + CHECK_MESSAGE(sd_bus_message_close_container(message)); + } + CHECK_MESSAGE(sd_bus_message_close_container(message)); + } + CHECK_MESSAGE(sd_bus_message_close_container(message)); + + CHECK_MESSAGE(sd_bus_call(g_dbus, message, UINT64_MAX, NULL, &reply)); + + + sd_bus_message_unref(reply); + + fail_message: + sd_bus_message_unref(message); + + return ret; +} + +#endif + static std::vector< steamcompmgr_win_t* > GetGlobalPossibleFocusWindows(); static bool pick_primary_focus_and_override( @@ -777,7 +858,7 @@ global_focus_t *GetCurrentFocus() if ( iter != g_VirtualConnectorFocuses.end() ) return &iter->second; } - + if ( g_VirtualConnectorFocuses.size() > 0 ) return &g_VirtualConnectorFocuses.begin()->second; @@ -3839,7 +3920,7 @@ determine_and_apply_focus( global_focus_t *pFocus ) { pFocus->overlayWindow = nullptr; pFocus->notificationWindow = nullptr; - } + } // Pick inputFocusWindow if ( gamescope::VirtualConnectorIsSingleOutput() && @@ -3964,6 +4045,20 @@ determine_and_apply_focus( global_focus_t *pFocus ) hasRepaint = true; } +#if HAVE_LIBSYSTEMD + pid_t newFocusedWindowPID = pFocus->focusWindow ? pFocus->focusWindow->pid : 0; + if (g_dbus && focusWindow_pid != newFocusedWindowPID) { + const char *unfocusedWindowUnit = unit_from_pid(focusWindow_pid); + const char *focusedWindowUnit = unit_from_pid(newFocusedWindowPID); + bool sameUnit = unfocusedWindowUnit && focusedWindowUnit && !strcmp(unfocusedWindowUnit, focusedWindowUnit); + + if (unfocusedWindowUnit && !sameUnit) + set_memory_low(unfocusedWindowUnit, false); + if (focusedWindowUnit && !sameUnit) + set_memory_low(focusedWindowUnit, true); + } +#endif + // Backchannel to Steam unsigned long focusedWindow = 0; unsigned long focusedAppId = 0; @@ -6672,10 +6767,10 @@ void update_wayland_res(CommitDoneList_t *doneCommits, steamcompmgr_win_t *w, Re global_focus_t *pCurrentFocus = GetCurrentFocus(); static bool bMangoappSocketDisable = env_to_bool( getenv( "GAMESCOPE_MANGOAPP_SOCKET_DISABLE" )); - + // Whether or not to nudge mango app when this commit is done. const bool mango_nudge = pCurrentFocus && ( ( w == pCurrentFocus->focusWindow && !w->isSteamStreamingClient ) || - ( pCurrentFocus->focusWindow && pCurrentFocus->focusWindow->isSteamStreamingClient && w->isSteamStreamingClientVideo ) ) + ( pCurrentFocus->focusWindow && pCurrentFocus->focusWindow->isSteamStreamingClient && w->isSteamStreamingClientVideo ) ) && !bMangoappSocketDisable; bool bValidPreemptiveScale = reslistentry.pAcquirePoint && pCurrentFocus && w == pCurrentFocus->focusWindow; @@ -7319,7 +7414,7 @@ void init_xwayland_ctx(uint32_t serverId, gamescope_xwayland_server_t *xwayland_ xwm_log.errorf("Failed to load mouse cursor: %s", g_customCursorPath); } else - { + { if ( std::shared_ptr pHostCursor = gamescope::GetX11HostCursor() ) { ctx->cursor->setCursorImage( @@ -7806,6 +7901,29 @@ steamcompmgr_main(int argc, char **argv) // ie. color.rgb = color.rgba * u_ctm[offsetLayerIdx]; s_scRGB709To2020Matrix = GetBackend()->CreateBackendBlob( glm::mat3x4( glm::transpose( k_2020_from_709 ) ) ); +#if HAVE_LIBSYSTEMD + int res = sd_bus_default(&g_dbus); + if (res < 0) { + g_dbus = NULL; + s_LaunchLogScope.warnf( + "Failed to open systemd message bus, there will be no cgroup protection for focused windows.\n"); + } + + FILE *sysfs_caps = fopen("/sys/fs/cgroup/dmem.capacity", "r"); + char *line = NULL; + size_t size = 0; + while (getline(&line, &size, sysfs_caps) >= 0) { + char *capacity = strstr(line, " "); + if (capacity) + ++capacity; + else + continue; + uint64_t vramSize = strtoull(capacity, NULL, 10); + std::string idString = std::string(line, (capacity - 1) - line); + g_vramCapacities.emplace(idString, vramSize); + } +#endif + for (;;) { { @@ -7917,7 +8035,7 @@ steamcompmgr_main(int argc, char **argv) std::back_inserter(diffKeys), [](auto& a, auto& b) { return a < b; }); - for ( gamescope::VirtualConnectorKey_t ulKey : diffKeys ) + for ( gamescope::VirtualConnectorKey_t ulKey : diffKeys ) { bool bIsSteam = gamescope::VirtualConnectorKeyIsSteam( ulKey );