public inbox for linux-arch@vger.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
	Andy Lutomirski <luto@kernel.org>, Will Deacon <will@kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>,
	kvm@vger.kernel.org, linux-arch@vger.kernel.org,
	Mike Rapoport <rppt@linux.ibm.com>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Miroslav Benes <mbenes@suse.cz>
Subject: [patch V2 12/17] entry: Provide generic syscall exit function
Date: Wed, 23 Oct 2019 14:27:17 +0200	[thread overview]
Message-ID: <20191023123118.778776715@linutronix.de> (raw)
In-Reply-To: 20191023122705.198339581@linutronix.de

From: Thomas Gleixner <tglx@linutronix.de>

Like syscall entry all architectures have similar and pointlessly different
code to handle pending work before returning from a syscall to user space.

Provide a generic version.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/entry-common.h |   31 ++++++++++++++++++++++++
 kernel/entry/common.c        |   55 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

--- a/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@ -46,6 +46,17 @@
 	 _TIF_SYSCALL_TRACEPOINT | _TIF_SYSCALL_EMU |			\
 	 ARCH_SYSCALL_ENTER_WORK)
 
+/*
+ * TIF flags handled in syscall_exit_to_usermode()
+ */
+#ifndef ARCH_SYSCALL_EXIT_WORK
+# define ARCH_SYSCALL_EXIT_WORK		(0)
+#endif
+
+#define SYSCALL_EXIT_WORK						\
+	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT |			\
+	 _TIF_SYSCALL_TRACEPOINT | ARCH_SYSCALL_EXIT_WORK)
+
 /**
  * arch_syscall_enter_tracehook - Wrapper around tracehook_report_syscall_entry()
  * @regs:	Pointer to currents pt_regs
@@ -129,4 +140,24 @@ static inline long syscall_enter_from_us
 	return syscall;
 }
 
+/**
+ * arch_syscall_exit_tracehook - Wrapper around tracehook_report_syscall_exit()
+ *
+ * Defaults to tracehook_report_syscall_exit(). Can be replaced by
+ * architecture specific code.
+ *
+ * Invoked from syscall_exit_to_usermode()
+ */
+static inline void arch_syscall_exit_tracehook(struct pt_regs *regs, bool step);
+
+#ifndef arch_syscall_exit_tracehook
+static inline void arch_syscall_exit_tracehook(struct pt_regs *regs, bool step)
+{
+	tracehook_report_syscall_exit(regs, step);
+}
+#endif
+
+/* Common syscall exit function */
+void syscall_exit_to_usermode(struct pt_regs *regs, long syscall, long retval);
+
 #endif
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -31,3 +31,58 @@ long core_syscall_enter_from_usermode(st
 
 	return ret ? : syscall;
 }
+
+#ifndef _TIF_SINGLESTEP
+static inline bool report_single_step(unsigned long ti_work)
+{
+	return false;
+}
+#else
+/*
+ * If TIF_SYSCALL_EMU is set, then the only reason to report is when
+ * TIF_SINGLESTEP is set (i.e. PTRACE_SYSEMU_SINGLESTEP).  This syscall
+ * instruction has been already reported in syscall_enter_from_usermode().
+ */
+#define SYSEMU_STEP	(_TIF_SINGLESTEP | _TIF_SYSCALL_EMU)
+
+static inline bool report_single_step(unsigned long ti_work)
+{
+	return (ti_work & SYSEMU_STEP) == _TIF_SINGLESTEP;
+}
+#endif
+
+static void syscall_exit_work(struct pt_regs *regs, long retval,
+			      unsigned long ti_work)
+{
+	bool step;
+
+	audit_syscall_exit(regs);
+
+	if (ti_work & _TIF_SYSCALL_TRACEPOINT)
+		trace_sys_exit(regs, retval);
+
+	step = report_single_step(ti_work);
+	if (step || ti_work & _TIF_SYSCALL_TRACE)
+		arch_syscall_exit_tracehook(regs, step);
+}
+
+void syscall_exit_to_usermode(struct pt_regs *regs, long syscall, long retval)
+{
+	unsigned long ti_work;
+
+	CT_WARN_ON(ct_state() != CONTEXT_KERNEL);
+
+	if (IS_ENABLED(CONFIG_PROVE_LOCKING) &&
+	    WARN(irqs_disabled(), "syscall %ld left IRQs disabled", syscall))
+		local_irq_enable();
+
+	rseq_syscall(regs);
+
+	/*
+	 * Handle work which needs to run exactly once per syscall exit
+	 * with interrupts enabled.
+	 */
+	ti_work = READ_ONCE(current_thread_info()->flags);
+	if (unlikely(ti_work & SYSCALL_EXIT_WORK))
+		syscall_exit_work(regs, retval, ti_work);
+}

  parent reply	other threads:[~2019-10-23 12:27 UTC|newest]

Thread overview: 122+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-23 12:27 [patch V2 00/17] entry: Provide generic implementation for host and guest entry/exit work Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 01/17] x86/entry/32: Remove unused resume_userspace label Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 13:43   ` Sean Christopherson
2019-10-23 13:43     ` Sean Christopherson
2019-11-06 15:26   ` Alexandre Chartre
2019-11-06 15:26     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 02/17] x86/entry/64: Remove pointless jump in paranoid_exit Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 13:45   ` Sean Christopherson
2019-10-23 13:45     ` Sean Christopherson
2019-11-06 15:29   ` Alexandre Chartre
2019-11-06 15:29     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 03/17] x86/traps: Remove pointless irq enable from do_spurious_interrupt_bug() Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 13:52   ` Sean Christopherson
2019-10-23 13:52     ` Sean Christopherson
2019-10-23 21:31   ` Josh Poimboeuf
2019-10-23 21:31     ` Josh Poimboeuf
2019-10-23 22:35     ` Thomas Gleixner
2019-10-23 22:35       ` Thomas Gleixner
2019-10-23 22:49       ` Josh Poimboeuf
2019-10-23 22:49         ` Josh Poimboeuf
2019-10-23 23:18         ` Thomas Gleixner
2019-10-23 23:18           ` Thomas Gleixner
2019-11-06 15:33   ` Alexandre Chartre
2019-11-06 15:33     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 04/17] x86/entry: Make DEBUG_ENTRY_ASSERT_IRQS_OFF available for 32bit Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 14:16   ` Sean Christopherson
2019-10-23 14:16     ` Sean Christopherson
2019-11-06 15:50   ` Alexandre Chartre
2019-11-06 15:50     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 05/17] x86/traps: Make interrupt enable/disable symmetric in C code Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 14:16   ` Sean Christopherson
2019-10-23 14:16     ` Sean Christopherson
2019-10-23 22:01   ` Josh Poimboeuf
2019-10-23 22:01     ` Josh Poimboeuf
2019-10-23 23:23     ` Thomas Gleixner
2019-10-23 23:23       ` Thomas Gleixner
2019-11-06 16:19   ` Alexandre Chartre
2019-11-06 16:19     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 06/17] x86/entry/32: Remove redundant interrupt disable Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 14:17   ` Sean Christopherson
2019-10-23 14:17     ` Sean Christopherson
2019-11-08 10:41   ` Alexandre Chartre
2019-11-08 10:41     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 07/17] x86/entry/64: " Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 14:20   ` Sean Christopherson
2019-10-23 14:20     ` Sean Christopherson
2019-10-23 22:06   ` Josh Poimboeuf
2019-10-23 22:06     ` Josh Poimboeuf
2019-10-23 23:52     ` Thomas Gleixner
2019-10-23 23:52       ` Thomas Gleixner
2019-10-24 16:18       ` Andy Lutomirski
2019-10-24 16:18         ` Andy Lutomirski
2019-10-24 20:52         ` Thomas Gleixner
2019-10-24 20:52           ` Thomas Gleixner
2019-10-24 20:59           ` Thomas Gleixner
2019-10-24 20:59             ` Thomas Gleixner
2019-10-24 21:21           ` Peter Zijlstra
2019-10-24 21:21             ` Peter Zijlstra
2019-10-24 21:24           ` Andy Lutomirski
2019-10-24 21:24             ` Andy Lutomirski
2019-10-24 22:33             ` Thomas Gleixner
2019-10-24 22:33               ` Thomas Gleixner
2019-11-08 11:07   ` Alexandre Chartre
2019-11-08 11:07     ` Alexandre Chartre
2019-10-23 12:27 ` [patch V2 08/17] x86/entry: Move syscall irq tracing to C code Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 21:30   ` Andy Lutomirski
2019-10-23 21:30     ` Andy Lutomirski
2019-10-23 21:35     ` Andy Lutomirski
2019-10-23 21:35       ` Andy Lutomirski
2019-10-23 23:31       ` Thomas Gleixner
2019-10-23 23:31         ` Thomas Gleixner
2019-10-23 23:16     ` Thomas Gleixner
2019-10-23 23:16       ` Thomas Gleixner
2019-10-24 16:24     ` Andy Lutomirski
2019-10-24 16:24       ` Andy Lutomirski
2019-10-24 17:40       ` Peter Zijlstra
2019-10-24 17:40         ` Peter Zijlstra
2019-10-24 20:54         ` Thomas Gleixner
2019-10-24 20:54           ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 09/17] x86/entry: Remove _TIF_NOHZ from _TIF_WORK_SYSCALL_ENTRY Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2020-01-06  4:11   ` Frederic Weisbecker
2020-01-06  4:11     ` Frederic Weisbecker
2019-10-23 12:27 ` [patch V2 10/17] entry: Provide generic syscall entry functionality Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 11/17] x86/entry: Use generic syscall entry function Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 12:27 ` Thomas Gleixner [this message]
2019-10-23 12:27   ` [patch V2 12/17] entry: Provide generic syscall exit function Thomas Gleixner
2019-10-23 12:27 ` [patch V2 13/17] x86/entry: Use generic syscall exit functionality Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 14/17] entry: Provide generic exit to usermode functionality Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 21:34   ` Andy Lutomirski
2019-10-23 21:34     ` Andy Lutomirski
2019-10-23 23:20     ` Thomas Gleixner
2019-10-23 23:20       ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 15/17] x86/entry: Use generic exit to usermode Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 12:27 ` [patch V2 16/17] kvm/workpending: Provide infrastructure for work before entering a guest Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 14:55   ` Sean Christopherson
2019-10-23 14:55     ` Sean Christopherson
2019-10-23 12:27 ` [patch V2 17/17] x86/kvm: Use generic exit to guest work function Thomas Gleixner
2019-10-23 12:27   ` Thomas Gleixner
2019-10-23 14:48   ` Sean Christopherson
2019-10-23 14:48     ` Sean Christopherson
2019-10-23 14:37 ` [patch V2 00/17] entry: Provide generic implementation for host and guest entry/exit work Peter Zijlstra
2019-10-23 14:37   ` Peter Zijlstra
2019-10-23 21:20 ` Josh Poimboeuf
2019-10-23 21:20   ` Josh Poimboeuf
2019-10-29 11:28 ` Will Deacon
2019-10-29 11:28   ` Will Deacon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191023123118.778776715@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=jpoimboe@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mbenes@suse.cz \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rppt@linux.ibm.com \
    --cc=will@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox