From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 07/21] xen/arm: grant table Date: Fri, 5 Oct 2012 10:38:13 +0000 Message-ID: <1349433507-21148-7-git-send-email-ian.campbell@citrix.com> References: <1349433418.20946.46.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1349433418.20946.46.camel@zakaz.uk.xensource.com> 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.xen.org Cc: Stefano Stabellini , tim@xen.org, stefano.stabelini@citrix.com List-Id: xen-devel@lists.xenproject.org From: Stefano Stabellini Implement XENMAPSPACE_grant_table and grant_table_op. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan [ ijc -- fixed reject in traps.c, grant table op is a 3 argument hypercall, rebased over "xen: arm: implement XENMEM_add_to_physmap_range" ] --- xen/arch/arm/mm.c | 26 ++++++++++++++++++++++++++ xen/arch/arm/traps.c | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 478984f..bf9b6c5 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -475,6 +476,31 @@ static int xenmem_add_to_physmap_one( switch ( space ) { + case XENMAPSPACE_grant_table: + spin_lock(&d->grant_table->lock); + + if ( d->grant_table->gt_version == 0 ) + d->grant_table->gt_version = 1; + + if ( d->grant_table->gt_version == 2 && + (idx & XENMAPIDX_grant_table_status) ) + { + idx &= ~XENMAPIDX_grant_table_status; + if ( idx < nr_status_frames(d->grant_table) ) + mfn = virt_to_mfn(d->grant_table->status[idx]); + } + else + { + if ( (idx >= nr_grant_frames(d->grant_table)) && + (idx < max_nr_grant_frames) ) + gnttab_grow_table(d, idx + 1); + + if ( idx < nr_grant_frames(d->grant_table) ) + mfn = virt_to_mfn(d->grant_table->shared_raw[idx]); + } + + spin_unlock(&d->grant_table->lock); + break; case XENMAPSPACE_shared_info: if ( idx == 0 ) mfn = virt_to_mfn(d->shared_info); diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index e4bed69..8c818c2 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -438,6 +438,7 @@ static arm_hypercall_t arm_hypercall_table[] = { HYPERCALL(physdev_op, 2), HYPERCALL(sysctl, 2), HYPERCALL(hvm_op, 2), + HYPERCALL(grant_table_op, 3), }; static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) -- 1.7.9.1