From: Nicholas Piggin Date: Fri, 16 Dec 2022 11:59:27 +0000 (+1000) Subject: powerpc/64s: Fix stress_hpt memblock alloc alignment X-Git-Tag: v6.3-rc1~87^2~73 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dea18da459922d70692ae1e5736d1c760040cb07;p=thirdparty%2Fkernel%2Flinux.git powerpc/64s: Fix stress_hpt memblock alloc alignment 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 Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20221216115930.2667772-2-npiggin@gmail.com --- diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index 80a148c57de81..fa1c148e1f50b 100644 --- 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);