Skip to content

Commit fc6bcf9

Browse files
davidhildenbrandakpm00
authored andcommitted
powerpc/pseries/cmm: call balloon_devinfo_init() also without CONFIG_BALLOON_COMPACTION
Patch series "powerpc/pseries/cmm: two smaller fixes". Two smaller fixes identified while doing a bigger rework. This patch (of 2): We always have to initialize the balloon_dev_info, even when compaction is not configured in: otherwise the containing list and the lock are left uninitialized. Likely not many such configs exist in practice, but let's CC stable to be sure. This was found by code inspection. Link: https://lkml.kernel.org/r/20251021100606.148294-1-david@redhat.com Link: https://lkml.kernel.org/r/20251021100606.148294-2-david@redhat.com Fixes: fe030c9 ("powerpc/pseries/cmm: Implement balloon compaction") Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent faf3c92 commit fc6bcf9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • arch/powerpc/platforms/pseries

arch/powerpc/platforms/pseries/cmm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info,
550550

551551
static void cmm_balloon_compaction_init(void)
552552
{
553-
balloon_devinfo_init(&b_dev_info);
554553
b_dev_info.migratepage = cmm_migratepage;
555554
}
556555
#else /* CONFIG_BALLOON_COMPACTION */
@@ -572,6 +571,7 @@ static int cmm_init(void)
572571
if (!firmware_has_feature(FW_FEATURE_CMO) && !simulate)
573572
return -EOPNOTSUPP;
574573

574+
balloon_devinfo_init(&b_dev_info);
575575
cmm_balloon_compaction_init();
576576

577577
rc = register_oom_notifier(&cmm_oom_nb);

0 commit comments

Comments
 (0)