* [PATCH 1/2] arm64: Add missing Set/Way CMO encodings
2023-05-15 20:45 [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs Marc Zyngier
@ 2023-05-15 20:46 ` Marc Zyngier
2023-05-17 10:23 ` Cornelia Huck
2023-05-15 20:46 ` [PATCH 2/2] KVM: arm64: Handle trap of tagged Set/Way CMOs Marc Zyngier
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Marc Zyngier @ 2023-05-15 20:46 UTC (permalink / raw)
To: James Morse, Suzuki K Poulose, Oliver Upton, Zenghui Yu
Cc: Catalin Marinas, steven.price, kvmarm, linux-arm-kernel, kvm
Add the missing Set/Way CMOs that apply to tagged memory.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/include/asm/sysreg.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index e72d9aaab6b1..eefd712f2430 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -115,8 +115,14 @@
#define SB_BARRIER_INSN __SYS_BARRIER_INSN(0, 7, 31)
#define SYS_DC_ISW sys_insn(1, 0, 7, 6, 2)
+#define SYS_DC_IGSW sys_insn(1, 0, 7, 6, 4)
+#define SYS_DC_IGDSW sys_insn(1, 0, 7, 6, 6)
#define SYS_DC_CSW sys_insn(1, 0, 7, 10, 2)
+#define SYS_DC_CGSW sys_insn(1, 0, 7, 10, 4)
+#define SYS_DC_CGDSW sys_insn(1, 0, 7, 10, 6)
#define SYS_DC_CISW sys_insn(1, 0, 7, 14, 2)
+#define SYS_DC_CIGSW sys_insn(1, 0, 7, 14, 4)
+#define SYS_DC_CIGDSW sys_insn(1, 0, 7, 14, 6)
/*
* Automatically generated definitions for system registers, the
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] arm64: Add missing Set/Way CMO encodings
2023-05-15 20:46 ` [PATCH 1/2] arm64: Add missing Set/Way CMO encodings Marc Zyngier
@ 2023-05-17 10:23 ` Cornelia Huck
0 siblings, 0 replies; 8+ messages in thread
From: Cornelia Huck @ 2023-05-17 10:23 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Suzuki K Poulose, Oliver Upton,
Zenghui Yu
Cc: Catalin Marinas, steven.price, kvmarm, linux-arm-kernel, kvm
On Mon, May 15 2023, Marc Zyngier <maz@kernel.org> wrote:
> Add the missing Set/Way CMOs that apply to tagged memory.
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/include/asm/sysreg.h | 6 ++++++
> 1 file changed, 6 insertions(+)
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] KVM: arm64: Handle trap of tagged Set/Way CMOs
2023-05-15 20:45 [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs Marc Zyngier
2023-05-15 20:46 ` [PATCH 1/2] arm64: Add missing Set/Way CMO encodings Marc Zyngier
@ 2023-05-15 20:46 ` Marc Zyngier
2023-05-17 10:24 ` Cornelia Huck
2023-05-17 10:06 ` [PATCH 0/2] KVM: arm64: Handle MTE " Steven Price
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Marc Zyngier @ 2023-05-15 20:46 UTC (permalink / raw)
To: James Morse, Suzuki K Poulose, Oliver Upton, Zenghui Yu
Cc: Catalin Marinas, steven.price, kvmarm, linux-arm-kernel, kvm
We appear to have missed the Set/Way CMOs when adding MTE support.
Not that we really expect anyone to use them, but you never know
what stupidity some people can come up with...
Treat these mostly like we deal with the classic S/W CMOs, only
with an additional check that MTE really is enabled.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kvm/sys_regs.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 71b12094d613..753aa7418149 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -211,6 +211,19 @@ static bool access_dcsw(struct kvm_vcpu *vcpu,
return true;
}
+static bool access_dcgsw(struct kvm_vcpu *vcpu,
+ struct sys_reg_params *p,
+ const struct sys_reg_desc *r)
+{
+ if (!kvm_has_mte(vcpu->kvm)) {
+ kvm_inject_undefined(vcpu);
+ return false;
+ }
+
+ /* Treat MTE S/W ops as we treat the classic ones: with contempt */
+ return access_dcsw(vcpu, p, r);
+}
+
static void get_access_mask(const struct sys_reg_desc *r, u64 *mask, u64 *shift)
{
switch (r->aarch32_map) {
@@ -1756,8 +1769,14 @@ static bool access_spsr(struct kvm_vcpu *vcpu,
*/
static const struct sys_reg_desc sys_reg_descs[] = {
{ SYS_DESC(SYS_DC_ISW), access_dcsw },
+ { SYS_DESC(SYS_DC_IGSW), access_dcgsw },
+ { SYS_DESC(SYS_DC_IGDSW), access_dcgsw },
{ SYS_DESC(SYS_DC_CSW), access_dcsw },
+ { SYS_DESC(SYS_DC_CGSW), access_dcgsw },
+ { SYS_DESC(SYS_DC_CGDSW), access_dcgsw },
{ SYS_DESC(SYS_DC_CISW), access_dcsw },
+ { SYS_DESC(SYS_DC_CIGSW), access_dcgsw },
+ { SYS_DESC(SYS_DC_CIGDSW), access_dcgsw },
DBG_BCR_BVR_WCR_WVR_EL1(0),
DBG_BCR_BVR_WCR_WVR_EL1(1),
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] KVM: arm64: Handle trap of tagged Set/Way CMOs
2023-05-15 20:46 ` [PATCH 2/2] KVM: arm64: Handle trap of tagged Set/Way CMOs Marc Zyngier
@ 2023-05-17 10:24 ` Cornelia Huck
0 siblings, 0 replies; 8+ messages in thread
From: Cornelia Huck @ 2023-05-17 10:24 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Suzuki K Poulose, Oliver Upton,
Zenghui Yu
Cc: Catalin Marinas, steven.price, kvmarm, linux-arm-kernel, kvm
On Mon, May 15 2023, Marc Zyngier <maz@kernel.org> wrote:
> We appear to have missed the Set/Way CMOs when adding MTE support.
> Not that we really expect anyone to use them, but you never know
> what stupidity some people can come up with...
>
> Treat these mostly like we deal with the classic S/W CMOs, only
> with an additional check that MTE really is enabled.
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/kvm/sys_regs.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs
2023-05-15 20:45 [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs Marc Zyngier
2023-05-15 20:46 ` [PATCH 1/2] arm64: Add missing Set/Way CMO encodings Marc Zyngier
2023-05-15 20:46 ` [PATCH 2/2] KVM: arm64: Handle trap of tagged Set/Way CMOs Marc Zyngier
@ 2023-05-17 10:06 ` Steven Price
2023-05-23 16:13 ` Oliver Upton
2023-05-24 12:49 ` Marc Zyngier
4 siblings, 0 replies; 8+ messages in thread
From: Steven Price @ 2023-05-17 10:06 UTC (permalink / raw)
To: Marc Zyngier, James Morse, Suzuki K Poulose, Oliver Upton,
Zenghui Yu
Cc: Catalin Marinas, kvmarm, linux-arm-kernel, kvm
On 15/05/2023 21:45, Marc Zyngier wrote:
> When the MTE support was added, it seens the handling of MTE Set/Way
> was ommited, meaning that the guest will get an UNDEF if it tries to
> do something that is quite stupid, but still allowed by the
> architecture...
Sorry about that, as you say it's quite a stupid thing for a guest to
attempt and it hadn't occurred to me when implementing KVM support.
Both patches:
Reviewed-by: Steven Price <steven.price@arm.com>
Thanks,
Steve
>
> Found by inspection while writting the trap support for NV.
>
> Marc Zyngier (2):
> arm64: Add missing Set/Way CMO encodings
> KVM: arm64: Handle trap of tagged Set/Way CMOs
>
> arch/arm64/include/asm/sysreg.h | 6 ++++++
> arch/arm64/kvm/sys_regs.c | 19 +++++++++++++++++++
> 2 files changed, 25 insertions(+)
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs
2023-05-15 20:45 [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs Marc Zyngier
` (2 preceding siblings ...)
2023-05-17 10:06 ` [PATCH 0/2] KVM: arm64: Handle MTE " Steven Price
@ 2023-05-23 16:13 ` Oliver Upton
2023-05-24 12:49 ` Marc Zyngier
4 siblings, 0 replies; 8+ messages in thread
From: Oliver Upton @ 2023-05-23 16:13 UTC (permalink / raw)
To: Marc Zyngier
Cc: James Morse, Suzuki K Poulose, Zenghui Yu, Catalin Marinas,
steven.price, kvmarm, linux-arm-kernel, kvm
On Mon, May 15, 2023 at 09:45:59PM +0100, Marc Zyngier wrote:
> When the MTE support was added, it seens the handling of MTE Set/Way
> was ommited, meaning that the guest will get an UNDEF if it tries to
> do something that is quite stupid, but still allowed by the
> architecture...
>
> Found by inspection while writting the trap support for NV.
>
> Marc Zyngier (2):
> arm64: Add missing Set/Way CMO encodings
> KVM: arm64: Handle trap of tagged Set/Way CMOs
For the series:
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
--
Thanks,
Oliver
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs
2023-05-15 20:45 [PATCH 0/2] KVM: arm64: Handle MTE Set/Way CMOs Marc Zyngier
` (3 preceding siblings ...)
2023-05-23 16:13 ` Oliver Upton
@ 2023-05-24 12:49 ` Marc Zyngier
4 siblings, 0 replies; 8+ messages in thread
From: Marc Zyngier @ 2023-05-24 12:49 UTC (permalink / raw)
To: James Morse, Oliver Upton, Suzuki K Poulose, Zenghui Yu,
Marc Zyngier
Cc: steven.price, Catalin Marinas, kvmarm, kvm, linux-arm-kernel
On Mon, 15 May 2023 21:45:59 +0100, Marc Zyngier wrote:
> When the MTE support was added, it seens the handling of MTE Set/Way
> was ommited, meaning that the guest will get an UNDEF if it tries to
> do something that is quite stupid, but still allowed by the
> architecture...
>
> Found by inspection while writting the trap support for NV.
>
> [...]
Applied to fixes, thanks!
[1/2] arm64: Add missing Set/Way CMO encodings
commit: 8d0f019e4c4f2ee2de81efd9bf1c27e9fb3c0460
[2/2] KVM: arm64: Handle trap of tagged Set/Way CMOs
commit: d282fa3c5ccb7a0029c418f358143689553b6447
Cheers,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread