Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1b8d43 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

BACKPORT: arm64: sysreg: Make mrs_s and msr_s macros work with Clang and LTO 

Clang's integrated assembler does not allow assembly macros defined
in one inline asm block using the .macro directive to be used across
separate asm blocks. LLVM developers consider this a feature and not a
bug, recommending code refactoring:

  https://bugs.llvm.org/show_bug.cgi?id=19749



As binutils doesn't allow macros to be redefined, this change uses
UNDEFINE_MRS_S and UNDEFINE_MSR_S to define corresponding macros
in-place and workaround gcc and clang limitations on redefining macros
across different assembler blocks.

Specifically, the current state after preprocessing looks like this:

asm volatile(".macro mXX_s ... .endm");
void f()
{
	asm volatile("mXX_s a, b");
}

With GCC, it gives macro redefinition error because sysreg.h is included
in multiple source files, and assembler code for all of them is later
combined for LTO (I've seen an intermediate file with hundreds of
identical definitions).

With clang, it gives macro undefined error because clang doesn't allow
sharing macros between inline asm statements.

I also seem to remember catching another sort of undefined error with
GCC due to reordering of macro definition asm statement and generated
asm code for function that uses the macro.

The solution with defining and undefining for each use, while certainly
not elegant, satisfies both GCC and clang, LTO and non-LTO.

Co-developed-by: default avatarAlex Matveev <alxmtvv@gmail.com>
Co-developed-by: default avatarYury Norov <ynorov@caviumnetworks.com>
Co-developed-by: default avatarSami Tolvanen <samitolvanen@google.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
(cherry picked from commit be604c616ca71cbf5c860d0cfa4595128ab74189)
Change-Id: I803fff57f639b0921ef81f90ec4befe802e7eecf
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 76a7d7cf

arch/arm64/include/asm/kvm_hyp.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
	({								\

		u64 reg;						\

		asm volatile(ALTERNATIVE("mrs %0, " __stringify(r##nvh),\

					 "mrs_s %0, " __stringify(r##vh),\

					 __mrs_s("%0", r##vh),		\

					 ARM64_HAS_VIRT_HOST_EXTN)	\

			     : "=r" (reg));				\

		reg;							\
@@ -38,7 +38,7 @@ 
	do {								\

		u64 __val = (u64)(v);					\

		asm volatile(ALTERNATIVE("msr " __stringify(r##nvh) ", %x0",\

					 "msr_s " __stringify(r##vh) ", %x0",\

					 __msr_s(r##vh, "%x0"),		\

					 ARM64_HAS_VIRT_HOST_EXTN)	\

					 : : "rZ" (__val));		\

	} while (0)

arch/arm64/include/asm/sysreg.h

+32 −13
Original line number Diff line number Diff line
@@ -684,20 +684,39 @@ 
#include <linux/build_bug.h>

#include <linux/types.h>



asm(

"	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n"

"	.equ	.L__reg_num_x\\num, \\num\n"

"	.endr\n"

#define __DEFINE_MRS_MSR_S_REGNUM				\

"	.irp	num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" \

"	.equ	.L__reg_num_x\\num, \\num\n"			\

"	.endr\n"						\

"	.equ	.L__reg_num_xzr, 31\n"

"\n"

"	.macro	mrs_s, rt, sreg\n"

	__emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt))



#define DEFINE_MRS_S						\

	__DEFINE_MRS_MSR_S_REGNUM				\

"	.macro	mrs_s, rt, sreg\n"				\

	__emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt))	\

"	.endm\n"

"\n"

"	.macro	msr_s, sreg, rt\n"

	__emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt))



#define DEFINE_MSR_S						\

	__DEFINE_MRS_MSR_S_REGNUM				\

"	.macro	msr_s, sreg, rt\n"				\

	__emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt))	\

"	.endm\n"

);



#define UNDEFINE_MRS_S						\

"	.purgem	mrs_s\n"



#define UNDEFINE_MSR_S						\

"	.purgem	msr_s\n"



#define __mrs_s(v, r)						\

	DEFINE_MRS_S						\

"	mrs_s " v ", " __stringify(r) "\n"			\

	UNDEFINE_MRS_S



#define __msr_s(r, v)						\

	DEFINE_MSR_S						\

"	msr_s " __stringify(r) ", " v "\n"			\

	UNDEFINE_MSR_S



/*

 * Unlike read_cpuid, calls to read_sysreg are never expected to be
@@ -725,13 +744,13 @@ asm( 
 */

#define read_sysreg_s(r) ({						\

	u64 __val;							\

	asm volatile("mrs_s %0, " __stringify(r) : "=r" (__val));	\

	asm volatile(__mrs_s("%0", r) : "=r" (__val));			\

	__val;								\

})



#define write_sysreg_s(v, r) do {					\

	u64 __val = (u64)(v);						\

	asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val));	\

	asm volatile(__msr_s(r, "%x0") : : "rZ" (__val));		\

} while (0)



/*