Commit 6d536cad authored by Uros Bizjak's avatar Uros Bizjak Committed by Ingo Molnar
Browse files

x86/percpu: Fix __per_cpu_hot_end marker 



Make __per_cpu_hot_end marker point to the end of the percpu cache
hot data, not to the end of the percpu cache hot section.

This fixes CONFIG_MPENTIUM4 case where X86_L1_CACHE_SHIFT
is set to 7 (128 bytes).

Also update assert message accordingly.

Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Link: https://lore.kernel.org/r/20250304173455.89361-1-ubizjak@gmail.com

Closes: https://lore.kernel.org/lkml/Z8a-NVJs-pm5W-mG@gmail.com/
parent 06aa0305

arch/x86/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ SECTIONS 
	}



	PERCPU_SECTION(L1_CACHE_BYTES)

	ASSERT(__per_cpu_hot_end - __per_cpu_hot_start <= 64, "percpu cache hot section too large")

	ASSERT(__per_cpu_hot_end - __per_cpu_hot_start <= 64, "percpu cache hot data too large")



	RUNTIME_CONST_VARIABLES

	RUNTIME_CONST(ptr, USER_PTR_MAX)

include/asm-generic/vmlinux.lds.h

+1 −2
Original line number Diff line number Diff line
@@ -1072,9 +1072,8 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) 
	. = ALIGN(cacheline);						\

	__per_cpu_hot_start = .;					\

	*(SORT_BY_ALIGNMENT(.data..percpu..hot.*))			\

	__per_cpu_hot_pad = .;						\

	. = ALIGN(cacheline);						\

	__per_cpu_hot_end = .;						\

	. = ALIGN(cacheline);						\

	*(.data..percpu..read_mostly)					\

	. = ALIGN(cacheline);						\

	*(.data..percpu)						\