[Xen-changelog] [xen-unstable] xenpaging: populate paged-out pages unconditionally in grant code

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1290781076 0
# Node ID 9a9bcf399856f8d8f5b13add8d85ec58439a517d
# Parent  b153d3b715049a081732bb2478bff3f6048f75e6
xenpaging: populate paged-out pages unconditionally in grant code

Populate a page unconditionally to avoid missing a page-in request.
If the page is already in the process of being paged-in, the this vcpu
will be stopped and later resumed once the page content is usable
again.

This matches other p2m_mem_paging_populate usage in the source tree.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 xen/common/grant_table.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r b153d3b71504 -r 9a9bcf399856 xen/common/grant_table.c
--- a/xen/common/grant_table.c  Fri Nov 26 14:17:01 2010 +0000
+++ b/xen/common/grant_table.c  Fri Nov 26 14:17:56 2010 +0000
@@ -156,10 +156,11 @@ static int __get_paged_frame(unsigned lo
 
     if ( p2m_is_valid(p2mt) ) {
         *frame = mfn_x(mfn);
-        if ( p2m_is_paged(p2mt) )
+        if ( p2m_is_paging(p2mt) )
+        {
             p2m_mem_paging_populate(p2m, gfn);
-        if ( p2m_is_paging(p2mt) )
             rc = GNTST_eagain;
+        }
     } else {
        *frame = INVALID_MFN;
        rc = GNTST_bad_page;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog