From patchwork Thu Apr 17 12:57:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 28581 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50E7A206A6 for ; Thu, 17 Apr 2014 12:59:38 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kq14sf1378552pab.10 for ; Thu, 17 Apr 2014 05:59:37 -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=cvyFVlEmd48/x9vJrc2EtUv19L05uABYGYNvmTP/Q8Q=; b=Db7OjBeapxtdQfhuWq0NU6b4JF/FYA3JAwyXBKKiKQn754fApDGPewjgs/KjS1R7sB puMwYfBRO6tY11ZybJiOKzWE76J88iWD0SmYpc+L5jRsHg/iQlrJuqclOL+mI0Nu5ZUZ Ze/yIPt8DzRe0teRpzNuG6kZLhAnDkWYuMDEAt9aeTGReUMHKrbuzbwubTc60YqpViRr ZXa2TD8JTYaWfHXP7Y2ohnI37reddQOoeigRd2xO3t4au9g1P6z3cqTstpod7LB1D3eq W7fsIbyww1WV8zZQBPijkL4BA6YMeuP085b3T2DWjmLB0KkRrRvM3d/ixYN1RVC0vsVf RrZA== X-Gm-Message-State: ALoCoQn0M5gr7C1PQ/vuhKaMDWZ3mLJKIcIg4iZ0U4v0FdAd0TFSoU5DSeMRdNe+5s7rq0uw725p X-Received: by 10.66.163.33 with SMTP id yf1mr7440918pab.19.1397739577344; Thu, 17 Apr 2014 05:59:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.136 with SMTP id v8ls1071208qgd.13.gmail; Thu, 17 Apr 2014 05:59:37 -0700 (PDT) X-Received: by 10.52.26.161 with SMTP id m1mr6380226vdg.24.1397739577168; Thu, 17 Apr 2014 05:59:37 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id ys8si4443396veb.52.2014.04.17.05.59.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 05:59:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 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.175; Received: by mail-vc0-f175.google.com with SMTP id lh14so441558vcb.34 for ; Thu, 17 Apr 2014 05:59:37 -0700 (PDT) X-Received: by 10.58.90.99 with SMTP id bv3mr230916veb.34.1397739577037; Thu, 17 Apr 2014 05:59:37 -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.221.72 with SMTP id ib8csp33277vcb; Thu, 17 Apr 2014 05:59:36 -0700 (PDT) X-Received: by 10.229.192.7 with SMTP id do7mr11316999qcb.1.1397739576096; Thu, 17 Apr 2014 05:59:36 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id a30si1967267qge.39.2014.04.17.05.59.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Apr 2014 05:59:36 -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 1Walst-00082y-Og; Thu, 17 Apr 2014 12:57:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Walss-00082b-45 for xen-devel@lists.xen.org; Thu, 17 Apr 2014 12:57:42 +0000 Received: from [193.109.254.147:54018] by server-15.bemta-14.messagelabs.com id B4/6A-15813-5CFCF435; Thu, 17 Apr 2014 12:57:41 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1397739459!8935760!1 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 21833 invoked from network); 17 Apr 2014 12:57:40 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 17 Apr 2014 12:57:40 -0000 X-IronPort-AV: E=Sophos;i="4.97,879,1389744000"; d="scan'208";a="121999000" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 17 Apr 2014 12:57:38 +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.3.123.3; Thu, 17 Apr 2014 08:57:38 -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 1Walsn-0004oq-V7; Thu, 17 Apr 2014 12:57:38 +0000 From: Ian Campbell To: Date: Thu, 17 Apr 2014 13:57:37 +0100 Message-ID: <1397739457-25541-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397739444-31407-1-git-send-email-ian.campbell@citrix.com> References: <1397739444-31407-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , julien.grall@linaro.org, tim@xen.org, David Vrabel , Boris Ostrovsky , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH linux v3] 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.175 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 definition 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. Use uint32_t nr_calls on x86 for consistency with the ARM definition. 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 --- v3: - Add for arm64 too v2: - Typo in commit message. - Update x86 prototype for HYPERCALL_multicall for consistency (nr_calls is a uint32_t). Tested on ARM and arm64 with a stupid patch: diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index b96723e..8b1dc7a 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -339,6 +339,63 @@ static int __init xen_pm_init(void) } late_initcall(xen_pm_init); +static int __init multicall_test(void) +{ + struct multicall_entry templ[3]; + struct multicall_entry call[3]; + const char *str0 = "This is the first debug string\n"; + const char *str1 = "This is the second debug string\n"; + const char *str2 = "This is the third debug string\n"; + int ret; + + templ[0] = (struct multicall_entry) { + .op = __HYPERVISOR_console_io, + .args[0] = CONSOLEIO_write, + .args[1] = strlen(str0), + .args[2] = (uintptr_t)str0 + }; + templ[1] = (struct multicall_entry) { + .op = __HYPERVISOR_console_io, + .args[0] = CONSOLEIO_write, + .args[1] = strlen(str1), + .args[2] = (uintptr_t)str1 + }; + templ[2] = (struct multicall_entry) { + .op = __HYPERVISOR_console_io, + .args[0] = CONSOLEIO_write, + .args[1] = strlen(str2), + .args[2] = (uintptr_t)str2 + }; + + memcpy(call, templ, sizeof(templ)); + + ret = HYPERVISOR_multicall(call, ARRAY_SIZE(call)); + printk("1st 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); + printk("call[2].result = %"PRI_xen_long"\n", call[2].result); + } + + memcpy(call, templ, sizeof(templ)); + call[1].args[0] |= 0xf000000000000000ULL; + + /* + * On arm: should die after printing first string, shouldn't print third + * On arm64: should print all three. + */ + ret = HYPERVISOR_multicall(call, ARRAY_SIZE(call)); + printk("2nd 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); + printk("call[2].result = %"PRI_xen_long"\n", call[2].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/arm64/xen/hypercall.S | 1 + arch/x86/include/asm/xen/hypercall.h | 2 +- arch/x86/include/asm/xen/interface.h | 3 +++ include/xen/interface/xen.h | 6 +++--- 7 files changed, 12 insertions(+), 9 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/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S index 531342e..8bbe940 100644 --- a/arch/arm64/xen/hypercall.S +++ b/arch/arm64/xen/hypercall.S @@ -80,6 +80,7 @@ HYPERCALL2(memory_op); HYPERCALL2(physdev_op); HYPERCALL3(vcpu_op); HYPERCALL1(tmem_op); +HYPERCALL2(multicall); ENTRY(privcmd_call) mov x16, x0 diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index e709884..ca08a27 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -343,7 +343,7 @@ HYPERVISOR_memory_op(unsigned int cmd, void *arg) } static inline int -HYPERVISOR_multicall(void *call_list, int nr_calls) +HYPERVISOR_multicall(void *call_list, uint32_t nr_calls) { return _hypercall2(int, multicall, call_list, nr_calls); } 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);