From: Andy Lutomirski <luto@amacapital.net>
To: linux-kernel@vger.kernel.org, Kees Cook <keescook@chromium.org>,
Will Drewry <wad@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>,
x86@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mips@linux-mips.org, linux-arch@vger.kernel.org,
linux-security-module@vger.kernel.org,
Alexei Starovoitov <ast@plumgrid.com>,
hpa@zytor.com, Andy Lutomirski <luto@amacapital.net>
Subject: [PATCH v2 0/7] Two-phase seccomp and x86 tracing changes
Date: Fri, 18 Jul 2014 14:18:08 -0700 [thread overview]
Message-ID: <cover.1405717901.git.luto@amacapital.net> (raw)
This is both a cleanup and a speedup. It reduces overhead due to
installing a trivial seccomp filter by 87%. The speedup comes from
avoiding the full syscall tracing mechanism for filters that don't
return SECCOMP_RET_TRACE.
This series works by splitting the seccomp hooks into two phases.
The first phase evaluates the filter; it can skip syscalls, allow
them, kill the calling task, or pass a u32 to the second phase. The
second phase requires a full tracing context, and it sends ptrace
events if necessary.
Once this is done, I implemented a similar split for the x86 syscall
entry work. The C callback is invoked in two phases: the first has
only a partial frame, and it can request phase 2 processing with a
full frame.
Finally, I switch the 64-bit system_call code to use the new split
entry work. This is a net deletion of assembly code: it replaces
all of the audit entry muck.
In the process, I fixed some bugs.
If this is acceptable, someone can do the same tweak for the
ia32entry and entry_32 code.
This passes all seccomp tests that I know of. Now that it's properly
rebased, even the previously expected failures are gone.
Kees, if you like this version, can you create a branch with patches
1-3? I think that the rest should go into tip/x86 once everyone's happy
with it.
Changes from v1:
- Rebased on top of Kees' shiny new seccomp tree (no effect on the x86
part).
- Improved patch 6 vs patch 7 split (thanks Alexei!)
- Fixed bogus -ENOSYS in patch 5 (thanks Kees!)
- Improved changelog message in patch 6.
Changes from RFC version:
- The first three patches are more or less the same
- The rest is more or less a rewrite
Andy Lutomirski (7):
seccomp,x86,arm,mips,s390: Remove nr parameter from secure_computing
seccomp: Refactor the filter callback and the API
seccomp: Allow arch code to provide seccomp_data
x86,x32,audit: Fix x32's AUDIT_ARCH wrt audit
x86: Split syscall_trace_enter into two phases
x86_64,entry: Treat regs->ax the same in fastpath and slowpath
syscalls
x86_64,entry: Use split-phase syscall_trace_enter for 64-bit syscalls
arch/arm/kernel/ptrace.c | 7 +-
arch/mips/kernel/ptrace.c | 2 +-
arch/s390/kernel/ptrace.c | 2 +-
arch/x86/include/asm/calling.h | 6 +-
arch/x86/include/asm/ptrace.h | 5 +
arch/x86/kernel/entry_64.S | 51 ++++-----
arch/x86/kernel/ptrace.c | 146 +++++++++++++++++++-----
arch/x86/kernel/vsyscall_64.c | 2 +-
include/linux/seccomp.h | 25 ++--
kernel/seccomp.c | 252 ++++++++++++++++++++++++++++-------------
10 files changed, 344 insertions(+), 154 deletions(-)
--
1.9.3
next reply other threads:[~2014-07-18 21:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 21:18 Andy Lutomirski [this message]
2014-07-18 21:18 ` [PATCH v2 0/7] Two-phase seccomp and x86 tracing changes Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 1/7] seccomp,x86,arm,mips,s390: Remove nr parameter from secure_computing Andy Lutomirski
2014-07-18 21:18 ` Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 2/7] seccomp: Refactor the filter callback and the API Andy Lutomirski
2014-07-18 21:18 ` Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 3/7] seccomp: Allow arch code to provide seccomp_data Andy Lutomirski
2014-07-18 21:18 ` Andy Lutomirski
2014-07-18 22:16 ` Kees Cook
2014-07-18 22:16 ` Kees Cook
2014-07-18 22:26 ` Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 4/7] x86,x32,audit: Fix x32's AUDIT_ARCH wrt audit Andy Lutomirski
2014-07-18 21:18 ` Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 5/7] x86: Split syscall_trace_enter into two phases Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 6/7] x86_64,entry: Treat regs->ax the same in fastpath and slowpath syscalls Andy Lutomirski
2014-07-18 21:18 ` Andy Lutomirski
2014-07-18 21:18 ` [PATCH v2 7/7] x86_64,entry: Use split-phase syscall_trace_enter for 64-bit syscalls Andy Lutomirski
2014-07-18 22:32 ` [PATCH v2 8/7] seccomp: Document two-phase seccomp and arch-provided seccomp_data Andy Lutomirski
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=cover.1405717901.git.luto@amacapital.net \
--to=luto@amacapital.net \
--cc=ast@plumgrid.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-security-module@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=wad@chromium.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