OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ffc8e90
)
powerpc/64s: Fix stress_hpt memblock alloc alignment
author
Nicholas Piggin
<npiggin@gmail.com>
Fri, 16 Dec 2022 11:59:27 +0000
(21:59 +1000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 10 Feb 2023 11:17:36 +0000
(22:17 +1100)
The stress_hpt memblock allocation did not pass in an alignment,
which causes a stack dump in early boot (that I missed, oops).
Fixes:
6b34a099faa1
("powerpc/64s/hash: add stress_hpt kernel boot option to increase hash faults")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link:
https://lore.kernel.org/r/20221216115930.2667772-2-npiggin@gmail.com
arch/powerpc/mm/book3s64/hash_utils.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/mm/book3s64/hash_utils.c
b/arch/powerpc/mm/book3s64/hash_utils.c
index
80a148c
..
fa1c148
100644
(file)
--- a/
arch/powerpc/mm/book3s64/hash_utils.c
+++ b/
arch/powerpc/mm/book3s64/hash_utils.c
@@
-1051,7
+1051,8
@@
static void __init htab_initialize(void)
static_branch_enable(&stress_hpt_key);
// Too early to use nr_cpu_ids, so use NR_CPUS
tmp = memblock_phys_alloc_range(sizeof(struct stress_hpt_struct) * NR_CPUS,
- 0, 0, MEMBLOCK_ALLOC_ANYWHERE);
+ __alignof__(struct stress_hpt_struct),
+ 0, MEMBLOCK_ALLOC_ANYWHERE);
memset((void *)tmp, 0xff, sizeof(struct stress_hpt_struct) * NR_CPUS);
stress_hpt_struct = __va(tmp);