Page MenuHomeFreeBSD
Files F137183089

D53850.id166878.diff
No OneTemporary
Actions

D53850.id166878.diff
View Options

diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -85,6 +85,8 @@
#include <sys/refcount.h>
#include <sys/resourcevar.h>
#include <sys/rwlock.h>
+#include <sys/sched.h>
+#include <sys/sf_buf.h>
#include <sys/signalvar.h>
#include <sys/sysctl.h>
#include <sys/sysent.h>
@@ -1220,6 +1222,20 @@
if ((fs->m->flags & PG_ZERO) == 0) {
pmap_zero_page(fs->m);
} else {
+#ifdef DIAGNOSTIC
+ struct sf_buf *sf;
+ unsigned long *p;
+ int i;
+
+ sched_pin();
+ sf = sf_buf_alloc(fs->m, SFB_CPUPRIVATE);
+ p = (unsigned long *)sf_buf_kva(sf);
+ for (i = 0; i < PAGE_SIZE / sizeof(*p); i++, p++)
+ KASSERT(*p == 0, ("zerocheck failed page %p PG_ZERO %d %jx",
+ fs->m, i, (uintmax_t)*p));
+ sf_buf_free(sf);
+ sched_unpin();
+#endif
VM_CNT_INC(v_ozfod);
}
VM_CNT_INC(v_zfod);
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -84,6 +84,7 @@
#include <sys/sleepqueue.h>
#include <sys/sbuf.h>
#include <sys/sched.h>
+#include <sys/sf_buf.h>
#include <sys/smp.h>
#include <sys/sysctl.h>
#include <sys/vmmeter.h>
@@ -4050,14 +4051,24 @@
*/
atomic_thread_fence_acq();
-#if defined(DIAGNOSTIC) && defined(PHYS_TO_DMAP)
- if (PMAP_HAS_DMAP && (m->flags & PG_ZERO) != 0) {
- uint64_t *p;
+#if defined(DIAGNOSTIC)
+ if ((m->flags & PG_ZERO) != 0) {
+ struct sf_buf *sf;
+ unsigned long *p;
int i;
- p = (uint64_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m));
- for (i = 0; i < PAGE_SIZE / sizeof(uint64_t); i++, p++)
- KASSERT(*p == 0, ("vm_page_free_prep %p PG_ZERO %d %jx",
- m, i, (uintmax_t)*p));
+
+ sched_pin();
+ sf = sf_buf_alloc(m, SFB_CPUPRIVATE | SFB_NOWAIT);
+ if (sf != NULL) {
+ p = (unsigned long *)sf_buf_kva(sf);
+ for (i = 0; i < PAGE_SIZE / sizeof(*p); i++, p++) {
+ KASSERT(*p == 0,
+ ("zerocheck failed page %p PG_ZERO %d %jx",
+ m, i, (uintmax_t)*p));
+ }
+ sf_buf_free(sf);
+ }
+ sched_unpin();
}
#endif
if ((m->oflags & VPO_UNMANAGED) == 0) {

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 22, 10:02 AM (16 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25951268
Default Alt Text
D53850.id166878.diff (1 KB)

Event Timeline