From owner-svn-src-user@FreeBSD.ORG Fri Jul 10 23:51:57 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08189106564A; Fri, 10 Jul 2009 23:51:57 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EAEC28FC18; Fri, 10 Jul 2009 23:51:56 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6ANpu5w035795; Fri, 10 Jul 2009 23:51:56 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6ANpuu3035792; Fri, 10 Jul 2009 23:51:56 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200907102351.n6ANpuu3035792@svn.freebsd.org> From: Kip Macy Date: Fri, 10 Jul 2009 23:51:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195599 - in user/kmacy/releng_7_2_fcs_1/sys/amd64: amd64 include X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2009 23:51:57 -0000 Author: kmacy Date: Fri Jul 10 23:51:56 2009 New Revision: 195599 URL: http://svn.freebsd.org/changeset/base/195599 Log: add page exclusion to the API Modified: user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c user/kmacy/releng_7_2_fcs_1/sys/amd64/include/md_var.h Modified: user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c Fri Jul 10 23:51:22 2009 (r195598) +++ user/kmacy/releng_7_2_fcs_1/sys/amd64/amd64/minidump_machdep.c Fri Jul 10 23:51:56 2009 (r195599) @@ -56,6 +56,7 @@ CTASSERT(sizeof(struct kerneldumpheader) extern uint64_t KPDPphys; uint64_t *vm_page_dump; +uint64_t *vm_page_dump_exclude; int vm_page_dump_size; static struct kerneldumpheader kdh; @@ -69,7 +70,7 @@ static size_t counter, progress; CTASSERT(sizeof(*vm_page_dump) == 8); static int -is_dumpable(vm_paddr_t pa, int ignorebit) +is_dumpable(vm_paddr_t pa) { int i, idx, bit, isdata; uint64_t pfn = pa; @@ -77,7 +78,7 @@ is_dumpable(vm_paddr_t pa, int ignorebit pfn >>= PAGE_SHIFT; idx = pfn >> 6; /* 2^6 = 64 */ bit = pfn & 63; - isdata = (ignorebit == TRUE) ? 1 : vm_page_dump[idx] & (1ul << bit); + isdata = ((vm_page_dump_exclude[idx] & (1ul << bit)) == 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] && isdata) @@ -224,7 +225,7 @@ minidumpsys(struct dumperinfo *di) /* This is an entire 2M page. */ pa = pd[j] & PG_PS_FRAME; for (k = 0; k < NPTEPG; k++) { - if (is_dumpable(pa, TRUE)) + if (is_dumpable(pa)) dump_add_page(pa); pa += PAGE_SIZE; } @@ -236,7 +237,7 @@ minidumpsys(struct dumperinfo *di) for (k = 0; k < NPTEPG; k++) { if ((pt[k] & PG_V) == PG_V) { pa = pt[k] & PG_FRAME; - if (is_dumpable(pa, TRUE)) + if (is_dumpable(pa)) dump_add_page(pa); } } @@ -256,7 +257,7 @@ minidumpsys(struct dumperinfo *di) bit = bsfq(bits); pa = (((uint64_t)i * sizeof(*vm_page_dump) * NBBY) + bit) * PAGE_SIZE; /* Clear out undumpable pages now if needed */ - if (is_dumpable(pa, FALSE)) { + if (is_dumpable(pa)) { dumpsize += PAGE_SIZE; } else { dump_drop_page(pa); @@ -437,3 +438,25 @@ dump_drop_page(vm_paddr_t pa) bit = pa & 63; atomic_clear_long(&vm_page_dump[idx], 1ul << bit); } + +void +dump_exclude_page(vm_paddr_t pa) +{ + int idx, bit; + + pa >>= PAGE_SHIFT; + idx = pa >> 6; /* 2^6 = 64 */ + bit = pa & 63; + atomic_set_long(&vm_page_dump_exclude[idx], 1ul << bit); +} + +void +dump_unexclude_page(vm_paddr_t pa) +{ + int idx, bit; + + pa >>= PAGE_SHIFT; + idx = pa >> 6; /* 2^6 = 64 */ + bit = pa & 63; + atomic_clear_long(&vm_page_dump_exclude[idx], 1ul << bit); +} Modified: user/kmacy/releng_7_2_fcs_1/sys/amd64/include/md_var.h ============================================================================== --- user/kmacy/releng_7_2_fcs_1/sys/amd64/include/md_var.h Fri Jul 10 23:51:22 2009 (r195598) +++ user/kmacy/releng_7_2_fcs_1/sys/amd64/include/md_var.h Fri Jul 10 23:51:56 2009 (r195599) @@ -57,6 +57,7 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; extern uint64_t *vm_page_dump; +extern uint64_t *vm_page_dump_exclude; extern int vm_page_dump_size; typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); @@ -72,6 +73,8 @@ void doreti_iret(void) __asm(__STRING(do void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); void dump_add_page(vm_paddr_t); void dump_drop_page(vm_paddr_t); +void dump_exclude_page(vm_paddr_t); +void dump_unexclude_page(vm_paddr_t); void initializecpu(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td);