xen/arm64: Place a speculation barrier following an ret instruction

Some CPUs can speculate past a RET instruction and potentially perform
speculative accesses to memory before processing the return.

There is no known gadget available after the RET instruction today.
However some of the registers (such as in check_pending_guest_serror())
may contain a value provided by the guest.

In order to harden the code, it would be better to add a speculation
barrier after each RET instruction. The performance impact is meant to
be negligeable as the speculation barrier is not meant to be
architecturally executed.

Rather than manually inserting a speculation barrier, use a macro
which overrides the mnemonic RET and replace with RET + SB. We need to
use the opcode for RET to prevent any macro recursion.

This patch is only covering the assembly code. C code would need to be
covered separately using the compiler support.

Note that the definition of the macros sb needs to be moved earlier in
asm-arm/macros.h so it can be used by the new macro.

This is part of the work to mitigate straight-line speculation.

Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
Julien Grall committed 2021-04-20 13:17:34 +01:00
1 parent 730d0f6082
commit bcab2ac849
2 files changed
+15 -9

No files matched your search

+6
View File
@@ -21,6 +21,12 @@
ldr \dst, [\dst, \tmp]
.endm
.macro ret
/* ret opcode */
.inst 0xd65f03c0
sb
.endm
/*
* Register aliases.
*/
+9 -9
View File
@@ -5,6 +5,15 @@
# error "This file should only be included in assembly file"
#endif
/*
* Speculative barrier
* XXX: Add support for the 'sb' instruction
*/
.macro sb
dsb nsh
isb
.endm
#if defined (CONFIG_ARM_32)
# include <asm/arm32/macros.h>
#elif defined(CONFIG_ARM_64)
@@ -20,13 +29,4 @@
.endr
.endm
/*
* Speculative barrier
* XXX: Add support for the 'sb' instruction
*/
.macro sb
dsb nsh
isb
.endm
#endif /* __ASM_ARM_MACROS_H */
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.