UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

posix-cpu-timers: Remove pointless comparisons 

The soft RLIMIT expiry code checks whether the soft limit is greater than
the hard limit. That's pointless because if the soft RLIMIT is greater than
the hard RLIMIT then that code cannot be reached as the hard RLIMIT check
is before that and already killed the process.

Remove it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lkml.kernel.org/r/20190821192922.548747613@linutronix.de
This commit is contained in:
Thomas Gleixner 2019-08-21 21:09:22 +02:00
parent 8ea1de90a5
commit dd67022413
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/time/posix-cpu-timers.c
View File

@ -814,15 +814,14 @@ static void check_thread_timers(struct task_struct *tsk,
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
return; return;
} }
if (rtim >= soft) { if (rtim >= soft) {
/* /*
* At the soft limit, send a SIGXCPU every second. * At the soft limit, send a SIGXCPU every second.
*/ */
if (soft < hard) { soft += USEC_PER_SEC;
soft += USEC_PER_SEC; tsk->signal->rlim[RLIMIT_RTTIME].rlim_cur = soft;
tsk->signal->rlim[RLIMIT_RTTIME].rlim_cur =
soft;
}
if (print_fatal_signals) { if (print_fatal_signals) {
pr_info("RT Watchdog Timeout (soft): %s[%d]\n", pr_info("RT Watchdog Timeout (soft): %s[%d]\n",
tsk->comm, task_pid_nr(tsk)); tsk->comm, task_pid_nr(tsk));
@ -938,10 +937,9 @@ static void check_process_timers(struct task_struct *tsk,
tsk->comm, task_pid_nr(tsk)); tsk->comm, task_pid_nr(tsk));
} }
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk); __group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
if (soft < hard) {
sig->rlim[RLIMIT_CPU].rlim_cur = soft + 1; sig->rlim[RLIMIT_CPU].rlim_cur = soft + 1;
softns += NSEC_PER_SEC; softns += NSEC_PER_SEC;
}
} }
/* Update the expiry cache */ /* Update the expiry cache */