| Message ID | 1389946399-4525-6-git-send-email-takahiro.akashi@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 17, 2014 at 08:13:18AM +0000, AKASHI Takahiro wrote: > generic compat sycall audit (lib/compat_audit.c) requires unistd_32.h > for __NR_xyx compat syscall numbers. This is a different file from unistd32.h > on arm64 and so it must be generated from unistd32.h. > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > --- > arch/arm64/Makefile | 4 ++++ > arch/arm64/kernel/syscalls/Makefile | 20 ++++++++++++++++++++ > 2 files changed, 24 insertions(+) > create mode 100644 arch/arm64/kernel/syscalls/Makefile > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > index 2fceb71..6d24f92 100644 > --- a/arch/arm64/Makefile > +++ b/arch/arm64/Makefile > @@ -72,6 +72,10 @@ PHONY += vdso_install > vdso_install: > $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ > > +# Compat syscall header generation > +archheaders: > + $(Q)$(MAKE) $(build)=arch/arm64/kernel/syscalls $@ See my other post to the lib/compat_audit.c file. I think that's too complex for what you need.
Catalin, On 01/23/2014 11:53 PM, Catalin Marinas wrote: > On Fri, Jan 17, 2014 at 08:13:18AM +0000, AKASHI Takahiro wrote: >> generic compat sycall audit (lib/compat_audit.c) requires unistd_32.h >> for __NR_xyx compat syscall numbers. This is a different file from unistd32.h >> on arm64 and so it must be generated from unistd32.h. >> >> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> >> --- >> arch/arm64/Makefile | 4 ++++ >> arch/arm64/kernel/syscalls/Makefile | 20 ++++++++++++++++++++ >> 2 files changed, 24 insertions(+) >> create mode 100644 arch/arm64/kernel/syscalls/Makefile >> >> diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile >> index 2fceb71..6d24f92 100644 >> --- a/arch/arm64/Makefile >> +++ b/arch/arm64/Makefile >> @@ -72,6 +72,10 @@ PHONY += vdso_install >> vdso_install: >> $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ >> >> +# Compat syscall header generation >> +archheaders: >> + $(Q)$(MAKE) $(build)=arch/arm64/kernel/syscalls $@ > > See my other post to the lib/compat_audit.c file. I think that's too > complex for what you need. Generation script is getting more complexed than I assumed at first because some of system call names are a bit inconsistent with native 32-bit system calls, for example, fchown16 vs. fchown, fchown vs. fchown32. Now my tentative sed script looks like: +quiet_cmd_syshdr = SYSHDR $@ + cmd_syshdr = cat $< | sed -r \ + -e 's/compat_//' \ + -e 's/_wrapper//' \ + -e 's/(sys_[fl]?chown)(\))/\132\)/' \ + -e 's/(sys_[gs]et)(|e|fs|re|res)(uid\))/\1\2uid32\)/' \ + -e 's/(sys_[gs]et)(|e|fs|re|res)(gid\))/\1\2gid32\)/' \ + -e 's/(sys_[gs]etgroups)(\))/\132\)/' \ + -e 's/(sys_new)(.*)/sys_\2/' \ + -e 's/sys_mmap_pgoff/sys_mmap2/' \ + -e 's/(sys_[_a-z]*)16(.*)/\1\2/' \ + -e 's/^__SYSCALL\((.*),[ ]*sys_([^)].*)\).*/\#define __NR_\2 \1/p;d' \ + | grep -v __NR_ni_syscall > $@ So, yeah, I agree with you now. -Takahiro AKASHI
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 2fceb71..6d24f92 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -72,6 +72,10 @@ PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ +# Compat syscall header generation +archheaders: + $(Q)$(MAKE) $(build)=arch/arm64/kernel/syscalls $@ + # We use MRPROPER_FILES and CLEAN_FILES now archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/arm64/kernel/syscalls/Makefile b/arch/arm64/kernel/syscalls/Makefile new file mode 100644 index 0000000..7661113 --- /dev/null +++ b/arch/arm64/kernel/syscalls/Makefile @@ -0,0 +1,20 @@ +out := $(obj)/../../include/generated/asm + +# Create output directory if not already present +_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') + +syshdr-$(CONFIG_COMPAT) += unistd_32.h + +targets += $(syshdr-y) + +quiet_cmd_syshdr = SYSHDR $@ + cmd_syshdr = cat $< | sed -r \ + -e 's/compat_//' \ + -e 's/_wrapper//' \ + -e 's/^__SYSCALL\((.*),[ ]*sys_([^)].*)\).*/\#define __NR_\2 \1/p;d' \ + | grep -v __NR_ni_syscall > $@ + +archheaders: $(addprefix $(out)/,$(syshdr-y)) + +$(out)/unistd_32.h: $(src)/../../include/asm/unistd32.h + $(call if_changed,syshdr)
generic compat sycall audit (lib/compat_audit.c) requires unistd_32.h for __NR_xyx compat syscall numbers. This is a different file from unistd32.h on arm64 and so it must be generated from unistd32.h. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- arch/arm64/Makefile | 4 ++++ arch/arm64/kernel/syscalls/Makefile | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 arch/arm64/kernel/syscalls/Makefile