From owner-svn-src-head@FreeBSD.ORG Mon Mar 19 15:25:42 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D66661065679; Mon, 19 Mar 2012 15:25:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id A7BEA8FC1B; Mon, 19 Mar 2012 15:25:42 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) by cyrus.watson.org (Postfix) with ESMTPSA id 5B7BA46B17; Mon, 19 Mar 2012 11:25:42 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id C49E3B93E; Mon, 19 Mar 2012 11:25:41 -0400 (EDT) From: John Baldwin To: Konstantin Belousov Date: Mon, 19 Mar 2012 08:28:35 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p10; KDE/4.5.5; amd64; ; ) References: <201203190934.q2J9YMEo061016@svn.freebsd.org> In-Reply-To: <201203190934.q2J9YMEo061016@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201203190828.35561.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 19 Mar 2012 11:25:41 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r233168 - in head/sys: amd64/amd64 i386/i386 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2012 15:25:42 -0000 On Monday, March 19, 2012 5:34:22 am Konstantin Belousov wrote: > Author: kib > Date: Mon Mar 19 09:34:22 2012 > New Revision: 233168 > URL: http://svn.freebsd.org/changeset/base/233168 > > Log: > If we ever allow for managed fictitious pages, the pages shall be > excluded from superpage promotions. At least one of the reason is > that pv_table is sized for non-fictitious pages only. > > Consistently check for the page to be non-fictitious before accesing > superpage pv list. > > Sponsored by: The FreeBSD Foundation > Reviewed by: alc > MFC after: 2 weeks Hmm, I think you accidentally reverted 223122? > Modified: head/sys/amd64/amd64/pmap.c > ============================================================================== > --- head/sys/amd64/amd64/pmap.c Mon Mar 19 09:30:40 2012 (r233167) > +++ head/sys/amd64/amd64/pmap.c Mon Mar 19 09:34:22 2012 (r233168) > @@ -2939,7 +2942,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sv > pdp_entry_t *pdpe; > pd_entry_t ptpaddr, *pde; > pt_entry_t *pte; > - boolean_t anychanged, pv_lists_locked; > + int anychanged; > + boolean_t pv_lists_locked; > > if ((prot & VM_PROT_READ) == VM_PROT_NONE) { > pmap_remove(pmap, sva, eva); > @@ -2952,7 +2956,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv > > pv_lists_locked = FALSE; > resume: > - anychanged = FALSE; > + anychanged = 0; > > PMAP_LOCK(pmap); > for (; sva < eva; sva = va_next) { > @@ -3000,7 +3004,7 @@ resume: > * invalidated by pmap_protect_pde(). > */ > if (pmap_protect_pde(pmap, pde, sva, prot)) > - anychanged = TRUE; > + anychanged = 1; > continue; > } else { > if (!pv_lists_locked) { > @@ -3054,7 +3058,7 @@ retry: > if (obits & PG_G) > pmap_invalidate_page(pmap, sva); > else > - anychanged = TRUE; > + anychanged = 1; > } > } > } -- John Baldwin