diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-07 16:50:41 +0800 |
| commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 (patch) | |
| tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 /Documentation/virtual/kvm/mmu.txt | |
| parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (diff) | |
| parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 (diff) | |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4hikey-hibernate-v4.4
Conflicts:
arch/arm64/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/asm-offsets.c
arch/arm64/kvm/hyp/fpsimd.S
drivers/firmware/psci.c
fs/proc/task_mmu.c
mm/memcontrol.c
Diffstat (limited to 'Documentation/virtual/kvm/mmu.txt')
| -rw-r--r-- | Documentation/virtual/kvm/mmu.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/mmu.txt b/Documentation/virtual/kvm/mmu.txt index 3a4d681c3e98..b653641d4261 100644 --- a/Documentation/virtual/kvm/mmu.txt +++ b/Documentation/virtual/kvm/mmu.txt @@ -358,7 +358,8 @@ In the first case there are two additional complications: - if CR4.SMEP is enabled: since we've turned the page into a kernel page, the kernel may now execute it. We handle this by also setting spte.nx. If we get a user fetch or read fault, we'll change spte.u=1 and - spte.nx=gpte.nx back. + spte.nx=gpte.nx back. For this to work, KVM forces EFER.NX to 1 when + shadow paging is in use. - if CR4.SMAP is disabled: since the page has been changed to a kernel page, it can not be reused when CR4.SMAP is enabled. We set CR4.SMAP && !CR0.WP into shadow page's role to avoid this case. Note, |