x86/vdso: Change return type to vm_fault_t for fault handlers
Subsystems (3)
PATCH v2 1/1 x86/vdso: Change return type to vm_fault_t for fault handlers
Use new return type vm_fault_t for both fault handler vdso_fault() and vvar_fault(). Previously vm_insert_pfn() returns err which has to mapped into VM_FAULT_* type. The new function vmf_insert_pfn() will replace this inefficiency by returning correct VM_FAULT_* type.
See the following commit:
1c8f422059ae ("mm: change return type to vm_fault_t") b3ec9f33acb8 ("mm: change return type to vm_fault_t")
---
v2: Updated the change log
arch/x86/entry/vdso/vma.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
arch/x86/entry/vdso/vma.c +8 -11
@@ -39,7 +39,7 @@ void __init init_vdso_image(const struct vdso_image *image)struct linux_binprm ; -static int vdso_fault (const struct vm_special_mapping *sm, +static vm_fault_t vdso_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {const struct vdso_image *image = vma->vm_mm->context.vdso_image;
@@ -84,15 +84,15 @@ static int vdso_mremap(const struct vm_special_mapping *sm,return 0 ; } -static int vvar_fault (const struct vm_special_mapping *sm, +static vm_fault_t vvar_fault (const struct vm_special_mapping *sm,struct vm_area_struct *vma,struct vm_fault *vmf) {const struct vdso_image *image = vma->vm_mm->context.vdso_image;long sym_offset; -int ret = -EFAULT ; +vm_fault_t ret =VM_FAULT_SIGBUS ;if (!image) -return VM_FAULT_SIGBUS ; +return ret; sym_offset = (long )(vmf->pgoff <<PAGE_SHIFT ) + image->sym_vvar_start;
@@ -105,10 +105,10 @@ static int vvar_fault(const struct vm_special_mapping *sm,* the page past the end of the vvar mapping. */ if (sym_offset ==0 ) -return VM_FAULT_SIGBUS ; +return ret;if (sym_offset == image->sym_vvar_page) { - ret =vm_insert_pfn (vma, vmf->address, + ret =vmf_insert_pfn (vma, vmf->address,__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); }else if (sym_offset == image->sym_pvclock_page) { struct pvclock_vsyscall_time_info *pvti =
@@ -124,14 +124,11 @@ static int vvar_fault(const struct vm_special_mapping *sm,struct ms_hyperv_tsc_page *tsc_pg =hv_get_tsc_page ();if (tsc_pg &&vclock_was_used (VCLOCK_HVCLOCK )) - ret =vm_insert_pfn (vma, vmf->address, + ret =vmf_insert_pfn (vma, vmf->address,vmalloc_to_pfn (tsc_pg)); } -if (ret ==0 || ret == -EBUSY ) -return VM_FAULT_NOPAGE ; - -return VM_FAULT_SIGBUS ; +return ret; }static const struct vm_special_mapping vdso_mapping = {
Signature · 1 line
1.9.1
arch/x86/entry/vdso/vma.c static int vvar_fault(const struct vm_special_mapping *sm,
Quoted 20 lines · Souptick Joarder
Use new return type
vm_fault_tfor both fault handlervdso_fault()andvvar_fault(). Previouslyvm_insert_pfn()returns err which has to mapped into VM_FAULT_* type. The new functionvmf_insert_pfn()will replace this inefficiency by returning correct VM_FAULT_* type.arch/x86/entry/vdso/vma.c +2
-2@@ -105,10 +105,10 @@ static int vvar_fault(const struct vm_special_mapping *sm,* the page past the end of the vvar mapping. */ if (sym_offset ==0 ) -return VM_FAULT_SIGBUS ; +return ret;if (sym_offset == image->sym_vvar_page) { - ret =vm_insert_pfn (vma, vmf->address, + ret =vmf_insert_pfn (vma, vmf->address,__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); }else if (sym_offset == image->sym_pvclock_page) { struct pvclock_vsyscall_time_info *pvti =@@ -124,14 +124,11 @@ static int vvar_fault(const struct vm_special_mapping *sm,
Haven't you missed converting vm_insert_pfn_prot() at line 117? Did you test-compile this?
Quoted 14 lines · Matthew Wilcox
Quoted 13 lines · Souptick Joarder
Use new return type
vm_fault_tfor both fault handlervdso_fault()andvvar_fault(). Previouslyvm_insert_pfn()returns err which has to mapped into VM_FAULT_* type. The new functionvmf_insert_pfn()will replace this inefficiency by returning correct VM_FAULT_* type.arch/x86/entry/vdso/vma.c +1
-1@@ -105,10 +105,10 @@ static int vvar_fault(const struct vm_special_mapping *sm,* the page past the end of the vvar mapping. */ if (sym_offset ==0 ) -return VM_FAULT_SIGBUS ; +return ret;
Quoted 11 lines
arch/x86/entry/vdso/vma.c static int vvar_fault(const struct vm_special_mapping *sm,
Quoted 7 lines
arch/x86/entry/vdso/vma.c +1
-1if (sym_offset == image->sym_vvar_page) { - ret =vm_insert_pfn (vma, vmf->address, + ret =vmf_insert_pfn (vma, vmf->address,__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); }else if (sym_offset == image->sym_pvclock_page) { struct pvclock_vsyscall_time_info *pvti =@@ -124,14 +124,11 @@ static int vvar_fault(const struct vm_special_mapping *sm,Haven't you missed converting
vm_insert_pfn_prot()at line 117? Did you test-compile this?
I left it intentionally in this patch. When we will be replacing vm_insert_foo() with new API vmf_insert_foo(), vm_insert_pfn_prot need to be changed to return vm_fault_t type.
I will change the return type of vm_insert_pfn_prot() in that patch.
Quoted 27 lines · Souptick Joarder
Quoted 14 lines · Matthew Wilcox
Quoted 13 lines · Souptick Joarder
Use new return type
vm_fault_tfor both fault handlervdso_fault()andvvar_fault(). Previouslyvm_insert_pfn()returns err which has to mapped into VM_FAULT_* type. The new functionvmf_insert_pfn()will replace this inefficiency by returning correct VM_FAULT_* type.arch/x86/entry/vdso/vma.c +1
-1@@ -105,10 +105,10 @@ static int vvar_fault(const struct vm_special_mapping *sm,* the page past the end of the vvar mapping. */ if (sym_offset ==0 ) -return VM_FAULT_SIGBUS ; +return ret;Quoted 11 lines
arch/x86/entry/vdso/vma.c static int vvar_fault(const struct vm_special_mapping *sm,
Quoted 7 lines
arch/x86/entry/vdso/vma.c +1
-1if (sym_offset == image->sym_vvar_page) { - ret =vm_insert_pfn (vma, vmf->address, + ret =vmf_insert_pfn (vma, vmf->address,__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); }else if (sym_offset == image->sym_pvclock_page) { struct pvclock_vsyscall_time_info *pvti =@@ -124,14 +124,11 @@ static int vvar_fault(const struct vm_special_mapping *sm,Haven't you missed converting
vm_insert_pfn_prot()at line 117? Did you test-compile this?
Quoted 5 lines
I left it intentionally in this patch. When we will be replacing
vm_insert_foo()with new APIvmf_insert_foo(),vm_insert_pfn_protneed to be changed to returnvm_fault_ttype.I will change the return type of
vm_insert_pfn_prot()in that patch.
What?! That's just broken. vm_insert_pfn_prot returns an errno, so this patch introduces a bug where sometimes 'ret' contains a vm_fault_t and sometimes contains an errno. That's exactly the kind of thing this patch series is supposed to be *preventing*, not introducing!
I'll send a replacement patch series to do this properly.
Quoted 32 lines · Matthew Wilcox
Quoted 31 lines · Souptick Joarder
Quoted 14 lines · Matthew Wilcox
Quoted 13 lines · Souptick Joarder
Use new return type
vm_fault_tfor both fault handlervdso_fault()andvvar_fault(). Previouslyvm_insert_pfn()returns err which has to mapped into VM_FAULT_* type. The new functionvmf_insert_pfn()will replace this inefficiency by returning correct VM_FAULT_* type.arch/x86/entry/vdso/vma.c +1
-1@@ -105,10 +105,10 @@ static int vvar_fault(const struct vm_special_mapping *sm,* the page past the end of the vvar mapping. */ if (sym_offset ==0 ) -return VM_FAULT_SIGBUS ; +return ret;Quoted 11 lines
arch/x86/entry/vdso/vma.c static int vvar_fault(const struct vm_special_mapping *sm,
Quoted 7 lines
arch/x86/entry/vdso/vma.c +1
-1if (sym_offset == image->sym_vvar_page) { - ret =vm_insert_pfn (vma, vmf->address, + ret =vmf_insert_pfn (vma, vmf->address,__pa_symbol (&__vvar_page) >>PAGE_SHIFT ); }else if (sym_offset == image->sym_pvclock_page) { struct pvclock_vsyscall_time_info *pvti =@@ -124,14 +124,11 @@ static int vvar_fault(const struct vm_special_mapping *sm,Haven't you missed converting
vm_insert_pfn_prot()at line 117? Did you test-compile this?I left it intentionally in this patch. When we will be replacing
vm_insert_foo()with new APIvmf_insert_foo(),vm_insert_pfn_protneed to be changed to returnvm_fault_ttype.
Quoted 7 lines
Quoted 1 line
I will change the return type of
vm_insert_pfn_prot()in that patch.What?! That's just broken.
vm_insert_pfn_protreturns an errno, so this patch introduces a bug where sometimes 'ret' contains avm_fault_tand sometimes contains an errno. That's exactly the kind of thing this patch series is supposed to be *preventing*, not introducing!
It was my wrong understanding which create this issue. Sorry about it. I though to change the return type of vm_insert_pfn_prot() to vm_fault_t type directly along with the caller of vm_insert_pfn_prot(), but in a separate patch.
But introducing vmf_insert_pfn_prot() is much simpler approach here.
Sorry for making things complex.