printk: stop including cache.h from printk.h
Subsystems (9)
PATCH v5 1/2 printk: stop including cache.h from printk.h
An inclusion of cache.h in printk.h was added in 2014 in commit c28aa1f0a847 ("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit 3ec25826ae33 ("printk:
Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it.
We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header.
This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch.
Build tested using {allyesconfig,defconfig} x {arm64,x86_64}.
---
v5:
- fixes for arm randconfig and (tentatively) csky
arch/arm64/include/asm/mte-kasan.h | 1 + arch/arm64/include/asm/percpu.h | 1 + arch/csky/include/asm/processor.h | 2 +- drivers/firmware/smccc/kvm_guest.c | 1 + include/linux/printk.h | 1 - kernel/bpf/bpf_lru_list.h | 1 + 6 files changed, 5 insertions(+), 2 deletions(-)
arch/arm64/include/asm/mte-kasan.h +1 -0
@@ -6,6 +6,7 @@#define __ASM_MTE_KASAN_H#include <asm/compiler.h> +#include <asm/cputype.h> #include <asm/mte-def.h> #ifndef __ASSEMBLY__
arch/arm64/include/asm/percpu.h +1 -0
@@ -10,6 +10,7 @@#include <asm/alternative.h> #include <asm/cmpxchg.h> #include <asm/stack_pointer.h> +#include <asm/sysreg.h> static inline void set_my_cpu_offset (unsigned long off) {
arch/csky/include/asm/processor.h +1 -1
@@ -4,9 +4,9 @@#define __ASM_CSKY_PROCESSOR_H#include <linux/bitops.h> +#include <linux/cache.h> #include <asm/ptrace.h> #include <asm/current.h> -#include <asm/cache.h> #include <abi/reg_ops.h> #include <abi/regdef.h> #include <abi/switch_context.h>
drivers/firmware/smccc/kvm_guest.c +1 -0
@@ -4,6 +4,7 @@#include <linux/arm-smccc.h> #include <linux/bitmap.h> +#include <linux/cache.h> #include <linux/kernel.h> #include <linux/string.h>
include/linux/printk.h +0 -1
@@ -6,7 +6,6 @@#include <linux/init.h> #include <linux/kern_levels.h> #include <linux/linkage.h> -#include <linux/cache.h> #include <linux/ratelimit_types.h> #include <linux/once_lite.h>
kernel/bpf/bpf_lru_list.h +1 -0
@@ -4,6 +4,7 @@#ifndef __BPF_LRU_LIST_H_#define __BPF_LRU_LIST_H_ +#include <linux/cache.h> #include <linux/list.h> #include <linux/spinlock_types.h>
Signature · 1 line
2.36.0.464.gb9c8b46e94-goog
PATCH v5 2/2 mm: make minimum slab alignment a runtime property
When CONFIG_KASAN_HW_TAGS is enabled we currently increase the minimum slab alignment to 16. This happens even if MTE is not supported in hardware or disabled via kasan=off, which creates an unnecessary memory overhead in those cases. Eliminate this overhead by making the minimum slab alignment a runtime property and only aligning to 16 if KASAN is enabled at runtime.
On a DragonBoard 845c (non-MTE hardware) with a kernel built with CONFIG_KASAN_HW_TAGS, waiting for quiescence after a full Android boot I see the following Slab measurements in /proc/meminfo (median of 3 reboots):
Before: 169020 kB After: 167304 kB
---
v4:
- add a dependent patch to fix the build with CONFIG_JUMP_LABEL disabled
v3:
- go back to ARCH_SLAB_MINALIGN
- revert changes to fs/binfmt_flat.c
- update arch_slab_minalign() comment to say that it must be a power of two
v2:
- use max instead of max_t in flat_stack_align()
arch/arm64/include/asm/cache.h | 17 ++++++++++++----- include/linux/slab.h | 12 ++++++++++++ mm/slab.c | 7 +++---- mm/slab_common.c | 3 +-- mm/slob.c | 6 +++--- 5 files changed, 31 insertions(+), 14 deletions(-)
arch/arm64/include/asm/cache.h +12 -5
@@ -6,6 +6,7 @@#define __ASM_CACHE_H#include <asm/cputype.h> +#include <asm/mte-def.h> #define CTR_L1IP_SHIFT 14#define CTR_L1IP_MASK 3
@@ -49,16 +50,22 @@*/ #define ARCH_DMA_MINALIGN (128) +#ifndef __ASSEMBLY__ + +#include <linux/bitops.h> +#include <linux/kasan-enabled.h> +#ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT)#elif defined(CONFIG_KASAN_HW_TAGS ) -#define ARCH_SLAB_MINALIGN MTE_GRANULE_SIZE +static inline size_t arch_slab_minalign (void ) +{ +return kasan_hw_tags_enabled () ?MTE_GRANULE_SIZE : + __alignof__(unsigned long long ); +} +#define arch_slab_minalign () arch_slab_minalign()#endif -#ifndef __ASSEMBLY__ - -#include <linux/bitops.h> -#define ICACHEF_ALIASING 0#define ICACHEF_VPIPT 1extern unsigned long __icache_flags;
include/linux/slab.h +12 -0
@@ -209,6 +209,18 @@ void kmem_dump_obj(void *object);#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)#endif +/* +* Arches can define this function if they want to decide the minimum slab +* alignment at runtime. The value returned by the function must be a power +* of two and >= ARCH_SLAB_MINALIGN. +*/ +#ifndef arch_slab_minalign +static inline size_t arch_slab_minalign (void ) +{ +return ARCH_SLAB_MINALIGN ; +} +#endif +/* * kmalloc and friends return ARCH_KMALLOC_MINALIGN aligned * pointers. kmem_cache_alloc and friends return ARCH_SLAB_MINALIGN
mm/slab.c +3 -4
@@ -3009,10 +3009,9 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, objp +=obj_offset (cachep);if (cachep->ctor && cachep->flags &SLAB_POISON ) cachep->ctor (objp); -if (ARCH_SLAB_MINALIGN && - ((unsigned long )objp & (ARCH_SLAB_MINALIGN -1 ))) { -pr_err ("0x%px: not aligned to ARCH_SLAB_MINALIGN=%d\n" , - objp, (int )ARCH_SLAB_MINALIGN ); +if ((unsigned long )objp & (arch_slab_minalign () -1 )) { +pr_err ("0x%px: not aligned to arch_slab_minalign()=%d\n" , objp, + (int )arch_slab_minalign ()); }return objp; }
mm/slab_common.c +1 -2
@@ -154,8 +154,7 @@ static unsigned int calculate_alignment(slab_flags_t flags, align =max (align, ralign); } -if (align <ARCH_SLAB_MINALIGN ) - align =ARCH_SLAB_MINALIGN ; + align =max_t (size_t, align,arch_slab_minalign ());return ALIGN (align,sizeof (void *)); }
mm/slob.c +3 -3
@@ -478,7 +478,7 @@ static __always_inline void * __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller) { unsigned int *m; -int minalign =max_t (size_t,ARCH_KMALLOC_MINALIGN ,ARCH_SLAB_MINALIGN ); +int minalign =max_t (size_t,ARCH_KMALLOC_MINALIGN ,arch_slab_minalign ());void *ret; gfp &= gfp_allowed_mask;
@@ -555,7 +555,7 @@ void kfree(const void *block) sp =virt_to_folio (block);if (folio_test_slab (sp)) { -int align =max_t (size_t,ARCH_KMALLOC_MINALIGN ,ARCH_SLAB_MINALIGN ); +int align =max_t (size_t,ARCH_KMALLOC_MINALIGN ,arch_slab_minalign ());unsigned int *m = (unsigned int *)(block - align);slob_free (m, *m + align); }else {
@@ -584,7 +584,7 @@ size_t __ksize(const void *block)if (unlikely (!folio_test_slab (folio)))return folio_size (folio); - align =max_t (size_t,ARCH_KMALLOC_MINALIGN ,ARCH_SLAB_MINALIGN ); + align =max_t (size_t,ARCH_KMALLOC_MINALIGN ,arch_slab_minalign ()); m = (unsigned int *)(block - align);return SLOB_UNITS (*m) *SLOB_UNIT ; }
Signature · 1 line
2.36.0.464.gb9c8b46e94-goog
Andrew Morton
maintainerRe: [PATCH v5 2/2] mm: make minimum slab alignment a runtime property
Quoted 17 lines · On Wed, 27 Apr 2022 12:58:20 -0700 Peter Collingbourne <[email protected]> wrote:
When
CONFIG_KASAN_HW_TAGSis enabled we currently increase the minimum slab alignment to 16. This happens even if MTE is not supported in hardware or disabled via kasan=off, which creates an unnecessary memory overhead in those cases. Eliminate this overhead by making the minimum slab alignment a runtime property and only aligning to 16 if KASAN is enabled at runtime.On a DragonBoard 845c (non-MTE hardware) with a kernel built with
CONFIG_KASAN_HW_TAGS, waiting for quiescence after a full Android boot I see the following Slab measurements in/proc/meminfo(median of 3 reboots):...
mm/slab.c static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, · line 3014
Quoted 10 lines
mm/slab.c +3
-4@@ -3009,10 +3009,9 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, objp +=obj_offset (cachep);if (cachep->ctor && cachep->flags &SLAB_POISON ) cachep->ctor (objp); -if (ARCH_SLAB_MINALIGN && - ((unsigned long )objp & (ARCH_SLAB_MINALIGN -1 ))) { -pr_err ("0x%px: not aligned to ARCH_SLAB_MINALIGN=%d\n" , - objp, (int )ARCH_SLAB_MINALIGN ); +if ((unsigned long )objp & (arch_slab_minalign () -1 )) { +pr_err ("0x%px: not aligned to arch_slab_minalign()=%d\n" , objp, + (int )arch_slab_minalign ());
printf/printk know about size_t. Use %zu, no cast needed. But...
Quoted 8 lines
mm/slab.c +0
-0}return objp; }mm/slab_common.c +0
-0
mm/slab_common.c static unsigned int calculate_alignment(slab_flags_t flags, · line 157
Quoted 6 lines
mm/slab_common.c +1
-2@@ -154,8 +154,7 @@ static unsigned int calculate_alignment(slab_flags_t flags, align =max (align, ralign); } -if (align <ARCH_SLAB_MINALIGN ) - align =ARCH_SLAB_MINALIGN ; + align =max_t (size_t, align,arch_slab_minalign ());
max_t/min_t are nature's way of telling us "you screwed up the types".
So what type _is_ slab alignment? size_t seems sensible, but the code prefers unsigned int. So how about we stick with that?
This compiles. Still some max_t's in slob.c because I was too lazy to go fix the type of ARCH_KMALLOC_MINALIGN.
Shrug, I don't know if we can be bothered. You decide :)
arch/arm64/include/asm/cache.h | 2 +- include/linux/slab.h | 2 +- mm/slab.c | 4 ++-- mm/slab_common.c | 2 +- mm/slob.c | 16 +++++++++++----- 5 files changed, 16 insertions(+), 10 deletions(-)
arch/arm64/include/asm/cache.h renamed from arch/arm64/include/asm/cache.h~mm-make-minimum-slab-alignment-a-runtime-property-fix +1 -1
@@ -58,7 +58,7 @@#ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT)#elif defined(CONFIG_KASAN_HW_TAGS ) -static inline size_t arch_slab_minalign (void ) +static inline unsigned int arch_slab_minalign (void ) {return kasan_hw_tags_enabled () ?MTE_GRANULE_SIZE : __alignof__(unsigned long long );
include/linux/slab.h renamed from include/linux/slab.h~mm-make-minimum-slab-alignment-a-runtime-property-fix +1 -1
@@ -215,7 +215,7 @@ void kmem_dump_obj(void *object);* of two and >= ARCH_SLAB_MINALIGN. */ #ifndef arch_slab_minalign -static inline size_t arch_slab_minalign (void ) +static inline unsigned int arch_slab_minalign (void ) {return ARCH_SLAB_MINALIGN ; }
mm/slab.c renamed from mm/slab.c~mm-make-minimum-slab-alignment-a-runtime-property-fix +2 -2
@@ -3010,8 +3010,8 @@ static void *cache_alloc_debugcheck_afteif (cachep->ctor && cachep->flags &SLAB_POISON ) cachep->ctor (objp);if ((unsigned long )objp & (arch_slab_minalign () -1 )) { -pr_err ("0x%px: not aligned to arch_slab_minalign()=%d\n" , objp, - (int )arch_slab_minalign ()); +pr_err ("0x%px: not aligned to arch_slab_minalign()=%u\n" , objp, +arch_slab_minalign ()); }return objp; }
mm/slab_common.c renamed from mm/slab_common.c~mm-make-minimum-slab-alignment-a-runtime-property-fix +1 -1
@@ -154,7 +154,7 @@ static unsigned int calculate_alignment( align =max (align, ralign); } - align =max_t (size_t, align,arch_slab_minalign ()); + align =max (align,arch_slab_minalign ());return ALIGN (align,sizeof (void *)); }
mm/slob.c renamed from mm/slob.c~mm-make-minimum-slab-alignment-a-runtime-property-fix +11 -5
@@ -478,9 +478,11 @@ static __always_inline void * __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller) { unsigned int *m; -int minalign =max_t (size_t,ARCH_KMALLOC_MINALIGN ,arch_slab_minalign ()); +unsigned int minalign;void *ret; + minalign = max_t(unsigned int, ARCH_KMALLOC_MINALIGN, +arch_slab_minalign ()); gfp &= gfp_allowed_mask;might_alloc (gfp);
@@ -493,7 +495,7 @@ __do_kmalloc_node(size_t size, gfp_t gfp* kmalloc()'d objects. */ if (is_power_of_2 (size)) - align =max (minalign, (int ) size); + align = max_t(unsigned int, minalign, size);if (!size)return ZERO_SIZE_PTR ;
@@ -555,8 +557,11 @@ void kfree(const void *block) sp =virt_to_folio (block);if (folio_test_slab (sp)) { -int align =max_t (size_t,ARCH_KMALLOC_MINALIGN ,arch_slab_minalign ()); + unsigned int align = max_t(unsigned int, +ARCH_KMALLOC_MINALIGN , +arch_slab_minalign ());unsigned int *m = (unsigned int *)(block - align); +slob_free (m, *m + align); }else {unsigned int order =folio_order (sp);
@@ -573,7 +578,7 @@ EXPORT_SYMBOL(kfree);size_t __ksize (const void *block) {struct folio *folio; -int align; +unsigned int align;unsigned int *m;BUG_ON (!block);
@@ -584,7 +589,8 @@ size_t __ksize(const void *block)if (unlikely (!folio_test_slab (folio)))return folio_size (folio); - align =max_t (size_t,ARCH_KMALLOC_MINALIGN ,arch_slab_minalign ()); + align = max_t(unsigned int, ARCH_KMALLOC_MINALIGN, +arch_slab_minalign ()); m = (unsigned int *)(block - align);return SLOB_UNITS (*m) *SLOB_UNIT ; }
_
Re: [PATCH v5 2/2] mm: make minimum slab alignment a runtime property
Quoted 50 lines · Andrew Morton
Quoted 17 lines · On Wed, 27 Apr 2022 12:58:20 -0700 Peter Collingbourne <[email protected]> wrote:
When
CONFIG_KASAN_HW_TAGSis enabled we currently increase the minimum slab alignment to 16. This happens even if MTE is not supported in hardware or disabled via kasan=off, which creates an unnecessary memory overhead in those cases. Eliminate this overhead by making the minimum slab alignment a runtime property and only aligning to 16 if KASAN is enabled at runtime.On a DragonBoard 845c (non-MTE hardware) with a kernel built with
CONFIG_KASAN_HW_TAGS, waiting for quiescence after a full Android boot I see the following Slab measurements in/proc/meminfo(median of 3 reboots):...
mm/slab.c static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, · line 3014
Quoted 10 lines
mm/slab.c +3
-4@@ -3009,10 +3009,9 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, objp +=obj_offset (cachep);if (cachep->ctor && cachep->flags &SLAB_POISON ) cachep->ctor (objp); -if (ARCH_SLAB_MINALIGN && - ((unsigned long )objp & (ARCH_SLAB_MINALIGN -1 ))) { -pr_err ("0x%px: not aligned to ARCH_SLAB_MINALIGN=%d\n" , - objp, (int )ARCH_SLAB_MINALIGN ); +if ((unsigned long )objp & (arch_slab_minalign () -1 )) { +pr_err ("0x%px: not aligned to arch_slab_minalign()=%d\n" , objp, + (int )arch_slab_minalign ());printf/printk know about
size_t. Use %zu, no cast needed. But...Quoted 8 lines
mm/slab.c +0
-0}return objp; }mm/slab_common.c +0
-0mm/slab_common.c static unsigned int calculate_alignment(slab_flags_t flags, · line 157
Quoted 6 lines
mm/slab_common.c +1
-2@@ -154,8 +154,7 @@ static unsigned int calculate_alignment(slab_flags_t flags, align =max (align, ralign); } -if (align <ARCH_SLAB_MINALIGN ) - align =ARCH_SLAB_MINALIGN ; + align =max_t (size_t, align,arch_slab_minalign ());max_t/min_t are nature's way of telling us "you screwed up the types".
Quoted 8 lines
So what type _is_ slab alignment?
size_tseems sensible, but the code prefers unsigned int. So how about we stick with that?This compiles. Still some max_t's in
slob.cbecause I was too lazy to go fix the type ofARCH_KMALLOC_MINALIGN.Shrug, I don't know if we can be bothered. You decide :)
Hi Andrew,
No strong opinions here. I'm happy with the fixup that you added to your tree on top of my patch.
Peter
Re: [PATCH v5 2/2] mm: make minimum slab alignment a runtime property
In reply to Peter CollingbourneQuoted 15 lines · Peter Collingbourne
When
CONFIG_KASAN_HW_TAGSis enabled we currently increase the minimum slab alignment to 16. This happens even if MTE is not supported in hardware or disabled via kasan=off, which creates an unnecessary memory overhead in those cases. Eliminate this overhead by making the minimum slab alignment a runtime property and only aligning to 16 if KASAN is enabled at runtime.On a DragonBoard 845c (non-MTE hardware) with a kernel built with
CONFIG_KASAN_HW_TAGS, waiting for quiescence after a full Android boot I see the following Slab measurements in/proc/meminfo(median of 3 reboots):Before: 169020 kB After: 167304 kB
Quoted 7 lines
Signed-off-by Peter Collingbourne <[email protected]>Reviewed-by Andrey Konovalov <[email protected]>Reviewed-by Hyeonggon Yoo <[email protected]>Tested-by Hyeonggon Yoo <[email protected]>Acked-by David Rientjes <[email protected]>Reviewed-by Catalin Marinas <[email protected]>
Andrew's fixup LGTM too.
Quoted 10 lines · Peter Collingbourne
An inclusion of
cache.hinprintk.hwas added in 2014 in commitc28aa1f0a847("printk/cache: markprintk_oncetest variable__read_mostly") in order to bring in the definition of__read_mostly. The usage of__read_mostlywas later removed in commit3ec25826ae33("printk:
Tieprintk_once/printk_deferred_onceinto .data.once for reset") which made the inclusion ofcache.hunnecessary, so remove it.We have a small amount of code that depended on the inclusion of
cache.hfromprintk.h; fix that code to include the appropriate header.
Quoted 6 lines
This fixes a circular inclusion on arm64 (
linux/printk.h->linux/cache.h->asm/cache.h->linux/kasan-enabled.h->linux/static_key.h->linux/jump_label.h->linux/bug.h->asm/bug.h->linux/printk.h) that would otherwise be introduced by the next patch.Build tested using {allyesconfig,defconfig} x {arm64,x86_64}.
But not powerpc:corenet64_smp_defconfig, where it results in lots of build errors such as
powerpc64-linux-ld: fs/freevxfs/vxfs_fshead.o:(.bss+0x0):
multiple definition of `____cacheline_aligned'; fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here
Reverting this patch fixes the problem.
Guenter
---
# bad: [18ecd30af1a8402c162cca1bd58771c0e5be7815] Add linux-next specific files for 20220520
# good: [42226c989789d8da4af1de0c31070c96726d990c] Linux 5.18-rc7
git bisect start 'HEAD' 'v5.18-rc7'
# good: [f9b63740b666dd9887eb0282d21b5f65bb0cadd0] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
git bisect good f9b63740b666dd9887eb0282d21b5f65bb0cadd0
# good: [1f5eb3e76303572f0318e8c50da51c516580aa03] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
git bisect good 1f5eb3e76303572f0318e8c50da51c516580aa03
# good: [4c1d9cc0363691893ef94fa0d798faca013e27d3] Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
git bisect good 4c1d9cc0363691893ef94fa0d798faca013e27d3
# good: [a3204ed0fc565fc76901c67dfc8e04c91a5c8ea4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
git bisect good a3204ed0fc565fc76901c67dfc8e04c91a5c8ea4
# bad: [ca228447682904bc749c0702695681543b5dc709] Merge branch 'mm-nonmm-unstable' into mm-everything
git bisect bad ca228447682904bc749c0702695681543b5dc709
# bad: [c0eeeb02d9df878c71a457008900b650d94bd0d9] selftests/uffd: enable uffd-wp for shmem/hugetlbfs
git bisect bad c0eeeb02d9df878c71a457008900b650d94bd0d9
# good: [0a7a0f6f7f3679c906fc55e3805c1d5e2c566f55] hugetlb: fix wrong use of nr_online_nodes
git bisect good 0a7a0f6f7f3679c906fc55e3805c1d5e2c566f55
# good: [c9fe66560bf2dc7d109754414e309888cb8c9ba9] mm/mprotect: do not flush when not required architecturally
git bisect good c9fe66560bf2dc7d109754414e309888cb8c9ba9
# bad: [97d482f4592fde2322c319f07bc54f3a0d37861c] mm/damon/sysfs: reuse damon_set_regions() for regions setting
git bisect bad 97d482f4592fde2322c319f07bc54f3a0d37861c
# good: [54205e9c5425049aef1bc7a812f890f00b5f79c7] mm: rmap: move the cache flushing to the correct place for hugetlb PMD sharing git bisect good 54205e9c5425049aef1bc7a812f890f00b5f79c7
# bad: [9994715333515e82865e533250e488496b9742f4] selftest/vm: test that mremap fails on non-existent vma
git bisect bad 9994715333515e82865e533250e488496b9742f4
# bad: [d949a8155d139aa890795b802004a196b7f00598] mm: make minimum slab alignment a runtime property
git bisect bad d949a8155d139aa890795b802004a196b7f00598
# bad: [534aa1dc975ac883ad89110534585a96630802a0] printk: stop including cache.h from printk.h
git bisect bad 534aa1dc975ac883ad89110534585a96630802a0
# good: [dfc7ab57560da385f705b28e2bf50e3b90444a6b] mm: rmap: use flush_cache_range() to flush cache for hugetlb pages
git bisect good dfc7ab57560da385f705b28e2bf50e3b90444a6b
# first bad commit: [534aa1dc975ac883ad89110534585a96630802a0] printk: stop including cache.h from printk.h
Quoted 16 lines · Guenter Roeck
Quoted 15 lines · Peter Collingbourne
An inclusion of
cache.hinprintk.hwas added in 2014 in commitc28aa1f0a847("printk/cache: markprintk_oncetest variable__read_mostly") in order to bring in the definition of__read_mostly. The usage of__read_mostlywas later removed in commit3ec25826ae33("printk:
Tieprintk_once/printk_deferred_onceinto .data.once for reset") which made the inclusion ofcache.hunnecessary, so remove it.We have a small amount of code that depended on the inclusion of
cache.hfromprintk.h; fix that code to include the appropriate header.This fixes a circular inclusion on arm64 (
linux/printk.h->linux/cache.h->asm/cache.h->linux/kasan-enabled.h->linux/static_key.h->linux/jump_label.h->linux/bug.h->asm/bug.h->linux/printk.h) that would otherwise be introduced by the next patch.
Quoted 8 lines
Quoted 1 line
Build tested using {allyesconfig,defconfig} x {arm64,x86_64}.
But not powerpc:corenet64_smp_defconfig, where it results in lots of build errors such as
powerpc64-linux-ld: fs/freevxfs/vxfs_fshead.o:(.bss+0x0):
multiple definition of `____cacheline_aligned'; fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here
I sent a patch to fix it, and will merge the fix via my tree:
http://patchwork.ozlabs.org/project/linuxppc-dev/patch/[email protected]/
cheers