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:05:44 +0000 (16:05 +0200)
commit7e1e0235b3db32b190dc7b47434587075580caff
tree7e125894007a2c6bf22884199b5726814c21d813
parentc25be19aa95755daca6a09ea07d932007cdbf60a
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