From: Andrei Vagin <avagin@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Andrei Vagin <avagin@google.com>,
Sean Christopherson <seanjc@google.com>,
Wanpeng Li <wanpengli@tencent.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Jianfeng Tan <henry.tjf@antfin.com>,
Adin Scannell <ascannell@google.com>,
Konstantin Bogomolov <bogomolov@google.com>,
Etienne Perot <eperot@google.com>
Subject: [PATCH 1/5] kernel: add a new helper to execute system calls from kernel code
Date: Fri, 22 Jul 2022 16:02:37 -0700 [thread overview]
Message-ID: <20220722230241.1944655-2-avagin@google.com> (raw)
In-Reply-To: <20220722230241.1944655-1-avagin@google.com>
This helper will be used to implement a kvm hypercall to call host
system calls.
The new helper executes seccomp rules and calls trace_sys_{enter,exit}
hooks. But it intentionally doesn't call ptrace hooks because calling
syscalls are not linked with the current process state.
Signed-off-by: Andrei Vagin <avagin@google.com>
---
arch/x86/entry/common.c | 50 ++++++++++++++++++++++++++++++++++
arch/x86/include/asm/syscall.h | 1 +
2 files changed, 51 insertions(+)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 6c2826417b33..7f4c172a9a4e 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -19,6 +19,7 @@
#include <linux/nospec.h>
#include <linux/syscalls.h>
#include <linux/uaccess.h>
+#include <trace/events/syscalls.h>
#ifdef CONFIG_XEN_PV
#include <xen/xen-ops.h>
@@ -37,6 +38,55 @@
#ifdef CONFIG_X86_64
+/*
+ * do_ksyscall_64 executes a system call. This helper can be used from the
+ * kernel code.
+ */
+bool do_ksyscall_64(int nr, struct pt_regs *regs)
+{
+ struct task_struct *task = current;
+ unsigned long work = READ_ONCE(current_thread_info()->syscall_work);
+ /*
+ * Convert negative numbers to very high and thus out of range
+ * numbers for comparisons.
+ */
+ unsigned int unr = nr;
+
+#ifdef CONFIG_IA32_EMULATION
+ if (task->thread_info.status & TS_COMPAT)
+ return false;
+#endif
+
+ if (work & SYSCALL_WORK_SECCOMP) {
+ struct seccomp_data sd;
+ unsigned long args[6];
+
+ sd.nr = nr;
+ sd.arch = AUDIT_ARCH_X86_64;
+ syscall_get_arguments(task, regs, args);
+ sd.args[0] = args[0];
+ sd.args[1] = args[1];
+ sd.args[2] = args[2];
+ sd.args[3] = args[3];
+ sd.args[4] = args[4];
+ sd.args[5] = args[5];
+ sd.instruction_pointer = regs->ip;
+ if (__secure_computing(&sd) == -1)
+ return false;
+ }
+
+ if (likely(unr >= NR_syscalls))
+ return false;
+
+ unr = array_index_nospec(unr, NR_syscalls);
+
+ trace_sys_enter(regs, unr);
+ regs->ax = sys_call_table[unr](regs);
+ trace_sys_exit(regs, syscall_get_return_value(task, regs));
+ return true;
+}
+EXPORT_SYMBOL_GPL(do_ksyscall_64);
+
static __always_inline bool do_syscall_x64(struct pt_regs *regs, int nr)
{
/*
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 5b85987a5e97..6cde1ddeb50b 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -126,6 +126,7 @@ static inline int syscall_get_arch(struct task_struct *task)
? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64;
}
+bool do_ksyscall_64(int nr, struct pt_regs *regs);
void do_syscall_64(struct pt_regs *regs, int nr);
void do_int80_syscall_32(struct pt_regs *regs);
long do_fast_syscall_32(struct pt_regs *regs);
--
2.37.1.359.gd136c6c3e2-goog
next prev parent reply other threads:[~2022-07-22 23:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-22 23:02 [PATCH 0/5] KVM/x86: add a new hypercall to execute host system Andrei Vagin
2022-07-22 23:02 ` Andrei Vagin [this message]
2022-07-22 23:02 ` [PATCH 2/5] kvm/x86: add controls to enable/disable paravirtualized system calls Andrei Vagin
2022-07-22 23:02 ` [PATCH 3/5] KVM/x86: add a new hypercall to execute host " Andrei Vagin
2022-07-22 23:02 ` [PATCH 4/5] selftests/kvm/x86_64: set rax before vmcall Andrei Vagin
2022-08-01 11:32 ` Vitaly Kuznetsov
2022-08-01 12:43 ` Paolo Bonzini
2022-07-22 23:02 ` [PATCH 5/5] selftests/kvm/x86_64: add tests for KVM_HC_HOST_SYSCALL Andrei Vagin
2022-07-22 23:41 ` [PATCH 0/5] KVM/x86: add a new hypercall to execute host system Sean Christopherson
2022-07-26 8:33 ` Andrei Vagin
2022-07-26 10:27 ` Paolo Bonzini
2022-07-27 6:44 ` Andrei Vagin
2022-07-26 15:10 ` Sean Christopherson
2022-07-26 22:10 ` Thomas Gleixner
2022-07-27 1:03 ` Andrei Vagin
2022-08-22 20:26 ` Andrei Vagin
2022-07-27 0:25 ` Andrei Vagin
2022-07-26 21:27 ` Thomas Gleixner
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=20220722230241.1944655-2-avagin@google.com \
--to=avagin@google.com \
--cc=ascannell@google.com \
--cc=bogomolov@google.com \
--cc=eperot@google.com \
--cc=henry.tjf@antfin.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/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