On signal delivery collect_signal() copies the queued siginfo into a caller
provided siginfo struct. The posix timer signal delivery code then uses
siginfo::si_tid to lookup the timer in the hash table.
That's required today as the timer and the sigqueue are separate entities
and have different life time rules.
The sigqueue will be embedded into struct k_itimer to address a few issues
in the posix timer signal handling, which means the life time rules are
not longer separate, which can spare the lookup.
Due to locking rules posixtimer_deliver_signal() cannot be invoked from
collect_signal(). The timer pointer could be handed down from
collect_signal() to dequeue_signal(), but that's just overhead for the
non-posixtimer case.
There is room in the _sifields union for an extra pointer which will be
used later for storing the timer pointer. This field is copied with siginfo
and cleared before the info is delivered to userspace like the existing
si_sys_private field.
Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/x86/kernel/signal_32.c | 2 +-
arch/x86/kernel/signal_64.c | 2 +-
include/uapi/asm-generic/siginfo.h | 2 ++
kernel/signal.c | 6 ++++--
kernel/time/posix-timers.c | 4 +++-
5 files changed, 11 insertions(+), 5 deletions(-)
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -456,7 +456,7 @@ CHECK_SI_OFFSET(_timer);
/* compat_siginfo_t doesn't have si_sys_private */
CHECK_SI_SIZE (_timer, 3*sizeof(int));
#else
-CHECK_SI_SIZE (_timer, 4*sizeof(int));
+CHECK_SI_SIZE (_timer, 5*sizeof(int));
#endif
static_assert(offsetof(siginfo32_t, si_tid) == 0x0C);
static_assert(offsetof(siginfo32_t, si_overrun) == 0x10);
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -456,7 +456,7 @@ static_assert(offsetof(siginfo_t, si_pid
static_assert(offsetof(siginfo_t, si_uid) == 0x14);
CHECK_SI_OFFSET(_timer);
-CHECK_SI_SIZE (_timer, 6*sizeof(int));
+CHECK_SI_SIZE (_timer, 8*sizeof(int));
static_assert(offsetof(siginfo_t, si_tid) == 0x10);
static_assert(offsetof(siginfo_t, si_overrun) == 0x14);
static_assert(offsetof(siginfo_t, si_value) == 0x18);
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -47,6 +47,7 @@ union __sifields {
int _overrun; /* overrun count */
sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */
+ void *_sys_privptr; /* not to be passed to user */
} _timer;
/* POSIX.1b signals */
@@ -146,6 +147,7 @@ typedef struct siginfo {
#define si_tid _sifields._timer._tid
#define si_overrun _sifields._timer._overrun
#define si_sys_private _sifields._timer._sys_private
+#define si_sys_privptr _sifields._timer._sys_privptr
#define si_status _sifields._sigchld._status
#define si_utime _sifields._sigchld._utime
#define si_stime _sifields._sigchld._stime
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3406,12 +3406,14 @@ static int post_copy_siginfo_from_user(k
const siginfo_t __user *from)
{
/*
- * Clear the si_sys_private field for timer signals as that's the
+ * Clear the si_sys_priv* fields for timer signals as that's the
* indicator for rearming a posix timer. User space submitted
* signals are not allowed to inject that.
*/
- if (info->si_code == SI_TIMER)
+ if (info->si_code == SI_TIMER) {
info->si_sys_private = 0;
+ info->su_sys_privptr = NULL;
+ }
if (unlikely(!known_siginfo_layout(info->si_signo, info->si_code))) {
char __user *expansion = si_expansion(from);
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -289,8 +289,9 @@ bool posixtimer_deliver_signal(struct ke
out:
spin_lock(¤t->sighand->siglock);
- /* Don't expose the si_sys_private value to userspace */
+ /* Don't expose the si_sys_priv* values to userspace */
info->si_sys_private = 0;
+ info->si_sys_privptr = NULL;
return ret;
}
@@ -505,6 +506,7 @@ static int do_timer_create(clockid_t whi
new_timer->sigq->info.si_tid = new_timer->it_id;
new_timer->sigq->info.si_code = SI_TIMER;
+ new_timer->sigq->info.si_sys_privptr = new_timer;
if (copy_to_user(created_timer_id, &new_timer_id, sizeof (new_timer_id))) {
error = -EFAULT;