Skip to contentSkip to conversation

s390: nmi: fix virtual-physical address confusion

PATCH In review Nico Boehr 2 participants 3 messages Feb 16, 2023

Subsystems (2)
lore
Share & tools
lore

Nico Boehr

author
#0 lore raw

v2 cover s390: nmi: fix virtual-physical address confusion

v2:
---
* remove unneeded cast (thanks Alexander)

When a machine check is received while in SIE, it is reinjected into the guest in some cases. The respective code needs to access the sie_block, which is taken from the backed up R14.

Since reinjection only occurs while we are in SIE (i.e. between the labels sie_entry and sie_leave in entry.S and thus if CIF_MCCK_GUEST is set), the backed up R14 will always contain a physical address in s390_backup_mcck_info.

This currently works, because virtual and physical addresses are the same.

Add phys_to_virt() to resolve the virtual-physical confusion.

Nico Boehr (1):
s390: nmi: fix virtual-physical address confusion

 arch/s390/kernel/nmi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Signature · 1 line
2.39.1
author
#1 lore raw

PATCH v2 1/1 s390: nmi: fix virtual-physical address confusion

When a machine check is received while in SIE, it is reinjected into the guest in some cases. The respective code needs to access the sie_block, which is taken from the backed up R14.

Since reinjection only occurs while we are in SIE (i.e. between the labels sie_entry and sie_leave in entry.S and thus if CIF_MCCK_GUEST is set), the backed up R14 will always contain a physical address in s390_backup_mcck_info.

This currently works, because virtual and physical addresses are the same.

Add phys_to_virt() to resolve the virtual-physical confusion.

---
 arch/s390/kernel/nmi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/s390/kernel/nmi.c +1 -2
index 5dbf274719a9..56d9c559afa1 100644
@@ -346,8 +346,7 @@ static void notrace s390_backup_mcck_info(struct pt_regs *regs)
 	struct sie_page *sie_page;
 
 	/* r14 contains the sie block, which was set in sie64a */
-	struct kvm_s390_sie_block *sie_block =
-			(struct kvm_s390_sie_block *) regs->gprs[14];
+	struct kvm_s390_sie_block *sie_block = phys_to_virt(regs->gprs[14]);
 
 	if (sie_block == NULL)
 		/* Something's seriously wrong, stop system. */
Signature · 1 line
2.39.1
Reviewed-by on v2 1/1
#2 lore raw
Quoted 9 lines · On Thu, 16 Feb 2023 13:12:08 +0100 Nico Boehr <[email protected]> wrote:

When a machine check is received while in SIE, it is reinjected into the guest in some cases. The respective code needs to access the sie_block, which is taken from the backed up R14.

Since reinjection only occurs while we are in SIE (i.e. between the labels sie_entry and sie_leave in entry.S and thus if CIF_MCCK_GUEST is set), the backed up R14 will always contain a physical address in s390_backup_mcck_info.

Quoted 6 lines

This currently works, because virtual and physical addresses are the same.

Add phys_to_virt() to resolve the virtual-physical confusion.

Quoted 18 lines
---
 arch/s390/kernel/nmi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/s390/kernel/nmi.c +1 -2
index 5dbf274719a9..56d9c559afa1 100644
@@ -346,8 +346,7 @@ static void notrace s390_backup_mcck_info(struct pt_regs *regs)
 	struct sie_page *sie_page;
 
 	/* r14 contains the sie block, which was set in sie64a */
-	struct kvm_s390_sie_block *sie_block =
-			(struct kvm_s390_sie_block *) regs->gprs[14];
+	struct kvm_s390_sie_block *sie_block = phys_to_virt(regs->gprs[14]);
 
 	if (sie_block == NULL)
 		/* Something's seriously wrong, stop system. */