arch/s390: save_area_alloc default failure behavior changed to panic
Subsystems (2)
PATCH 1/1 arch/s390: save_area_alloc default failure behavior changed to panic
Now with the memblock_alloc_or_panic interface, save_area_alloc no longer needs to handle panic itself.
--- arch/s390/kernel/crash_dump.c | 4 +--- arch/s390/kernel/numa.c | 3 +-- arch/s390/kernel/smp.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-)
arch/s390/kernel/crash_dump.c +1 -3
@@ -63,9 +63,7 @@ struct save_area * __init save_area_alloc(bool is_boot_cpu) {struct save_area *sa; - sa =memblock_alloc (sizeof (*sa),8 ); -if (!sa) -return NULL ; + sa =memblock_alloc_or_panic (sizeof (*sa),8 );if (is_boot_cpu)list_add (&sa->list, &dump_save_areas);
arch/s390/kernel/numa.c +1 -2
@@ -21,9 +21,8 @@ void __init numa_setup(void)nodes_clear (node_possible_map);node_set (0 , node_possible_map);node_set_online (0 ); -for (nid =0 ; nid <MAX_NUMNODES ; nid++) { +for (nid =0 ; nid <MAX_NUMNODES ; nid++)NODE_DATA (nid) =memblock_alloc_or_panic (sizeof (pg_data_t),8 ); - }NODE_DATA (0 )->node_spanned_pages =memblock_end_of_DRAM () >>PAGE_SHIFT ;NODE_DATA (0 )->node_id =0 ; }
arch/s390/kernel/smp.c +0 -4
@@ -611,8 +611,6 @@ void __init smp_save_dump_ipl_cpu(void)if (!dump_available ())return ; sa =save_area_alloc (true); -if (!sa) -panic ("could not allocate memory for boot CPU save area\n" ); regs =memblock_alloc_or_panic (512 ,8 );copy_oldmem_kernel (regs, __LC_FPREGS_SAVE_AREA,512 );save_area_add_regs (sa, regs);
@@ -646,8 +644,6 @@ void __init smp_save_dump_secondary_cpus(void) SIGP_CC_NOT_OPERATIONAL)continue ; sa =save_area_alloc (false); -if (!sa) -panic ("could not allocate memory for save area\n" );__pcpu_sigp_relax (addr,SIGP_STORE_STATUS_AT_ADDRESS ,__pa (page));save_area_add_regs (sa, page);if (cpu_has_vx ()) {
Signature · 1 line
2.25.1
Alexander Gordeev
maintainerOn Thu, Jan 09, 2025 at 11:31:36AM +0800, Guo Weikang wrote:
Hi Guo,
Quoted 9 lines
Now with the
memblock_alloc_or_panicinterface,save_area_allocno longer needs to handle panic itself.Signed-off-by Guo Weikang <[email protected]>--- arch/s390/kernel/crash_dump.c | 4 +--- arch/s390/kernel/numa.c | 3 +-- arch/s390/kernel/smp.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-)
This patch is a follow-up to v7, but instead it needs to be part of v8. I guess Andrew would refresh mm-everything (or whatever he finds appropriate) with the new version.
@Andrew, please correct me if I am wroing.
Thanks!
Hi, Alexander
Quoted 17 lines
Alexander Gordeev <[email protected]> wrote on Thursday, 9 January 2025 16:08
On Thu, Jan 09, 2025 at 11:31:36AM +0800, Guo Weikang wrote:
Hi Guo,
Quoted 9 lines
Now with the
memblock_alloc_or_panicinterface,save_area_allocno longer needs to handle panic itself.Signed-off-by Guo Weikang <[email protected]>--- arch/s390/kernel/crash_dump.c | 4 +--- arch/s390/kernel/numa.c | 3 +-- arch/s390/kernel/smp.c | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-)
Quoted 3 lines
This patch is a follow-up to v7, but instead it needs to be part of v8. I guess Andrew would refresh mm-everything (or whatever he finds appropriate) with the new version.
Sorry to confuse you, memblock_alloc_or_panic is already merged into mm/mm-everything
by Andrew, so this is an additional patch specifically to fix the problem you mentioned.
This patch is based on the latest mm/mm-everything branch, and it has also been merged
by Andrew,You should have received the email.
@Alexander I hope I cleared your confusion. ^ ^
Quoted 4 lines
@Andrew, please correct me if I am wroing.
Thanks!
Best regards.
---
Guo
Alexander Gordeev
maintainerQuoted 9 lines · Weikang Guo
Quoted 3 lines
This patch is a follow-up to v7, but instead it needs to be part of v8. I guess Andrew would refresh mm-everything (or whatever he finds appropriate) with the new version.
Sorry to confuse you,
memblock_alloc_or_panicis already merged intomm/mm-everything
by Andrew, so this is an additional patch specifically to fix the problem you mentioned.
Quoted 5 lines
This patch is based on the latest
mm/mm-everythingbranch, and it has also been merged
by Andrew,You should have received the email.@Alexander I hope I cleared your confusion. ^ ^
I do not think I am confused. The merged patch is not good enough for s390. This patch addresses my comments, but it needs to be merged into v7 or re- posted as v8.
@Andrew, is that still possible?
Quoted 8 lines
Quoted 3 lines
@Andrew, please correct me if I am wroing.
Thanks!
Best regards.
---
Guo
Thanks!
Alexander Gordeev <[email protected]> wrote on Thursday, 9 January 2025 21:56:
Quoted 15 lines · Weikang Guo
Quoted 13 lines
Quoted 3 lines
This patch is a follow-up to v7, but instead it needs to be part of v8. I guess Andrew would refresh mm-everything (or whatever he finds appropriate) with the new version.
Sorry to confuse you,
memblock_alloc_or_panicis already merged intomm/mm-everything
by Andrew, so this is an additional patch specifically to fix the problem you mentioned.This patch is based on the latest
mm/mm-everythingbranch, and it has also been merged
by Andrew,You should have received the email.
Quoted 6 lines
Quoted 1 line
@Alexander I hope I cleared your confusion. ^ ^
I do not think I am confused. The merged patch is not good enough for s390. This patch addresses my comments, but it needs to be merged into v7 or re- posted as v8.
I understand your point, you want to modify directly based on the original patch.
If we repost it,it may not be v8 but v9.
Last v8 patch: https://lkml.kernel.org/r/[email protected]
I reduced the recipients for V8 because I remembered that the number of CCs might
have exceeded the limit at the time, and there hadn't been any comments on V7 for a long time
Quoted 1 line
@Andrew, is that still possible?
@Andrew, I can cooperate if necessary, I could merge them into one patch and repost.
Quoted 10 lines
Quoted 8 lines
Quoted 3 lines
@Andrew, please correct me if I am wrong.
Thanks!
Best regards.
---
GuoThanks!
---
Guo
Andrew Morton
maintainerQuoted 11 lines · On Thu, 9 Jan 2025 22:53:57 +0800 Weikang Guo <[email protected]>…
I understand your point, you want to modify directly based on the original patch.
If we repost it,it may not be v8 but v9.Last v8 patch: https://lkml.kernel.org/r/[email protected]
I reduced the recipients for V8 because I remembered that the number of CCs might
have exceeded the limit at the time, and there hadn't been any comments on V7 for a long time
Quoted 4 lines
Quoted 1 line
@Andrew, is that still possible?
@Andrew, I can cooperate if necessary, I could merge them into one patch and repost.
I'll fold this patch ("arch/s390: save_area_alloc default failure behavior changed to panic") into "mm-memblock-add-memblock_alloc_or_panic-interface.patch", v8 before sending the latter upstream.
But I'm not sure that we've completed the review discussion of "mm/memblock: add memblock_alloc_or_panic interface" with Mike?
Weikang Guo
Acked-by Mike Rapoport (Microsoft)Andrew Morton <[email protected]> wrote on Friday, 10 January 2025 08:43:
Quoted 16 lines · On Thu, 9 Jan 2025 22:53:57 +0800 Weikang Guo <[email protected]>…
Quoted 14 lines
I understand your point, you want to modify directly based on the original patch.
If we repost it,it may not be v8 but v9.Last v8 patch: https://lkml.kernel.org/r/[email protected]
I reduced the recipients for V8 because I remembered that the number of CCs might
have exceeded the limit at the time, and there hadn't been any comments on V7 for a long timeQuoted 1 line
@Andrew, is that still possible?
Quoted 8 lines
Quoted 2 lines
@Andrew, I can cooperate if necessary, I could merge them into one patch and repost.
I'll fold this patch ("
arch/s390:save_area_allocdefault failure behavior changed to panic") into "mm-memblock-add-memblock_alloc_or_panic-interface.patch", v8 before sending the latter upstream.
Andrew, I appreciate your help with this!
Quoted 2 lines
But I'm not sure that we've completed the review discussion of "mm/memblock: add
memblock_alloc_or_panicinterface" with Mike?
Here is Mike's latest feedback on the patch, I have recorded it in the v8 changelog:
Links: https://lore.kernel.org/lkml/[email protected]/
Thanks!
---
Guo
On Thu, Jan 09, 2025 at 04:43:15PM -0800, Andrew Morton wrote:
Hi Andrew,
Quoted 4 lines
I'll fold this patch ("
arch/s390:save_area_allocdefault failure behavior changed to panic") into "mm-memblock-add-memblock_alloc_or_panic-interface.patch", v8 before sending the latter upstream.
To s390 bits of the folded patch:
Thanks!