CVS commit: src/sys/external/bsd/drm2/ttm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:34:14 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c

Log Message:
drm/ttm: More careful diagnostics earlier on.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.19 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.20
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.19	Sun Dec 19 11:34:06 2021
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c	Sun Dec 19 11:34:14 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttm_bo_vm.c,v 1.19 2021/12/19 11:34:06 riastradh Exp $	*/
+/*	$NetBSD: ttm_bo_vm.c,v 1.20 2021/12/19 11:34:14 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.19 2021/12/19 11:34:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo_vm.c,v 1.20 2021/12/19 11:34:14 riastradh Exp $");
 
 #include <sys/types.h>
 
@@ -254,7 +254,29 @@ ttm_bo_mmap_object(struct ttm_bo_device 
 	ret = ttm_bo_uvm_lookup(bdev, startpage, npages, &bo);
 	if (ret)
 		goto fail0;
-	KASSERT(drm_vma_node_start(&bo->base.vma_node) <= offset);
+	KASSERTMSG((drm_vma_node_start(&bo->base.vma_node) <= startpage),
+	    "mapping npages=0x%jx @ pfn=0x%jx"
+	    " from vma npages=0x%jx @ pfn=0x%jx",
+	    (uintmax_t)npages,
+	    (uintmax_t)startpage,
+	    (uintmax_t)drm_vma_node_size(&bo->base.vma_node),
+	    (uintmax_t)drm_vma_node_start(&bo->base.vma_node));
+	KASSERTMSG((npages <= drm_vma_node_size(&bo->base.vma_node)),
+	    "mapping npages=0x%jx @ pfn=0x%jx"
+	    " from vma npages=0x%jx @ pfn=0x%jx",
+	    (uintmax_t)npages,
+	    (uintmax_t)startpage,
+	    (uintmax_t)drm_vma_node_size(&bo->base.vma_node),
+	    (uintmax_t)drm_vma_node_start(&bo->base.vma_node));
+	KASSERTMSG(((startpage - drm_vma_node_start(&bo->base.vma_node))
+		<= (drm_vma_node_size(&bo->base.vma_node) - npages)),
+	    "mapping npages=0x%jx @ pfn=0x%jx"
+	    " from vma npages=0x%jx @ pfn=0x%jx",
+	    (uintmax_t)npages,
+	    (uintmax_t)startpage,
+	    (uintmax_t)drm_vma_node_size(&bo->base.vma_node),
+	    (uintmax_t)drm_vma_node_start(&bo->base.vma_node));
+
 	/* XXX Just assert this?  */
 	if (__predict_false(bdev->driver->verify_access == NULL)) {
 		ret = -EPERM;