From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: linux-arch@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Rusty Russell <rusty@rustcorp.com.au>,
Paul McKenney <paulmck@linux.vnet.ibm.com>,
Ingo Molnar <mingo@elte.hu>,
Peter Zijlstra <peterz@infradead.org>,
"Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>,
Magnus Damm <magnus.damm@gmail.com>
Subject: [patch 02/34] arch: Consolidate tsk_is_polling()
Date: Thu, 21 Mar 2013 21:52:57 -0000 [thread overview]
Message-ID: <20130321215233.446034505@linutronix.de> (raw)
In-Reply-To: 20130321214930.752934102@linutronix.de
[-- Attachment #1: arch-consolidate-tsk-is-polling.patch --]
[-- Type: text/plain, Size: 9430 bytes --]
Move it to a common place. Preparatory patch for implementing
set/clear for the idle need_resched poll implementation.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/alpha/include/asm/thread_info.h | 2 --
arch/ia64/include/asm/thread_info.h | 2 --
arch/metag/include/asm/thread_info.h | 2 --
arch/microblaze/include/asm/thread_info.h | 1 -
arch/mn10300/include/asm/thread_info.h | 2 --
arch/openrisc/include/asm/thread_info.h | 2 --
arch/parisc/include/asm/thread_info.h | 2 --
arch/powerpc/include/asm/thread_info.h | 4 ----
arch/sh/include/asm/thread_info.h | 4 ----
arch/sparc/include/asm/thread_info_32.h | 2 --
arch/sparc/include/asm/thread_info_64.h | 2 --
arch/tile/include/asm/thread_info.h | 2 --
arch/x86/include/asm/thread_info.h | 2 --
include/linux/sched.h | 20 ++++++++++++++++++++
kernel/sched/core.c | 5 -----
15 files changed, 20 insertions(+), 34 deletions(-)
Index: linux-2.6/arch/alpha/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/alpha/include/asm/thread_info.h
+++ linux-2.6/arch/alpha/include/asm/thread_info.h
@@ -95,8 +95,6 @@ register struct thread_info *__current_t
#define TS_POLLING 0x0010 /* idle task polling need_resched,
skip sending interrupt */
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
#ifndef __ASSEMBLY__
#define HAVE_SET_RESTORE_SIGMASK 1
static inline void set_restore_sigmask(void)
Index: linux-2.6/arch/ia64/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/ia64/include/asm/thread_info.h
+++ linux-2.6/arch/ia64/include/asm/thread_info.h
@@ -131,8 +131,6 @@ struct thread_info {
#define TS_POLLING 1 /* true if in idle loop and not sleeping */
#define TS_RESTORE_SIGMASK 2 /* restore signal mask in do_signal() */
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
#ifndef __ASSEMBLY__
#define HAVE_SET_RESTORE_SIGMASK 1
static inline void set_restore_sigmask(void)
Index: linux-2.6/arch/metag/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/metag/include/asm/thread_info.h
+++ linux-2.6/arch/metag/include/asm/thread_info.h
@@ -150,6 +150,4 @@ static inline int kstack_end(void *addr)
#define _TIF_WORK_MASK (_TIF_ALLWORK_MASK & ~(_TIF_SYSCALL_TRACE | \
_TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP))
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
#endif /* _ASM_THREAD_INFO_H */
Index: linux-2.6/arch/microblaze/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/microblaze/include/asm/thread_info.h
+++ linux-2.6/arch/microblaze/include/asm/thread_info.h
@@ -182,7 +182,6 @@ static inline bool test_and_clear_restor
ti->status &= ~TS_RESTORE_SIGMASK;
return true;
}
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
#endif
#endif /* __KERNEL__ */
Index: linux-2.6/arch/mn10300/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/mn10300/include/asm/thread_info.h
+++ linux-2.6/arch/mn10300/include/asm/thread_info.h
@@ -165,8 +165,6 @@ void arch_release_thread_info(struct thr
#define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */
#define _TIF_ALLWORK_MASK 0x0000FFFF /* work to do on any return to u-space */
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
#endif /* __KERNEL__ */
#endif /* _ASM_THREAD_INFO_H */
Index: linux-2.6/arch/openrisc/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/openrisc/include/asm/thread_info.h
+++ linux-2.6/arch/openrisc/include/asm/thread_info.h
@@ -128,8 +128,6 @@ register struct thread_info *current_thr
/* For OpenRISC, this is anything in the LSW other than syscall trace */
#define _TIF_WORK_MASK (0xff & ~(_TIF_SYSCALL_TRACE|_TIF_SINGLESTEP))
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
#endif /* __KERNEL__ */
#endif /* _ASM_THREAD_INFO_H */
Index: linux-2.6/arch/parisc/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/parisc/include/asm/thread_info.h
+++ linux-2.6/arch/parisc/include/asm/thread_info.h
@@ -77,8 +77,6 @@ struct thread_info {
#define _TIF_SYSCALL_TRACE_MASK (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | \
_TIF_BLOCKSTEP)
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
#endif /* __KERNEL__ */
#endif /* _ASM_PARISC_THREAD_INFO_H */
Index: linux-2.6/arch/powerpc/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/powerpc/include/asm/thread_info.h
+++ linux-2.6/arch/powerpc/include/asm/thread_info.h
@@ -182,10 +182,6 @@ static inline bool test_thread_local_fla
#define is_32bit_task() (1)
#endif
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
-#endif /* !__ASSEMBLY__ */
-
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_THREAD_INFO_H */
Index: linux-2.6/arch/sh/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/sh/include/asm/thread_info.h
+++ linux-2.6/arch/sh/include/asm/thread_info.h
@@ -207,10 +207,6 @@ static inline bool test_and_clear_restor
return true;
}
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
-#endif /* !__ASSEMBLY__ */
-
#endif /* __KERNEL__ */
#endif /* __ASM_SH_THREAD_INFO_H */
Index: linux-2.6/arch/sparc/include/asm/thread_info_32.h
===================================================================
--- linux-2.6.orig/arch/sparc/include/asm/thread_info_32.h
+++ linux-2.6/arch/sparc/include/asm/thread_info_32.h
@@ -132,8 +132,6 @@ register struct thread_info *current_thr
#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \
_TIF_SIGPENDING)
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
#endif /* __KERNEL__ */
#endif /* _ASM_THREAD_INFO_H */
Index: linux-2.6/arch/sparc/include/asm/thread_info_64.h
===================================================================
--- linux-2.6.orig/arch/sparc/include/asm/thread_info_64.h
+++ linux-2.6/arch/sparc/include/asm/thread_info_64.h
@@ -256,8 +256,6 @@ static inline bool test_and_clear_restor
return true;
}
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
#define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0)
#define test_thread_64bit_stack(__SP) \
((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \
Index: linux-2.6/arch/tile/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/tile/include/asm/thread_info.h
+++ linux-2.6/arch/tile/include/asm/thread_info.h
@@ -153,8 +153,6 @@ extern void _cpu_idle(void);
#define TS_POLLING 0x0004 /* in idle loop but not sleeping */
#define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal */
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
#ifndef __ASSEMBLY__
#define HAVE_SET_RESTORE_SIGMASK 1
static inline void set_restore_sigmask(void)
Index: linux-2.6/arch/x86/include/asm/thread_info.h
===================================================================
--- linux-2.6.orig/arch/x86/include/asm/thread_info.h
+++ linux-2.6/arch/x86/include/asm/thread_info.h
@@ -241,8 +241,6 @@ static inline struct thread_info *curren
skip sending interrupt */
#define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
#ifndef __ASSEMBLY__
#define HAVE_SET_RESTORE_SIGMASK 1
static inline void set_restore_sigmask(void)
Index: linux-2.6/include/linux/sched.h
===================================================================
--- linux-2.6.orig/include/linux/sched.h
+++ linux-2.6/include/linux/sched.h
@@ -2472,6 +2472,26 @@ static inline unsigned long *end_of_stac
#endif
+/*
+ * Idle thread specific functions to determine the need_resched
+ * polling state. We have two versions, one based on TS_POLLING in
+ * thread_info.status and one based on TIF_POLLING_NRFLAG in
+ * thread_info.flags
+ */
+#ifdef TS_POLLING
+static inline int tsk_is_polling(struct task_struct *p)
+{
+ return task_thread_info(p)->status & TS_POLLING;
+}
+#elif defined(TIF_POLLING_NRFLAG)
+static inline int tsk_is_polling(struct task_struct *p)
+{
+ test_tsk_thread_flag(p, TIF_POLLING_NRFLAG);
+}
+#else
+static inline int tsk_is_polling(struct task_struct *p) { return 0; }
+#endif
+
static inline int object_is_on_stack(void *obj)
{
void *stack = task_stack_page(current);
Index: linux-2.6/kernel/sched/core.c
===================================================================
--- linux-2.6.orig/kernel/sched/core.c
+++ linux-2.6/kernel/sched/core.c
@@ -512,11 +512,6 @@ static inline void init_hrtick(void)
* the target CPU.
*/
#ifdef CONFIG_SMP
-
-#ifndef tsk_is_polling
-#define tsk_is_polling(t) 0
-#endif
-
void resched_task(struct task_struct *p)
{
int cpu;
next prev parent reply other threads:[~2013-03-21 21:52 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 21:52 [patch 00/34] idle: Consolidate idle implementations Thomas Gleixner
2013-03-21 21:52 ` [patch 01/34] arch: Cleanup enable/disable_hlt Thomas Gleixner
2013-03-21 21:52 ` Thomas Gleixner
2013-03-21 21:52 ` Thomas Gleixner [this message]
2013-03-21 21:52 ` [patch 02/34] arch: Consolidate tsk_is_polling() Thomas Gleixner
2013-03-22 5:01 ` Tony Breeds
2013-03-22 5:20 ` Tony Breeds
2013-03-22 9:26 ` Thomas Gleixner
2013-03-21 21:52 ` [patch 03/34] idle: Implement set/clr functions for need_resched poll Thomas Gleixner
2013-03-21 21:52 ` Thomas Gleixner
2013-03-22 9:38 ` James Hogan
2013-03-21 21:52 ` [patch 04/34] idle: Provide a generic entry point for the idle code Thomas Gleixner
2013-03-21 21:52 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 06/34] arc: Use generic idle loop Thomas Gleixner
2013-03-22 9:02 ` Vineet Gupta
2013-03-21 21:53 ` [patch 05/34] idle: Implement generic idle function Thomas Gleixner
2013-03-23 8:56 ` Heiko Carstens
2013-03-25 10:39 ` Thomas Gleixner
2013-03-28 15:39 ` Srivatsa S. Bhat
2013-11-18 6:05 ` Viresh Kumar
2013-11-22 22:32 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 07/34] alpha: Use generic idle loop Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:37 ` Srivatsa S. Bhat
2013-03-29 11:22 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 08/34] arm: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-22 21:24 ` Kevin Hilman
2013-03-22 21:24 ` Kevin Hilman
2013-03-25 11:31 ` Thomas Gleixner
2013-03-25 11:48 ` Russell King - ARM Linux
2013-03-25 11:48 ` Russell King - ARM Linux
2013-03-25 14:02 ` Thomas Gleixner
2013-04-08 21:47 ` Russell King - ARM Linux
2013-04-09 9:20 ` Thomas Gleixner
2013-04-09 9:20 ` Thomas Gleixner
2013-04-09 9:38 ` Russell King - ARM Linux
2013-04-09 9:38 ` Russell King - ARM Linux
2013-04-25 20:03 ` Stephen Boyd
2013-04-25 21:01 ` Thomas Gleixner
2013-04-25 21:01 ` Thomas Gleixner
2013-05-01 0:49 ` Stephen Boyd
2013-05-01 0:55 ` Paul E. McKenney
2013-05-21 0:57 ` [PATCH] ARM: smp: Drop RCU_NONIDLE usage in cpu_die() Stephen Boyd
2013-03-21 21:53 ` [patch 09/34] arm64: Use generic idle loop Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-25 18:06 ` Catalin Marinas
2013-03-21 21:53 ` [patch 10/34] avr32: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 11/34] bfin: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 12/34] c6x: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 13/34] cris: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-27 15:04 ` Jesper Nilsson
2013-03-27 15:04 ` Jesper Nilsson
2013-03-27 17:10 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 14/34] frv: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 15/34] h8300: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 16/34] hexagon: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 17/34] ia64: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:40 ` Srivatsa S. Bhat
2013-03-28 15:40 ` Srivatsa S. Bhat
2013-03-21 21:53 ` [patch 18/34] m32r: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 19/34] m68k: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 20/34] metag: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-22 10:16 ` James Hogan
2013-03-25 11:26 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 21/34] microblaze: " Thomas Gleixner
2013-03-21 21:53 ` [patch 22/34] mips: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:42 ` Srivatsa S. Bhat
2013-03-28 15:42 ` Srivatsa S. Bhat
2013-03-21 21:53 ` [patch 24/34] openrisc: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 23/34] mn10300: " Thomas Gleixner
2013-03-21 21:53 ` [patch 25/34] parisc: " Thomas Gleixner
2013-03-21 21:53 ` [patch 26/34] powerpc: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:40 ` Srivatsa S. Bhat
2013-03-28 15:40 ` Srivatsa S. Bhat
2013-04-01 9:13 ` Deepthi Dharwar
2013-04-01 9:13 ` Deepthi Dharwar
2013-03-21 21:53 ` [patch 27/34] s390: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-23 9:38 ` Heiko Carstens
2013-03-23 9:38 ` Heiko Carstens
2013-03-23 9:39 ` Heiko Carstens
2013-03-21 21:53 ` [patch 28/34] score: " Thomas Gleixner
2013-03-21 21:53 ` [patch 29/34] sh: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:40 ` Srivatsa S. Bhat
2013-03-21 21:53 ` [patch 30/34] tile: Enter idle with preemption disabled Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-22 20:34 ` Chris Metcalf
2013-03-22 20:40 ` Chris Metcalf
2013-03-28 15:43 ` Srivatsa S. Bhat
2013-03-28 15:43 ` Srivatsa S. Bhat
2013-03-21 21:53 ` [patch 31/34] tile: Use generic idle loop Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:41 ` Srivatsa S. Bhat
2013-03-29 11:24 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 32/34] unicore: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-21 21:53 ` [patch 33/34] x86: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-28 15:43 ` Srivatsa S. Bhat
2013-03-28 15:43 ` Srivatsa S. Bhat
2013-03-21 21:53 ` [patch 34/34] xtensa: " Thomas Gleixner
2013-03-21 21:53 ` Thomas Gleixner
2013-03-22 12:37 ` Max Filippov
2013-03-22 12:37 ` Max Filippov
2013-03-22 20:09 ` [patch 00/34] idle: Consolidate idle implementations Sam Ravnborg
[not found] ` <alpine.LFD.2.02.1303271940150.22263@ionos>
[not found] ` <5153EC43.7070808@zankel.net>
2013-03-28 9:24 ` Thomas Gleixner
2013-03-28 22:16 ` Chris Zankel
2013-03-29 16:19 ` Sam Ravnborg
2013-03-29 16:19 ` Sam Ravnborg
2013-03-29 20:29 ` [PATCH] sparc: Use generic idle loop Sam Ravnborg
2013-03-31 23:46 ` David Miller
2013-04-01 6:53 ` Srivatsa S. Bhat
2013-04-01 6:53 ` Srivatsa S. Bhat
2013-04-01 9:06 ` Sam Ravnborg
2013-04-01 9:06 ` Sam Ravnborg
2013-04-08 12:33 ` Srivatsa S. Bhat
2013-04-08 12:33 ` Srivatsa S. Bhat
2013-04-08 17:10 ` Sam Ravnborg
2013-04-08 19:24 ` David Miller
2013-04-11 19:38 ` [PATCH v2] " Sam Ravnborg
2013-04-11 19:38 ` Sam Ravnborg
2013-04-12 18:56 ` Thomas Gleixner
2013-04-12 18:58 ` David Miller
2013-05-03 9:47 ` [patch 00/34] idle: Consolidate idle implementations Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130321215233.446034505@linutronix.de \
--to=tglx@linutronix.de \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=mingo@elte.hu \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rusty@rustcorp.com.au \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).