diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-01-13 08:14:01 +0000 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-01-13 08:14:01 +0000 |
commit | b3eb2c1e8b4cf199aa4bf8188685c3059c420a60 (patch) | |
tree | d8eb7d4c8ba276a0f422af101f52ac54aa240781 /tools/libxc/xc_offline_page.c | |
parent | 9fececad98aa1259a9896edf7e7931822e3eef87 (diff) | |
download | xen-b3eb2c1e8b4cf199aa4bf8188685c3059c420a60.tar.gz xen-b3eb2c1e8b4cf199aa4bf8188685c3059c420a60.tar.bz2 xen-b3eb2c1e8b4cf199aa4bf8188685c3059c420a60.zip |
x86: add and use XEN_DOMCTL_getpageframeinfo3
To support wider than 28-bit MFNs, add XEN_DOMCTL_getpageframeinfo3
(with the type replacing the passed in MFN rather than getting or-ed
into it) to properly back xc_get_pfn_type_batch().
With xc_get_pfn_type_batch() only used internally to libxc, move its
prototype from xenctrl.h to xc_private.h.
This also fixes a couple of bugs in pre-existing code:
- the failure path for init_mem_info() leaked minfo->pfn_type,
- one error path of the XEN_DOMCTL_getpageframeinfo2 handler used
put_domain() where rcu_unlock_domain() was meant, and
- the XEN_DOMCTL_getpageframeinfo2 handler could call
xsm_getpageframeinfo() with an invalid struct page_info pointer.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'tools/libxc/xc_offline_page.c')
-rw-r--r-- | tools/libxc/xc_offline_page.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index eb6d998aa0..5c90e16ad6 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -24,7 +24,7 @@ struct domain_mem_info{ int domid; unsigned int pt_level; unsigned int guest_width; - uint32_t *pfn_type; + xen_pfn_t *pfn_type; xen_pfn_t *p2m_table; unsigned long p2m_size; xen_pfn_t *m2p_table; @@ -266,19 +266,18 @@ static int init_mem_info(int xc_handle, int domid, } /* Get pfn type */ - minfo->pfn_type = malloc(sizeof(uint32_t) * minfo->p2m_size); + minfo->pfn_type = calloc(sizeof(*minfo->pfn_type), minfo->p2m_size); if (!minfo->pfn_type) { ERROR("Failed to malloc pfn_type\n"); goto failed; } - memset(minfo->pfn_type, 0, sizeof(uint32_t) * minfo->p2m_size); for (i = 0; i < minfo->p2m_size; i++) minfo->pfn_type[i] = pfn_to_mfn(i, minfo->p2m_table, minfo->guest_width); - if ( lock_pages(minfo->pfn_type, minfo->p2m_size * sizeof(uint32_t)) ) + if ( lock_pages(minfo->pfn_type, minfo->p2m_size * sizeof(*minfo->pfn_type)) ) { ERROR("Unable to lock pfn_type array"); goto failed; @@ -297,12 +296,12 @@ static int init_mem_info(int xc_handle, int domid, return 0; unlock: - unlock_pages(minfo->pfn_type, minfo->p2m_size * sizeof(uint32_t)); + unlock_pages(minfo->pfn_type, minfo->p2m_size * sizeof(*minfo->pfn_type)); failed: if (minfo->pfn_type) { - minfo->pfn_type = NULL; free(minfo->pfn_type); + minfo->pfn_type = NULL; } if (live_shinfo) munmap(live_shinfo, PAGE_SIZE); @@ -418,7 +417,9 @@ static int change_pte(int xc_handle, int domid, uint64_t pte, new_pte; int j; - if ( table_mfn == INVALID_P2M_ENTRY ) + if ( (table_mfn == INVALID_P2M_ENTRY) || + ((minfo->pfn_type[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == + XEN_DOMCTL_PFINFO_XTAB) ) continue; if ( minfo->pfn_type[i] & XEN_DOMCTL_PFINFO_LTABTYPE_MASK ) |