| Message ID | 1416830039-21952-3-git-send-email-drysdale@google.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 24 Nov 2014, David Drysdale wrote: > Hook up x86-64, i386 and x32 ABIs. > > Signed-off-by: David Drysdale <drysdale@google.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Nov 24, 2014 at 11:53:56AM +0000, David Drysdale wrote: > Hook up x86-64, i386 and x32 ABIs. > > Signed-off-by: David Drysdale <drysdale@google.com> This one has been breaking my linux-next build for the past week. I'm not sure what's going on. I build with a script: make allmodconfig cat << EOF >> .config CONFIG_DYNAMIC_DEBUG=n CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=n CONFIG_DYNAMIC_DEBUG=y EOF make oldconfig Here are the errors: CHK include/generated/compile.h CHECK arch/x86/ia32/audit.c CC arch/x86/ia32/audit.o arch/x86/ia32/audit.c: In function ‘ia32_classify_syscall’: arch/x86/ia32/audit.c:38:7: error: ‘__NR_execveat’ undeclared (first use in this function) arch/x86/ia32/audit.c:38:7: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [arch/x86/ia32/audit.o] Error 1 make[2]: Target `__build' not remade because of errors. make[1]: *** [arch/x86/ia32] Error 2 CHECK arch/x86/kernel/audit_64.c CHK kernel/config_data.h CC arch/x86/kernel/audit_64.o arch/x86/kernel/audit_64.c: In function ‘audit_classify_syscall’: arch/x86/kernel/audit_64.c:53:7: error: ‘__NR_execveat’ undeclared (first use in this function) arch/x86/kernel/audit_64.c:53:7: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [arch/x86/kernel/audit_64.o] Error 1 make[2]: Target `__build' not remade because of errors. make[1]: *** [arch/x86/kernel] Error 2 make[1]: Target `__build' not remade because of errors. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Nov 24, 2014 at 5:06 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote: > On Mon, Nov 24, 2014 at 11:53:56AM +0000, David Drysdale wrote: >> Hook up x86-64, i386 and x32 ABIs. >> >> Signed-off-by: David Drysdale <drysdale@google.com> > > This one has been breaking my linux-next build for the past week. I'm > not sure what's going on. Hi Dan, Sorry if this has been causing you problems -- I've not had any errors from the kbuild robots or my local builds. > I build with a script: > > make allmodconfig > > cat << EOF >> .config > CONFIG_DYNAMIC_DEBUG=n > CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=n > CONFIG_DYNAMIC_DEBUG=y > EOF > > make oldconfig > > Here are the errors: > > CHK include/generated/compile.h > CHECK arch/x86/ia32/audit.c > CC arch/x86/ia32/audit.o > arch/x86/ia32/audit.c: In function ‘ia32_classify_syscall’: > arch/x86/ia32/audit.c:38:7: error: ‘__NR_execveat’ undeclared (first use in this function) > arch/x86/ia32/audit.c:38:7: note: each undeclared identifier is reported only once for each function it appears in > make[2]: *** [arch/x86/ia32/audit.o] Error 1 > make[2]: Target `__build' not remade because of errors. > make[1]: *** [arch/x86/ia32] Error 2 > CHECK arch/x86/kernel/audit_64.c > CHK kernel/config_data.h > CC arch/x86/kernel/audit_64.o > arch/x86/kernel/audit_64.c: In function ‘audit_classify_syscall’: > arch/x86/kernel/audit_64.c:53:7: error: ‘__NR_execveat’ undeclared (first use in this function) > arch/x86/kernel/audit_64.c:53:7: note: each undeclared identifier is reported only once for each function it appears in > make[2]: *** [arch/x86/kernel/audit_64.o] Error 1 > make[2]: Target `__build' not remade because of errors. > make[1]: *** [arch/x86/kernel] Error 2 > make[1]: Target `__build' not remade because of errors. That seems odd -- the generic definition of __NR_execveat is in the first patch in the series, and the various x86-specific definitions should get generated from the table entries in the second patch in the series (at least since the v9 set I sent on 19 Nov, which split out the x86 wiring from the general implementation). Are the syscall table generation steps happening in your build? And does __NR_execveat appear in the various generated x86 unistd*.h headers? As an aside, I've just built next-20141124 (a4cfa44aa26a) fine from scratch with your config steps. The build output included the header generation steps: SYSTBL arch/x86/syscalls/../include/generated/asm/syscalls_32.h SYSHDR arch/x86/syscalls/../include/generated/asm/unistd_32_ia32.h SYSHDR arch/x86/syscalls/../include/generated/asm/unistd_64_x32.h SYSTBL arch/x86/syscalls/../include/generated/asm/syscalls_64.h SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_32.h HOSTCC scripts/basic/bin2c SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_64.h SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_x32.h and the resulting files did include the __NR_execveat constant: % grep execveat usr/include/asm*/*.h arch/x86/include/generated/uapi/asm/*.h usr/include/asm-generic/unistd.h:#define __NR_execveat 281 usr/include/asm-generic/unistd.h:__SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat) usr/include/asm/unistd_32.h:#define __NR_execveat 358 usr/include/asm/unistd_64.h:#define __NR_execveat 322 usr/include/asm/unistd_x32.h:#define __NR_execveat (__X32_SYSCALL_BIT + 545) arch/x86/include/generated/uapi/asm/unistd_32.h:#define __NR_execveat 358 arch/x86/include/generated/uapi/asm/unistd_64.h:#define __NR_execveat 322 arch/x86/include/generated/uapi/asm/unistd_x32.h:#define __NR_execveat (__X32_SYSCALL_BIT + 545) So I can't (yet) reproduce your problem I'm afraid... > regards, > dan carpenter -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 24 Nov 2014, Dan Carpenter wrote: > On Mon, Nov 24, 2014 at 11:53:56AM +0000, David Drysdale wrote: > > Hook up x86-64, i386 and x32 ABIs. > > > > Signed-off-by: David Drysdale <drysdale@google.com> > > This one has been breaking my linux-next build for the past week. I'm > not sure what's going on. I build with a script: > > make allmodconfig > > cat << EOF >> .config > CONFIG_DYNAMIC_DEBUG=n > CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=n > CONFIG_DYNAMIC_DEBUG=y > EOF > > make oldconfig > > Here are the errors: > > CHK include/generated/compile.h > CHECK arch/x86/ia32/audit.c > CC arch/x86/ia32/audit.o > arch/x86/ia32/audit.c: In function ‘ia32_classify_syscall’: > arch/x86/ia32/audit.c:38:7: error: ‘__NR_execveat’ undeclared (first use in this function) > arch/x86/ia32/audit.c:38:7: note: each undeclared identifier is reported only once for each function it appears in > make[2]: *** [arch/x86/ia32/audit.o] Error 1 > make[2]: Target `__build' not remade because of errors. > make[1]: *** [arch/x86/ia32] Error 2 > CHECK arch/x86/kernel/audit_64.c > CHK kernel/config_data.h > CC arch/x86/kernel/audit_64.o > arch/x86/kernel/audit_64.c: In function ‘audit_classify_syscall’: > arch/x86/kernel/audit_64.c:53:7: error: ‘__NR_execveat’ undeclared (first use in this function) > arch/x86/kernel/audit_64.c:53:7: note: each undeclared identifier is reported only once for each function it appears in > make[2]: *** [arch/x86/kernel/audit_64.o] Error 1 > make[2]: Target `__build' not remade because of errors. > make[1]: *** [arch/x86/kernel] Error 2 > make[1]: Target `__build' not remade because of errors. I don't know what you're doing. Tried the above and it rebuilds the relevant unistd*.h files and compiles happily. Thanks, tglx
On Mon, Nov 24, 2014 at 06:26:24PM +0000, David Drysdale wrote: > On Mon, Nov 24, 2014 at 5:06 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > On Mon, Nov 24, 2014 at 11:53:56AM +0000, David Drysdale wrote: > >> Hook up x86-64, i386 and x32 ABIs. > >> > >> Signed-off-by: David Drysdale <drysdale@google.com> > > > > This one has been breaking my linux-next build for the past week. I'm > > not sure what's going on. > > Hi Dan, > > Sorry if this has been causing you problems -- I've not had any > errors from the kbuild robots or my local builds. > For some reason I had a stale copy of arch/x86/include/generated/asm/unistd_32.h and it was using that in preference to the arch/x86/include/generated/uapi/asm/unistd_32.h file. Once I did ran: arch/x86/include/generated/ -rf Then it builds now. I'm not sure what that's all about but it's fixed now. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c index 5d7b381da692..2eccc8932ae6 100644 --- a/arch/x86/ia32/audit.c +++ b/arch/x86/ia32/audit.c @@ -35,6 +35,7 @@ int ia32_classify_syscall(unsigned syscall) case __NR_socketcall: return 4; case __NR_execve: + case __NR_execveat: return 5; default: return 1; diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index ffe71228fc10..82e8a1d44658 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -480,6 +480,7 @@ GLOBAL(\label) PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn PTREGSCALL stub32_sigreturn, sys32_sigreturn PTREGSCALL stub32_execve, compat_sys_execve + PTREGSCALL stub32_execveat, compat_sys_execveat PTREGSCALL stub32_fork, sys_fork PTREGSCALL stub32_vfork, sys_vfork diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c index 06d3e5a14d9d..f3672508b249 100644 --- a/arch/x86/kernel/audit_64.c +++ b/arch/x86/kernel/audit_64.c @@ -50,6 +50,7 @@ int audit_classify_syscall(int abi, unsigned syscall) case __NR_openat: return 3; case __NR_execve: + case __NR_execveat: return 5; default: return 0; diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index df088bb03fb3..40d893c60fcc 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -652,6 +652,20 @@ ENTRY(stub_execve) CFI_ENDPROC END(stub_execve) +ENTRY(stub_execveat) + CFI_STARTPROC + addq $8, %rsp + PARTIAL_FRAME 0 + SAVE_REST + FIXUP_TOP_OF_STACK %r11 + call sys_execveat + RESTORE_TOP_OF_STACK %r11 + movq %rax,RAX(%rsp) + RESTORE_REST + jmp int_ret_from_sys_call + CFI_ENDPROC +END(stub_execveat) + /* * sigreturn is special because it needs to restore all registers on return. * This cannot be done with SYSRET, so use the IRET return path instead. @@ -697,6 +711,20 @@ ENTRY(stub_x32_execve) CFI_ENDPROC END(stub_x32_execve) +ENTRY(stub_x32_execveat) + CFI_STARTPROC + addq $8, %rsp + PARTIAL_FRAME 0 + SAVE_REST + FIXUP_TOP_OF_STACK %r11 + call compat_sys_execveat + RESTORE_TOP_OF_STACK %r11 + movq %rax,RAX(%rsp) + RESTORE_REST + jmp int_ret_from_sys_call + CFI_ENDPROC +END(stub_x32_execveat) + #endif /* diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl index 9fe1b5d002f0..b3560ece1c9f 100644 --- a/arch/x86/syscalls/syscall_32.tbl +++ b/arch/x86/syscalls/syscall_32.tbl @@ -364,3 +364,4 @@ 355 i386 getrandom sys_getrandom 356 i386 memfd_create sys_memfd_create 357 i386 bpf sys_bpf +358 i386 execveat sys_execveat stub32_execveat diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl index 281150b539a2..8d656fbb57aa 100644 --- a/arch/x86/syscalls/syscall_64.tbl +++ b/arch/x86/syscalls/syscall_64.tbl @@ -328,6 +328,7 @@ 319 common memfd_create sys_memfd_create 320 common kexec_file_load sys_kexec_file_load 321 common bpf sys_bpf +322 64 execveat stub_execveat # # x32-specific system call numbers start at 512 to avoid cache impact @@ -366,3 +367,4 @@ 542 x32 getsockopt compat_sys_getsockopt 543 x32 io_setup compat_sys_io_setup 544 x32 io_submit compat_sys_io_submit +545 x32 execveat stub_x32_execveat diff --git a/arch/x86/um/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c index f2f0723070ca..20c3649d0691 100644 --- a/arch/x86/um/sys_call_table_64.c +++ b/arch/x86/um/sys_call_table_64.c @@ -31,6 +31,7 @@ #define stub_fork sys_fork #define stub_vfork sys_vfork #define stub_execve sys_execve +#define stub_execveat sys_execveat #define stub_rt_sigreturn sys_rt_sigreturn #define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
Hook up x86-64, i386 and x32 ABIs. Signed-off-by: David Drysdale <drysdale@google.com> --- arch/x86/ia32/audit.c | 1 + arch/x86/ia32/ia32entry.S | 1 + arch/x86/kernel/audit_64.c | 1 + arch/x86/kernel/entry_64.S | 28 ++++++++++++++++++++++++++++ arch/x86/syscalls/syscall_32.tbl | 1 + arch/x86/syscalls/syscall_64.tbl | 2 ++ arch/x86/um/sys_call_table_64.c | 1 + 7 files changed, 35 insertions(+)