From: Chen Yu <yu.c.chen@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org, Pavel Machek <pavel@ucw.cz>,
Len Brown <len.brown@intel.com>, Zhimin Gu <kookoo.gu@intel.com>,
Yu Chen <yu.c.chen@intel.com>
Subject: [PATCH 09/12][RFC v3] x86-32, hibernate: Switch to original page table after resumed
Date: Wed, 19 Sep 2018 15:43:05 +0800 [thread overview]
Message-ID: <f5dda0f48029c576d754559cfc60c2fef443c5e4.1537275915.git.yu.c.chen@intel.com> (raw)
In-Reply-To: <cover.1537275915.git.yu.c.chen@intel.com>
From: Zhimin Gu <kookoo.gu@intel.com>
After all the pages are restored to previous address, the page
table switches back to current swapper_pg_dir. However the
swapper_pg_dir currently in used might not be consistent with
previous page table, which might cause issue after resumed.
Fix this issue by switching to original page table after resumed.
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Zhimin Gu <kookoo.gu@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
---
arch/x86/power/hibernate_asm_32.S | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S
index f5103ae96582..6b2b94937113 100644
--- a/arch/x86/power/hibernate_asm_32.S
+++ b/arch/x86/power/hibernate_asm_32.S
@@ -25,6 +25,10 @@ ENTRY(swsusp_arch_suspend)
pushfl
popl saved_context_eflags
+ /* save cr3 */
+ movl %cr3, %eax
+ movl %eax, restore_cr3
+
FRAME_BEGIN
call swsusp_save
FRAME_END
@@ -32,6 +36,8 @@ ENTRY(swsusp_arch_suspend)
ENDPROC(swsusp_arch_suspend)
ENTRY(restore_image)
+ movl restore_cr3, %ebp
+
movl mmu_cr4_features, %ecx
movl temp_pgt, %eax
movl %eax, %cr3
@@ -66,9 +72,7 @@ done:
.align PAGE_SIZE
ENTRY(restore_registers)
/* go back to the original page tables */
- movl $swapper_pg_dir, %eax
- subl $__PAGE_OFFSET, %eax
- movl %eax, %cr3
+ movl %ebp, %cr3
movl mmu_cr4_features, %ecx
jecxz 1f # cr4 Pentium and higher, skip if zero
movl %ecx, %cr4; # turn PGE back on
--
2.17.1
next prev parent reply other threads:[~2018-09-19 7:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 7:37 [PATCH 00/12][RFC v3] Backport several fixes from 64bits to 32bits hibernation Chen Yu
2018-09-19 7:37 ` [PATCH 01/12][RFC v3] x86, hibernate: Fix nosave_regions setup for hibernation Chen Yu
2018-09-19 8:34 ` Rafael J. Wysocki
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:38 ` [PATCH 02/12][RFC v3] PM / hibernate: Check the success of generating md5 digest before hibernation Chen Yu
2018-09-19 8:36 ` Rafael J. Wysocki
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:38 ` [PATCH 03/12][RFC v3] x86-32/asm/power: Create stack frames in hibernate_asm_32.S Chen Yu
2018-09-19 8:41 ` Rafael J. Wysocki
2018-09-19 8:54 ` Yu Chen
2018-09-19 7:38 ` [PATCH 04/12][RFC v3] x86, hibernate: Extract the common code of 64/32 bit system Chen Yu
2018-09-19 9:03 ` Rafael J. Wysocki
2018-09-19 10:15 ` Rafael J. Wysocki
2018-09-19 10:34 ` Ingo Molnar
2018-09-19 10:36 ` Rafael J. Wysocki
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:38 ` [PATCH 05/12][RFC v3] x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER set on 32bit system Chen Yu
2018-09-19 10:31 ` Rafael J. Wysocki
2018-09-19 7:42 ` [PATCH 06/12][RFC v3] x86, hibernate: Rename temp_level4_pgt to temp_pgt Chen Yu
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:42 ` [PATCH 07/12][RFC v3] x86-32, hibernate: Use temp_pgt as the temporary page table Chen Yu
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:42 ` [PATCH 08/12][RFC v3] x86-32, hibernate: Use the page size macro instead of constant value Chen Yu
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:43 ` Chen Yu [this message]
2018-09-20 22:05 ` [PATCH 09/12][RFC v3] x86-32, hibernate: Switch to original page table after resumed Pavel Machek
2018-09-19 7:43 ` [PATCH 10/12][RFC v3] x86-32, hibernate: Switch to relocated restore code during resume on 32bit system Chen Yu
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:43 ` [PATCH 11/12][RFC v3] x86-32, hibernate: Set up temporary text mapping for " Chen Yu
2018-09-20 22:05 ` Pavel Machek
2018-09-19 7:43 ` [PATCH 12/12][RFC v3] x86-32, hibernate: Adjust in_suspend after resumed on " Chen Yu
2018-09-20 22:06 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f5dda0f48029c576d754559cfc60c2fef443c5e4.1537275915.git.yu.c.chen@intel.com \
--to=yu.c.chen@intel.com \
--cc=kookoo.gu@intel.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®