Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixlet from Thomas Gleixner:
"Silence dmesg spam by making the posix cpu timer printks depend on
print_fatal_signals"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
posix-timers: Make signal printks conditional
+16
-8
kernel/time/posix-cpu-timers.c
+16
-8
kernel/time/posix-cpu-timers.c
···
825
* At the hard limit, we just die.
826
* No need to calculate anything else now.
827
*/
828
-
pr_info("CPU Watchdog Timeout (hard): %s[%d]\n",
829
-
tsk->comm, task_pid_nr(tsk));
830
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
831
return;
832
}
···
840
soft += USEC_PER_SEC;
841
sig->rlim[RLIMIT_RTTIME].rlim_cur = soft;
842
}
843
-
pr_info("RT Watchdog Timeout (soft): %s[%d]\n",
844
-
tsk->comm, task_pid_nr(tsk));
845
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
846
}
847
}
···
940
* At the hard limit, we just die.
941
* No need to calculate anything else now.
942
*/
943
-
pr_info("RT Watchdog Timeout (hard): %s[%d]\n",
944
-
tsk->comm, task_pid_nr(tsk));
945
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
946
return;
947
}
···
951
/*
952
* At the soft limit, send a SIGXCPU every second.
953
*/
954
-
pr_info("CPU Watchdog Timeout (soft): %s[%d]\n",
955
-
tsk->comm, task_pid_nr(tsk));
956
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
957
if (soft < hard) {
958
soft++;
···
825
* At the hard limit, we just die.
826
* No need to calculate anything else now.
827
*/
828
+
if (print_fatal_signals) {
829
+
pr_info("CPU Watchdog Timeout (hard): %s[%d]\n",
830
+
tsk->comm, task_pid_nr(tsk));
831
+
}
832
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
833
return;
834
}
···
838
soft += USEC_PER_SEC;
839
sig->rlim[RLIMIT_RTTIME].rlim_cur = soft;
840
}
841
+
if (print_fatal_signals) {
842
+
pr_info("RT Watchdog Timeout (soft): %s[%d]\n",
843
+
tsk->comm, task_pid_nr(tsk));
844
+
}
845
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
846
}
847
}
···
936
* At the hard limit, we just die.
937
* No need to calculate anything else now.
938
*/
939
+
if (print_fatal_signals) {
940
+
pr_info("RT Watchdog Timeout (hard): %s[%d]\n",
941
+
tsk->comm, task_pid_nr(tsk));
942
+
}
943
__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);
944
return;
945
}
···
945
/*
946
* At the soft limit, send a SIGXCPU every second.
947
*/
948
+
if (print_fatal_signals) {
949
+
pr_info("CPU Watchdog Timeout (soft): %s[%d]\n",
950
+
tsk->comm, task_pid_nr(tsk));
951
+
}
952
__group_send_sig_info(SIGXCPU, SEND_SIG_PRIV, tsk);
953
if (soft < hard) {
954
soft++;