Commit 00aa3193 authored by Juergen Gross's avatar Juergen Gross Committed by Borislav Petkov
Browse files

x86/paravirt: Add new PVOP_ALT* macros to support pvops in ALTERNATIVEs 



Instead of using paravirt patching for custom code sequences add
support for using ALTERNATIVE handling combined with paravirt call
patching.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210311142319.4723-13-jgross@suse.com
parent ae755b5a

arch/x86/include/asm/paravirt_types.h

+48 −1
Original line number Diff line number Diff line
@@ -477,44 +477,91 @@ int paravirt_disable_iospace(void); 
		ret;							\

	})



#define ____PVOP_ALT_CALL(ret, op, alt, cond, clbr, call_clbr,		\

			  extra_clbr, ...)				\

	({								\

		PVOP_CALL_ARGS;						\

		PVOP_TEST_NULL(op);					\

		asm volatile(ALTERNATIVE(paravirt_alt(PARAVIRT_CALL),	\

					 alt, cond)			\

			     : call_clbr, ASM_CALL_CONSTRAINT		\

			     : paravirt_type(op),			\

			       paravirt_clobber(clbr),			\

			       ##__VA_ARGS__				\

			     : "memory", "cc" extra_clbr);		\

		ret;							\

	})



#define __PVOP_CALL(rettype, op, ...)					\

	____PVOP_CALL(PVOP_RETVAL(rettype), op, CLBR_ANY,		\

		      PVOP_CALL_CLOBBERS, EXTRA_CLOBBERS, ##__VA_ARGS__)



#define __PVOP_ALT_CALL(rettype, op, alt, cond, ...)			\

	____PVOP_ALT_CALL(PVOP_RETVAL(rettype), op, alt, cond, CLBR_ANY,\

			  PVOP_CALL_CLOBBERS, EXTRA_CLOBBERS,		\

			  ##__VA_ARGS__)



#define __PVOP_CALLEESAVE(rettype, op, ...)				\

	____PVOP_CALL(PVOP_RETVAL(rettype), op.func, CLBR_RET_REG,	\

		      PVOP_CALLEE_CLOBBERS, , ##__VA_ARGS__)



#define __PVOP_ALT_CALLEESAVE(rettype, op, alt, cond, ...)		\

	____PVOP_ALT_CALL(PVOP_RETVAL(rettype), op.func, alt, cond,	\

			  CLBR_RET_REG, PVOP_CALLEE_CLOBBERS, , ##__VA_ARGS__)





#define __PVOP_VCALL(op, ...)						\

	(void)____PVOP_CALL(, op, CLBR_ANY, PVOP_VCALL_CLOBBERS,	\

		       VEXTRA_CLOBBERS, ##__VA_ARGS__)



#define __PVOP_ALT_VCALL(op, alt, cond, ...)				\

	(void)____PVOP_ALT_CALL(, op, alt, cond, CLBR_ANY,		\

				PVOP_VCALL_CLOBBERS, VEXTRA_CLOBBERS,	\

				##__VA_ARGS__)



#define __PVOP_VCALLEESAVE(op, ...)					\

	(void)____PVOP_CALL(, op.func, CLBR_RET_REG,			\

			    PVOP_VCALLEE_CLOBBERS, , ##__VA_ARGS__)



#define __PVOP_ALT_VCALLEESAVE(op, alt, cond, ...)			\

	(void)____PVOP_ALT_CALL(, op.func, alt, cond, CLBR_RET_REG,	\

				PVOP_VCALLEE_CLOBBERS, , ##__VA_ARGS__)





#define PVOP_CALL0(rettype, op)						\

	__PVOP_CALL(rettype, op)

#define PVOP_VCALL0(op)							\

	__PVOP_VCALL(op)

#define PVOP_ALT_CALL0(rettype, op, alt, cond)				\

	__PVOP_ALT_CALL(rettype, op, alt, cond)

#define PVOP_ALT_VCALL0(op, alt, cond)					\

	__PVOP_ALT_VCALL(op, alt, cond)



#define PVOP_CALLEE0(rettype, op)					\

	__PVOP_CALLEESAVE(rettype, op)

#define PVOP_VCALLEE0(op)						\

	__PVOP_VCALLEESAVE(op)

#define PVOP_ALT_CALLEE0(rettype, op, alt, cond)			\

	__PVOP_ALT_CALLEESAVE(rettype, op, alt, cond)

#define PVOP_ALT_VCALLEE0(op, alt, cond)				\

	__PVOP_ALT_VCALLEESAVE(op, alt, cond)





#define PVOP_CALL1(rettype, op, arg1)					\

	__PVOP_CALL(rettype, op, PVOP_CALL_ARG1(arg1))

#define PVOP_VCALL1(op, arg1)						\

	__PVOP_VCALL(op, PVOP_CALL_ARG1(arg1))

#define PVOP_ALT_VCALL1(op, arg1, alt, cond)				\

	__PVOP_ALT_VCALL(op, alt, cond, PVOP_CALL_ARG1(arg1))



#define PVOP_CALLEE1(rettype, op, arg1)					\

	__PVOP_CALLEESAVE(rettype, op, PVOP_CALL_ARG1(arg1))

#define PVOP_VCALLEE1(op, arg1)						\

	__PVOP_VCALLEESAVE(op, PVOP_CALL_ARG1(arg1))

#define PVOP_ALT_CALLEE1(rettype, op, arg1, alt, cond)			\

	__PVOP_ALT_CALLEESAVE(rettype, op, alt, cond, PVOP_CALL_ARG1(arg1))

#define PVOP_ALT_VCALLEE1(op, arg1, alt, cond)				\

	__PVOP_ALT_VCALLEESAVE(op, alt, cond, PVOP_CALL_ARG1(arg1))





#define PVOP_CALL2(rettype, op, arg1, arg2)				\