* [PATCH] x86/percpu: Fix __per_cpu_hot_end marker
@ 2025-03-04 17:34 Uros Bizjak
2025-03-04 19:03 ` [tip: x86/core] " tip-bot2 for Uros Bizjak
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Uros Bizjak @ 2025-03-04 17:34 UTC (permalink / raw)
To: x86, linux-kernel
Cc: Uros Bizjak, Ingo Molnar, Brian Gerst, H. Peter Anvin,
Thomas Gleixner, Borislav Petkov, Ard Biesheuvel, Linus Torvalds,
Andy Lutomirski, Peter Zijlstra, Andrew Morton
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: Ingo Molnar <mingo@kernel.org>
Closes: https://lore.kernel.org/lkml/Z8a-NVJs-pm5W-mG@gmail.com/
Cc: Brian Gerst <brgerst@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Linus Torvalds <torvalds@linuxfoundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
---
arch/x86/kernel/vmlinux.lds.S | 2 +-
include/asm-generic/vmlinux.lds.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 31f9102b107f..ccdc45e5b759 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -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)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 4ed0e6a013d0..58a635a6d5bd 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -1071,9 +1071,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) \
--
2.42.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [tip: x86/core] x86/percpu: Fix __per_cpu_hot_end marker
2025-03-04 17:34 [PATCH] x86/percpu: Fix __per_cpu_hot_end marker Uros Bizjak
@ 2025-03-04 19:03 ` tip-bot2 for Uros Bizjak
2025-03-04 19:33 ` tip-bot2 for Uros Bizjak
2025-03-04 19:43 ` tip-bot2 for Uros Bizjak
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Uros Bizjak @ 2025-03-04 19:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ingo Molnar, Uros Bizjak, Brian Gerst, x86, linux-kernel
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 56cbc77dd94dc4932dd4d4543bd92a3334815354
Gitweb: https://git.kernel.org/tip/56cbc77dd94dc4932dd4d4543bd92a3334815354
Author: Uros Bizjak <ubizjak@gmail.com>
AuthorDate: Tue, 04 Mar 2025 18:34:36 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 04 Mar 2025 19:54:26 +01:00
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: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo 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/
---
arch/x86/kernel/vmlinux.lds.S | 2 +-
include/asm-generic/vmlinux.lds.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 31f9102..ccdc45e 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -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)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c4e8fac..4925441 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -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) \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip: x86/core] x86/percpu: Fix __per_cpu_hot_end marker
2025-03-04 17:34 [PATCH] x86/percpu: Fix __per_cpu_hot_end marker Uros Bizjak
2025-03-04 19:03 ` [tip: x86/core] " tip-bot2 for Uros Bizjak
@ 2025-03-04 19:33 ` tip-bot2 for Uros Bizjak
2025-03-04 19:43 ` tip-bot2 for Uros Bizjak
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Uros Bizjak @ 2025-03-04 19:33 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ingo Molnar, Uros Bizjak, Brian Gerst, x86, linux-kernel
The following commit has been merged into the x86/core branch of tip:
Commit-ID: d99d0dea2fabf3f7538dd3a19b43b9aea4468037
Gitweb: https://git.kernel.org/tip/d99d0dea2fabf3f7538dd3a19b43b9aea4468037
Author: Uros Bizjak <ubizjak@gmail.com>
AuthorDate: Tue, 04 Mar 2025 18:34:36 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 04 Mar 2025 20:18:02 +01:00
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: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo 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/
---
arch/x86/kernel/vmlinux.lds.S | 2 +-
include/asm-generic/vmlinux.lds.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 31f9102..ccdc45e 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -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)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c4e8fac..4925441 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -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) \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip: x86/core] x86/percpu: Fix __per_cpu_hot_end marker
2025-03-04 17:34 [PATCH] x86/percpu: Fix __per_cpu_hot_end marker Uros Bizjak
2025-03-04 19:03 ` [tip: x86/core] " tip-bot2 for Uros Bizjak
2025-03-04 19:33 ` tip-bot2 for Uros Bizjak
@ 2025-03-04 19:43 ` tip-bot2 for Uros Bizjak
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Uros Bizjak @ 2025-03-04 19:43 UTC (permalink / raw)
To: linux-tip-commits
Cc: Ingo Molnar, Uros Bizjak, Brian Gerst, x86, linux-kernel
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 6d536cad0d55e71442b6d65500f74eb85544269e
Gitweb: https://git.kernel.org/tip/6d536cad0d55e71442b6d65500f74eb85544269e
Author: Uros Bizjak <ubizjak@gmail.com>
AuthorDate: Tue, 04 Mar 2025 18:34:36 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 04 Mar 2025 20:30:33 +01:00
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: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo 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/
---
arch/x86/kernel/vmlinux.lds.S | 2 +-
include/asm-generic/vmlinux.lds.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 31f9102..ccdc45e 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -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)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c4e8fac..4925441 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -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) \
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-04 19:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-04 17:34 [PATCH] x86/percpu: Fix __per_cpu_hot_end marker Uros Bizjak
2025-03-04 19:03 ` [tip: x86/core] " tip-bot2 for Uros Bizjak
2025-03-04 19:33 ` tip-bot2 for Uros Bizjak
2025-03-04 19:43 ` tip-bot2 for Uros Bizjak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox