From owner-cvs-all@FreeBSD.ORG Tue Aug 19 01:17:07 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AB851065681; Tue, 19 Aug 2008 01:17:07 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F5A78FC0C; Tue, 19 Aug 2008 01:17:07 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7J1H7Ro083073; Tue, 19 Aug 2008 01:17:07 GMT (envelope-from kmacy@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7J1H7FC083072; Tue, 19 Aug 2008 01:17:07 GMT (envelope-from kmacy@repoman.freebsd.org) Message-Id: <200808190117.m7J1H7FC083072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to kmacy@repoman.freebsd.org using -f From: Kip Macy Date: Tue, 19 Aug 2008 01:16:12 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/i386/i386 pmap.c src/sys/kern kern_mbuf.c src/sys/vm uma.h uma_core.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 01:17:07 -0000 kmacy 2008-08-19 01:16:12 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/i386/i386 pmap.c sys/kern kern_mbuf.c sys/vm uma.h uma_core.c Log: SVN rev 181859 on 2008-08-19 01:16:12Z by kmacy In anticipation of MFCing physically contiguous jumbo frames MFC r177921: Reintroduce UMA_SLAB_KMAP; however, change its spelling to UMA_SLAB_KERNEL for consistency with its sibling UMA_SLAB_KMEM. (UMA_SLAB_KMAP met its original demise in revision 1.30 of vm/uma_core.c.) UMA_SLAB_KERNEL is now required by the jumbo frame allocators. Without it, UMA cannot correctly return pages from the jumbo frame zones to the VM system because it resets the pages' object field to NULL instead of the kernel object. In more detail, the jumbo frame zones are created with the option UMA_ZONE_REFCNT. This causes UMA to overwrite the pages' object field with the address of the slab. However, when UMA wants to release these pages, it doesn't know how to restore the object field, so it sets it to NULL. This change teaches UMA how to reset the object field to the kernel object. Crashes reported by: kris Fix tested by: kris Approved by: alc Revision Changes Path 1.594.2.8 +3 -1 src/sys/i386/i386/pmap.c 1.32.2.3 +30 -0 src/sys/kern/kern_mbuf.c 1.31.2.1 +1 -0 src/sys/vm/uma.h 1.147.2.2 +4 -0 src/sys/vm/uma_core.c