s390/vdso: on timens page fault prefault also VVAR page

This is the s390 variant of commit e6b28ec65b6d ("x86/vdso: On timens
page fault prefault also VVAR page").

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index dd967af29d2b6f5ec074666e8ddf574ed698a4b9..8c4e07d533c8db8aacefeaf3e1fe6f277e46f088 100644 (file)
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -105,14 +105,23 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
                             struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        struct page *timens_page = find_timens_vvar_page(vma);
-       unsigned long pfn;
+       unsigned long addr, pfn;
+       vm_fault_t err;
 
        switch (vmf->pgoff) {
        case VVAR_DATA_PAGE_OFFSET:
-               if (timens_page)
+               pfn = virt_to_pfn(vdso_data);
+               if (timens_page) {
+                       /*
+                        * Fault in VVAR page too, since it will be accessed
+                        * to get clock data anyway.
+                        */
+                       addr = vmf->address + VVAR_TIMENS_PAGE_OFFSET * PAGE_SIZE;
+                       err = vmf_insert_pfn(vma, addr, pfn);
+                       if (unlikely(err & VM_FAULT_ERROR))
+                               return err;
                        pfn = page_to_pfn(timens_page);
-               else
-                       pfn = virt_to_pfn(vdso_data);
+               }
                break;
 #ifdef CONFIG_TIME_NS
        case VVAR_TIMENS_PAGE_OFFSET: