Module Name: src
Committed By: ad
Date: Fri May 15 22:35:05 UTC 2020
Modified Files:
src/sys/uvm: uvm_fault.c
Log Message:
Reported-by: syzbot+3e3c7cfa8093f8de0...@syzkaller.appspotmail.com
Comment out an assertion that's now bogus and add a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/sys/uvm/uvm_fault.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/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.225 src/sys/uvm/uvm_fault.c:1.226
--- src/sys/uvm/uvm_fault.c:1.225 Mon Apr 13 22:22:19 2020
+++ src/sys/uvm/uvm_fault.c Fri May 15 22:35:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.225 2020/04/13 22:22:19 ad Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.226 2020/05/15 22:35:05 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.225 2020/04/13 22:22:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.226 2020/05/15 22:35:05 ad Exp $");
#include "opt_uvmhist.h"
@@ -1701,9 +1701,13 @@ uvm_fault_upper_enter(
* but rather that the pmap should be designed such that it
* never needs to fail when the new mapping is replacing an
* existing mapping and the new page has no existing mappings.
+ *
+ * XXX This can't be asserted safely any more because many
+ * LWPs and/or many processes could simultaneously fault on
+ * the same VA and some might succeed.
*/
- KASSERT(!pmap_extract(pmap, va, NULL));
+ /* KASSERT(!pmap_extract(pmap, va, NULL)); */
/*
* ensure that the page is queued in the case that
