[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] xenpaging: move nominate+evict into single function
# HG changeset patch # User Olaf Hering <olaf@xxxxxxxxx> # Date 1329769124 -3600 # Node ID 68f149bbee77b3ce12702475b27d3d5002cf4c19 # Parent 9e33293aee2abaac27962b8c7f6918f7094f2962 xenpaging: move nominate+evict into single function Move all code to evict a single gfn into one function. This simplifies error handling in caller. The function returns -1 on fatal error, 0 on success and 1 if the gfn cant be paged. Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> Committed-by: Ian Jackson <ian.jackson.citrix.com> --- diff -r 9e33293aee2a -r 68f149bbee77 tools/xenpaging/xenpaging.c --- a/tools/xenpaging/xenpaging.c Mon Feb 20 21:18:44 2012 +0100 +++ b/tools/xenpaging/xenpaging.c Mon Feb 20 21:18:44 2012 +0100 @@ -571,6 +571,11 @@ RING_PUSH_RESPONSES(back_ring); } +/* Evict a given gfn + * Returns < 0 on fatal error + * Returns 0 on successful evict + * Returns > 0 if gfn can not be evicted + */ static int xenpaging_evict_page(struct xenpaging *paging, unsigned long gfn, int fd, int slot) { xc_interface *xch = paging->xc_handle; @@ -580,31 +585,51 @@ DECLARE_DOMCTL; + /* Nominate page */ + ret = xc_mem_paging_nominate(xch, paging->mem_event.domain_id, gfn); + if ( ret < 0 ) + { + /* unpageable gfn is indicated by EBUSY */ + if ( errno == EBUSY ) + ret = 1; + else + PERROR("Error nominating page %lx", gfn); + goto out; + } + /* Map page */ - ret = -EFAULT; page = xc_map_foreign_pages(xch, paging->mem_event.domain_id, PROT_READ, &victim, 1); if ( page == NULL ) { PERROR("Error mapping page %lx", gfn); + ret = -1; goto out; } /* Copy page */ ret = write_page(fd, page, slot); - if ( ret != 0 ) + if ( ret < 0 ) { PERROR("Error copying page %lx", gfn); munmap(page, PAGE_SIZE); + ret = -1; goto out; } + /* Release page */ munmap(page, PAGE_SIZE); /* Tell Xen to evict page */ ret = xc_mem_paging_evict(xch, paging->mem_event.domain_id, gfn); - if ( ret != 0 ) + if ( ret < 0 ) { - PERROR("Error evicting page %lx", gfn); + /* A gfn in use is indicated by EBUSY */ + if ( errno == EBUSY ) + { + ret = 1; + DPRINTF("Nominated page %lx busy", gfn); + } else + PERROR("Error evicting page %lx", gfn); goto out; } @@ -619,6 +644,8 @@ /* Record number of evicted pages */ paging->num_paged_out++; + ret = 0; + out: return ret; } @@ -753,9 +780,10 @@ ret = -EINTR; goto out; } - ret = xc_mem_paging_nominate(xch, paging->mem_event.domain_id, gfn); - if ( ret == 0 ) - ret = xenpaging_evict_page(paging, gfn, fd, slot); + + ret = xenpaging_evict_page(paging, gfn, fd, slot); + if ( ret < 0 ) + goto out; } while ( ret ); _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |