From owner-freebsd-current@FreeBSD.ORG Fri Nov 4 15:30:11 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 075F11065672; Fri, 4 Nov 2011 15:30:11 +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 642218FC1C; Fri, 4 Nov 2011 15:30:09 +0000 (UTC) Received: from alf.home (alf.kiev.zoral.com.ua [10.1.1.177]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id pA4FU5Lk062022 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 Nov 2011 17:30:05 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from alf.home (kostik@localhost [127.0.0.1]) by alf.home (8.14.5/8.14.5) with ESMTP id pA4FU5wv044357; Fri, 4 Nov 2011 17:30:05 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by alf.home (8.14.5/8.14.5/Submit) id pA4FU5eg044356; Fri, 4 Nov 2011 17:30:05 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: alf.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 4 Nov 2011 17:30:05 +0200 From: Kostik Belousov To: Alan Cox Message-ID: <20111104153004.GK50300@deviant.kiev.zoral.com.ua> References: <4EB11C32.80106@FreeBSD.org> <4EB22938.4050803@rice.edu> <20111103132437.GV50300@deviant.kiev.zoral.com.ua> <4EB2D48E.1030102@rice.edu> <20111104100828.GG50300@deviant.kiev.zoral.com.ua> <4EB40015.5040100@rice.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="FdRGtB4gDWnqYrPg" Content-Disposition: inline In-Reply-To: <4EB40015.5040100@rice.edu> 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=-3.9 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: "K. Macy" , freebsd-current@freebsd.org, Penta Upa , Andriy Gapon , Benjamin Kaduk Subject: Re: panic at vm_page_wire with FreeBSD 9.0 Beta 3 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Nov 2011 15:30:11 -0000 --FdRGtB4gDWnqYrPg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 04, 2011 at 10:09:09AM -0500, Alan Cox wrote: > On 11/04/2011 05:08, Kostik Belousov wrote: > >On Thu, Nov 03, 2011 at 12:51:10PM -0500, Alan Cox wrote: > >>I would suggest introducing the vm_page_bits_t change first. If, at the > >>same time, you change the return type from the function vm_page_bits() > >>to use vm_page_bits_t, then I believe it is straightforward to fix all > >>of the places in vm_page.c that don't properly handle a 32 KB page size. > >Ok, I think this is orhtohonal to the ABI issue. The vm_page_bits_t > >applied. >=20 > Agreed, which is why I wanted to separate the two things. >=20 > I've made a few comments below. =2E.. > Looks good. I will make universe the patch below. Any further notes ? diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index f14da4a..f398453 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -137,7 +137,7 @@ SYSCTL_INT(_vm, OID_AUTO, tryrelock_restart, CTLFLAG_RD, =20 static uma_zone_t fakepg_zone; =20 -static void vm_page_clear_dirty_mask(vm_page_t m, int pagebits); +static void vm_page_clear_dirty_mask(vm_page_t m, vm_page_bits_t pagebits); static void vm_page_queue_remove(int queue, vm_page_t m); static void vm_page_enqueue(int queue, vm_page_t m); static void vm_page_init_fakepg(void *dummy); @@ -2350,7 +2350,7 @@ retrylookup: * * Inputs are required to range within a page. */ -int +vm_page_bits_t vm_page_bits(int base, int size) { int first_bit; @@ -2367,7 +2367,8 @@ vm_page_bits(int base, int size) first_bit =3D base >> DEV_BSHIFT; last_bit =3D (base + size - 1) >> DEV_BSHIFT; =20 - return ((2 << last_bit) - (1 << first_bit)); + return (((vm_page_bits_t)2 << last_bit) - + ((vm_page_bits_t)1 << first_bit)); } =20 /* @@ -2426,7 +2427,7 @@ vm_page_set_valid(vm_page_t m, int base, int size) * Clear the given bits from the specified page's dirty field. */ static __inline void -vm_page_clear_dirty_mask(vm_page_t m, int pagebits) +vm_page_clear_dirty_mask(vm_page_t m, vm_page_bits_t pagebits) { uintptr_t addr; #if PAGE_SIZE < 16384 @@ -2455,7 +2456,6 @@ vm_page_clear_dirty_mask(vm_page_t m, int pagebits) */ addr =3D (uintptr_t)&m->dirty; #if PAGE_SIZE =3D=3D 32768 -#error pagebits too short atomic_clear_64((uint64_t *)addr, pagebits); #elif PAGE_SIZE =3D=3D 16384 atomic_clear_32((uint32_t *)addr, pagebits); @@ -2492,8 +2492,8 @@ vm_page_clear_dirty_mask(vm_page_t m, int pagebits) void vm_page_set_validclean(vm_page_t m, int base, int size) { - u_long oldvalid; - int endoff, frag, pagebits; + vm_page_bits_t oldvalid, pagebits; + int endoff, frag; =20 VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if (size =3D=3D 0) /* handle degenerate case */ @@ -2505,7 +2505,7 @@ vm_page_set_validclean(vm_page_t m, int base, int siz= e) * first block. */ if ((frag =3D base & ~(DEV_BSIZE - 1)) !=3D base && - (m->valid & (1 << (base >> DEV_BSHIFT))) =3D=3D 0) + (m->valid & ((vm_page_bits_t)1 << (base >> DEV_BSHIFT))) =3D=3D 0) pmap_zero_page_area(m, frag, base - frag); =20 /* @@ -2515,7 +2515,7 @@ vm_page_set_validclean(vm_page_t m, int base, int siz= e) */ endoff =3D base + size; if ((frag =3D endoff & ~(DEV_BSIZE - 1)) !=3D endoff && - (m->valid & (1 << (endoff >> DEV_BSHIFT))) =3D=3D 0) + (m->valid & ((vm_page_bits_t)1 << (endoff >> DEV_BSHIFT))) =3D=3D 0) pmap_zero_page_area(m, endoff, DEV_BSIZE - (endoff & (DEV_BSIZE - 1))); =20 @@ -2585,7 +2585,7 @@ vm_page_clear_dirty(vm_page_t m, int base, int size) void vm_page_set_invalid(vm_page_t m, int base, int size) { - int bits; + vm_page_bits_t bits; =20 VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); KASSERT((m->oflags & VPO_BUSY) =3D=3D 0, @@ -2625,7 +2625,7 @@ vm_page_zero_invalid(vm_page_t m, boolean_t setvalid) */ for (b =3D i =3D 0; i <=3D PAGE_SIZE / DEV_BSIZE; ++i) { if (i =3D=3D (PAGE_SIZE / DEV_BSIZE) ||=20 - (m->valid & (1 << i)) + (m->valid & ((vm_page_bits_t)1 << i)) ) { if (i > b) { pmap_zero_page_area(m,=20 @@ -2656,9 +2656,10 @@ vm_page_zero_invalid(vm_page_t m, boolean_t setvalid) int vm_page_is_valid(vm_page_t m, int base, int size) { - int bits =3D vm_page_bits(base, size); + vm_page_bits_t bits; =20 VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + bits =3D vm_page_bits(base, size); if (m->valid && ((m->valid & bits) =3D=3D bits)) return 1; else diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 23637bb..e3eb08c 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -113,6 +113,20 @@ =20 TAILQ_HEAD(pglist, vm_page); =20 +#if PAGE_SIZE =3D=3D 4096 +#define VM_PAGE_BITS_ALL 0xffu +typedef uint8_t vm_page_bits_t; +#elif PAGE_SIZE =3D=3D 8192 +#define VM_PAGE_BITS_ALL 0xffffu +typedef uint16_t vm_page_bits_t; +#elif PAGE_SIZE =3D=3D 16384 +#define VM_PAGE_BITS_ALL 0xffffffffu +typedef uint32_t vm_page_bits_t; +#elif PAGE_SIZE =3D=3D 32768 +#define VM_PAGE_BITS_ALL 0xfffffffffffffffflu +typedef uint64_t vm_page_bits_t; +#endif + struct vm_page { TAILQ_ENTRY(vm_page) pageq; /* queue info for FIFO queue or free list (Q)= */ TAILQ_ENTRY(vm_page) listq; /* pages in same object (O) */ @@ -137,20 +151,8 @@ struct vm_page { u_char busy; /* page busy count (O) */ /* NOTE that these must support one bit per DEV_BSIZE in a page!!! */ /* so, on normal X86 kernels, they must be at least 8 bits wide */ - /* In reality, support for 32KB pages is not fully implemented. */ -#if PAGE_SIZE =3D=3D 4096 - uint8_t valid; /* map of valid DEV_BSIZE chunks (O) */ - uint8_t dirty; /* map of dirty DEV_BSIZE chunks (M) */ -#elif PAGE_SIZE =3D=3D 8192 - uint16_t valid; /* map of valid DEV_BSIZE chunks (O) */ - uint16_t dirty; /* map of dirty DEV_BSIZE chunks (M) */ -#elif PAGE_SIZE =3D=3D 16384 - uint32_t valid; /* map of valid DEV_BSIZE chunks (O) */ - uint32_t dirty; /* map of dirty DEV_BSIZE chunks (M) */ -#elif PAGE_SIZE =3D=3D 32768 - uint64_t valid; /* map of valid DEV_BSIZE chunks (O) */ - uint64_t dirty; /* map of dirty DEV_BSIZE chunks (M) */ -#endif + vm_page_bits_t valid; /* map of valid DEV_BSIZE chunks (O) */ + vm_page_bits_t dirty; /* map of dirty DEV_BSIZE chunks (M) */ }; =20 /* @@ -403,7 +405,7 @@ void vm_page_clear_dirty (vm_page_t, int, int); void vm_page_set_invalid (vm_page_t, int, int); int vm_page_is_valid (vm_page_t, int, int); void vm_page_test_dirty (vm_page_t); -int vm_page_bits (int, int); +vm_page_bits_t vm_page_bits(int base, int size); void vm_page_zero_invalid(vm_page_t m, boolean_t setvalid); void vm_page_free_toq(vm_page_t m); void vm_page_zero_idle_wakeup(void); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index e3222cb..cd2658d 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -486,15 +486,16 @@ vnode_pager_input_smlfs(object, m) vm_object_t object; vm_page_t m; { - int bits, i; struct vnode *vp; struct bufobj *bo; struct buf *bp; struct sf_buf *sf; daddr_t fileaddr; vm_offset_t bsize; - int error =3D 0; + vm_page_bits_t bits; + int error, i; =20 + error =3D 0; vp =3D object->handle; if (vp->v_iflag & VI_DOOMED) return VM_PAGER_BAD; --FdRGtB4gDWnqYrPg Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk60BPwACgkQC3+MBN1Mb4jt6gCg2BmcnCD1X9++gR2OZxqz2EXx ujIAoIEt7WnjQoQJlfzZXkPPaTU9e/1g =/hl5 -----END PGP SIGNATURE----- --FdRGtB4gDWnqYrPg--