Module Name: src
Committed By: riastradh
Date: Mon Feb 14 13:22:11 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_mm.c
Log Message:
drm/mm: Assert invariant of another rb lookup.
This one looks a little more questionable.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/drm_mm.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/dist/drm/drm_mm.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.15 src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.16
--- src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.15 Mon Feb 14 13:02:31 2022
+++ src/sys/external/bsd/drm2/dist/drm/drm_mm.c Mon Feb 14 13:22:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_mm.c,v 1.15 2022/02/14 13:02:31 riastradh Exp $ */
+/* $NetBSD: drm_mm.c,v 1.16 2022/02/14 13:22:11 riastradh Exp $ */
/**************************************************************************
*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.15 2022/02/14 13:02:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.16 2022/02/14 13:22:11 riastradh Exp $");
#include <linux/export.h>
#include <linux/interval_tree_generic.h>
@@ -430,7 +430,14 @@ static struct drm_mm_node *best_hole(str
static struct drm_mm_node *find_hole(struct drm_mm *mm, u64 addr)
{
#ifdef __NetBSD__
- return rb_tree_find_node_leq(&mm->holes_addr.rbr_tree, &addr);
+ struct drm_mm_node *node;
+
+ node = rb_tree_find_node_leq(&mm->holes_addr.rbr_tree, &addr);
+ KASSERT(node == NULL || __drm_mm_hole_node_start(node) <= addr);
+ KASSERT(node == NULL || addr <
+ __drm_mm_hole_node_start(node) + node->hole_size);
+
+ return node;
#else
struct rb_node *rb = mm->holes_addr.rb_node;
struct drm_mm_node *node = NULL;
