mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rt: Remove RLIMIT_RTTIME while trying rt policy

Browse source 
Trying rt scheduling policy while RLIMIT_RTTIME is set could result in
SIGXCPU if the limit is exceeded. Set an infinite limit temporarily
while checking if rt policy is allowed.
This commit is contained in:
Jonas Holmberg 2023-11-15 17:11:19 +01:00
parent 92330b9de3
commit 0ecc7ca5f5
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/module-rt.c
View file

@ -549,6 +549,8 @@ static bool check_realtime_privileges(struct impl *impl)
int err, old_policy, new_policy, min, max; int err, old_policy, new_policy, min, max;
struct sched_param old_sched_params; struct sched_param old_sched_params;
struct sched_param new_sched_params; struct sched_param new_sched_params;
struct rlimit old_rlim;
struct rlimit no_rlim = { -1, -1 };
int try = 0; int try = 0;
if (!impl->rlimits_enabled) if (!impl->rlimits_enabled)
@ -596,11 +598,21 @@ static bool check_realtime_privileges(struct impl *impl)
if ((old_policy & PW_SCHED_RESET_ON_FORK) != 0) if ((old_policy & PW_SCHED_RESET_ON_FORK) != 0)
new_policy |= PW_SCHED_RESET_ON_FORK; new_policy |= PW_SCHED_RESET_ON_FORK;
/* Disable RLIMIT_RTTIME while trying new_policy. */
if ((err = getrlimit(RLIMIT_RTTIME, &old_rlim)) < 0)
pw_log_debug("getrlimit() failed: %s", spa_strerror(err));
if ((err = setrlimit(RLIMIT_RTTIME, &no_rlim)) < 0)
pw_log_debug("setrlimit() failed: %s", spa_strerror(err));
if (pthread_setschedparam(pthread_self(), new_policy, &new_sched_params) == 0) { if (pthread_setschedparam(pthread_self(), new_policy, &new_sched_params) == 0) {
impl->rt_prio = new_sched_params.sched_priority; impl->rt_prio = new_sched_params.sched_priority;
pthread_setschedparam(pthread_self(), old_policy, &old_sched_params); pthread_setschedparam(pthread_self(), old_policy, &old_sched_params);
if ((err = setrlimit(RLIMIT_RTTIME, &old_rlim)) < 0)
pw_log_debug("setrlimit() failed: %s", spa_strerror(err));
return true; return true;
} }
if ((err = setrlimit(RLIMIT_RTTIME, &old_rlim)) < 0)
pw_log_debug("setrlimit() failed: %s", spa_strerror(err));
} }
pw_log_info("Can't set rt prio to %d: %m (try increasing rlimits)", (int)priority); pw_log_info("Can't set rt prio to %d: %m (try increasing rlimits)", (int)priority);
return false; return false;
@ -648,18 +660,18 @@ static int set_nice(struct impl *impl, int nice_level, bool warn)
return res; return res;
} }
static int set_rlimit(struct impl *impl) static int set_rlimit(struct rlimit *rlim)
{ {
int res = 0; int res = 0;
if (setrlimit(RLIMIT_RTTIME, &impl->rl) < 0) if (setrlimit(RLIMIT_RTTIME, rlim) < 0)
res = -errno; res = -errno;
if (res < 0) if (res < 0)
pw_log_debug("setrlimit() failed: %s", spa_strerror(res)); pw_log_debug("setrlimit() failed: %s", spa_strerror(res));
else else
pw_log_debug("rt.time.soft:%"PRIi64" rt.time.hard:%"PRIi64, pw_log_debug("rt.time.soft:%"PRIi64" rt.time.hard:%"PRIi64,
(int64_t)impl->rl.rlim_cur, (int64_t)impl->rl.rlim_max); (int64_t)rlim->rlim_cur, (int64_t)rlim->rlim_max);
return res; return res;
} }
@ -1023,7 +1035,7 @@ static int do_rtkit_setup(struct spa_loop *loop, bool async, uint32_t seq,
impl->rl.rlim_cur = SPA_MIN(impl->rl.rlim_cur, impl->rttime_max); impl->rl.rlim_cur = SPA_MIN(impl->rl.rlim_cur, impl->rttime_max);
impl->rl.rlim_max = SPA_MIN(impl->rl.rlim_max, impl->rttime_max); impl->rl.rlim_max = SPA_MIN(impl->rl.rlim_max, impl->rttime_max);
set_rlimit(impl); set_rlimit(&impl->rl);
return 0; return 0;
} }
@ -1144,7 +1156,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
use_rtkit = can_use_rtkit; use_rtkit = can_use_rtkit;
} }
if (!use_rtkit) if (!use_rtkit)
set_rlimit(impl); set_rlimit(&impl->rl);
if (impl->uclamp_max > 1024) { if (impl->uclamp_max > 1024) {
pw_log_warn("uclamp.max out of bounds. Got %d, clamping to 1024.", impl->uclamp_max); pw_log_warn("uclamp.max out of bounds. Got %d, clamping to 1024.", impl->uclamp_max);