Commit 66e7f47c authored by Peter Zijlstra's avatar Peter Zijlstra Committed by sanglipeng1
Browse files

x86/text-patching: Make text_gen_insn() play nice with ANNOTATE_NOENDBR 

stable inclusion
from stable-v5.10.211
commit e752912ce18c5ec0f40c86541ef38805d6f47581
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF2J4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e752912ce18c5ec0f40c86541ef38805d6f47581



--------------------------------

Upstream commit: bbf92368

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20220308154317.638561109@infradead.org


Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 8a407c4e

arch/x86/include/asm/text-patching.h

+9 −1
Original line number Diff line number Diff line
@@ -101,13 +101,21 @@ void *text_gen_insn(u8 opcode, const void *addr, const void *dest) 
	static union text_poke_insn insn; /* per instance */

	int size = text_opcode_size(opcode);



	/*

	 * Hide the addresses to avoid the compiler folding in constants when

	 * referencing code, these can mess up annotations like

	 * ANNOTATE_NOENDBR.

	 */

	OPTIMIZER_HIDE_VAR(addr);

	OPTIMIZER_HIDE_VAR(dest);



	insn.opcode = opcode;



	if (size > 1) {

		insn.disp = (long)dest - (long)(addr + size);

		if (size == 2) {

			/*

			 * Ensure that for JMP9 the displacement

			 * Ensure that for JMP8 the displacement

			 * actually fits the signed byte.

			 */

			BUG_ON((insn.disp >> 31) != (insn.disp >> 7));