Fixes for the generic entry/exit framework
cover Fixes for the generic entry/exit framework
This fixes a !CONFIG_SECCOMP build bug found during CI testing, plus adds a couple of 'noinstr' attribute ordering corrections similar to 7f6fa101dfac and previous commits.
I resolved the CONFIG_SECCOMP problem by also making GENERIC_ENTRY depend on HAVE_ARCH_SECCOMP_FILTER. This dependency was implicit in the new code by virtue of x86 being a modern seccomp-filter architecture.
The patch makes this explicit. I think it's reasonable to assume any architecture that wants to make use of the generic code to have modern seccomp framework. If they don't they'd have to port it to the old secure_computing_strict() API anyway.
It's on top of the latest tip:x86/entry.
Thanks,
Ingo
Ingo Molnar (2):
entry: Fix CONFIG_SECCOMP assumption
entry: Correct 'noinstr' attributes
arch/Kconfig | 6 ++++-- kernel/entry/common.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 entry: Fix CONFIG_SECCOMP assumption
The __secure_computing() callback only exists on CONFIG_SECCOMP=y, and on architectures that have CONFIG_HAVE_ARCH_SECCOMP_FILTER.
Instead of complicating the #ifdef within the generic entry code, make the generic entry code depend on the availability of a modern seccomp framework. This was implicit in the generic code due to x86 being a modern seccomp-filter architecture.
Also move the Kconfig entry to after its HAVE_ARCH_SECCOMP_FILTER dependency and fix minor whitespace damage while at it.
--- arch/Kconfig | 6 ++++-- kernel/entry/common.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)
arch/Kconfig +4 -2
@@ -27,8 +27,6 @@ config HAVE_IMA_KEXEC config HOTPLUG_SMT bool -config GENERIC_ENTRY - bool config OPROFILE tristate "OProfile system profiling"
@@ -654,6 +652,10 @@ config HAVE_IRQ_EXIT_ON_IRQ_STACK This spares a stack switch and improves cache usage on softirq processing. +config GENERIC_ENTRY + bool + depends on HAVE_ARCH_SECCOMP_FILTER + config PGTABLE_LEVELS int default 2
kernel/entry/common.c +2 -0
@@ -53,12 +53,14 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall,return -1L ; } +#ifdef CONFIG_SECCOMP /* Do seccomp after ptrace, to catch any tracer changes. */ if (ti_work & _TIF_SECCOMP) { ret =__secure_computing (NULL );if (ret ==-1L )return ret; } +#endif if (unlikely (ti_work & _TIF_SYSCALL_TRACEPOINT))trace_sys_enter (regs, syscall);
Signature · 1 line
2.25.1
PATCH 2/2 entry: Correct 'noinstr' attributes
In reply to Ingo MolnarThe noinstr attribute is to be specified before the return type in the same way 'inline' is used.
Similar cases were recently fixed for x86, via:
7f6fa101dfac: ("x86: Correct noinstr qualifiers")
These 2 cases were carried over by the new generic entry code.
--- kernel/entry/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/entry/common.c +2 -2
@@ -258,7 +258,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs)exit_to_user_mode (); } -irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs) +noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) {irqentry_state_t ret = { .exit_rcu = false,
@@ -335,7 +335,7 @@ void irqentry_exit_cond_resched(void) } } -void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state) +noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state) {lockdep_assert_irqs_disabled ();
Signature · 1 line
2.25.1
Re: [PATCH 1/2] entry: Fix CONFIG_SECCOMP assumption
In reply to Ingo MolnarQuoted 1 line · Ingo Molnar
The
__secure_computing()callback only exists onCONFIG_SECCOMP=y,
No. There is a stub function for the SECCOMP=n case.
Quoted 1 line
and on architectures that have
CONFIG_HAVE_ARCH_SECCOMP_FILTER.
which is a prerequiste for converting over.
Quoted 1 line
Instead of complicating the #ifdef within the generic entry code,
There is no #ifdef in the generic code and there is none required.
Quoted 9 lines
make the generic entry code depend on the availability of a modern seccomp framework. This was implicit in the generic code due to x86 being a modern seccomp-filter architecture.
Also move the
Kconfigentry to after itsHAVE_ARCH_SECCOMP_FILTERdependency and fix minor whitespace damage while at it.Fixes 142781e108b1: ("entry: Provide generic syscall entryfunctionality")
I don't see what that fixes.
Quoted 20 lines
Signed-off-by Ingo Molnar <[email protected]>--- arch/Kconfig | 6 ++++-- kernel/entry/common.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)arch/Kconfig +0
-2@@ -27,8 +27,6 @@ config HAVE_IMA_KEXEC config HOTPLUG_SMT bool -config GENERIC_ENTRY - bool config OPROFILE tristate "OProfile system profiling"
arch/Kconfig config HAVE_IRQ_EXIT_ON_IRQ_STACK · line 657
Quoted 6 lines
arch/Kconfig +3
-0@@ -654,6 +652,10 @@ config HAVE_IRQ_EXIT_ON_IRQ_STACK This spares a stack switch and improves cache usage on softirq processing. +config GENERIC_ENTRY + bool + depends on HAVE_ARCH_SECCOMP_FILTER
Any architecture which wants to switch over to this should have that. Otherwise the build will just fail and rightfully so.
arch/Kconfig config HAVE_IRQ_EXIT_ON_IRQ_STACK · line 658
Quoted 2 lines
arch/Kconfig +1
-0+#ifdef CONFIG_SECCOMP
And the exact point of that ifdef is? This code was carefully written NOT to have ifdefs and all non-active things are optimized out by the compiler.
arch/Kconfig
Quoted 7 lines
arch/Kconfig +0
-0/* Do seccomp after ptrace, to catch any tracer changes. */ if (ti_work & _TIF_SECCOMP) { ret = __secure_computing(NULL);arch/Kconfig +1
-0if (ret == -1L) return ret; } +#endif
Thanks,
tglx
Re: [PATCH 2/2] entry: Correct 'noinstr' attributes
In reply to Ingo MolnarQuoted 8 lines · Ingo Molnar
The noinstr attribute is to be specified before the return type in the same way 'inline' is used.
Similar cases were recently fixed for x86, via:
7f6fa101dfac: ("x86: Correct noinstr qualifiers")These 2 cases were carried over by the new generic entry code.
Yes, my bad. I merged the above and then forgot to carry it over.
[tip: core/entry] entry: Correct 'noinstr' attributes
In reply to Ingo MolnarThe following commit has been merged into the core/entry branch of tip:
The following commit has been merged into the core/entry branch of tip:
Commit-ID: aadfc2f957cb470a5a7e52cc41a2fa86e784bcd2 Gitweb: https://git.kernel.org/tip/aadfc2f957cb470a5a7e52cc41a2fa86e784bcd2 Author: Ingo Molnar <[email protected]> AuthorDate: Sat, 25 Jul 2020 11:19:51 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sun, 26 Jul 2020 15:42:20 +02:00
entry: Correct 'noinstr' attributes
The noinstr attribute is to be specified before the return type in the same way 'inline' is used.
Similar cases were recently fixed for x86 in commit 7f6fa101dfac ("x86:
Correct noinstr qualifiers"), but the generic entry code was based on the the original version and did not carry the fix over.
--- kernel/entry/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/entry/common.c +2 -2
@@ -256,7 +256,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs)exit_to_user_mode (); } -irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs) +noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) {irqentry_state_t ret = { .exit_rcu = false,
@@ -333,7 +333,7 @@ void irqentry_exit_cond_resched(void) } } -void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state) +noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state) {lockdep_assert_irqs_disabled ();
Re: [PATCH 1/2] entry: Fix CONFIG_SECCOMP assumption
In reply to Thomas GleixnerQuoted 4 lines · Thomas Gleixner
Quoted 1 line · Ingo Molnar
The
__secure_computing()callback only exists onCONFIG_SECCOMP=y,No. There is a stub function for the SECCOMP=n case.
Which was buggy:
static inline int __secure_computing(void) { return 0; }
Note the 'void' argument, while it should take an argument.
For example on x86-64 allnoconfig there's !CONFIG_SECCOMP.
Quoted 3 lines
Quoted 1 line
and on architectures that have
CONFIG_HAVE_ARCH_SECCOMP_FILTER.which is a prerequiste for converting over.
Yeah, and the patch I sent makes this explicit instead of implicit.
Quoted 3 lines
Quoted 1 line
Instead of complicating the #ifdef within the generic entry code,
There is no #ifdef in the generic code and there is none required.
I simply carried that #ifdef over from the x86 code, but indeed fixing the stub is a bit cleaner.
Quoted 11 lines
Quoted 9 lines
make the generic entry code depend on the availability of a modern seccomp framework. This was implicit in the generic code due to x86 being a modern seccomp-filter architecture.
Also move the
Kconfigentry to after itsHAVE_ARCH_SECCOMP_FILTERdependency and fix minor whitespace damage while at it.Fixes 142781e108b1: ("entry: Provide generic syscall entryfunctionality")
I don't see what that fixes.
A build bug.
Thanks,
Ingo
Re: [PATCH 1/2] entry: Fix CONFIG_SECCOMP assumption
Quoted 10 lines · Ingo Molnar
Quoted 4 lines · Thomas Gleixner
Quoted 1 line · Ingo Molnar
The
__secure_computing()callback only exists onCONFIG_SECCOMP=y,No. There is a stub function for the SECCOMP=n case.
Which was buggy:
static inline int
__secure_computing(void){ return 0; }
Yes. I screwed that up and fixing that is the right thing to do.