Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51d6ff7a authored by Srivatsa S. Bhat's avatar Srivatsa S. Bhat Committed by Rafael J. Wysocki
Browse files

PM / Hibernate: Thaw kernel threads in hibernation_snapshot() in error/test path 



In the hibernation call path, the kernel threads are frozen inside
hibernation_snapshot(). If we happen to encounter an error further down
the road or if we are exiting early due to a successful freezer test,
then thaw kernel threads before returning to the caller.

Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 9045a050

kernel/power/hibernate.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -343,13 +343,13 @@ int hibernation_snapshot(int platform_mode) 
		 * successful freezer test.

		 * successful freezer test.

		 */

		 */

		freezer_test_done = true;

		freezer_test_done = true;

		goto Cleanup;

		goto Thaw;

	}

	}





	error = dpm_prepare(PMSG_FREEZE);

	error = dpm_prepare(PMSG_FREEZE);

	if (error) {

	if (error) {

		dpm_complete(PMSG_RECOVER);

		dpm_complete(PMSG_RECOVER);

		goto Cleanup;

		goto Thaw;

	}

	}





	suspend_console();

	suspend_console();
@@ -385,6 +385,8 @@ int hibernation_snapshot(int platform_mode) 
	platform_end(platform_mode);

	platform_end(platform_mode);

	return error;

	return error;





 Thaw:

	thaw_kernel_threads();

 Cleanup:

 Cleanup:

	swsusp_free();

	swsusp_free();

	goto Close;

	goto Close;

kernel/power/user.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -249,16 +249,12 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, 
		}

		}

		pm_restore_gfp_mask();

		pm_restore_gfp_mask();

		error = hibernation_snapshot(data->platform_support);

		error = hibernation_snapshot(data->platform_support);

		if (error) {

		if (!error) {

			thaw_kernel_threads();

		} else {

			error = put_user(in_suspend, (int __user *)arg);

			error = put_user(in_suspend, (int __user *)arg);

			if (!error && !freezer_test_done)

			if (!error && !freezer_test_done)

				data->ready = 1;

				data->ready = 1;

			if (freezer_test_done) {

			if (freezer_test_done)

				freezer_test_done = false;

				freezer_test_done = false;

				thaw_kernel_threads();

			}

		}

		}

		break;

		break;