Commit a5a0b45e authored by Souptick Joarder's avatar Souptick Joarder Committed by Greg Kroah-Hartman

misc: cxl: Change return type to vm_fault_t

Use new return type vm_fault_t for fault handler. For
now, this is just documenting that the function returns
a VM_FAULT value rather than an errno. Once all instances
are converted, vm_fault_t will become a distinct type.

Reference id -> 1c8f4220 ("mm: change return type to
vm_fault_t")

previously cxl_mmap_fault returns VM_FAULT_NOPAGE as
default value irrespective of vm_insert_pfn() return
value. This bug is fixed with new vmf_insert_pfn()
which will return VM_FAULT_ type based on err.
Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Acked-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 361f2ddb
...@@ -128,11 +128,12 @@ void cxl_context_set_mapping(struct cxl_context *ctx, ...@@ -128,11 +128,12 @@ void cxl_context_set_mapping(struct cxl_context *ctx,
mutex_unlock(&ctx->mapping_lock); mutex_unlock(&ctx->mapping_lock);
} }
static int cxl_mmap_fault(struct vm_fault *vmf) static vm_fault_t cxl_mmap_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct cxl_context *ctx = vma->vm_file->private_data; struct cxl_context *ctx = vma->vm_file->private_data;
u64 area, offset; u64 area, offset;
vm_fault_t ret;
offset = vmf->pgoff << PAGE_SHIFT; offset = vmf->pgoff << PAGE_SHIFT;
...@@ -169,11 +170,11 @@ static int cxl_mmap_fault(struct vm_fault *vmf) ...@@ -169,11 +170,11 @@ static int cxl_mmap_fault(struct vm_fault *vmf)
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
} }
vm_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT); ret = vmf_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT);
mutex_unlock(&ctx->status_mutex); mutex_unlock(&ctx->status_mutex);
return VM_FAULT_NOPAGE; return ret;
} }
static const struct vm_operations_struct cxl_mmap_vmops = { static const struct vm_operations_struct cxl_mmap_vmops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment