From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6 6/8] KVM: arm64: Refactor exit handlers
Date: Fri, 21 Mar 2025 13:29:45 -0400 [thread overview]
Message-ID: <20250321122229-0babb15d2822d69c@stable.kernel.org> (raw)
In-Reply-To: <20250321-stable-sve-6-6-v1-6-0b3a6a14ea53@kernel.org>
[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: 9b66195063c5a145843547b1d692bd189be85287
WARNING: Author mismatch between patch and upstream commit:
Backport author: Mark Brown<broonie@kernel.org>
Commit author: Mark Rutland<mark.rutland@arm.com>
Status in newer kernel trees:
6.13.y | Present (different SHA1: 4c68a146aaaa)
6.12.y | Present (different SHA1: 14aab4391836)
Note: The patch differs from the upstream commit:
---
1: 9b66195063c5a ! 1: 15cf8a2271ac3 KVM: arm64: Refactor exit handlers
@@ Metadata
## Commit message ##
KVM: arm64: Refactor exit handlers
+ [ Upstream commit 9b66195063c5a145843547b1d692bd189be85287 ]
+
The hyp exit handling logic is largely shared between VHE and nVHE/hVHE,
with common logic in arch/arm64/kvm/hyp/include/hyp/switch.h. The code
in the header depends on function definitions provided by
@@ Commit message
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20250210195226.1215254-7-mark.rutland@arm.com
Signed-off-by: Marc Zyngier <maz@kernel.org>
+ Signed-off-by: Mark Brown <broonie@kernel.org>
## arch/arm64/kvm/hyp/include/hyp/switch.h ##
@@ arch/arm64/kvm/hyp/include/hyp/switch.h: static bool kvm_hyp_handle_dabt_low(struct kvm_vcpu *vcpu, u64 *exit_code)
@@ arch/arm64/kvm/hyp/nvhe/switch.c: static const exit_handler_fn *kvm_get_exit_han
+static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code)
{
+ const exit_handler_fn *handlers = kvm_get_exit_handler_array(vcpu);
-+
+ struct kvm *kvm = kern_hyp_va(vcpu->kvm);
+
+ synchronize_vcpu_pstate(vcpu, exit_code);
+
+ /*
@@ arch/arm64/kvm/hyp/nvhe/switch.c: static const exit_handler_fn *kvm_get_exit_han
+ * it. The check below is based on the one in
+ * kvm_arch_vcpu_ioctl_run().
+ */
- if (unlikely(vcpu_is_protected(vcpu) && vcpu_mode_is_32bit(vcpu))) {
+ if (kvm_vm_is_protected(kvm) && vcpu_mode_is_32bit(vcpu)) {
/*
* As we have caught the guest red-handed, decide that it isn't
@@ arch/arm64/kvm/hyp/nvhe/switch.c: static void early_exit_filter(struct kvm_vcpu *vcpu, u64 *exit_code)
@@ arch/arm64/kvm/hyp/nvhe/switch.c: static void early_exit_filter(struct kvm_vcpu
## arch/arm64/kvm/hyp/vhe/switch.c ##
@@ arch/arm64/kvm/hyp/vhe/switch.c: static const exit_handler_fn hyp_exit_handlers[] = {
- [ESR_ELx_EC_MOPS] = kvm_hyp_handle_mops,
+ [ESR_ELx_EC_PAC] = kvm_hyp_handle_ptrauth,
};
-static const exit_handler_fn *kvm_get_exit_handler_array(struct kvm_vcpu *vcpu)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.12.y | Success | Success |
next prev parent reply other threads:[~2025-03-21 17:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-21 0:16 [PATCH 6.6 0/8] KVM: arm64: Backport of SVE fixes to v6.6 Mark Brown
2025-03-21 0:16 ` [PATCH 6.6 1/8] KVM: arm64: Calculate cptr_el2 traps on activating traps Mark Brown
2025-03-21 17:27 ` Sasha Levin
2025-03-21 0:16 ` [PATCH 6.6 2/8] KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state Mark Brown
2025-03-21 17:28 ` Sasha Levin
2025-03-21 0:16 ` [PATCH 6.6 3/8] KVM: arm64: Remove host FPSIMD saving for non-protected KVM Mark Brown
2025-03-21 17:28 ` Sasha Levin
2025-03-21 0:16 ` [PATCH 6.6 4/8] KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN Mark Brown
2025-03-21 17:26 ` Sasha Levin
2025-03-21 0:16 ` [PATCH 6.6 5/8] KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN Mark Brown
2025-03-21 17:26 ` Sasha Levin
2025-03-21 0:16 ` [PATCH 6.6 6/8] KVM: arm64: Refactor exit handlers Mark Brown
2025-03-21 17:29 ` Sasha Levin [this message]
2025-03-21 0:16 ` [PATCH 6.6 7/8] KVM: arm64: Mark some header functions as inline Mark Brown
2025-03-21 17:27 ` Sasha Levin
2025-03-21 0:16 ` [PATCH 6.6 8/8] KVM: arm64: Eagerly switch ZCR_EL{1,2} Mark Brown
2025-03-21 17:29 ` Sasha Levin
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=20250321122229-0babb15d2822d69c@stable.kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=stable@vger.kernel.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