Module Name: src
Committed By: ad
Date: Thu Mar 19 18:58:14 UTC 2020
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
PR port-amd64/55083 (assertion "pmap->pm_stats.resident_count == PDP_SIZE"
failed)
Reported-by: syzbot+2c1e17352173a60ee...@syzkaller.appspotmail.com
Don't screw up resident_count in failure path.
To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 src/sys/arch/x86/x86/pmap.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/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.377 src/sys/arch/x86/x86/pmap.c:1.378
--- src/sys/arch/x86/x86/pmap.c:1.377 Wed Mar 18 18:54:28 2020
+++ src/sys/arch/x86/x86/pmap.c Thu Mar 19 18:58:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.377 2020/03/18 18:54:28 ad Exp $ */
+/* $NetBSD: pmap.c,v 1.378 2020/03/19 18:58:14 ad 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.377 2020/03/18 18:54:28 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.378 2020/03/19 18:58:14 ad Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2229,11 +2229,11 @@ pmap_freepage(struct pmap *pmap, struct
{
int lidx;
- KASSERT(ptp->wire_count == 1);
+ KASSERT(ptp->wire_count <= 1);
PMAP_CHECK_PP(VM_PAGE_TO_PP(ptp));
lidx = level - 1;
- pmap_stats_update(pmap, -1, 0);
+ pmap_stats_update(pmap, -ptp->wire_count, 0);
if (pmap->pm_ptphint[lidx] == ptp)
pmap->pm_ptphint[lidx] = NULL;
ptp->wire_count = 0;
@@ -2450,7 +2450,6 @@ pmap_unget_ptp(struct pmap *pmap, struct
continue;
}
KASSERT(pt->pg[i]->wire_count == 0);
- pt->pg[i]->wire_count = 1;
PMAP_CHECK_PP(VM_PAGE_TO_PP(pt->pg[i]));
pmap_freepage(pmap, pt->pg[i], i - 1);
}
