Commit 375d4bfd authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Thomas Gleixner
Browse files

perf/x86: Avoid TIF_IA32 when checking 64bit mode 



In preparation to remove TIF_IA32, stop using it in perf events code.

Tested by running perf on 32-bit, 64-bit and x32 applications.

Suggested-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20201004032536.1229030-2-krisman@collabora.com
parent 3650b228

arch/x86/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2602,7 +2602,7 @@ perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry_ctx *ent 
	struct stack_frame_ia32 frame;

	const struct stack_frame_ia32 __user *fp;



	if (!test_thread_flag(TIF_IA32))

	if (user_64bit_mode(regs))

		return 0;



	cs_base = get_segment_base(regs->cs);

arch/x86/events/intel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs) 
		old_to = to;



#ifdef CONFIG_X86_64

		is_64bit = kernel_ip(to) || !test_thread_flag(TIF_IA32);

		is_64bit = kernel_ip(to) || any_64bit_mode(regs);

#endif

		insn_init(&insn, kaddr, size, is_64bit);

		insn_get_length(&insn);

arch/x86/events/intel/lbr.c

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ static int branch_type(unsigned long from, unsigned long to, int abort) 
	 * on 64-bit systems running 32-bit apps

	 */

#ifdef CONFIG_X86_64

	is64 = kernel_ip((unsigned long)addr) || !test_thread_flag(TIF_IA32);

	is64 = kernel_ip((unsigned long)addr) || any_64bit_mode(current_pt_regs());

#endif

	insn_init(&insn, addr, bytes_read, is64);

	insn_get_opcode(&insn);

arch/x86/kernel/perf_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ int perf_reg_validate(u64 mask) 


u64 perf_reg_abi(struct task_struct *task)

{

	if (test_tsk_thread_flag(task, TIF_IA32))

	if (!user_64bit_mode(task_pt_regs(task)))

		return PERF_SAMPLE_REGS_ABI_32;

	else

		return PERF_SAMPLE_REGS_ABI_64;

CRA Git | Maintained and supported by SUSTech CRA and CCSE