* [PATCH] KVM: arm64: Expose S1PIE to guests
@ 2024-10-04 23:19 Mark Brown
2024-10-08 9:31 ` Joey Gouly
2024-10-08 12:05 ` Marc Zyngier
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2024-10-04 23:19 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, James Morse, Suzuki K Poulose,
Catalin Marinas, Will Deacon, Joey Gouly
Cc: linux-arm-kernel, kvmarm, linux-kernel, Mark Brown
Prior to commit 70ed7238297f ("KVM: arm64: Sanitise ID_AA64MMFR3_EL1")
we just exposed the santised view of ID_AA64MMFR3_EL1 to guests, meaning
that they saw both TCRX and S1PIE if present on the host machine. That
commit added VMM control over the contents of the register and exposed
S1POE but removed S1PIE, meaning that the extension is no longer visible
to guests. Reenable support for S1PIE with VMM control.
Fixes: 70ed7238297f ("KVM: arm64: Sanitise ID_AA64MMFR3_EL1")
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/kvm/sys_regs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index dad88e31f9537fe02e28b117d6a740f15572e0ba..d48f89ad6aa7139078e7991ce6c8ebc4a0543551 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1550,7 +1550,8 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu,
val &= ~ID_AA64MMFR2_EL1_CCIDX_MASK;
break;
case SYS_ID_AA64MMFR3_EL1:
- val &= ID_AA64MMFR3_EL1_TCRX | ID_AA64MMFR3_EL1_S1POE;
+ val &= ID_AA64MMFR3_EL1_TCRX | ID_AA64MMFR3_EL1_S1POE |
+ ID_AA64MMFR3_EL1_S1PIE;
break;
case SYS_ID_MMFR4_EL1:
val &= ~ARM64_FEATURE_MASK(ID_MMFR4_EL1_CCIDX);
@@ -2433,6 +2434,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
ID_AA64MMFR2_EL1_NV |
ID_AA64MMFR2_EL1_CCIDX)),
ID_WRITABLE(ID_AA64MMFR3_EL1, (ID_AA64MMFR3_EL1_TCRX |
+ ID_AA64MMFR3_EL1_S1PIE |
ID_AA64MMFR3_EL1_S1POE)),
ID_SANITISED(ID_AA64MMFR4_EL1),
ID_UNALLOCATED(7,5),
---
base-commit: 9852d85ec9d492ebef56dc5f229416c925758edc
change-id: 20241004-kvm-arm64-fix-s1pie-a6d85b4b3274
Best regards,
--
Mark Brown <broonie@kernel.org>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] KVM: arm64: Expose S1PIE to guests
2024-10-04 23:19 [PATCH] KVM: arm64: Expose S1PIE to guests Mark Brown
@ 2024-10-08 9:31 ` Joey Gouly
2024-10-08 12:05 ` Marc Zyngier
1 sibling, 0 replies; 3+ messages in thread
From: Joey Gouly @ 2024-10-08 9:31 UTC (permalink / raw)
To: Mark Brown
Cc: Marc Zyngier, Oliver Upton, James Morse, Suzuki K Poulose,
Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm,
linux-kernel
Hi,
On Sat, Oct 05, 2024 at 12:19:37AM +0100, Mark Brown wrote:
> Prior to commit 70ed7238297f ("KVM: arm64: Sanitise ID_AA64MMFR3_EL1")
> we just exposed the santised view of ID_AA64MMFR3_EL1 to guests, meaning
> that they saw both TCRX and S1PIE if present on the host machine. That
> commit added VMM control over the contents of the register and exposed
> S1POE but removed S1PIE, meaning that the extension is no longer visible
> to guests. Reenable support for S1PIE with VMM control.
>
> Fixes: 70ed7238297f ("KVM: arm64: Sanitise ID_AA64MMFR3_EL1")
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> arch/arm64/kvm/sys_regs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index dad88e31f9537fe02e28b117d6a740f15572e0ba..d48f89ad6aa7139078e7991ce6c8ebc4a0543551 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -1550,7 +1550,8 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu,
> val &= ~ID_AA64MMFR2_EL1_CCIDX_MASK;
> break;
> case SYS_ID_AA64MMFR3_EL1:
> - val &= ID_AA64MMFR3_EL1_TCRX | ID_AA64MMFR3_EL1_S1POE;
> + val &= ID_AA64MMFR3_EL1_TCRX | ID_AA64MMFR3_EL1_S1POE |
> + ID_AA64MMFR3_EL1_S1PIE;
> break;
> case SYS_ID_MMFR4_EL1:
> val &= ~ARM64_FEATURE_MASK(ID_MMFR4_EL1_CCIDX);
> @@ -2433,6 +2434,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
> ID_AA64MMFR2_EL1_NV |
> ID_AA64MMFR2_EL1_CCIDX)),
> ID_WRITABLE(ID_AA64MMFR3_EL1, (ID_AA64MMFR3_EL1_TCRX |
> + ID_AA64MMFR3_EL1_S1PIE |
> ID_AA64MMFR3_EL1_S1POE)),
> ID_SANITISED(ID_AA64MMFR4_EL1),
> ID_UNALLOCATED(7,5),
>
> ---
Sorry, silly mistake by me.
Reviewed-by: Joey Gouly <joey.gouly@arm.com>
Thanks,
Joey
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] KVM: arm64: Expose S1PIE to guests
2024-10-04 23:19 [PATCH] KVM: arm64: Expose S1PIE to guests Mark Brown
2024-10-08 9:31 ` Joey Gouly
@ 2024-10-08 12:05 ` Marc Zyngier
1 sibling, 0 replies; 3+ messages in thread
From: Marc Zyngier @ 2024-10-08 12:05 UTC (permalink / raw)
To: Oliver Upton, James Morse, Suzuki K Poulose, Catalin Marinas,
Will Deacon, Joey Gouly, Mark Brown
Cc: linux-arm-kernel, kvmarm, linux-kernel
On Sat, 05 Oct 2024 00:19:37 +0100, Mark Brown wrote:
> Prior to commit 70ed7238297f ("KVM: arm64: Sanitise ID_AA64MMFR3_EL1")
> we just exposed the santised view of ID_AA64MMFR3_EL1 to guests, meaning
> that they saw both TCRX and S1PIE if present on the host machine. That
> commit added VMM control over the contents of the register and exposed
> S1POE but removed S1PIE, meaning that the extension is no longer visible
> to guests. Reenable support for S1PIE with VMM control.
>
> [...]
Applied to fixes, thanks!
[1/1] KVM: arm64: Expose S1PIE to guests
commit: d4a89e5aee23eaebdc45f63cb3d6d5917ff6acf4
Cheers,
M.
--
Without deviation from the norm, progress is not possible.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-08 12:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-04 23:19 [PATCH] KVM: arm64: Expose S1PIE to guests Mark Brown
2024-10-08 9:31 ` Joey Gouly
2024-10-08 12:05 ` Marc Zyngier
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).