diff options
| -rw-r--r-- | tools/libxc/xc_domain.c | 1 | ||||
| -rw-r--r-- | tools/libxc/xenctrl.h | 1 | ||||
| -rw-r--r-- | xen/arch/x86/mm/p2m.c | 5 | ||||
| -rw-r--r-- | xen/common/domctl.c | 1 | ||||
| -rw-r--r-- | xen/include/public/domctl.h | 3 | ||||
| -rw-r--r-- | xen/include/xen/sched.h | 1 |
6 files changed, 11 insertions, 1 deletions
diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index d6f007df53..b6c67a2e4a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -235,6 +235,7 @@ int xc_domain_getinfo(xc_interface *xch, info->ssidref = domctl.u.getdomaininfo.ssidref; info->nr_pages = domctl.u.getdomaininfo.tot_pages; info->nr_shared_pages = domctl.u.getdomaininfo.shr_pages; + info->nr_paged_pages = domctl.u.getdomaininfo.paged_pages; info->max_memkb = domctl.u.getdomaininfo.max_pages << (PAGE_SHIFT-10); info->shared_info_frame = domctl.u.getdomaininfo.shared_info_frame; info->cpu_time = domctl.u.getdomaininfo.cpu_time; diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 4bcb9bd6c9..3a6071f114 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -351,6 +351,7 @@ typedef struct xc_dominfo { unsigned int shutdown_reason; /* only meaningful if shutdown==1 */ unsigned long nr_pages; /* current number, not maximum */ unsigned long nr_shared_pages; + unsigned long nr_paged_pages; unsigned long shared_info_frame; uint64_t cpu_time; unsigned long max_memkb; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c62aa12da7..b6fb4d8275 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -746,6 +746,9 @@ int p2m_mem_paging_evict(struct domain *d, unsigned long gfn) /* Put the page back so it gets freed */ put_page(page); + /* Track number of paged gfns */ + atomic_inc(&d->paged_pages); + return 0; } @@ -831,6 +834,8 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn) audit_p2m(p2m, 1); p2m_unlock(p2m); + atomic_dec(&d->paged_pages); + return 0; } diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 5f7194dc88..57c906cb75 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -137,6 +137,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->tot_pages = d->tot_pages; info->max_pages = d->max_pages; info->shr_pages = atomic_read(&d->shr_pages); + info->paged_pages = atomic_read(&d->paged_pages); info->shared_info_frame = mfn_to_gmfn(d, __pa(d->shared_info)>>PAGE_SHIFT); BUG_ON(SHARED_M2P(info->shared_info_frame)); diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index ae512aac10..ea8fce63d9 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -35,7 +35,7 @@ #include "xen.h" #include "grant_table.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000007 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000008 /* * NB. xen_domctl.domain is an IN/OUT parameter for this operation. @@ -95,6 +95,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t tot_pages; uint64_aligned_t max_pages; uint64_aligned_t shr_pages; + uint64_aligned_t paged_pages; uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index c6b3a5916f..784bcecdab 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -208,6 +208,7 @@ struct domain unsigned int tot_pages; /* number of pages currently possesed */ unsigned int max_pages; /* maximum value for tot_pages */ atomic_t shr_pages; /* number of shared pages */ + atomic_t paged_pages; /* number of paged-out pages */ unsigned int xenheap_pages; /* # pages allocated from Xen heap */ unsigned int max_vcpus; |