Module Name: src
Committed By: ad
Date: Thu Apr 23 21:53:01 UTC 2020
Modified Files:
src/sys/uvm: uvm_bio.c uvm_glue.c
Log Message:
Enable ubc_direct by default, but only on systems with no more than 2 CPUs
for now.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.177 -r1.178 src/sys/uvm/uvm_glue.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_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.110 src/sys/uvm/uvm_bio.c:1.111
--- src/sys/uvm/uvm_bio.c:1.110 Thu Apr 23 21:47:09 2020
+++ src/sys/uvm/uvm_bio.c Thu Apr 23 21:53:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.110 2020/04/23 21:47:09 ad Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.111 2020/04/23 21:53:01 ad Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.110 2020/04/23 21:47:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.111 2020/04/23 21:53:01 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
@@ -64,7 +64,7 @@ static int __noinline ubc_uiomove_direct
int, int);
static void __noinline ubc_zerorange_direct(struct uvm_object *, off_t, size_t, int);
-bool ubc_direct = false; /* XXX */
+bool ubc_direct = true;
#endif
/*
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.177 src/sys/uvm/uvm_glue.c:1.178
--- src/sys/uvm/uvm_glue.c:1.177 Thu Mar 5 12:21:00 2020
+++ src/sys/uvm/uvm_glue.c Thu Apr 23 21:53:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.177 2020/03/05 12:21:00 rin Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.178 2020/04/23 21:53:01 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.177 2020/03/05 12:21:00 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.178 2020/04/23 21:53:01 ad Exp $");
#include "opt_kgdb.h"
#include "opt_kstack.h"
@@ -504,6 +504,18 @@ uvm_scheduler(void)
/* Start the freelist cache. */
uvm_pgflcache_start();
+#ifdef PMAP_DIRECT
+ /*
+ * XXX Temporary ugly hack. Just before boot, disable ubc_direct if
+ * there's more than a couple of CPUs, since it has concurrency
+ * problems.
+ */
+ if (ncpu > 2) {
+ extern bool ubc_direct;
+ ubc_direct = false;
+ }
+#endif
+
for (;;) {
/* Update legacy stats for post-mortem debugging. */
uvm_update_uvmexp();
