diff options
| author | Alexander Graf <agraf@suse.de> | 2014-04-29 10:17:26 (GMT) |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-04-29 10:36:09 (GMT) |
| commit | b18db0b80867931f4e3a844400a3c22a4fd2ff57 (patch) | |
| tree | 0bc2511f1c513a919904016a0665949107f36c40 /arch/powerpc/mm | |
| parent | ab78475c76bd8c54375d8a778200c59314973d30 (diff) | |
| download | linux-b18db0b80867931f4e3a844400a3c22a4fd2ff57.tar.xz | |
KVM guest: Make pv trampoline code executable
Our PV guest patching code assembles chunks of instructions on the fly when it
encounters more complicated instructions to hijack. These instructions need
to live in a section that we don't mark as non-executable, as otherwise we
fault when jumping there.
Right now we put it into the .bss section where it automatically gets marked
as non-executable. Add a check to the NX setting function to ensure that we
leave these particular pages executable.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index d766d6e..06ba83b 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -207,6 +207,10 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, if (overlaps_kernel_text(vaddr, vaddr + step)) tprot &= ~HPTE_R_N; + /* Make kvm guest trampolines executable */ + if (overlaps_kvm_tmp(vaddr, vaddr + step)) + tprot &= ~HPTE_R_N; + /* * If relocatable, check if it overlaps interrupt vectors that * are copied down to real 0. For relocatable kernel |