From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>, Will Deacon <will@kernel.org>,
Cornelia Huck <cohuck@redhat.com>,
Jing Zhang <jingzhangos@google.com>,
Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH v10 07/12] KVM: arm64: Allow userspace to change ID_AA64MMFR{0-2}_EL1
Date: Wed, 20 Sep 2023 18:33:04 +0000 [thread overview]
Message-ID: <20230920183310.1163034-8-oliver.upton@linux.dev> (raw)
In-Reply-To: <20230920183310.1163034-1-oliver.upton@linux.dev>
From: Jing Zhang <jingzhangos@google.com>
Allow userspace to modify the guest-visible values of these ID
registers. Prevent changes to any of the virtualization features until
KVM picks up support for nested and we have a handle on managing NV
features.
Signed-off-by: Jing Zhang <jingzhangos@google.com>
[oliver: prevent changes to EL2 features for now]
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
arch/arm64/kvm/sys_regs.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 71664bec2808..5758cff479d3 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -2103,9 +2103,23 @@ static const struct sys_reg_desc sys_reg_descs[] = {
ID_UNALLOCATED(6,7),
/* CRm=7 */
- ID_SANITISED(ID_AA64MMFR0_EL1),
- ID_SANITISED(ID_AA64MMFR1_EL1),
- ID_SANITISED(ID_AA64MMFR2_EL1),
+ ID_WRITABLE(ID_AA64MMFR0_EL1, ~(ID_AA64MMFR0_EL1_RES0 |
+ ID_AA64MMFR0_EL1_TGRAN4_2 |
+ ID_AA64MMFR0_EL1_TGRAN64_2 |
+ ID_AA64MMFR0_EL1_TGRAN16_2)),
+ ID_WRITABLE(ID_AA64MMFR1_EL1, ~(ID_AA64MMFR1_EL1_RES0 |
+ ID_AA64MMFR1_EL1_HCX |
+ ID_AA64MMFR1_EL1_XNX |
+ ID_AA64MMFR1_EL1_TWED |
+ ID_AA64MMFR1_EL1_XNX |
+ ID_AA64MMFR1_EL1_VH |
+ ID_AA64MMFR1_EL1_VMIDBits)),
+ ID_WRITABLE(ID_AA64MMFR2_EL1, ~(ID_AA64MMFR2_EL1_RES0 |
+ ID_AA64MMFR2_EL1_EVT |
+ ID_AA64MMFR2_EL1_FWB |
+ ID_AA64MMFR2_EL1_IDS |
+ ID_AA64MMFR2_EL1_NV |
+ ID_AA64MMFR2_EL1_CCIDX)),
ID_SANITISED(ID_AA64MMFR3_EL1),
ID_UNALLOCATED(7,4),
ID_UNALLOCATED(7,5),
--
2.42.0.515.g380fc7ccd1-goog
next prev parent reply other threads:[~2023-09-20 18:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 18:32 [PATCH v10 00/12] KVM: arm64: Enable 'writable' ID registers Oliver Upton
2023-09-20 18:32 ` [PATCH v10 01/12] KVM: arm64: Allow userspace to get the writable masks for feature " Oliver Upton
2023-09-21 9:53 ` Cornelia Huck
2023-09-21 18:20 ` Oliver Upton
2023-09-20 18:32 ` [PATCH v10 02/12] KVM: arm64: Document KVM_ARM_GET_REG_WRITABLE_MASKS Oliver Upton
2023-09-21 9:56 ` Cornelia Huck
2023-09-20 18:33 ` [PATCH v10 03/12] KVM: arm64: Use guest ID register values for the sake of emulation Oliver Upton
2023-09-20 18:33 ` [PATCH v10 04/12] KVM: arm64: Reject attempts to set invalid debug arch version Oliver Upton
2023-09-20 18:33 ` [PATCH v10 05/12] KVM: arm64: Bump up the default KVM sanitised debug version to v8p8 Oliver Upton
2023-09-20 18:33 ` [PATCH v10 06/12] KVM: arm64: Allow userspace to change ID_AA64ISAR{0-2}_EL1 Oliver Upton
2023-09-22 17:18 ` Kristina Martsenko
2023-09-22 17:20 ` Kristina Martsenko
2023-09-22 17:52 ` Oliver Upton
2023-10-03 19:41 ` Oliver Upton
2023-09-20 18:33 ` Oliver Upton [this message]
2023-09-20 18:33 ` [PATCH v10 08/12] KVM: arm64: Allow userspace to change ID_AA64PFR0_EL1 Oliver Upton
2023-09-20 18:33 ` [PATCH v10 09/12] KVM: arm64: Allow userspace to change ID_AA64ZFR0_EL1 Oliver Upton
2023-09-20 18:33 ` [PATCH v10 10/12] KVM: arm64: Document vCPU feature selection UAPIs Oliver Upton
2023-09-27 2:45 ` kernel test robot
2023-10-03 19:37 ` Oliver Upton
2023-09-20 18:33 ` [PATCH v10 11/12] KVM: arm64: selftests: Import automatic generation of sysreg defs Oliver Upton
2023-09-20 18:33 ` [PATCH v10 12/12] KVM: arm64: selftests: Test for setting ID register from usersapce Oliver Upton
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=20230920183310.1163034-8-oliver.upton@linux.dev \
--to=oliver.upton@linux.dev \
--cc=cohuck@redhat.com \
--cc=james.morse@arm.com \
--cc=jingzhangos@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=maz@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/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