Page MenuHomeFreeBSD
Differential D11722 Diff 31150 sys/amd64/amd64/minidump_machdep.c

Changeset View

Standalone View

View Options

sys/amd64/amd64/minidump_machdep.c

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
#include <machine/minidump.h> #include <machine/minidump.h>
CTASSERT(sizeof(struct kerneldumpheader) == 512); CTASSERT(sizeof(struct kerneldumpheader) == 512);
uint64_t *vm_page_dump; uint64_t *vm_page_dump;
int vm_page_dump_size; int vm_page_dump_size;
static struct kerneldumpheader kdh; static struct kerneldumpheader kdh;
static off_t dumplo;
/* Handle chunked writes. */ /* Handle chunked writes. */
static size_t fragsz; static size_t fragsz;
static void *dump_va; static void *dump_va;
static size_t counter, progress, dumpsize; static size_t counter, progress, dumpsize;
CTASSERT(sizeof(*vm_page_dump) == 8); CTASSERT(sizeof(*vm_page_dump) == 8);
static int dump_retry_count = 5; static int dump_retry_count = 5;
Show All 20 Lines
static int static int
blk_flush(struct dumperinfo *di) blk_flush(struct dumperinfo *di)
{ {
int error; int error;
if (fragsz == 0) if (fragsz == 0)
return (0); return (0);
error = dump_write(di, dump_va, 0, dumplo, fragsz); error = dump_write(di, dump_va, 0, fragsz);
cemUnsubmitted
Not Done
Inline Actions

Stupid bikeshedding: Maybe rename dump_write to dump_append, now that the offset is tracked implicitly?

cem: Stupid bikeshedding: Maybe rename dump_write to dump_append, now that the offset is tracked…
markjAuthorUnsubmitted
Not Done
Inline Actions

Yeah, I think that'd be an improvement. And then rename dump_raw_write() to dump_write().

Alternately, follow the convention of write(2) and pwrite(2) and call them dump_write() and dump_pwrite(). Do you have any preference?

markj: Yeah, I think that'd be an improvement. And then rename dump_raw_write() to dump_write().
cemUnsubmitted
Not Done
Inline Actions

Yeah, userspace write() does the implicit offset thing. My thought is that kernel interfaces like VOP_WRITE take an explicit offset rather than relying on the state. So I'd say my preference would be append/write. But it's only a weak preference.

cem: Yeah, userspace write() does the implicit offset thing. My thought is that kernel interfaces…
markjAuthorUnsubmitted
Not Done
Inline Actions

Yeah, fair enough.

markj: Yeah, fair enough.
dumplo += fragsz;
fragsz = 0; fragsz = 0;
return (error); return (error);
} }
static struct { static struct {
int min_per; int min_per;
int max_per; int max_per;
int visited; int visited;
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Lines while (sz) {
if (counter >> 24) { if (counter >> 24) {
report_progress(progress, dumpsize); report_progress(progress, dumpsize);
counter &= (1<<24) - 1; counter &= (1<<24) - 1;
} }
wdog_kern_pat(WD_LASTVAL); wdog_kern_pat(WD_LASTVAL);
if (ptr) { if (ptr) {
error = dump_write(di, ptr, 0, dumplo, len); error = dump_write(di, ptr, 0, len);
if (error) if (error)
return (error); return (error);
dumplo += len;
ptr += len; ptr += len;
sz -= len; sz -= len;
} else { } else {
for (i = 0; i < len; i += PAGE_SIZE) for (i = 0; i < len; i += PAGE_SIZE)
dump_va = pmap_kenter_temporary(pa + i, (i + fragsz) >> PAGE_SHIFT); dump_va = pmap_kenter_temporary(pa + i, (i + fragsz) >> PAGE_SHIFT);
fragsz += len; fragsz += len;
pa += len; pa += len;
sz -= len; sz -= len;
▲ Show 20 Lines • Show All 136 Lines • ▼ Show 20 Lines retry:
mdhdr.dmapend = DMAP_MAX_ADDRESS; mdhdr.dmapend = DMAP_MAX_ADDRESS;
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize, mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_AMD64_VERSION, dumpsize,
di->blocksize); di->blocksize);
printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20, printf("Dumping %llu out of %ju MB:", (long long)dumpsize >> 20,
ptoa((uintmax_t)physmem) / 1048576); ptoa((uintmax_t)physmem) / 1048576);
error = dump_start(di, &kdh, &dumplo); error = dump_start(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
/* Dump my header */ /* Dump my header */
bzero(&fakepd, sizeof(fakepd)); bzero(&fakepd, sizeof(fakepd));
bcopy(&mdhdr, &fakepd, sizeof(mdhdr)); bcopy(&mdhdr, &fakepd, sizeof(mdhdr));
error = blk_write(di, (char *)&fakepd, 0, PAGE_SIZE); error = blk_write(di, (char *)&fakepd, 0, PAGE_SIZE);
if (error) if (error)
▲ Show 20 Lines • Show All 69 Lines • ▼ Show 20 Lines while (bits) {
bits &= ~(1ul << bit); bits &= ~(1ul << bit);
} }
} }
error = blk_flush(di); error = blk_flush(di);
if (error) if (error)
goto fail; goto fail;
error = dump_finish(di, &kdh, dumplo); error = dump_finish(di, &kdh);
if (error != 0) if (error != 0)
goto fail; goto fail;
printf("\nDump complete\n"); printf("\nDump complete\n");
return (0); return (0);
fail: fail:
if (error < 0) if (error < 0)
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines