PM / Hibernate: Fix the early termination of test modes (aa9a7b11) · Commits · 戴 / test

Commit (PM / Hibernate: Freeze kernel threads after preallocating memory) postponed the freezing of kernel threads to after preallocating memory for hibernation. But while doing that, the hibernation test TEST_FREEZER and the test mode HIBERNATION_TESTPROC were not moved accordingly. As a result, when using these test modes, it only goes upto the freezing of userspace and exits, when in fact it should go till the complete end of task freezing stage, namely the freezing of kernel threads as well. So, move these points of exit to appropriate places so that freezing of kernel threads is also tested while using these test harnesses. Signed-off-by:

Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Signed-off-by:

Rafael J. Wysocki <rjw@sisk.pl>

kernel/power/hibernate.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -55,6 +55,8 @@ enum {

		static int hibernation_mode = HIBERNATION_SHUTDOWN;

		static bool freezer_test_done;

		static const struct platform_hibernation_ops *hibernation_ops;

		/**
		@@ -347,6 +349,17 @@ int hibernation_snapshot(int platform_mode)
		if (error)
		goto Close;

		if (hibernation_test(TEST_FREEZER) \|\|
		hibernation_testmode(HIBERNATION_TESTPROC)) {

		/*
		* Indicate to the caller that we are returning due to a
		* successful freezer test.
		*/
		freezer_test_done = true;
		goto Close;
		}

		error = dpm_prepare(PMSG_FREEZE);
		if (error)
		goto Complete_devices;
		@@ -641,15 +654,13 @@ int hibernate(void)
		if (error)
		goto Finish;

		if (hibernation_test(TEST_FREEZER))
		goto Thaw;

		if (hibernation_testmode(HIBERNATION_TESTPROC))
		goto Thaw;

		error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
		if (error)
		goto Thaw;
		if (freezer_test_done) {
		freezer_test_done = false;
		goto Thaw;
		}

		if (in_suspend) {
		unsigned int flags = 0;

Admin message