From: Mark Brown <broonie@kernel•org>
To: Catalin Marinas <catalin.marinas@arm•com>, Will Deacon <will@kernel•org>
Cc: "Paul Elliott" <paul.elliott@arm•com>,
"Peter Zijlstra" <peterz@infradead•org>,
"Andrew Jones" <drjones@redhat•com>,
"Amit Kachhap" <amit.kachhap@arm•com>,
"Vincenzo Frascino" <vincenzo.frascino@arm•com>,
linux-arch@vger•kernel.org, "Marc Zyngier" <maz@kernel•org>,
"Eugene Syromiatnikov" <esyr@redhat•com>,
"Szabolcs Nagy" <szabolcs.nagy@arm•com>,
"Dave Martin" <Dave.Martin@arm•com>,
"H . J . Lu " <hjl.tools@gmail•com>,
"Yu-cheng Yu" <yu-cheng.yu@intel•com>,
"Kees Cook" <keescook@chromium•org>,
"Arnd Bergmann" <arnd@arndb•de>, "Jann Horn" <jannh@google•com>,
"Richard Henderson" <richard.henderson@linaro•org>,
"Kristina Martšenko" <kristina.martsenko@arm•com>,
"Mark Brown" <broonie@kernel•org>,
"Alexander Viro" <viro@zeniv•linux.org.uk>,
"Thomas Gleixner" <tglx@linutronix•de>,
linux-arm-kernel@lists•infradead.org,
"Florian Weimer" <fweimer@redhat•com>,
linux-kernel@vger•kernel.org, linux-fsdevel@vger•kernel.org,
"Sudakshina Das" <sudi.das@arm•com>
Subject: [PATCH v8 10/11] KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions
Date: Thu, 27 Feb 2020 17:44:16 +0000 [thread overview]
Message-ID: <20200227174417.23722-11-broonie@kernel.org> (raw)
In-Reply-To: <20200227174417.23722-1-broonie@kernel.org>
From: Dave Martin <Dave.Martin@arm•com>
Since normal execution of any non-branch instruction resets the
PSTATE BTYPE field to 0, so do the same thing when emulating a
trapped instruction.
Branches don't trap directly, so we should never need to assign a
non-zero value to BTYPE here.
Signed-off-by: Dave Martin <Dave.Martin@arm•com>
Acked-by: Marc Zyngier <maz@kernel•org>
Signed-off-by: Mark Brown <broonie@kernel•org>
---
arch/arm64/include/asm/kvm_emulate.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 688c63412cc2..dee51c1dcb93 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -506,10 +506,12 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
static inline void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr)
{
- if (vcpu_mode_is_32bit(vcpu))
+ if (vcpu_mode_is_32bit(vcpu)) {
kvm_skip_instr32(vcpu, is_wide_instr);
- else
+ } else {
*vcpu_pc(vcpu) += 4;
+ *vcpu_cpsr(vcpu) &= ~PSR_BTYPE_MASK;
+ }
/* advance the singlestep state machine */
*vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-02-27 17:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 17:44 [PATCH v8 00/11] arm64: Branch Target Identification support Mark Brown
2020-02-27 17:44 ` [PATCH v8 01/11] ELF: UAPI and Kconfig additions for ELF program properties Mark Brown
2020-02-27 17:44 ` [PATCH v8 02/11] ELF: Add ELF program property parsing support Mark Brown
2020-02-27 17:44 ` [PATCH v8 03/11] arm64: Basic Branch Target Identification support Mark Brown
2020-03-11 16:31 ` Catalin Marinas
2020-02-27 17:44 ` [PATCH v8 04/11] elf: Allow arch to tweak initial mmap prot flags Mark Brown
2020-02-27 17:44 ` [PATCH v8 05/11] arm64: elf: Enable BTI at exec based on ELF program properties Mark Brown
2020-02-27 17:44 ` [PATCH v8 06/11] arm64: BTI: Decode BYTPE bits when printing PSTATE Mark Brown
2020-02-27 17:44 ` [PATCH v8 07/11] arm64: unify native/compat instruction skipping Mark Brown
2020-02-27 17:44 ` [PATCH v8 08/11] arm64: traps: Shuffle code to eliminate forward declarations Mark Brown
2020-02-27 17:44 ` [PATCH v8 09/11] arm64: BTI: Reset BTYPE when skipping emulated instructions Mark Brown
2020-02-27 17:44 ` Mark Brown [this message]
2020-02-27 17:44 ` [PATCH v8 11/11] arm64: mm: Display guarded pages in ptdump Mark Brown
2020-02-28 1:35 ` [PATCH v8 00/11] arm64: Branch Target Identification support Richard Henderson
2020-03-11 19:15 ` Mark Brown
2020-03-06 10:21 ` Catalin Marinas
2020-03-06 10:27 ` Catalin Marinas
2020-03-09 21:05 ` Mark Brown
2020-03-10 12:42 ` Mark Brown
2020-03-11 16:28 ` Catalin Marinas
2020-03-11 17:25 ` Mark Brown
2020-03-12 18:42 ` Catalin Marinas
2020-03-13 12:59 ` Mark Brown
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=20200227174417.23722-11-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=Dave.Martin@arm$(echo .)com \
--cc=amit.kachhap@arm$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=drjones@redhat$(echo .)com \
--cc=esyr@redhat$(echo .)com \
--cc=fweimer@redhat$(echo .)com \
--cc=hjl.tools@gmail$(echo .)com \
--cc=jannh@google$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=kristina.martsenko@arm$(echo .)com \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=maz@kernel$(echo .)org \
--cc=paul.elliott@arm$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=richard.henderson@linaro$(echo .)org \
--cc=sudi.das@arm$(echo .)com \
--cc=szabolcs.nagy@arm$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=vincenzo.frascino@arm$(echo .)com \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=will@kernel$(echo .)org \
--cc=yu-cheng.yu@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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