[src/trunk]: src/sys/arch/x86/x86 Fix braino in pmap_find_gnt(), really retur...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9636b4405092
branches:  trunk
changeset: 943370:9636b4405092
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Sep 01 11:24:14 2020 +0000

description:
Fix braino in pmap_find_gnt(), really return the gnt entry covering the range
and not one that starts just after.
Fixes a KASSERT in pmap_remove_gnt().

diffstat:

 sys/arch/x86/x86/pmap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 51c8caef831a -r 9636b4405092 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Tue Sep 01 08:22:36 2020 +0000
+++ b/sys/arch/x86/x86/pmap.c   Tue Sep 01 11:24:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.403 2020/08/04 06:23:46 skrll Exp $ */
+/*     $NetBSD: pmap.c,v 1.404 2020/09/01 11:24:14 bouyer Exp $        */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.403 2020/08/04 06:23:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.404 2020/09/01 11:24:14 bouyer Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -5082,7 +5082,7 @@
        headp = pmap->pm_data;
        KASSERT(headp != NULL);
        SLIST_FOREACH(pgnt, headp, pd_gnt_list) {
-               if (pgnt->pd_gnt_sva >= sva && pgnt->pd_gnt_sva <= eva)
+               if (pgnt->pd_gnt_sva <= sva && eva <= pgnt->pd_gnt_eva)
                        return pgnt;
                /* check that we're not overlapping part of a region */
                KASSERT(pgnt->pd_gnt_sva >= eva || pgnt->pd_gnt_eva <= sva);