From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v2 2/4] xen/arm: implement gnttab_create_shared_page and gnttab_shared_gmfn Date: Wed, 16 Jan 2013 18:58:53 +0000 Message-ID: <1358362736-2870-2-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org 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 --- xen/arch/arm/domain.c | 3 +++ xen/arch/arm/mm.c | 2 ++ xen/include/asm-arm/domain.h | 1 + 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 59d8d73..644b066 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -328,11 +329,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 4d3073b..137332e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -579,6 +579,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 577ad19..29fe808 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 e49aa8d..3fa270d 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: -- 1.7.2.5