* [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall
@ 2021-03-01 15:36 Masahiro Yamada
2021-03-01 15:36 ` [PATCH 2/3] xtensa: syscalls: switch to generic syscalltbl.sh Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-03-01 15:36 UTC (permalink / raw)
To: Chris Zankel, Max Filippov, linux-xtensa; +Cc: linux-kernel, Masahiro Yamada
arch/xtensa/kernel/syscalls/syscalltbl.sh fills missing syscall numbers
with sys_ni_syscall.
So, the generated arch/xtensa/include/generated/asm/syscall_table.h
has no hole.
Hence, the line:
[0 ... __NR_syscalls - 1] = (syscall_t)&sys_ni_syscall,
is meaningless.
The number of generated __SYSCALL() macros is the same as __NR_syscalls
(this is 442 as of v5.11).
Hence, the array size, [__NR_syscalls] is unneeded.
The designated initializer, '[nr] =', is also unneeded.
This file does not need to know __NR_syscalls. Drop the unneeded
<asm/unistd.h> include directive.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/xtensa/kernel/syscall.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index 2c415fce6801..26fa09ce4d17 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -17,7 +17,6 @@
*/
#include <linux/uaccess.h>
#include <asm/syscall.h>
-#include <asm/unistd.h>
#include <linux/linkage.h>
#include <linux/stringify.h>
#include <linux/errno.h>
@@ -28,10 +27,8 @@
#include <linux/sched/mm.h>
#include <linux/shm.h>
-syscall_t sys_call_table[__NR_syscalls] /* FIXME __cacheline_aligned */= {
- [0 ... __NR_syscalls - 1] = (syscall_t)&sys_ni_syscall,
-
-#define __SYSCALL(nr, entry, nargs)[nr] = (syscall_t)entry,
+syscall_t sys_call_table[] /* FIXME __cacheline_aligned */= {
+#define __SYSCALL(nr, entry, nargs) (syscall_t)entry,
#include <asm/syscall_table.h>
#undef __SYSCALL
};
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] xtensa: syscalls: switch to generic syscalltbl.sh
2021-03-01 15:36 [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Masahiro Yamada
@ 2021-03-01 15:36 ` Masahiro Yamada
2021-03-01 15:36 ` [PATCH 3/3] xtensa: syscalls: switch to generic syscallhdr.sh Masahiro Yamada
2021-03-14 15:09 ` [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Max Filippov
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-03-01 15:36 UTC (permalink / raw)
To: Chris Zankel, Max Filippov, linux-xtensa
Cc: linux-kernel, Masahiro Yamada, Geert Uytterhoeven
Many architectures duplicate similar shell scripts.
This commit converts xtensa to use scripts/syscalltbl.sh.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/xtensa/kernel/syscall.c | 3 +--
arch/xtensa/kernel/syscalls/Makefile | 7 ++---
arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 -----------------------
3 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index 26fa09ce4d17..201356faa7e6 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -28,9 +28,8 @@
#include <linux/shm.h>
syscall_t sys_call_table[] /* FIXME __cacheline_aligned */= {
-#define __SYSCALL(nr, entry, nargs) (syscall_t)entry,
+#define __SYSCALL(nr, entry) (syscall_t)entry,
#include <asm/syscall_table.h>
-#undef __SYSCALL
};
#define COLOUR_ALIGN(addr, pgoff) \
diff --git a/arch/xtensa/kernel/syscalls/Makefile b/arch/xtensa/kernel/syscalls/Makefile
index 285aaba832d9..ad2492cb5568 100644
--- a/arch/xtensa/kernel/syscalls/Makefile
+++ b/arch/xtensa/kernel/syscalls/Makefile
@@ -7,7 +7,7 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \
syscall := $(src)/syscall.tbl
syshdr := $(srctree)/$(src)/syscallhdr.sh
-systbl := $(srctree)/$(src)/syscalltbl.sh
+systbl := $(srctree)/scripts/syscalltbl.sh
quiet_cmd_syshdr = SYSHDR $@
cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \
@@ -16,10 +16,7 @@ quiet_cmd_syshdr = SYSHDR $@
'$(syshdr_offset_$(basetarget))'
quiet_cmd_systbl = SYSTBL $@
- cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@' \
- '$(systbl_abis_$(basetarget))' \
- '$(systbl_abi_$(basetarget))' \
- '$(systbl_offset_$(basetarget))'
+ cmd_systbl = $(CONFIG_SHELL) $(systbl) $< $@
$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr)
diff --git a/arch/xtensa/kernel/syscalls/syscalltbl.sh b/arch/xtensa/kernel/syscalls/syscalltbl.sh
deleted file mode 100644
index 85d78d9309ad..000000000000
--- a/arch/xtensa/kernel/syscalls/syscalltbl.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-
-in="$1"
-out="$2"
-my_abis=`echo "($3)" | tr ',' '|'`
-my_abi="$4"
-offset="$5"
-
-emit() {
- t_nxt="$1"
- t_nr="$2"
- t_entry="$3"
-
- while [ $t_nxt -lt $t_nr ]; do
- printf "__SYSCALL(%s, sys_ni_syscall, )\n" "${t_nxt}"
- t_nxt=$((t_nxt+1))
- done
- printf "__SYSCALL(%s, %s, )\n" "${t_nxt}" "${t_entry}"
-}
-
-grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (
- nxt=0
- if [ -z "$offset" ]; then
- offset=0
- fi
-
- while read nr abi name entry ; do
- emit $((nxt+offset)) $((nr+offset)) $entry
- nxt=$((nr+1))
- done
-) > "$out"
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] xtensa: syscalls: switch to generic syscallhdr.sh
2021-03-01 15:36 [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Masahiro Yamada
2021-03-01 15:36 ` [PATCH 2/3] xtensa: syscalls: switch to generic syscalltbl.sh Masahiro Yamada
@ 2021-03-01 15:36 ` Masahiro Yamada
2021-03-14 15:09 ` [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Max Filippov
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2021-03-01 15:36 UTC (permalink / raw)
To: Chris Zankel, Max Filippov, linux-xtensa
Cc: linux-kernel, Masahiro Yamada, Andrew Morton, Geert Uytterhoeven,
Michal Simek, Stefan Asserhall
Many architectures duplicate similar shell scripts.
This commit converts xtensa to use scripts/syscallhdr.sh.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/xtensa/kernel/syscalls/Makefile | 7 ++---
arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 -----------------------
2 files changed, 2 insertions(+), 41 deletions(-)
delete mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh
diff --git a/arch/xtensa/kernel/syscalls/Makefile b/arch/xtensa/kernel/syscalls/Makefile
index ad2492cb5568..6713c65a25e1 100644
--- a/arch/xtensa/kernel/syscalls/Makefile
+++ b/arch/xtensa/kernel/syscalls/Makefile
@@ -6,14 +6,11 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \
$(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
syscall := $(src)/syscall.tbl
-syshdr := $(srctree)/$(src)/syscallhdr.sh
+syshdr := $(srctree)/scripts/syscallhdr.sh
systbl := $(srctree)/scripts/syscalltbl.sh
quiet_cmd_syshdr = SYSHDR $@
- cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \
- '$(syshdr_abis_$(basetarget))' \
- '$(syshdr_pfx_$(basetarget))' \
- '$(syshdr_offset_$(basetarget))'
+ cmd_syshdr = $(CONFIG_SHELL) $(syshdr) --emit-nr $< $@
quiet_cmd_systbl = SYSTBL $@
cmd_systbl = $(CONFIG_SHELL) $(systbl) $< $@
diff --git a/arch/xtensa/kernel/syscalls/syscallhdr.sh b/arch/xtensa/kernel/syscalls/syscallhdr.sh
deleted file mode 100644
index eebfb8a8ace6..000000000000
--- a/arch/xtensa/kernel/syscalls/syscallhdr.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-
-in="$1"
-out="$2"
-my_abis=`echo "($3)" | tr ',' '|'`
-prefix="$4"
-offset="$5"
-
-fileguard=_UAPI_ASM_XTENSA_`basename "$out" | sed \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
- -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`
-grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (
- printf "#ifndef %s\n" "${fileguard}"
- printf "#define %s\n" "${fileguard}"
- printf "\n"
-
- nxt=0
- while read nr abi name entry ; do
- if [ -z "$offset" ]; then
- printf "#define __NR_%s%s\t%s\n" \
- "${prefix}" "${name}" "${nr}"
- else
- printf "#define __NR_%s%s\t(%s + %s)\n" \
- "${prefix}" "${name}" "${offset}" "${nr}"
- fi
- nxt=$((nr+1))
- done
-
- printf "\n"
- printf "#ifdef __KERNEL__\n"
- printf "#define __NR_syscalls\t%s\n" "${nxt}"
- printf "#endif\n"
- printf "\n"
- printf "#endif /* %s */\n" "${fileguard}"
-) > "$out"
--
2.27.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall
2021-03-01 15:36 [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Masahiro Yamada
2021-03-01 15:36 ` [PATCH 2/3] xtensa: syscalls: switch to generic syscalltbl.sh Masahiro Yamada
2021-03-01 15:36 ` [PATCH 3/3] xtensa: syscalls: switch to generic syscallhdr.sh Masahiro Yamada
@ 2021-03-14 15:09 ` Max Filippov
2 siblings, 0 replies; 4+ messages in thread
From: Max Filippov @ 2021-03-14 15:09 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Chris Zankel, open list:TENSILICA XTENSA PORT (xtensa), LKML
On Mon, Mar 1, 2021 at 7:37 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> arch/xtensa/kernel/syscalls/syscalltbl.sh fills missing syscall numbers
> with sys_ni_syscall.
>
> So, the generated arch/xtensa/include/generated/asm/syscall_table.h
> has no hole.
>
> Hence, the line:
>
> [0 ... __NR_syscalls - 1] = (syscall_t)&sys_ni_syscall,
>
> is meaningless.
>
> The number of generated __SYSCALL() macros is the same as __NR_syscalls
> (this is 442 as of v5.11).
>
> Hence, the array size, [__NR_syscalls] is unneeded.
>
> The designated initializer, '[nr] =', is also unneeded.
>
> This file does not need to know __NR_syscalls. Drop the unneeded
> <asm/unistd.h> include directive.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> arch/xtensa/kernel/syscall.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
Thanks. I've applied the whole series to my xtensa tree.
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-14 15:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-01 15:36 [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Masahiro Yamada
2021-03-01 15:36 ` [PATCH 2/3] xtensa: syscalls: switch to generic syscalltbl.sh Masahiro Yamada
2021-03-01 15:36 ` [PATCH 3/3] xtensa: syscalls: switch to generic syscallhdr.sh Masahiro Yamada
2021-03-14 15:09 ` [PATCH 1/3] xtensa: stop filling syscall array with sys_ni_syscall Max Filippov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).