diff options
| author | Janosch Frank <frankja@linux.ibm.com> | 2018-07-13 11:28:20 +0100 |
|---|---|---|
| committer | Janosch Frank <frankja@linux.ibm.com> | 2018-07-30 11:20:17 +0100 |
| commit | 58b7e200d2f1f9af9ef69a401a877791837a1c87 (patch) | |
| tree | c22e5b053c4d39f8dcd986ca5043ee37c8efad51 /arch/s390/mm | |
| parent | 2c46e974dd8b5316e65637af0ff6d4bc78554b2e (diff) | |
| download | talos-op-linux-58b7e200d2f1f9af9ef69a401a877791837a1c87.tar.gz talos-op-linux-58b7e200d2f1f9af9ef69a401a877791837a1c87.zip | |
s390/mm: Add gmap pmd linking
Let's allow pmds to be linked into gmap for the upcoming s390 KVM huge
page support.
Before this patch we copied the full userspace pmd entry. This is not
correct, as it contains SW defined bits that might be interpreted
differently in the GMAP context. Now we only copy over all hardware
relevant information leaving out the software bits.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/gmap.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 0bada5e097cb..870e81fcb0cf 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -596,10 +596,15 @@ int __gmap_link(struct gmap *gmap, unsigned long gaddr, unsigned long vmaddr) if (*table == _SEGMENT_ENTRY_EMPTY) { rc = radix_tree_insert(&gmap->host_to_guest, vmaddr >> PMD_SHIFT, table); - if (!rc) - *table = pmd_val(*pmd); - } else - rc = 0; + if (!rc) { + if (pmd_large(*pmd)) { + *table = pmd_val(*pmd) & + _SEGMENT_ENTRY_HARDWARE_BITS_LARGE; + } else + *table = pmd_val(*pmd) & + _SEGMENT_ENTRY_HARDWARE_BITS; + } + } spin_unlock(&gmap->guest_table_lock); spin_unlock(ptl); radix_tree_preload_end(); |
