Commit fc6bcf9a authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton
Browse files

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: fe030c9b ("powerpc/pseries/cmm: Implement balloon compaction")
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarRitesh 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent faf3c923

arch/powerpc/platforms/pseries/cmm.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info, 


static void cmm_balloon_compaction_init(void)

{

	balloon_devinfo_init(&b_dev_info);

	b_dev_info.migratepage = cmm_migratepage;

}

#else /* CONFIG_BALLOON_COMPACTION */
@@ -572,6 +571,7 @@ static int cmm_init(void) 
	if (!firmware_has_feature(FW_FEATURE_CMO) && !simulate)

		return -EOPNOTSUPP;



	balloon_devinfo_init(&b_dev_info);

	cmm_balloon_compaction_init();



	rc = register_oom_notifier(&cmm_oom_nb);