Attachment 50374 Details for Bug 40216 – Bus error debugging

[patch] Bus error debugging

fdo40216-debug.diff (text/plain), 1.99 KB, created by Michel Dänzer on 2011-08-19 06:15:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2011-08-19 06:15:24 UTC

Size: 1.99 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
>index 221b924..f462979 100644
>--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
>+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
>@@ -28,6 +28,7 @@
>  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
>  */
> 
>+#include <drmP.h>
> #include <ttm/ttm_module.h>
> #include <ttm/ttm_bo_driver.h>
> #include <ttm/ttm_placement.h>
>@@ -110,6 +111,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> 			retval = VM_FAULT_NOPAGE;
> 			goto out_unlock;
> 		default:
>+			DRM_ERROR("Driver fault_reserve_notify hook returned %d\n", ret);
> 			retval = VM_FAULT_SIGBUS;
> 			goto out_unlock;
> 		}
>@@ -125,6 +127,8 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> 		ret = ttm_bo_wait(bo, false, true, false);
> 		spin_unlock(&bdev->fence_lock);
> 		if (unlikely(ret != 0)) {
>+			if (ret != -ERESTARTSYS)
>+				DRM_ERROR("ttm_bo_wait returned %d\n", ret);
> 			retval = (ret != -ERESTARTSYS) ?
> 			    VM_FAULT_SIGBUS : VM_FAULT_NOPAGE;
> 			goto out_unlock;
>@@ -139,6 +143,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> 	}
> 	ret = ttm_mem_io_reserve_vm(bo);
> 	if (unlikely(ret != 0)) {
>+		DRM_ERROR("ttm_mem_io_reserve_vm returned %d\n", ret);
> 		retval = VM_FAULT_SIGBUS;
> 		goto out_io_unlock;
> 	}
>@@ -149,6 +154,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> 	    bo->vm_node->start - vma->vm_pgoff;
> 
> 	if (unlikely(page_offset >= bo->num_pages)) {
>+		DRM_ERROR("page_offset=%lu >= bo->num_pages=%lu\n", page_offset, bo->num_pages);
> 		retval = VM_FAULT_SIGBUS;
> 		goto out_io_unlock;
> 	}
>@@ -204,6 +210,8 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> 		if (unlikely((ret == -EBUSY) || (ret != 0 && i > 0)))
> 			break;
> 		else if (unlikely(ret != 0)) {
>+			if (ret != -ENOMEM)
>+				DRM_ERROR("vm_insert_mixed returned %d\n", ret);
> 			retval =
> 			    (ret == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS;
> 			goto out_io_unlock;

Actions: View | Splinter Review

Attachments on bug 40216: 50368 | 50374

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.