github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

s390/irqflags: Add out-of-line definitions of arch_local_irq_*() for KMSAN

Browse Source 
Inline KMSAN arch_local_irq_*() definitions run afoul of
-Wstatic-in-inline. Move them out-of-line. Make sure decompressor and
non-GPL modules see the out-of-line definitions.

Cc: Boqun Feng <boqun@kernel.org>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202607131219.euJHPSJ5-lkp@intel.com/
Suggested-by: Heiko Carstens <hca@linux.ibm.com>
Fixes: 1b301f5f28 ("s390/irqflags: do not instrument arch_local_irq_*() with KMSAN")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Ilya Leoshkevich 2026-08-06 21:04:45 +02:00 committed by Vasily Gorbik
parent f37b4f254f
commit 3f7c9f9c36
3 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/s390/include/asm/irqflags.h
View File

@ -37,18 +37,24 @@ static __always_inline void __arch_local_irq_ssm(unsigned long flags)
asm volatile("ssm %0" : : "Q" (flags) : "memory");
}
#ifdef CONFIG_KMSAN
#define arch_local_irq_attributes noinline notrace __no_sanitize_memory __maybe_unused
#if defined(CONFIG_KMSAN) && !defined(__DECOMPRESSOR)
unsigned long arch_local_save_flags(void);
unsigned long arch_local_irq_save(void);
void arch_local_irq_enable_external(void);
void arch_local_irq_enable(void);
#else
#define arch_local_irq_attributes __always_inline
#define arch_local_save_flags __arch_local_save_flags
#define arch_local_irq_save __arch_local_irq_save
#define arch_local_irq_enable_external __arch_local_irq_enable_external
#define arch_local_irq_enable __arch_local_irq_enable
#endif
static arch_local_irq_attributes unsigned long arch_local_save_flags(void)
static __always_inline unsigned long __arch_local_save_flags(void)
{
return __arch_local_irq_stnsm(0xff);
}
static arch_local_irq_attributes unsigned long arch_local_irq_save(void)
static __always_inline unsigned long __arch_local_irq_save(void)
{
return __arch_local_irq_stnsm(0xfc);
}
@ -58,12 +64,12 @@ static __always_inline void arch_local_irq_disable(void)
arch_local_irq_save();
}
static arch_local_irq_attributes void arch_local_irq_enable_external(void)
static __always_inline void __arch_local_irq_enable_external(void)
{
__arch_local_irq_stosm(0x01);
}
static arch_local_irq_attributes void arch_local_irq_enable(void)
static __always_inline void __arch_local_irq_enable(void)
{
__arch_local_irq_stosm(0x03);
}

1
arch/s390/kernel/Makefile
View File

@ -72,6 +72,7 @@ obj-$(CONFIG_STACKPROTECTOR) += stackprotector.o
obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o
obj-$(CONFIG_KEXEC_FILE) += kexec_elf.o
obj-$(CONFIG_CERT_STORE) += cert_store.o
obj-$(CONFIG_KMSAN) += irqflags.o
obj-$(CONFIG_PERF_EVENTS) += perf_event.o
obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf.o perf_cpum_sf.o

28
arch/s390/kernel/irqflags.c Normal file
View File

@ -0,0 +1,28 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/export.h>
#include <asm/irqflags.h>
noinstr unsigned long arch_local_save_flags(void)
{
return __arch_local_save_flags();
}
EXPORT_SYMBOL(arch_local_save_flags);
noinstr unsigned long arch_local_irq_save(void)
{
return __arch_local_irq_save();
}
EXPORT_SYMBOL(arch_local_irq_save);
noinstr void arch_local_irq_enable_external(void)
{
__arch_local_irq_enable_external();
}
EXPORT_SYMBOL(arch_local_irq_enable_external);
noinstr void arch_local_irq_enable(void)
{
__arch_local_irq_enable();
}
EXPORT_SYMBOL(arch_local_irq_enable);