Commit 7f234a4d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-sleep' and 'pm-tools' 

* pm-sleep:
  PM / hibernate: Introduce test_resume mode for hibernation
  x86 / hibernate: Use hlt_play_dead() when resuming from hibernation
  PM / hibernate: Image data protection during restoration
  PM / hibernate: Add missing braces in __register_nosave_region()
  PM / hibernate: Clean up comments in snapshot.c
  PM / hibernate: Clean up function headers in snapshot.c
  PM / hibernate: Add missing braces in hibernate_setup()
  PM / hibernate: Recycle safe pages after image restoration
  PM / hibernate: Simplify mark_unsafe_pages()
  PM / hibernate: Do not free preallocated safe pages during image restore
  PM / suspend: show workqueue state in suspend flow
  PM / sleep: make PM notifiers called symmetrically
  PM / sleep: Make pm_prepare_console() return void
  PM / Hibernate: Don't let kasan instrument snapshot.c

* pm-tools:
  PM / tools: scripts: AnalyzeSuspend v4.2
  tools/turbostat: allow user to alter DESTDIR and PREFIX
parents 523d939e fe12c00d af1e45e6

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -3594,6 +3594,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				present during boot.

		nocompress	Don't compress/decompress hibernation images.

		no		Disable hibernation and resume.

		protect_image	Turn on image protection during restoration

				(that will set all pages holding image data

				during restoration read-only).



	retain_initrd	[RAM] Keep initrd memory after extraction

arch/x86/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int native_cpu_up(unsigned int cpunum, struct task_struct *tidle); 
int native_cpu_disable(void);

int common_cpu_die(unsigned int cpu);

void native_cpu_die(unsigned int cpu);

void hlt_play_dead(void);

void native_play_dead(void);

void play_dead_common(void);

void wbinvd_on_cpu(int cpu);

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -1622,7 +1622,7 @@ static inline void mwait_play_dead(void) 
	}

}



static inline void hlt_play_dead(void)

void hlt_play_dead(void)

{

	if (__this_cpu_read(cpu_info.x86) >= 4)

		wbinvd();

arch/x86/power/cpu.c

+30 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/export.h>

#include <linux/smp.h>

#include <linux/perf_event.h>

#include <linux/tboot.h>



#include <asm/pgtable.h>

#include <asm/proto.h>
@@ -266,6 +267,35 @@ void notrace restore_processor_state(void) 
EXPORT_SYMBOL(restore_processor_state);

#endif



#if defined(CONFIG_HIBERNATION) && defined(CONFIG_HOTPLUG_CPU)

static void resume_play_dead(void)

{

	play_dead_common();

	tboot_shutdown(TB_SHUTDOWN_WFS);

	hlt_play_dead();

}



int hibernate_resume_nonboot_cpu_disable(void)

{

	void (*play_dead)(void) = smp_ops.play_dead;

	int ret;



	/*

	 * Ensure that MONITOR/MWAIT will not be used in the "play dead" loop

	 * during hibernate image restoration, because it is likely that the

	 * monitored address will be actually written to at that time and then

	 * the "dead" CPU will attempt to execute instructions again, but the

	 * address in its instruction pointer may not be possible to resolve

	 * any more at that point (the page tables used by it previously may

	 * have been overwritten by hibernate image data).

	 */

	smp_ops.play_dead = resume_play_dead;

	ret = disable_nonboot_cpus();

	smp_ops.play_dead = play_dead;

	return ret;

}

#endif



/*

 * When bsp_check() is called in hibernate and suspend, cpu hotplug

 * is disabled already. So it's unnessary to handle race condition between

include/linux/suspend.h

+2 −3
Original line number Diff line number Diff line
@@ -18,12 +18,11 @@ static inline void pm_set_vt_switch(int do_switch) 
#endif



#ifdef CONFIG_VT_CONSOLE_SLEEP

extern int pm_prepare_console(void);

extern void pm_prepare_console(void);

extern void pm_restore_console(void);

#else

static inline int pm_prepare_console(void)

static inline void pm_prepare_console(void)

{

	return 0;

}



static inline void pm_restore_console(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE