From patchwork Fri Mar 28 14:07:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 27292 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A8FAB20062 for ; Fri, 28 Mar 2014 14:09:58 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id oy12sf11330499veb.3 for ; Fri, 28 Mar 2014 07:09:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=785J4AlSCvDGjmf2vL4sVrIWgUkxj0kLLiWPMYoRTCk=; b=kd6RZfGw3fBTv41B87O6kLy9jIWqOWjHtCcR1fLdSfLpiWhccsWu1FDPL2iUiH/rdu /iaiVd87gXmmQRFMlu3RbkpGlKHpGlA4QUHpoYrYejHs1Hpe290kwOOkNHi10bUbUWhU N0xSVlVOb1595yuwqtZEmV5qsHsMfF/cWlmZZDT6R6aP/wf5URjWa3aNgcy2TiuwK5TS lJfB5to+iS0NCaqrgd9PD8cZfs5nNC+HHhF4RYAutBlApwA30Ewu/ubJrgu7joTvdHNu bVNAIYIAJSpAGCIDpDt2tFEHqAcHKFwM6JD/NZd0SqofiFo5PXOgxC84LEl/cI19P6JL Sa0Q== X-Gm-Message-State: ALoCoQm421RB4iKJwTCnft8PVpaWIWevrqBAKJ5jEBUBROw4/L3CT9ivlB9NcUeKzqwIHvKgPXQd X-Received: by 10.224.167.8 with SMTP id o8mr3231614qay.0.1396015798384; Fri, 28 Mar 2014 07:09:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.105 with SMTP id y96ls194555qgd.82.gmail; Fri, 28 Mar 2014 07:09:58 -0700 (PDT) X-Received: by 10.220.95.139 with SMTP id d11mr1821248vcn.21.1396015798284; Fri, 28 Mar 2014 07:09:58 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id fn10si1263019vdc.45.2014.03.28.07.09.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 07:09:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ij19so6062973vcb.10 for ; Fri, 28 Mar 2014 07:09:58 -0700 (PDT) X-Received: by 10.53.1.69 with SMTP id be5mr1344881vdd.27.1396015798195; Fri, 28 Mar 2014 07:09:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp11811vcv; Fri, 28 Mar 2014 07:09:57 -0700 (PDT) X-Received: by 10.229.81.71 with SMTP id w7mr9581855qck.8.1396015797722; Fri, 28 Mar 2014 07:09:57 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id k50si2594866qgf.156.2014.03.28.07.09.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 28 Mar 2014 07:09:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTXSB-0005Vi-Mw; Fri, 28 Mar 2014 14:08:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WTXS9-0005VS-Jn for xen-devel@lists.xen.org; Fri, 28 Mar 2014 14:08:13 +0000 Received: from [85.158.137.68:59265] by server-6.bemta-3.messagelabs.com id D8/83-00470-C4285335; Fri, 28 Mar 2014 14:08:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1396015684!3596327!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17633 invoked from network); 28 Mar 2014 14:08:11 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 28 Mar 2014 14:08:11 -0000 X-IronPort-AV: E=Sophos;i="4.97,751,1389744000"; d="scan'208";a="115955128" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 28 Mar 2014 14:07:41 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Fri, 28 Mar 2014 10:07:41 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] helo=cosworth.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WTXRc-0004yO-TY; Fri, 28 Mar 2014 14:07:40 +0000 From: Ian Campbell To: Date: Fri, 28 Mar 2014 14:07:40 +0000 Message-ID: <1396015660-7834-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396015649-5886-1-git-send-email-ian.campbell@citrix.com> References: <1396015649-5886-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , julien.grall@linaro.org, tim@xen.org, David Vrabel , Boris Ostrovsky , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH] arm: xen: implement multicall hypercall support. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: As part of this make the usual change to xen_ulong_t in place of unsigned long. This change has no impact on x86. The Linux defintion of struct multicall_entry.result differs from the Xen definition, I think for good reasons, and used a long rather than an unsigned long. Therefore introduce a xen_long_t, which is a long on x86 architectures and a signed 64-bit integer on ARM. Build tested on amd64 and i386 builds. Runtime tested on ARM. Signed-off-by: Ian Campbell Cc: Stefano Stabellini Cc: Konrad Rzeszutek Wilk Cc: Boris Ostrovsky Cc: David Vrabel --- Tested on ARM with a stupid patch: diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index b96723e..61c6b94 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -339,6 +339,36 @@ static int __init xen_pm_init(void) } late_initcall(xen_pm_init); +static int __init multicall_test(void) +{ + struct multicall_entry call[2]; + const char *str0 = "This is the first debug string\n"; + const char *str1 = "This is the second debug string\n"; + int ret; + + call[0] = (struct multicall_entry) { + .op = __HYPERVISOR_console_io, + .args[0] = CONSOLEIO_write, + .args[1] = strlen(str0), + .args[2] = (uintptr_t)str0 + }; + call[1] = (struct multicall_entry) { + .op = __HYPERVISOR_console_io, + .args[0] = CONSOLEIO_write, + .args[1] = strlen(str1), + .args[2] = (uintptr_t)str1 + }; + + ret = HYPERVISOR_multicall(call, ARRAY_SIZE(call)); + printk("MULTICALL returned %d\n", ret); + if (ret == 0) { + printk("call[0].result = %"PRI_xen_long"\n", call[0].result); + printk("call[1].result = %"PRI_xen_long"\n", call[1].result); + } + return 0; +} +late_initcall(multicall_test); + /* In the hypervisor.S file. */ EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); --- arch/arm/include/asm/xen/hypercall.h | 6 +----- arch/arm/include/asm/xen/interface.h | 2 ++ arch/arm/xen/hypercall.S | 1 + arch/x86/include/asm/xen/interface.h | 3 +++ include/xen/interface/xen.h | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h index 7704e28..7658150 100644 --- a/arch/arm/include/asm/xen/hypercall.h +++ b/arch/arm/include/asm/xen/hypercall.h @@ -48,6 +48,7 @@ int HYPERVISOR_memory_op(unsigned int cmd, void *arg); int HYPERVISOR_physdev_op(int cmd, void *arg); int HYPERVISOR_vcpu_op(int cmd, int vcpuid, void *extra_args); int HYPERVISOR_tmem_op(void *arg); +int HYPERVISOR_multicall(struct multicall_entry *calls, uint32_t nr); static inline void MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, @@ -63,9 +64,4 @@ MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req, BUG(); } -static inline int -HYPERVISOR_multicall(void *call_list, int nr_calls) -{ - BUG(); -} #endif /* _ASM_ARM_XEN_HYPERCALL_H */ diff --git a/arch/arm/include/asm/xen/interface.h b/arch/arm/include/asm/xen/interface.h index 1151188..5006600 100644 --- a/arch/arm/include/asm/xen/interface.h +++ b/arch/arm/include/asm/xen/interface.h @@ -40,6 +40,8 @@ typedef uint64_t xen_pfn_t; #define PRI_xen_pfn "llx" typedef uint64_t xen_ulong_t; #define PRI_xen_ulong "llx" +typedef int64_t xen_long_t; +#define PRI_xen_long "llx" /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S index d1cf7b7..44e3a5f 100644 --- a/arch/arm/xen/hypercall.S +++ b/arch/arm/xen/hypercall.S @@ -89,6 +89,7 @@ HYPERCALL2(memory_op); HYPERCALL2(physdev_op); HYPERCALL3(vcpu_op); HYPERCALL1(tmem_op); +HYPERCALL2(multicall); ENTRY(privcmd_call) stmdb sp!, {r4} diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h index fd9cb76..3400dba 100644 --- a/arch/x86/include/asm/xen/interface.h +++ b/arch/x86/include/asm/xen/interface.h @@ -54,6 +54,9 @@ typedef unsigned long xen_pfn_t; #define PRI_xen_pfn "lx" typedef unsigned long xen_ulong_t; #define PRI_xen_ulong "lx" +typedef long xen_long_t; +#define PRI_xen_long "lx" + /* Guest handles for primitive C types. */ __DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uint, unsigned int); diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 0cd5ca3..de08213 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h @@ -275,9 +275,9 @@ DEFINE_GUEST_HANDLE_STRUCT(mmu_update); * NB. The fields are natural register size for this architecture. */ struct multicall_entry { - unsigned long op; - long result; - unsigned long args[6]; + xen_ulong_t op; + xen_long_t result; + xen_ulong_t args[6]; }; DEFINE_GUEST_HANDLE_STRUCT(multicall_entry);