From owner-svn-src-all@FreeBSD.ORG Thu Mar 21 07:28:16 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 22BE79C5; Thu, 21 Mar 2013 07:28:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1507CE1E; Thu, 21 Mar 2013 07:28:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L7SFOM075871; Thu, 21 Mar 2013 07:28:15 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L7SFYI075868; Thu, 21 Mar 2013 07:28:15 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201303210728.r2L7SFYI075868@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 21 Mar 2013 07:28:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248569 - in head/sys: kern vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2013 07:28:16 -0000 Author: kib Date: Thu Mar 21 07:28:15 2013 New Revision: 248569 URL: http://svnweb.freebsd.org/changeset/base/248569 Log: Only size and create the bio_transient_map when unmapped buffers are enabled. Now, disabling the unmapped buffers should result in the kernel memory map identical to pre-r248550. Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/vfs_bio.c head/sys/vm/vm_init.c Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Thu Mar 21 07:26:33 2013 (r248568) +++ head/sys/kern/vfs_bio.c Thu Mar 21 07:28:15 2013 (r248569) @@ -586,7 +586,7 @@ kern_vfs_bio_buffer_alloc(caddr_t v, lon * allows to not trim the buffer KVA for the architectures * with ample KVA space. */ - if (bio_transient_maxcnt == 0) { + if (bio_transient_maxcnt == 0 && unmapped_buf_allowed) { maxbuf_sz = maxbcache != 0 ? maxbcache : maxbuf * BKVASIZE; buf_sz = (long)nbuf * BKVASIZE; if (buf_sz < maxbuf_sz / 10 * 9) { Modified: head/sys/vm/vm_init.c ============================================================================== --- head/sys/vm/vm_init.c Thu Mar 21 07:26:33 2013 (r248568) +++ head/sys/vm/vm_init.c Thu Mar 21 07:28:15 2013 (r248569) @@ -189,10 +189,12 @@ again: buffer_map = kmem_suballoc(clean_map, &kmi->buffer_sva, &kmi->buffer_eva, (long)nbuf * BKVASIZE, FALSE); buffer_map->system_map = 1; - bio_transient_map = kmem_suballoc(clean_map, &kmi->bio_transient_sva, - &kmi->bio_transient_eva, (long)bio_transient_maxcnt * MAXPHYS, - FALSE); - bio_transient_map->system_map = 1; + if (bio_transient_maxcnt != 0) { + bio_transient_map = kmem_suballoc(clean_map, + &kmi->bio_transient_sva, &kmi->bio_transient_eva, + (long)bio_transient_maxcnt * MAXPHYS, FALSE); + bio_transient_map->system_map = 1; + } pager_map = kmem_suballoc(clean_map, &kmi->pager_sva, &kmi->pager_eva, (long)nswbuf * MAXPHYS, FALSE); pager_map->system_map = 1;