diff options
| author | Keir Fraser <keir@xen.org> | 2010-11-26 14:20:10 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-11-26 14:20:10 +0000 |
| commit | 16e8ccb10c22e49fb4dc803509c0937d2ac5a864 (patch) | |
| tree | 3b4e979facf9399c785d372d678b94b25ee4edf7 /tools/xenpaging | |
| parent | 9663f9d58392848a52c1cf802219430fa40487c7 (diff) | |
| download | xen-16e8ccb10c22e49fb4dc803509c0937d2ac5a864.tar.gz xen-16e8ccb10c22e49fb4dc803509c0937d2ac5a864.tar.bz2 xen-16e8ccb10c22e49fb4dc803509c0937d2ac5a864.zip | |
xenpaging: notify policy only on resume
If a page is requested more than once, the policy is also notified
more than once about the page-in. However, a page-in happens only
once. Any further resume will only unpause the other vcpu. The
multiple notify will put the page into the mru list multiple times and
it will unlock other already resumed pages too early. In the worst
case, a page that was just resumed can be evicted right away, causing
a deadlock in the guest.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Diffstat (limited to 'tools/xenpaging')
| -rw-r--r-- | tools/xenpaging/xenpaging.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 59ba8d32f6..dd346db9a6 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -385,7 +385,7 @@ int xenpaging_evict_page(xc_interface *xch, xenpaging_t *paging, return ret; } -static int xenpaging_resume_page(xenpaging_t *paging, mem_event_response_t *rsp) +static int xenpaging_resume_page(xenpaging_t *paging, mem_event_response_t *rsp, int notify_policy) { int ret; @@ -395,7 +395,8 @@ static int xenpaging_resume_page(xenpaging_t *paging, mem_event_response_t *rsp) goto out; /* Notify policy of page being paged in */ - policy_notify_paged_in(paging->mem_event.domain_id, rsp->gfn); + if ( notify_policy ) + policy_notify_paged_in(paging->mem_event.domain_id, rsp->gfn); /* Tell Xen page is ready */ ret = xc_mem_paging_resume(paging->xc_handle, paging->mem_event.domain_id, @@ -621,7 +622,7 @@ int main(int argc, char *argv[]) rsp.vcpu_id = req.vcpu_id; rsp.flags = req.flags; - rc = xenpaging_resume_page(paging, &rsp); + rc = xenpaging_resume_page(paging, &rsp, 1); if ( rc != 0 ) { ERROR("Error resuming page"); @@ -650,7 +651,7 @@ int main(int argc, char *argv[]) rsp.vcpu_id = req.vcpu_id; rsp.flags = req.flags; - rc = xenpaging_resume_page(paging, &rsp); + rc = xenpaging_resume_page(paging, &rsp, 0); if ( rc != 0 ) { ERROR("Error resuming"); |