Skip to content

Commit 4281fc4

Browse files
committed
KVM: arm64: Restore S1PIE register visibility to userspace
Upstream Status: RHEL only JIRA: https://issues.redhat.com/browse/RHEL-89567 Commit 7e64e0b ("[PATCH v2 3/3] KVM: arm64: Hide S1PIE registers from userspace") broke the migration because it suddently hides PIRE0_EL1 and PIR_EL1 registers from userspace. Let's remove the visibility callback setting to restore the previous behavior. We don't do a full revert to minimize conflicts as kvm_has_s1pie is used in many places and the trap setup plus el2 visibility changes are still sensible from guest point of view. Signed-off-by: Eric Auger <eric.auger@redhat.com>
1 parent fec9546 commit 4281fc4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

arch/arm64/kvm/sys_regs.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,10 +2750,8 @@ static const struct sys_reg_desc sys_reg_descs[] = {
27502750
{ SYS_DESC(SYS_PMMIR_EL1), trap_raz_wi },
27512751

27522752
{ SYS_DESC(SYS_MAIR_EL1), access_vm_reg, reset_unknown, MAIR_EL1 },
2753-
{ SYS_DESC(SYS_PIRE0_EL1), NULL, reset_unknown, PIRE0_EL1,
2754-
.visibility = s1pie_visibility },
2755-
{ SYS_DESC(SYS_PIR_EL1), NULL, reset_unknown, PIR_EL1,
2756-
.visibility = s1pie_visibility },
2753+
{ SYS_DESC(SYS_PIRE0_EL1), NULL, reset_unknown, PIRE0_EL1 },
2754+
{ SYS_DESC(SYS_PIR_EL1), NULL, reset_unknown, PIR_EL1 },
27572755
{ SYS_DESC(SYS_POR_EL1), NULL, reset_unknown, POR_EL1,
27582756
.visibility = s1poe_visibility },
27592757
{ SYS_DESC(SYS_AMAIR_EL1), access_vm_reg, reset_amair_el1, AMAIR_EL1 },

0 commit comments

Comments
 (0)