Author: cperciva
Date: Fri Jan 7 23:11:19 2011
New Revision: 217130
URL: http://svn.freebsd.org/changeset/base/217130
Log:
MFS r217050: Make minidumps work on i386/XEN.
Approved by: re (rwatson)
Modified:
releng/8.2/sys/i386/i386/machdep.c
releng/8.2/sys/i386/i386/minidump_machdep.c
releng/8.2/sys/i386/xen/pmap.c
Directory Properties:
releng/8.2/sys/ (props changed)
releng/8.2/sys/amd64/include/xen/ (props changed)
releng/8.2/sys/cddl/contrib/opensolaris/ (props changed)
releng/8.2/sys/contrib/dev/acpica/ (props changed)
releng/8.2/sys/contrib/pf/ (props changed)
Modified: releng/8.2/sys/i386/i386/machdep.c
==============================================================================
--- releng/8.2/sys/i386/i386/machdep.c Fri Jan 7 22:58:12 2011
(r217129)
+++ releng/8.2/sys/i386/i386/machdep.c Fri Jan 7 23:11:19 2011
(r217130)
@@ -2437,6 +2437,9 @@ do_next:
#else
phys_avail[0] = physfree;
phys_avail[1] = xen_start_info->nr_pages*PAGE_SIZE;
+ dump_avail[0] = 0;
+ dump_avail[1] = xen_start_info->nr_pages*PAGE_SIZE;
+
#endif
/*
Modified: releng/8.2/sys/i386/i386/minidump_machdep.c
==============================================================================
--- releng/8.2/sys/i386/i386/minidump_machdep.c Fri Jan 7 22:58:12 2011
(r217129)
+++ releng/8.2/sys/i386/i386/minidump_machdep.c Fri Jan 7 23:11:19 2011
(r217130)
@@ -65,6 +65,11 @@ static void *dump_va;
static uint64_t counter, progress;
CTASSERT(sizeof(*vm_page_dump) == 4);
+#ifndef XEN
+#define xpmap_mtop(x) (x)
+#define xpmap_ptom(x) (x)
+#endif
+
static int
is_dumpable(vm_paddr_t pa)
@@ -194,7 +199,7 @@ minidumpsys(struct dumperinfo *di)
j = va >> PDRSHIFT;
if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
/* This is an entire 2M page. */
- pa = pd[j] & PG_PS_FRAME;
+ pa = xpmap_mtop(pd[j] & PG_PS_FRAME);
for (k = 0; k < NPTEPG; k++) {
if (is_dumpable(pa))
dump_add_page(pa);
@@ -204,10 +209,10 @@ minidumpsys(struct dumperinfo *di)
}
if ((pd[j] & PG_V) == PG_V) {
/* set bit for each valid page in this 2MB block */
- pt = pmap_kenter_temporary(pd[j] & PG_FRAME, 0);
+ pt = pmap_kenter_temporary(xpmap_mtop(pd[j] &
PG_FRAME), 0);
for (k = 0; k < NPTEPG; k++) {
if ((pt[k] & PG_V) == PG_V) {
- pa = pt[k] & PG_FRAME;
+ pa = xpmap_mtop(pt[k] & PG_FRAME);
if (is_dumpable(pa))
dump_add_page(pa);
}
@@ -307,8 +312,24 @@ minidumpsys(struct dumperinfo *di)
continue;
}
if ((pd[j] & PG_V) == PG_V) {
- pa = pd[j] & PG_FRAME;
+ pa = xpmap_mtop(pd[j] & PG_FRAME);
+#ifndef XEN
error = blk_write(di, 0, pa, PAGE_SIZE);
+#else
+ pt = pmap_kenter_temporary(pa, 0);
+ memcpy(fakept, pt, PAGE_SIZE);
+ for (i = 0; i < NPTEPG; i++)
+ fakept[i] = xpmap_mtop(fakept[i]);
+ error = blk_write(di, (char *)&fakept, 0, PAGE_SIZE);
+ if (error)
+ goto fail;
+ /* flush, in case we reuse fakept in the same block */
+ error = blk_flush(di);
+ if (error)
+ goto fail;
+ bzero(fakept, sizeof(fakept));
+#endif
+
if (error)
goto fail;
} else {
Modified: releng/8.2/sys/i386/xen/pmap.c
==============================================================================
--- releng/8.2/sys/i386/xen/pmap.c Fri Jan 7 22:58:12 2011
(r217129)
+++ releng/8.2/sys/i386/xen/pmap.c Fri Jan 7 23:11:19 2011
(r217130)
@@ -3097,9 +3097,10 @@ void *
pmap_kenter_temporary(vm_paddr_t pa, int i)
{
vm_offset_t va;
+ vm_paddr_t ma = xpmap_ptom(pa);
va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE);
- PT_SET_MA(va, (pa & ~PAGE_MASK) | PG_V | pgeflag);
+ PT_SET_MA(va, (ma & ~PAGE_MASK) | PG_V | pgeflag);
invlpg(va);
return ((void *)crashdumpmap);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
