x86/entry: Simplify _TIF_SYSCALL_EMU handling (b07d7d5c) · Commits · 戴 / test

The usage of emulated and _TIF_SYSCALL_EMU flags in syscall_trace_enter is more complicated than required. Cc: Andy Lutomirski <luto@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Acked-by:

Oleg Nesterov <oleg@redhat.com> Reviewed-by:

Thomas Gleixner <tglx@linutronix.de> Signed-off-by:

Sudeep Holla <sudeep.holla@arm.com> Signed-off-by:

Catalin Marinas <catalin.marinas@arm.com>

arch/x86/entry/common.c

+6 −11

Original line number	Diff line number	Diff line
		@@ -72,23 +72,18 @@ static long syscall_trace_enter(struct pt_regs *regs)

		struct thread_info *ti = current_thread_info();
		unsigned long ret = 0;
		bool emulated = false;
		u32 work;

		if (IS_ENABLED(CONFIG_DEBUG_ENTRY))
		BUG_ON(regs != task_pt_regs(current));

		work = READ_ONCE(ti->flags) & _TIF_WORK_SYSCALL_ENTRY;
		work = READ_ONCE(ti->flags);

		if (unlikely(work & _TIF_SYSCALL_EMU))
		emulated = true;

		if ((emulated \|\| (work & _TIF_SYSCALL_TRACE)) &&
		tracehook_report_syscall_entry(regs))
		return -1L;

		if (emulated)
		if (work & (_TIF_SYSCALL_TRACE \| _TIF_SYSCALL_EMU)) {
		ret = tracehook_report_syscall_entry(regs);
		if (ret \|\| (work & _TIF_SYSCALL_EMU))
		return -1L;
		}

		#ifdef CONFIG_SECCOMP
		/*

Admin message