From owner-svn-src-all@FreeBSD.ORG  Mon Jan 28 12:54:54 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 8BC214C1;
 Mon, 28 Jan 2013 12:54:54 +0000 (UTC)
 (envelope-from zont@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 5A8C886F;
 Mon, 28 Jan 2013 12:54:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SCss5h070952;
 Mon, 28 Jan 2013 12:54:54 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SCsrPK070947;
 Mon, 28 Jan 2013 12:54:53 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201301281254.r0SCsrPK070947@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Mon, 28 Jan 2013 12:54:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246032 - in head/sys: sys 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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2013 12:54:54 -0000

Author: zont
Date: Mon Jan 28 12:54:53 2013
New Revision: 246032
URL: http://svnweb.freebsd.org/changeset/base/246032

Log:
  - Add system wide page faults requiring I/O counter.
  
  Reviewed by:	alc
  MFC after:	2 weeks

Modified:
  head/sys/sys/vmmeter.h
  head/sys/vm/vm_fault.c
  head/sys/vm/vm_meter.c

Modified: head/sys/sys/vmmeter.h
==============================================================================
--- head/sys/sys/vmmeter.h	Mon Jan 28 12:50:16 2013	(r246031)
+++ head/sys/sys/vmmeter.h	Mon Jan 28 12:54:53 2013	(r246032)
@@ -61,6 +61,7 @@ struct vmmeter {
 	 * Virtual memory activity.
 	 */
 	u_int v_vm_faults;	/* (p) address memory faults */
+	u_int v_io_faults;	/* (p) page faults requiring I/O */
 	u_int v_cow_faults;	/* (p) copy-on-writes faults */
 	u_int v_cow_optim;	/* (p) optimized copy-on-writes faults */
 	u_int v_zfod;		/* (p) pages zero filled on demand */

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Mon Jan 28 12:50:16 2013	(r246031)
+++ head/sys/vm/vm_fault.c	Mon Jan 28 12:54:53 2013	(r246032)
@@ -939,9 +939,10 @@ vnode_locked:
 	 * Unlock everything, and return
 	 */
 	unlock_and_deallocate(&fs);
-	if (hardfault)
+	if (hardfault) {
+		PCPU_INC(cnt.v_io_faults);
 		curthread->td_ru.ru_majflt++;
-	else
+	} else 
 		curthread->td_ru.ru_minflt++;
 
 	return (KERN_SUCCESS);

Modified: head/sys/vm/vm_meter.c
==============================================================================
--- head/sys/vm/vm_meter.c	Mon Jan 28 12:50:16 2013	(r246031)
+++ head/sys/vm/vm_meter.c	Mon Jan 28 12:54:53 2013	(r246032)
@@ -283,6 +283,7 @@ VM_STATS_SYS(v_syscall, "System calls");
 VM_STATS_SYS(v_intr, "Device interrupts");
 VM_STATS_SYS(v_soft, "Software interrupts");
 VM_STATS_VM(v_vm_faults, "Address memory faults");
+VM_STATS_VM(v_io_faults, "Page faults requiring I/O");
 VM_STATS_VM(v_cow_faults, "Copy-on-write faults");
 VM_STATS_VM(v_cow_optim, "Optimized COW faults");
 VM_STATS_VM(v_zfod, "Pages zero-filled on demand");