From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Andy Lutomirski <luto@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Rik van Riel <riel@redhat.com>,
Paul McKenney <paulmck@linux.vnet.ibm.com>
Subject: [PATCH 3/3] x86: context_tracking: avoid irq_save/irq_restore on kernel entry and exit
Date: Wed, 28 Oct 2015 02:39:57 +0100 [thread overview]
Message-ID: <1445996397-32703-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1445996397-32703-1-git-send-email-pbonzini@redhat.com>
x86 always calls user_enter and user_exit with interrupt disabled.
Therefore, it is not necessary to check for exceptions, nor to
save/restore the IRQ state, when context tracking functions are
called by guest_enter and guest_exit.
Use the previously introduced __context_tracking_entry and
__context_tracking_exit.
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/entry/common.c | 4 ++--
include/linux/context_tracking.h | 42 ++++++++++++++++++++++++++--------------
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 80dcc9261ca3..ba707c6da818 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -33,7 +33,7 @@
__visible void enter_from_user_mode(void)
{
CT_WARN_ON(ct_state() != CONTEXT_USER);
- user_exit();
+ __user_exit();
}
#endif
@@ -262,7 +262,7 @@ __visible void prepare_exit_to_usermode(struct pt_regs *regs)
local_irq_disable();
}
- user_enter();
+ __user_enter();
}
/*
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index 68b575afe5f5..d36a5c8085b7 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -19,18 +19,6 @@ extern void context_tracking_exit(enum ctx_state state);
extern void context_tracking_user_enter(void);
extern void context_tracking_user_exit(void);
-static inline void user_enter(void)
-{
- if (context_tracking_is_enabled())
- context_tracking_enter(CONTEXT_USER);
-
-}
-static inline void user_exit(void)
-{
- if (context_tracking_is_enabled())
- context_tracking_exit(CONTEXT_USER);
-}
-
static inline enum ctx_state exception_enter(void)
{
enum ctx_state prev_ctx;
@@ -67,13 +55,39 @@ static inline enum ctx_state ct_state(void)
this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
}
#else
-static inline void user_enter(void) { }
-static inline void user_exit(void) { }
+static inline void __context_tracking_enter(enum ctx_state state) { }
+static inline void __context_tracking_exit(enum ctx_state state) { }
+static inline void context_tracking_enter(enum ctx_state state) { }
+static inline void context_tracking_exit(enum ctx_state state) { }
static inline enum ctx_state exception_enter(void) { return 0; }
static inline void exception_exit(enum ctx_state prev_ctx) { }
static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }
#endif /* !CONFIG_CONTEXT_TRACKING */
+static inline void __user_enter(void)
+{
+ if (context_tracking_is_enabled())
+ __context_tracking_enter(CONTEXT_USER);
+
+}
+static inline void __user_exit(void)
+{
+ if (context_tracking_is_enabled())
+ __context_tracking_exit(CONTEXT_USER);
+}
+
+static inline void user_enter(void)
+{
+ if (context_tracking_is_enabled())
+ context_tracking_enter(CONTEXT_USER);
+
+}
+static inline void user_exit(void)
+{
+ if (context_tracking_is_enabled())
+ context_tracking_exit(CONTEXT_USER);
+}
+
#define CT_WARN_ON(cond) WARN_ON(context_tracking_is_enabled() && (cond))
#ifdef CONFIG_CONTEXT_TRACKING_FORCE
--
2.5.0
next prev parent reply other threads:[~2015-10-28 1:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 1:39 [PATCH 0/3] context_tracking: streamline code, avoid IRQ save/restore Paolo Bonzini
2015-10-28 1:39 ` [PATCH 1/3] context_tracking: remove duplicate enabled check Paolo Bonzini
2015-10-28 5:19 ` Andy Lutomirski
2015-11-07 9:38 ` Paolo Bonzini
2015-11-09 13:57 ` Rik van Riel
2015-10-28 1:39 ` [PATCH 2/3] context_tracking: avoid irq_save/irq_restore on guest entry and exit Paolo Bonzini
2015-10-28 5:20 ` Andy Lutomirski
2015-11-09 13:58 ` Rik van Riel
2015-10-28 1:39 ` Paolo Bonzini [this message]
2015-10-28 5:22 ` [PATCH 3/3] x86: context_tracking: avoid irq_save/irq_restore on kernel " Andy Lutomirski
2015-10-28 14:51 ` Paolo Bonzini
2016-03-14 19:23 ` Andy Lutomirski
2016-03-15 8:51 ` Paolo Bonzini
2015-10-28 2:05 ` [PATCH 0/3] context_tracking: streamline code, avoid IRQ save/restore Paolo Bonzini
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=1445996397-32703-4-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=fweisbec@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=riel@redhat.com \
/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).