Commit 9a7b0158 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'posix-timers-2024-07-29' of... 

Merge tag 'posix-timers-2024-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core

Pull updates for posix timers and related signal code from Frederic Weisbecker:

  * Prepare posix timers selftests for upcoming changes:

	- Check signal behaviour sanity against SIG_IGN

	- Check signal behaviour sanity against timer
	  reprogramm/deletion

	- Check SIGEV_NONE pending expiry read

	- Check interval timer read on a pending SIGNAL

	- Check correct overrun count after signal block/unblock

  * Various consolidations:

	- timer get/set

	- signal queue

  * Fixes:
	- Correctly read SIGEV_NONE timers

	- Forward expiry while reading expired interval timers
	  with pending signal

	- Don't arm SIGEV_NONE timers

  * Various cleanups all over the place
parents 8400291e 7f8af7ba

fs/proc/base.c

+3 −3
Original line number Diff line number Diff line
@@ -2456,13 +2456,13 @@ static void *timers_start(struct seq_file *m, loff_t *pos) 
	if (!tp->sighand)

		return ERR_PTR(-ESRCH);



	return seq_list_start(&tp->task->signal->posix_timers, *pos);

	return seq_hlist_start(&tp->task->signal->posix_timers, *pos);

}



static void *timers_next(struct seq_file *m, void *v, loff_t *pos)

{

	struct timers_private *tp = m->private;

	return seq_list_next(v, &tp->task->signal->posix_timers, pos);

	return seq_hlist_next(v, &tp->task->signal->posix_timers, pos);

}



static void timers_stop(struct seq_file *m, void *v)
@@ -2491,7 +2491,7 @@ static int show_timer(struct seq_file *m, void *v) 
		[SIGEV_THREAD] = "thread",

	};



	timer = list_entry((struct list_head *)v, struct k_itimer, list);

	timer = hlist_entry((struct hlist_node *)v, struct k_itimer, list);

	notify = timer->it_sigev_notify;



	seq_printf(m, "ID: %d\n", timer->it_id);

fs/signalfd.c

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static ssize_t signalfd_dequeue(struct signalfd_ctx *ctx, kernel_siginfo_t *info 
	DECLARE_WAITQUEUE(wait, current);



	spin_lock_irq(&current->sighand->siglock);

	ret = dequeue_signal(current, &ctx->sigmask, info, &type);

	ret = dequeue_signal(&ctx->sigmask, info, &type);

	switch (ret) {

	case 0:

		if (!nonblock)
@@ -174,7 +174,7 @@ static ssize_t signalfd_dequeue(struct signalfd_ctx *ctx, kernel_siginfo_t *info 
	add_wait_queue(&current->sighand->signalfd_wqh, &wait);

	for (;;) {

		set_current_state(TASK_INTERRUPTIBLE);

		ret = dequeue_signal(current, &ctx->sigmask, info, &type);

		ret = dequeue_signal(&ctx->sigmask, info, &type);

		if (ret != 0)

			break;

		if (signal_pending(current)) {

include/linux/posix-timers.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static inline void posix_cputimers_init_work(void) { } 
 * @rcu:		RCU head for freeing the timer.

 */

struct k_itimer {

	struct list_head	list;

	struct hlist_node	list;

	struct hlist_node	t_hash;

	spinlock_t		it_lock;

	const struct k_clock	*kclock;

include/linux/sched/signal.h

+3 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct signal_struct { 


	/* POSIX.1b Interval Timers */

	unsigned int		next_posix_timer_id;

	struct list_head	posix_timers;

	struct hlist_head	posix_timers;



	/* ITIMER_REAL timer for the process */

	struct hrtimer real_timer;
@@ -276,8 +276,7 @@ static inline void signal_set_stop_flags(struct signal_struct *sig, 
extern void flush_signals(struct task_struct *);

extern void ignore_signals(struct task_struct *);

extern void flush_signal_handlers(struct task_struct *, int force_default);

extern int dequeue_signal(struct task_struct *task, sigset_t *mask,

			  kernel_siginfo_t *info, enum pid_type *type);

extern int dequeue_signal(sigset_t *mask, kernel_siginfo_t *info, enum pid_type *type);



static inline int kernel_dequeue_signal(void)

{
@@ -287,7 +286,7 @@ static inline int kernel_dequeue_signal(void) 
	int ret;



	spin_lock_irq(&task->sighand->siglock);

	ret = dequeue_signal(task, &task->blocked, &__info, &__type);

	ret = dequeue_signal(&task->blocked, &__info, &__type);

	spin_unlock_irq(&task->sighand->siglock);



	return ret;

init/init_task.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct signal_struct init_signals = { 
	.cred_guard_mutex = __MUTEX_INITIALIZER(init_signals.cred_guard_mutex),

	.exec_update_lock = __RWSEM_INITIALIZER(init_signals.exec_update_lock),

#ifdef CONFIG_POSIX_TIMERS

	.posix_timers = LIST_HEAD_INIT(init_signals.posix_timers),

	.posix_timers	= HLIST_HEAD_INIT,

	.cputimer	= {

		.cputime_atomic	= INIT_CPUTIME_ATOMIC,

	},