From: Andrii Anisov <andrii.anisov@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>,
Julien Grall <julien.grall@arm.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Andrii Anisov <andrii_anisov@epam.com>
Subject: [Xen-devel] [RFC 1/6] xen/arm: Re-enable interrupt later in the trap path
Date: Fri, 26 Jul 2019 13:37:34 +0300 [thread overview]
Message-ID: <1564137460-25629-2-git-send-email-andrii.anisov@gmail.com> (raw)
In-Reply-To: <1564137460-25629-1-git-send-email-andrii.anisov@gmail.com>
From: Julien Grall <julien.grall@arm.com>
This makes function enter_hypervisor_head() being executed with
irqs locked.
Signed-off-by: Julien Grall <julien.grall@arm.com>
[Andrii: add a justification commit message]
Signed-off-by: Andrii Anisov <andrii_anisov@epam.com>
---
xen/arch/arm/arm64/entry.S | 11 +++++------
xen/arch/arm/traps.c | 6 ++++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S
index 97b05f5..8f28789 100644
--- a/xen/arch/arm/arm64/entry.S
+++ b/xen/arch/arm/arm64/entry.S
@@ -195,7 +195,6 @@ hyp_error_invalid:
hyp_error:
entry hyp=1
- msr daifclr, #2
mov x0, sp
bl do_trap_hyp_serror
exit hyp=1
@@ -203,7 +202,7 @@ hyp_error:
/* Traps taken in Current EL with SP_ELx */
hyp_sync:
entry hyp=1
- msr daifclr, #6
+ msr daifclr, #4
mov x0, sp
bl do_trap_hyp_sync
exit hyp=1
@@ -304,7 +303,7 @@ guest_sync_slowpath:
ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f",
"nop; nop",
SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT)
- msr daifclr, #6
+ msr daifclr, #4
mov x0, sp
bl do_trap_guest_sync
1:
@@ -332,7 +331,7 @@ guest_fiq_invalid:
guest_error:
entry hyp=0, compat=0
- msr daifclr, #6
+ msr daifclr, #4
mov x0, sp
bl do_trap_guest_serror
exit hyp=0, compat=0
@@ -347,7 +346,7 @@ guest_sync_compat:
ALTERNATIVE("bl check_pending_vserror; cbnz x0, 1f",
"nop; nop",
SKIP_SYNCHRONIZE_SERROR_ENTRY_EXIT)
- msr daifclr, #6
+ msr daifclr, #4
mov x0, sp
bl do_trap_guest_sync
1:
@@ -375,7 +374,7 @@ guest_fiq_invalid_compat:
guest_error_compat:
entry hyp=0, compat=1
- msr daifclr, #6
+ msr daifclr, #4
mov x0, sp
bl do_trap_guest_serror
exit hyp=0, compat=1
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 3103620..5a9dc66 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -2017,6 +2017,8 @@ static void enter_hypervisor_head(struct cpu_user_regs *regs)
{
struct vcpu *v = current;
+ ASSERT(!local_irq_is_enabled());
+
/* If the guest has disabled the workaround, bring it back on. */
if ( needs_ssbd_flip(v) )
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_WORKAROUND_2_FID, 1, NULL);
@@ -2051,6 +2053,7 @@ void do_trap_guest_sync(struct cpu_user_regs *regs)
const union hsr hsr = { .bits = regs->hsr };
enter_hypervisor_head(regs);
+ local_irq_enable();
switch ( hsr.ec )
{
@@ -2186,6 +2189,7 @@ void do_trap_hyp_sync(struct cpu_user_regs *regs)
const union hsr hsr = { .bits = regs->hsr };
enter_hypervisor_head(regs);
+ local_irq_enable();
switch ( hsr.ec )
{
@@ -2224,6 +2228,7 @@ void do_trap_hyp_sync(struct cpu_user_regs *regs)
void do_trap_hyp_serror(struct cpu_user_regs *regs)
{
enter_hypervisor_head(regs);
+ local_irq_enable();
__do_trap_serror(regs, VABORT_GEN_BY_GUEST(regs));
}
@@ -2231,6 +2236,7 @@ void do_trap_hyp_serror(struct cpu_user_regs *regs)
void do_trap_guest_serror(struct cpu_user_regs *regs)
{
enter_hypervisor_head(regs);
+ local_irq_enable();
__do_trap_serror(regs, true);
}
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-07-26 10:38 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 10:37 [Xen-devel] [RFC 0/6] XEN scheduling hardening Andrii Anisov
2019-07-26 10:37 ` Andrii Anisov [this message]
2019-07-26 10:48 ` [Xen-devel] [RFC 1/6] xen/arm: Re-enable interrupt later in the trap path Julien Grall
2019-07-30 17:35 ` Andrii Anisov
2019-07-30 20:10 ` Julien Grall
2019-08-01 6:45 ` Andrii Anisov
2019-08-01 9:37 ` Julien Grall
2019-08-02 8:28 ` Andrii Anisov
2019-08-02 9:03 ` Julien Grall
2019-08-02 12:24 ` Andrii Anisov
2019-08-02 13:22 ` Julien Grall
2019-08-01 11:19 ` Dario Faggioli
2019-08-02 7:50 ` Andrii Anisov
2019-08-02 9:15 ` Julien Grall
2019-08-02 13:07 ` Andrii Anisov
2019-08-02 13:49 ` Julien Grall
2019-08-03 1:39 ` Dario Faggioli
2019-08-03 0:55 ` Dario Faggioli
2019-08-06 13:09 ` Andrii Anisov
2019-08-08 14:07 ` Andrii Anisov
2019-08-13 14:45 ` Dario Faggioli
2019-08-15 18:25 ` Andrii Anisov
2019-07-26 10:37 ` [Xen-devel] [RFC 2/6] schedule: account true system idle time Andrii Anisov
2019-07-26 12:00 ` Dario Faggioli
2019-07-26 12:42 ` Andrii Anisov
2019-07-29 11:40 ` Dario Faggioli
2019-08-01 8:23 ` Andrii Anisov
2019-07-26 10:37 ` [Xen-devel] [RFC 3/6] sysctl: extend XEN_SYSCTL_getcpuinfo interface Andrii Anisov
2019-07-26 12:15 ` Dario Faggioli
2019-07-26 13:06 ` Andrii Anisov
2019-07-26 10:37 ` [Xen-devel] [RFC 4/6] xentop: show CPU load information Andrii Anisov
2019-07-26 10:37 ` [Xen-devel] [RFC 5/6] arm64: сall enter_hypervisor_head only when it is needed Andrii Anisov
2019-07-26 10:44 ` Andrii Anisov
2019-07-26 10:37 ` [Xen-devel] [RFC 5/6] arm64: call " Andrii Anisov
2019-07-26 10:59 ` Julien Grall
2019-07-30 17:35 ` Andrii Anisov
2019-07-31 11:02 ` Julien Grall
2019-07-31 11:33 ` Andre Przywara
2019-08-01 7:33 ` Andrii Anisov
2019-08-01 10:17 ` Julien Grall
2019-08-02 13:50 ` Andrii Anisov
2019-07-26 10:37 ` [Xen-devel] [RFC 6/6] schedule: account all the hypervisor time to the idle vcpu Andrii Anisov
2019-07-26 11:56 ` [Xen-devel] [RFC 0/6] XEN scheduling hardening Dario Faggioli
2019-07-26 12:14 ` Juergen Gross
2019-07-29 11:53 ` Dario Faggioli
2019-07-29 12:13 ` Juergen Gross
2019-07-29 14:47 ` Andrii Anisov
2019-07-29 18:46 ` Dario Faggioli
2019-07-29 14:28 ` Andrii Anisov
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=1564137460-25629-2-git-send-email-andrii.anisov@gmail.com \
--to=andrii.anisov@gmail.com \
--cc=Volodymyr_Babchuk@epam.com \
--cc=andrii_anisov@epam.com \
--cc=julien.grall@arm.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.