Skip to contentSkip to conversation

gpu/drm/vkms: Use new return type vm_fault_t

PATCH Superseded Souptick Joarder 2 participants 3 messages Jul 23, 2018 – Jul 26, 2018

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpu/drm/vkms: Use new return type vm_fault_t

Use new return type vm_fault_t for fault handler.

---
 drivers/gpu/drm/vkms/vkms_drv.h | 2 +-
 drivers/gpu/drm/vkms/vkms_gem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.h +1 -1
index 07be29f..d5d04a8 100644
@@ -65,7 +65,7 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
 				       u32 *handle,
 				       u64 size);
 
-int vkms_gem_fault(struct vm_fault *vmf);
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
 
 int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
 		     struct drm_mode_create_dumb *args);
drivers/gpu/drm/vkms/vkms_gem.c +2 -3
index c7e3836..62e05dc 100644
@@ -43,14 +43,14 @@ void vkms_gem_free_object(struct drm_gem_object *obj)
 	kfree(gem);
 }
 
-int vkms_gem_fault(struct vm_fault *vmf)
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf)
 {
 	struct vm_area_struct *vma = vmf->vma;
 	struct vkms_gem_object *obj = vma->vm_private_data;
 	unsigned long vaddr = vmf->address;
 	pgoff_t page_offset;
 	loff_t num_pages;
-	int ret;
+	vm_fault_t ret = VM_FAULT_SIGBUS;
 
 	page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT;
 	num_pages = DIV_ROUND_UP(obj->gem.size, PAGE_SIZE);
@@ -58,7 +58,6 @@ int vkms_gem_fault(struct vm_fault *vmf)
 	if (page_offset > num_pages)
 		return VM_FAULT_SIGBUS;
 
-	ret = -ENOENT;
 	mutex_lock(&obj->pages_lock);
 	if (obj->pages) {
 		get_page(obj->pages[page_offset]);
Signature · 1 line
1.9.1
#1 lore raw

Hi,

Thanks for the patch,

I reviewed and tested it; everything is fine. I only suggest removing the "gpu" part from the patch title (i.e., "drm/vkms: Use new return type vm_fault_t").

Quoted 53 lines · Souptick Joarder

Use new return type vm_fault_t for fault handler.

---
 drivers/gpu/drm/vkms/vkms_drv.h | 2 +-
 drivers/gpu/drm/vkms/vkms_gem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.h +1 -1
index 07be29f..d5d04a8 100644
@@ -65,7 +65,7 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
 				       u32 *handle,
 				       u64 size);
 
-int vkms_gem_fault(struct vm_fault *vmf);
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
 
 int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
 		     struct drm_mode_create_dumb *args);
drivers/gpu/drm/vkms/vkms_gem.c +2 -3
index c7e3836..62e05dc 100644
@@ -43,14 +43,14 @@ void vkms_gem_free_object(struct drm_gem_object *obj)
 	kfree(gem);
 }
 
-int vkms_gem_fault(struct vm_fault *vmf)
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf)
 {
 	struct vm_area_struct *vma = vmf->vma;
 	struct vkms_gem_object *obj = vma->vm_private_data;
 	unsigned long vaddr = vmf->address;
 	pgoff_t page_offset;
 	loff_t num_pages;
-	int ret;
+	vm_fault_t ret = VM_FAULT_SIGBUS;
 
 	page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT;
 	num_pages = DIV_ROUND_UP(obj->gem.size, PAGE_SIZE);
@@ -58,7 +58,6 @@ int vkms_gem_fault(struct vm_fault *vmf)
 	if (page_offset > num_pages)
 		return VM_FAULT_SIGBUS;
 
-	ret = -ENOENT;
 	mutex_lock(&obj->pages_lock);
 	if (obj->pages) {
 		get_page(obj->pages[page_offset]);
Signature · 1 line
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 7 lines · Rodrigo Siqueira

Hi,

Thanks for the patch,

I reviewed and tested it; everything is fine. I only suggest removing the "gpu" part from the patch title (i.e., "drm/vkms: Use new return type vm_fault_t").

ok. I Will post v2.

Quoted 55 lines · Souptick Joarder
Quoted 53 lines

Use new return type vm_fault_t for fault handler.

---
 drivers/gpu/drm/vkms/vkms_drv.h | 2 +-
 drivers/gpu/drm/vkms/vkms_gem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.h +1 -1
index 07be29f..d5d04a8 100644
@@ -65,7 +65,7 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
                                     u32 *handle,
                                     u64 size);
 
-int vkms_gem_fault(struct vm_fault *vmf);
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
 
 int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
                   struct drm_mode_create_dumb *args);
drivers/gpu/drm/vkms/vkms_gem.c +2 -4
index c7e3836..62e05dc 100644
@@ -43,14 +43,14 @@ void vkms_gem_free_object(struct drm_gem_object *obj)
      kfree(gem);
 }
 
-int vkms_gem_fault(struct vm_fault *vmf)
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf)
 {
      struct vm_area_struct *vma = vmf->vma;
      struct vkms_gem_object *obj = vma->vm_private_data;
      unsigned long vaddr = vmf->address;
      pgoff_t page_offset;
      loff_t num_pages;
-     int ret;
+     vm_fault_t ret = VM_FAULT_SIGBUS;
 
      page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT;
      num_pages = DIV_ROUND_UP(obj->gem.size, PAGE_SIZE);
@@ -58,7 +58,6 @@ int vkms_gem_fault(struct vm_fault *vmf)
      if (page_offset > num_pages)
              return VM_FAULT_SIGBUS;
 
-     ret = -ENOENT;
      mutex_lock(&obj->pages_lock);
      if (obj->pages) {
              get_page(obj->pages[page_offset]);
--

1.9.1