From owner-svn-src-head@FreeBSD.ORG Mon Mar 19 15:51:05 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 D6E5D1065673; Mon, 19 Mar 2012 15:51:05 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 4D4B88FC12; Mon, 19 Mar 2012 15:51:04 +0000 (UTC) Received: from skuns.kiev.zoral.com.ua (localhost [127.0.0.1]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id q2JFonfx043311; Mon, 19 Mar 2012 17:50:49 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.5/8.14.5) with ESMTP id q2JFonLp027330; Mon, 19 Mar 2012 17:50:49 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.5/8.14.5/Submit) id q2JFonnR027329; Mon, 19 Mar 2012 17:50:49 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 19 Mar 2012 17:50:49 +0200 From: Konstantin Belousov To: John Baldwin Message-ID: <20120319155049.GA2358@deviant.kiev.zoral.com.ua> References: <201203190934.q2J9YMEo061016@svn.freebsd.org> <201203190828.35561.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="M9NhX3UHpAaciwkO" Content-Disposition: inline In-Reply-To: <201203190828.35561.jhb@freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.0 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua 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:51:05 -0000 --M9NhX3UHpAaciwkO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 19, 2012 at 08:28:35AM -0400, John Baldwin wrote: > 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 > >=20 > > 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. > > =20 > > Consistently check for the page to be non-fictitious before accesing > > superpage pv list. > > =20 > > Sponsored by: The FreeBSD Foundation > > Reviewed by: alc > > MFC after: 2 weeks >=20 > Hmm, I think you accidentally reverted 223122? Oops, yes, r233122 is reverted. I committed the fix, thank you for noting. Apparently I did not pulled the master branch on the machine were I did the commit, against which the topic branch was diffed :(. >=20 > > Modified: head/sys/amd64/amd64/pmap.c > >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- 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; > > =20 > > if ((prot & VM_PROT_READ) =3D=3D VM_PROT_NONE) { > > pmap_remove(pmap, sva, eva); > > @@ -2952,7 +2956,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv > > =20 > > pv_lists_locked =3D FALSE; > > resume: > > - anychanged =3D FALSE; > > + anychanged =3D 0; > > =20 > > PMAP_LOCK(pmap); > > for (; sva < eva; sva =3D va_next) { > > @@ -3000,7 +3004,7 @@ resume: > > * invalidated by pmap_protect_pde(). > > */ > > if (pmap_protect_pde(pmap, pde, sva, prot)) > > - anychanged =3D TRUE; > > + anychanged =3D 1; > > continue; > > } else { > > if (!pv_lists_locked) { > > @@ -3054,7 +3058,7 @@ retry: > > if (obits & PG_G) > > pmap_invalidate_page(pmap, sva); > > else > > - anychanged =3D TRUE; > > + anychanged =3D 1; > > } > > } > > } >=20 > --=20 > John Baldwin --M9NhX3UHpAaciwkO Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) iEYEARECAAYFAk9nVdkACgkQC3+MBN1Mb4h66ACeN6QoqjnGL+iB0ZRcmyO9jsu1 Lp8AnAptAqOafhhzfC0P5d1Fcfc5ipgb =Dj/J -----END PGP SIGNATURE----- --M9NhX3UHpAaciwkO--