Better sched_runtime handling

Author: wwmm

src/cpu.cpp

@@ -46,7 +46,7 @@ Backend::Backend(QObject* parent) : QObject(parent) {
   initPcieAspm();
   init_workqueue_affinity_scope();
 
-  setSchedRuntime(util::get_sched_runtime(0, 0) * 0.000001);
+  setSchedRuntime(util::get_sched_runtime(0) * 0.000001);
 }
 
 auto Backend::useSchedBatch() const -> bool {

src/fastgame_apply.cpp

@@ -235,7 +235,7 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int {
   auto use_realtime_wineserver = root.get<bool>("cpu.use-realtime-wineserver", false);
   int niceness = root.get<int>("cpu.niceness", 0);
   int autogroup_niceness = root.get<int>("cpu.autogroup-niceness", 0);
-  double sched_runtime = root.get<double>("cpu.sched-runtime", util::get_sched_runtime(0, 0));
+  double sched_runtime = root.get<double>("cpu.sched-runtime", util::get_sched_runtime(0));
 
   update_system_setting("/proc/sys/kernel/watchdog", root.get<bool>("cpu.enable-watchdog", true));
 
@@ -413,10 +413,10 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int {
       update_system_setting("/proc/" + util::to_string(game_pid) + "/autogroup", autogroup_niceness);
 
       if (use_batch_scheduler) {
-        util::set_sched_runtime(game_pid, sched_runtime, SCHED_BATCH, niceness, 0);
+        util::set_sched_runtime(game_pid, sched_runtime, SCHED_BATCH, niceness);
 
       } else {
-        util::set_sched_runtime(game_pid, sched_runtime, SCHED_OTHER, niceness, 0);
+        util::set_sched_runtime(game_pid, sched_runtime, SCHED_OTHER, niceness);
       }
 
       if (enable_realtime_io_priority) {
@@ -443,9 +443,9 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int {
         if (use_batch_scheduler) {
           util::set_process_scheduler(child_pid, SCHED_BATCH, 0);
 
-          util::set_sched_runtime(child_pid, sched_runtime, SCHED_BATCH, niceness, 0);
+          util::set_sched_runtime(child_pid, sched_runtime, SCHED_BATCH, niceness);
         } else {
-          util::set_sched_runtime(child_pid, sched_runtime, SCHED_OTHER, niceness, 0);
+          util::set_sched_runtime(child_pid, sched_runtime, SCHED_OTHER, niceness);
         }
 
         setpriority(PRIO_PROCESS, child_pid, niceness);

src/fastgame_launcher.cpp

@@ -75,14 +75,14 @@ auto main(int argc, char* argv[]) -> int {
 
   util::apply_cpu_affinity(0, cpu_affinity);
 
-  double sched_runtime = root.get<double>("cpu.sched-runtime", util::get_sched_runtime(0, 0));
+  double sched_runtime = root.get<double>("cpu.sched-runtime", util::get_sched_runtime(0));
 
   if (root.get<bool>("cpu.use-batch-scheduler")) {
     util::set_process_scheduler(0, SCHED_BATCH, 0);
 
-    util::set_sched_runtime(0, sched_runtime, SCHED_BATCH, 0, 0);
+    util::set_sched_runtime(0, sched_runtime, SCHED_BATCH, 0);
   } else {
-    util::set_sched_runtime(0, sched_runtime, SCHED_OTHER, 0, 0);
+    util::set_sched_runtime(0, sched_runtime, SCHED_OTHER, 0);
   }
 
   int timer_slack_ns = root.get<int>("cpu.timer-slack", 50000);

src/util.cpp

@@ -1,6 +1,7 @@
 #include "util.hpp"
 #include <bits/types/struct_sched_param.h>
 #include <fcntl.h>
+#include <linux/sched/types.h>
 #include <qdebug.h>
 #include <qlogging.h>
 #include <sched.h>
@@ -24,23 +25,6 @@
 
 namespace util {
 
-struct sched_attr {
-  uint32_t size;           /* Size of this structure */
-  uint32_t sched_policy;   /* Policy (SCHED_*) */
-  uint64_t sched_flags;    /* Flags */
-  int32_t sched_nice;      /* Nice value (SCHED_OTHER, SCHED_BATCH) */
-  uint32_t sched_priority; /* Static priority (SCHED_FIFO, SCHED_RR) */
-
-  /* For SCHED_DEADLINE */
-  uint64_t sched_runtime;
-  uint64_t sched_deadline;
-  uint64_t sched_period;
-
-  /* Utilization hints */
-  uint32_t sched_util_min;
-  uint32_t sched_util_max;
-};
-
 static auto prepare_debug_message(const std::string& message, source_location location) -> std::string {
   auto file_path = std::filesystem::path{location.file_name()};
 
@@ -199,29 +183,29 @@ void set_process_scheduler(const int& pid, const int& policy_index, const int& p
   sched_setscheduler(pid, policy_index, &policy_params);
 }
 
-void set_sched_runtime(const int& pid,
-                       const double& value,
-                       const int& policy_index,
-                       const int& nice,
-                       const uint& flags) {
-  sched_attr attr = {};
+void set_sched_runtime(const int& pid, const double& value, const int& policy_index, const int& nice) {
+  struct sched_attr attr = {};
 
   attr.size = sizeof(sched_attr);
   attr.sched_policy = policy_index;
   attr.sched_runtime = value * 1000 * 1000;  // ms in nanoseconds
   attr.sched_nice = nice;
 
-  if (syscall(SYS_sched_setattr, pid, &attr, flags) != 0) {
+  if (syscall(SYS_sched_setattr, pid, &attr, 0) != 0) {
     perror("sched_setattr");
   }
 }
 
-auto get_sched_runtime(const int& pid, const uint& flags) -> uint64_t {
-  sched_attr attr = {};
+auto get_sched_runtime(const int& pid) -> uint64_t {
+  struct sched_attr attr = {};
 
   attr.size = sizeof(sched_attr);
 
-  syscall(SYS_sched_getattr, pid, &attr, attr.size, flags);
+  if (syscall(SYS_sched_getattr, pid, &attr, attr.size, 0) != 0) {
+    perror("sched_getattr");
+
+    return 0;
+  }
 
   return attr.sched_runtime;
 }

src/util.hpp

@@ -39,13 +39,9 @@ void clear_cpu_affinity(const int& pid);
 
 void set_process_scheduler(const int& pid, const int& policy_index, const int& priority);
 
-void set_sched_runtime(const int& pid,
-                       const double& value,
-                       const int& policy_index,
-                       const int& nice,
-                       const uint& flags);
+void set_sched_runtime(const int& pid, const double& value, const int& policy_index, const int& nice);
 
-auto get_sched_runtime(const int& pid, const uint& flags) -> uint64_t;
+auto get_sched_runtime(const int& pid) -> uint64_t;
 
 auto card_is_amdgpu(const int& card_index) -> bool;