From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] ARM: context tracking: handle post exception/syscall/IRQ work
Date: Wed, 20 Mar 2013 17:02:00 -0700 [thread overview]
Message-ID: <1363824121-26169-4-git-send-email-khilman@linaro.org> (raw)
In-Reply-To: <1363824121-26169-1-git-send-email-khilman@linaro.org>
do_work_pending() may be called on IRQ, exception or syscall exit (for
reschedule, signal handling, etc.) , but user_enter() may have already
been called (e.g. by syscall return path.)
Since do_work_pending() is still in kernel mode, keep context_tracker
up to date by using user_exit/user_enter.
Based on commit edf55fda35c7dc7f2d9241c3abaddaf759b457c6 (x86: Exit
RCU extended QS on notify resume)
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
arch/arm/kernel/signal.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 296786b..42514fd 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -12,6 +12,7 @@
#include <linux/personality.h>
#include <linux/uaccess.h>
#include <linux/tracehook.h>
+#include <linux/context_tracking.h>
#include <asm/elf.h>
#include <asm/cacheflush.h>
@@ -575,12 +576,15 @@ static int do_signal(struct pt_regs *regs, int syscall)
asmlinkage int
do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
{
+ int retval = 0;
+
+ user_exit();
do {
if (likely(thread_flags & _TIF_NEED_RESCHED)) {
schedule();
} else {
if (unlikely(!user_mode(regs)))
- return 0;
+ break;
local_irq_enable();
if (thread_flags & _TIF_SIGPENDING) {
int restart = do_signal(regs, syscall);
@@ -590,7 +594,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
* Deal with it without leaving
* the kernel space.
*/
- return restart;
+ retval = restart;
+ break;
}
syscall = 0;
} else {
@@ -601,5 +606,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
local_irq_disable();
thread_flags = current_thread_info()->flags;
} while (thread_flags & _TIF_WORK_MASK);
- return 0;
+ user_enter();
+ return retval;
}
--
1.8.2
next prev parent reply other threads:[~2013-03-21 0:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 0:01 [PATCH 0/4] ARM: add support for context tracking subsystem Kevin Hilman
2013-03-21 0:01 ` [PATCH 1/4] ARM: context tracking: add exception support Kevin Hilman
2013-03-21 21:49 ` Russell King - ARM Linux
2013-03-22 0:33 ` Kevin Hilman
2013-03-26 0:28 ` Kevin Hilman
2013-03-21 0:01 ` [PATCH 2/4] ARM: context tracking: instrument system calls Kevin Hilman
2013-03-21 0:02 ` Kevin Hilman [this message]
2013-03-21 0:02 ` [PATCH 4/4] ARM: Kconfig: allow context tracking Kevin Hilman
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=1363824121-26169-4-git-send-email-khilman@linaro.org \
--to=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).