Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9556ad6a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'fortglx/4.11/time' of... 

Merge branch 'fortglx/4.11/time' of https://git.linaro.org/people/john.stultz/linux into timers/core

 - Remove unused functions
 - Document udelay inaccuracy
 - Remove posix timer data from task struct when posix timers are off
parents 4c45c516 b18b6a9c

fs/proc/base.c

+2 −2
Original line number Diff line number Diff line
@@ -2179,7 +2179,7 @@ static const struct file_operations proc_map_files_operations = { 
	.llseek		= generic_file_llseek,

};



#ifdef CONFIG_CHECKPOINT_RESTORE

#if defined(CONFIG_CHECKPOINT_RESTORE) && defined(CONFIG_POSIX_TIMERS)

struct timers_private {

	struct pid *pid;

	struct task_struct *task;
@@ -2936,7 +2936,7 @@ static const struct pid_entry tgid_base_stuff[] = { 
	REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),

	REG("setgroups",  S_IRUGO|S_IWUSR, proc_setgroups_operations),

#endif

#ifdef CONFIG_CHECKPOINT_RESTORE

#if defined(CONFIG_CHECKPOINT_RESTORE) && defined(CONFIG_POSIX_TIMERS)

	REG("timers",	  S_IRUGO, proc_timers_operations),

#endif

	REG("timerslack_ns", S_IRUGO|S_IWUGO, proc_pid_set_timerslack_ns_operations),

include/linux/delay.h

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,17 @@ 
 * Copyright (C) 1993 Linus Torvalds

 *

 * Delay routines, using a pre-computed "loops_per_jiffy" value.

 *

 * Please note that ndelay(), udelay() and mdelay() may return early for

 * several reasons:

 *  1. computed loops_per_jiffy too low (due to the time taken to

 *     execute the timer interrupt.)

 *  2. cache behaviour affecting the time it takes to execute the

 *     loop function.

 *  3. CPU clock rate changes.

 *

 * Please see this thread:

 *   http://lists.openwall.net/linux-kernel/2011/01/09/56

 */



#include <linux/kernel.h>

include/linux/init_task.h

+25 −15
Original line number Diff line number Diff line
@@ -42,6 +42,27 @@ extern struct fs_struct init_fs; 
#define INIT_PREV_CPUTIME(x)

#endif



#ifdef CONFIG_POSIX_TIMERS

#define INIT_POSIX_TIMERS(s)						\

	.posix_timers = LIST_HEAD_INIT(s.posix_timers),

#define INIT_CPU_TIMERS(s)						\

	.cpu_timers = {							\

		LIST_HEAD_INIT(s.cpu_timers[0]),			\

		LIST_HEAD_INIT(s.cpu_timers[1]),			\

		LIST_HEAD_INIT(s.cpu_timers[2]),								\

	},

#define INIT_CPUTIMER(s)						\

	.cputimer	= { 						\

		.cputime_atomic	= INIT_CPUTIME_ATOMIC,			\

		.running	= false,				\

		.checking_timer = false,				\

	},

#else

#define INIT_POSIX_TIMERS(s)

#define INIT_CPU_TIMERS(s)

#define INIT_CPUTIMER(s)

#endif



#define INIT_SIGNALS(sig) {						\

	.nr_threads	= 1,						\

	.thread_head	= LIST_HEAD_INIT(init_task.thread_node),	\
@@ -49,14 +70,10 @@ extern struct fs_struct init_fs; 
	.shared_pending	= { 						\

		.list = LIST_HEAD_INIT(sig.shared_pending.list),	\

		.signal =  {{0}}},					\

	.posix_timers	 = LIST_HEAD_INIT(sig.posix_timers),		\

	.cpu_timers	= INIT_CPU_TIMERS(sig.cpu_timers),		\

	INIT_POSIX_TIMERS(sig)						\

	INIT_CPU_TIMERS(sig)						\

	.rlim		= INIT_RLIMITS,					\

	.cputimer	= { 						\

		.cputime_atomic	= INIT_CPUTIME_ATOMIC,			\

		.running	= false,				\

		.checking_timer = false,				\

	},								\

	INIT_CPUTIMER(sig)						\

	INIT_PREV_CPUTIME(sig)						\

	.cred_guard_mutex =						\

		 __MUTEX_INITIALIZER(sig.cred_guard_mutex),		\
@@ -247,7 +264,7 @@ extern struct task_group root_task_group; 
	.blocked	= {{0}},					\

	.alloc_lock	= __SPIN_LOCK_UNLOCKED(tsk.alloc_lock),		\

	.journal_info	= NULL,						\

	.cpu_timers	= INIT_CPU_TIMERS(tsk.cpu_timers),		\

	INIT_CPU_TIMERS(tsk)						\

	.pi_lock	= __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock),	\

	.timer_slack_ns = 50000, /* 50 usec default slack */		\

	.pids = {							\
@@ -274,13 +291,6 @@ extern struct task_group root_task_group; 
}





#define INIT_CPU_TIMERS(cpu_timers)					\

{									\

	LIST_HEAD_INIT(cpu_timers[0]),					\

	LIST_HEAD_INIT(cpu_timers[1]),					\

	LIST_HEAD_INIT(cpu_timers[2]),					\

}



/* Attach to the init_task data structure for proper alignment */

#define __init_task_data __attribute__((__section__(".data..init_task")))

include/linux/sched.h

+10 −3
Original line number Diff line number Diff line
@@ -734,13 +734,14 @@ struct signal_struct { 
	unsigned int		is_child_subreaper:1;

	unsigned int		has_child_subreaper:1;



#ifdef CONFIG_POSIX_TIMERS



	/* POSIX.1b Interval Timers */

	int			posix_timer_id;

	struct list_head	posix_timers;



	/* ITIMER_REAL timer for the process */

	struct hrtimer real_timer;

	struct pid *leader_pid;

	ktime_t it_real_incr;



	/*
@@ -759,12 +760,16 @@ struct signal_struct { 
	/* Earliest-expiration cache. */

	struct task_cputime cputime_expires;



	struct list_head cpu_timers[3];



#endif



	struct pid *leader_pid;



#ifdef CONFIG_NO_HZ_FULL

	atomic_t tick_dep_mask;

#endif



	struct list_head cpu_timers[3];



	struct pid *tty_old_pgrp;



	/* boolean value for session group leader */
@@ -1691,8 +1696,10 @@ struct task_struct { 
/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */

	unsigned long min_flt, maj_flt;



#ifdef CONFIG_POSIX_TIMERS

	struct task_cputime cputime_expires;

	struct list_head cpu_timers[3];

#endif



/* process credentials */

	const struct cred __rcu *ptracer_cred; /* Tracer's credentials at attach */

kernel/fork.c

+9 −1
Original line number Diff line number Diff line
@@ -1304,6 +1304,7 @@ void __cleanup_sighand(struct sighand_struct *sighand) 
	}

}



#ifdef CONFIG_POSIX_TIMERS

/*

 * Initialize POSIX timer handling for a thread group.

 */
@@ -1322,6 +1323,9 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig) 
	INIT_LIST_HEAD(&sig->cpu_timers[1]);

	INIT_LIST_HEAD(&sig->cpu_timers[2]);

}

#else

static inline void posix_cpu_timers_init_group(struct signal_struct *sig) { }

#endif



static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)

{
@@ -1346,11 +1350,11 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) 
	init_waitqueue_head(&sig->wait_chldexit);

	sig->curr_target = tsk;

	init_sigpending(&sig->shared_pending);

	INIT_LIST_HEAD(&sig->posix_timers);

	seqlock_init(&sig->stats_lock);

	prev_cputime_init(&sig->prev_cputime);



#ifdef CONFIG_POSIX_TIMERS

	INIT_LIST_HEAD(&sig->posix_timers);

	hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	sig->real_timer.function = it_real_fn;

#endif
@@ -1425,6 +1429,7 @@ static void rt_mutex_init_task(struct task_struct *p) 
#endif

}



#ifdef CONFIG_POSIX_TIMERS

/*

 * Initialize POSIX timer handling for a single task.

 */
@@ -1437,6 +1442,9 @@ static void posix_cpu_timers_init(struct task_struct *tsk) 
	INIT_LIST_HEAD(&tsk->cpu_timers[1]);

	INIT_LIST_HEAD(&tsk->cpu_timers[2]);

}

#else

static inline void posix_cpu_timers_init(struct task_struct *tsk) { }

#endif



static inline void

init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)