From owner-svn-src-projects@FreeBSD.ORG  Wed Jan  9 01:18:20 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1E88E29E;
 Wed,  9 Jan 2013 01:18:20 +0000 (UTC)
 (envelope-from cherry@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 10009911;
 Wed,  9 Jan 2013 01:18:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r091IJ2T077422;
 Wed, 9 Jan 2013 01:18:19 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r091IJTO077421;
 Wed, 9 Jan 2013 01:18:19 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201301090118.r091IJTO077421@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Wed, 9 Jan 2013 01:18:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245200 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jan 2013 01:18:20 -0000

Author: cherry
Date: Wed Jan  9 01:18:19 2013
New Revision: 245200
URL: http://svnweb.freebsd.org/changeset/base/245200

Log:
  When trying to return pages to page cache, only try to free memory we manage
  
  Approved by: gibbs (implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/pmap.c

Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/pmap.c	Wed Jan  9 00:36:06 2013	(r245199)
+++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c	Wed Jan  9 01:18:19 2013	(r245200)
@@ -155,6 +155,8 @@ extern unsigned long physfree; /* from m
 
 struct pmap kernel_pmap_store;
 
+#define ISBOOTVA(va) ((va) >= KERNBASE && (va) <= virtual_avail) /* XXX: keep an eye on virtual_avail */
+
 uintptr_t virtual_avail;	/* VA of first avail page (after kernel bss) */
 uintptr_t virtual_end;	/* VA of last avail page (end of kernel AS) */
 
@@ -1064,7 +1066,7 @@ pmap_kremove(vm_offset_t va)
 	PT_CLEAR_VA(pte, TRUE);
 	PT_UPDATES_FLUSH();
 
-	//	vtopte_release(va, &tptr);
+	vtopte_release(va, &tptr);
 }
 
 /*
@@ -1357,7 +1359,7 @@ xen_vm_vtop(uintptr_t va)
 		 va <= VM_MAX_KERNEL_ADDRESS),
 		("Invalid kernel virtual address"));
 
-	if (va >= KERNBASE && va <= virtual_avail) { /* 
+	if (ISBOOTVA(va)) { /* 
 						      * Boot time page
 						      */
 		return VTOP(va);
@@ -1402,6 +1404,11 @@ static void
 xen_pagezone_free(vm_offset_t page)
 {
 
+	if (ISBOOTVA(page)) {
+		/* We don't manage this range */
+		return;
+	}
+
 	uma_zfree(xen_pagezone, (void *)page);
 }