Skip to content
  • Linus Torvalds's avatar
    Merge branch 'x86-seccomp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ba1a96fc
    Linus Torvalds authored
    Pull x86 seccomp changes from Ingo Molnar:
     "This tree includes x86 seccomp filter speedups and related preparatory
      work, which touches core seccomp facilities as well.
    
      The main idea is to split seccomp into two phases, to be able to enter
      a simple fast path for syscalls with ptrace side effects.
    
      There's no substantial user-visible (and ABI) effects expected from
      this, except a change in how we emit a better audit record for
      SECCOMP_RET_TRACE events"
    
    * 'x86-seccomp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86_64, entry: Use split-phase syscall_trace_enter for 64-bit syscalls
      x86_64, entry: Treat regs->ax the same in fastpath and slowpath syscalls
      x86: Split syscall_trace_enter into two phases
      x86, entry: Only call user_exit if TIF_NOHZ
      x86, x32, audit: Fix x32's AUDIT_ARCH wrt audit
      seccomp: Document two-phase seccomp and arch-provided seccomp_data
      seccomp: Allow arch code to provide seccomp_data
      seccomp: Refactor the filter callback and the API
      seccomp,x86,arm,mips,s390: Remove nr parameter from secure_computing
    ba1a96fc