diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-02-15 13:32:21 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-02-15 13:32:21 +0000 |
| commit | 650ae1580c48498693513fa04df56a4b97bb5539 (patch) | |
| tree | 527d4dae90fb3543caf67deaca4d97aa167cc557 | |
| parent | 096578b4e489f87e2a66b213108d511d15b4d9be (diff) | |
| download | xen-650ae1580c48498693513fa04df56a4b97bb5539.tar.gz xen-650ae1580c48498693513fa04df56a4b97bb5539.tar.bz2 xen-650ae1580c48498693513fa04df56a4b97bb5539.zip | |
xen/arm: implement gnttab_create_shared_page and gnttab_shared_gmfn
Introduce a simple pfn array, grant_table_gpfn, to keep track of the
grant table pages mapped in guest gpfn space.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/arch/arm/domain.c | 3 | ||||
| -rw-r--r-- | xen/arch/arm/mm.c | 2 | ||||
| -rw-r--r-- | xen/include/asm-arm/domain.h | 1 | ||||
| -rw-r--r-- | xen/include/asm-arm/grant_table.h | 13 |
4 files changed, 17 insertions, 2 deletions
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 0aa261abde..e37ec5498d 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -6,6 +6,7 @@ #include <xen/wait.h> #include <xen/errno.h> #include <xen/bitops.h> +#include <xen/grant_table.h> #include <asm/current.h> #include <asm/event.h> @@ -329,11 +330,13 @@ struct domain *alloc_domain_struct(void) d = alloc_xenheap_pages(0, 0); if ( d != NULL ) clear_page(d); + d->arch.grant_table_gpfn = xmalloc_array(xen_pfn_t, max_nr_grant_frames); return d; } void free_domain_struct(struct domain *d) { + xfree(d->arch.grant_table_gpfn); free_xenheap_page(d); } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 1c78d034b3..6b2d2b54e9 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -595,6 +595,8 @@ static int xenmem_add_to_physmap_one( if ( idx < nr_grant_frames(d->grant_table) ) mfn = virt_to_mfn(d->grant_table->shared_raw[idx]); } + + d->arch.grant_table_gpfn[idx] = gpfn; spin_unlock(&d->grant_table->lock); break; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 577ad1969a..29fe80821e 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -39,6 +39,7 @@ struct arch_domain { struct p2m_domain p2m; struct hvm_domain hvm_domain; + xen_pfn_t *grant_table_gpfn; struct { /* diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index e49aa8d115..3fa270d859 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -15,8 +15,6 @@ int replace_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned long new_gpaddr, unsigned int flags); void gnttab_mark_dirty(struct domain *d, unsigned long l); #define gnttab_create_status_page(d, t, i) do {} while (0) -#define gnttab_create_shared_page(d, t, i) do {} while (0) -#define gnttab_shared_gmfn(d, t, i) (0) #define gnttab_status_gmfn(d, t, i) (0) #define gnttab_release_host_mappings(domain) 1 static inline int replace_grant_supported(void) @@ -24,6 +22,17 @@ static inline int replace_grant_supported(void) return 1; } +#define gnttab_create_shared_page(d, t, i) \ + do { \ + share_xen_page_with_guest( \ + virt_to_page((char *)(t)->shared_raw[i]), \ + (d), XENSHARE_writable); \ + } while ( 0 ) + +#define gnttab_shared_gmfn(d, t, i) \ + ( ((i >= nr_grant_frames(d->grant_table)) && \ + (i < max_nr_grant_frames)) ? 0 : (d->arch.grant_table_gpfn[i])) + #endif /* __ASM_GRANT_TABLE_H__ */ /* * Local variables: |