s390/mem_detect: fix diag260() program check new psw handling
authorHeiko Carstens <hca@linux.ibm.com>
Mon, 14 Jun 2021 19:40:43 +0000 (21:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:02:10 +0000 (16:02 +0200)
commitb65b280edecae90f06e45cd5eb6ba1bcfaff9b60
tree3855a3f1a231ace392f23dc87b94e906b94502e5
parent7ee9c5ccc48cdd3022e3d43d96fb2419e63820a3
s390/mem_detect: fix diag260() program check new psw handling

[ Upstream commit 86807f348f418a84970eebb8f9912a7eea16b497 ]

The __diag260() inline asm temporarily changes the program check new
psw to redirect a potential program check on the diag instruction.
Restoring of the program check new psw is done in C code behind the
inline asm.

This can be problematic, especially if the function is inlined, since
the compiler can reorder instructions in such a way that a different
instruction, which may result in a program check, might be executed
before the program check new psw has been restored.

To avoid such a scenario move restoring into the inline asm. For
consistency reasons move also saving of the original program check new
psw into the inline asm.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/s390/boot/mem_detect.c