MFamd64: Various fixes for MIPS minidumps.
- Honor PG_NODUMP by not dumping pages with this flag set. - Pat the watchdog during dumps to avoid a watchdog reset while writing out a dump. - Reformat the output during a dump to update every 10% done rather than every 2MB dumped. - Include UMA small pages and pages holding PV entries in minidumps. Sponsored by: DARPA / AFRL
This commit is contained in:
parent
b47b9f6bd8
commit
7a6d450d66
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=310443
@ -37,8 +37,11 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/kerneldump.h>
|
||||
#include <sys/msgbuf.h>
|
||||
#include <sys/watchdog.h>
|
||||
#include <vm/vm.h>
|
||||
#include <vm/pmap.h>
|
||||
#include <vm/vm_page.h>
|
||||
#include <vm/vm_phys.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/elf.h>
|
||||
#include <machine/md_var.h>
|
||||
@ -62,7 +65,7 @@ static off_t dumplo;
|
||||
static off_t origdumplo;
|
||||
|
||||
/* Handle chunked writes. */
|
||||
static uint64_t counter, progress;
|
||||
static uint64_t counter, progress, dumpsize;
|
||||
/* Just auxiliary bufffer */
|
||||
static char tmpbuffer[PAGE_SIZE];
|
||||
|
||||
@ -73,8 +76,11 @@ CTASSERT(sizeof(*vm_page_dump) == 4);
|
||||
static int
|
||||
is_dumpable(vm_paddr_t pa)
|
||||
{
|
||||
vm_page_t m;
|
||||
int i;
|
||||
|
||||
if ((m = vm_phys_paddr_to_vm_page(pa)) != NULL)
|
||||
return ((m->flags & PG_NODUMP) == 0);
|
||||
for (i = 0; dump_avail[i] != 0 || dump_avail[i + 1] != 0; i += 2) {
|
||||
if (pa >= dump_avail[i] && pa < dump_avail[i + 1])
|
||||
return (1);
|
||||
@ -104,7 +110,40 @@ dump_drop_page(vm_paddr_t pa)
|
||||
atomic_clear_int(&vm_page_dump[idx], 1ul << bit);
|
||||
}
|
||||
|
||||
#define PG2MB(pgs) (((pgs) + (1 << 8) - 1) >> 8)
|
||||
static struct {
|
||||
int min_per;
|
||||
int max_per;
|
||||
int visited;
|
||||
} progress_track[10] = {
|
||||
{ 0, 10, 0},
|
||||
{ 10, 20, 0},
|
||||
{ 20, 30, 0},
|
||||
{ 30, 40, 0},
|
||||
{ 40, 50, 0},
|
||||
{ 50, 60, 0},
|
||||
{ 60, 70, 0},
|
||||
{ 70, 80, 0},
|
||||
{ 80, 90, 0},
|
||||
{ 90, 100, 0}
|
||||
};
|
||||
|
||||
static void
|
||||
report_progress(uint64_t progress, uint64_t dumpsize)
|
||||
{
|
||||
int sofar, i;
|
||||
|
||||
sofar = 100 - ((progress * 100) / dumpsize);
|
||||
for (i = 0; i < nitems(progress_track); i++) {
|
||||
if (sofar < progress_track[i].min_per ||
|
||||
sofar > progress_track[i].max_per)
|
||||
continue;
|
||||
if (progress_track[i].visited)
|
||||
return;
|
||||
progress_track[i].visited = 1;
|
||||
printf("..%d%%", sofar);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
write_buffer(struct dumperinfo *di, char *ptr, size_t sz)
|
||||
@ -126,10 +165,12 @@ write_buffer(struct dumperinfo *di, char *ptr, size_t sz)
|
||||
progress -= len;
|
||||
|
||||
if (counter >> 22) {
|
||||
printf(" %jd", PG2MB(progress >> PAGE_SHIFT));
|
||||
report_progress(progress, dumpsize);
|
||||
counter &= (1<<22) - 1;
|
||||
}
|
||||
|
||||
wdog_kern_pat(WD_LASTVAL);
|
||||
|
||||
if (ptr) {
|
||||
error = dump_write(di, ptr, 0, dumplo, len);
|
||||
if (error)
|
||||
@ -156,7 +197,6 @@ int
|
||||
minidumpsys(struct dumperinfo *di)
|
||||
{
|
||||
struct minidumphdr mdhdr;
|
||||
uint64_t dumpsize;
|
||||
uint32_t ptesize;
|
||||
uint32_t bits;
|
||||
vm_paddr_t pa;
|
||||
@ -247,9 +287,8 @@ minidumpsys(struct dumperinfo *di)
|
||||
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_MIPS_VERSION, dumpsize,
|
||||
kerneldumpcrypto_dumpkeysize(di->kdc), di->blocksize);
|
||||
|
||||
printf("Physical memory: %ju MB\n",
|
||||
(uintmax_t)ptoa((uintmax_t)physmem) / 1048576);
|
||||
printf("Dumping %llu MB:", (long long)dumpsize >> 20);
|
||||
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
|
||||
ptoa((uintmax_t)physmem) / 1048576);
|
||||
|
||||
/* Dump leader */
|
||||
error = dump_write_header(di, &kdh, 0, dumplo);
|
||||
|
@ -1484,6 +1484,7 @@ pmap_pv_reclaim(pmap_t locked_pmap)
|
||||
/* Entire chunk is free; return it. */
|
||||
m_pc = PHYS_TO_VM_PAGE(MIPS_DIRECT_TO_PHYS(
|
||||
(vm_offset_t)pc));
|
||||
dump_drop_page(m_pc->phys_addr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1545,6 +1546,7 @@ free_pv_chunk(struct pv_chunk *pc)
|
||||
PV_STAT(pc_chunk_frees++);
|
||||
/* entire chunk is free, return it */
|
||||
m = PHYS_TO_VM_PAGE(MIPS_DIRECT_TO_PHYS((vm_offset_t)pc));
|
||||
dump_drop_page(m->phys_addr);
|
||||
vm_page_unwire(m, PQ_NONE);
|
||||
vm_page_free(m);
|
||||
}
|
||||
@ -1605,6 +1607,7 @@ get_pv_entry(pmap_t pmap, boolean_t try)
|
||||
}
|
||||
PV_STAT(pc_chunk_count++);
|
||||
PV_STAT(pc_chunk_allocs++);
|
||||
dump_add_page(m->phys_addr);
|
||||
pc = (struct pv_chunk *)MIPS_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m));
|
||||
pc->pc_pmap = pmap;
|
||||
pc->pc_map[0] = pc_freemask[0] & ~1ul; /* preallocated bit 0 */
|
||||
|
@ -68,6 +68,8 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_int8_t *flags, int wait)
|
||||
}
|
||||
|
||||
pa = VM_PAGE_TO_PHYS(m);
|
||||
if ((wait & M_NODUMP) == 0)
|
||||
dump_add_page(pa);
|
||||
va = (void *)MIPS_PHYS_TO_DIRECT(pa);
|
||||
if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0)
|
||||
bzero(va, PAGE_SIZE);
|
||||
@ -81,6 +83,7 @@ uma_small_free(void *mem, vm_size_t size, u_int8_t flags)
|
||||
vm_paddr_t pa;
|
||||
|
||||
pa = MIPS_DIRECT_TO_PHYS((vm_offset_t)mem);
|
||||
dump_drop_page(pa);
|
||||
m = PHYS_TO_VM_PAGE(pa);
|
||||
m->wire_count--;
|
||||
vm_page_free(m);
|
||||
|
Loading…
Reference in New Issue
Block a user