From owner-svn-src-all@FreeBSD.ORG Fri Jul 25 15:07:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D487A4A; Fri, 25 Jul 2014 15:07:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A3BA2B6E; Fri, 25 Jul 2014 15:07:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PF77wR091532; Fri, 25 Jul 2014 15:07:07 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6PF77Lv091531; Fri, 25 Jul 2014 15:07:07 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201407251507.s6PF77Lv091531@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 25 Jul 2014 15:07:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r269090 - stable/9/sys/kern X-SVN-Group: stable-9 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.18 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: Fri, 25 Jul 2014 15:07:08 -0000 Author: kib Date: Fri Jul 25 15:07:07 2014 New Revision: 269090 URL: http://svnweb.freebsd.org/changeset/base/269090 Log: Partial MFC of r268466: Add a knob to disable the residency calculation for kern.proc.vmmap. Tested by: "Ivan A. Kosarev" Modified: stable/9/sys/kern/kern_proc.c Modified: stable/9/sys/kern/kern_proc.c ============================================================================== --- stable/9/sys/kern/kern_proc.c Fri Jul 25 14:47:44 2014 (r269089) +++ stable/9/sys/kern/kern_proc.c Fri Jul 25 15:07:07 2014 (r269090) @@ -141,6 +141,10 @@ uma_zone_t proc_zone; int kstack_pages = KSTACK_PAGES; SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0, "Kernel stack size in pages"); +static int vmmap_skip_res_cnt = 0; +SYSCTL_INT(_kern, OID_AUTO, proc_vmmap_skip_resident_count, CTLFLAG_RW, + &vmmap_skip_res_cnt, 0, + "Skip calculation of the pages resident count in kern.proc.vmmap"); CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE); #ifdef COMPAT_FREEBSD32 @@ -2189,6 +2193,8 @@ kern_proc_vmmap_out(struct proc *p, stru } kve->kve_resident = 0; addr = entry->start; + if (vmmap_skip_res_cnt) + goto skip_resident_count; while (addr < entry->end) { locked_pa = 0; mincoreinfo = pmap_mincore(map->pmap, addr, &locked_pa); @@ -2201,6 +2207,7 @@ kern_proc_vmmap_out(struct proc *p, stru addr += PAGE_SIZE; } +skip_resident_count: for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) { if (tobj != obj) VM_OBJECT_LOCK(tobj);