Commit 5e40704e authored by Ian Campbell's avatar Ian Campbell Committed by David Vrabel

arm: xen: implement multicall hypercall support.

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: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 1aae31c8
...@@ -48,6 +48,7 @@ int HYPERVISOR_memory_op(unsigned int cmd, void *arg); ...@@ -48,6 +48,7 @@ int HYPERVISOR_memory_op(unsigned int cmd, void *arg);
int HYPERVISOR_physdev_op(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_vcpu_op(int cmd, int vcpuid, void *extra_args);
int HYPERVISOR_tmem_op(void *arg); int HYPERVISOR_tmem_op(void *arg);
int HYPERVISOR_multicall(struct multicall_entry *calls, uint32_t nr);
static inline void static inline void
MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, 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, ...@@ -63,9 +64,4 @@ MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req,
BUG(); BUG();
} }
static inline int
HYPERVISOR_multicall(void *call_list, int nr_calls)
{
BUG();
}
#endif /* _ASM_ARM_XEN_HYPERCALL_H */ #endif /* _ASM_ARM_XEN_HYPERCALL_H */
...@@ -40,6 +40,8 @@ typedef uint64_t xen_pfn_t; ...@@ -40,6 +40,8 @@ typedef uint64_t xen_pfn_t;
#define PRI_xen_pfn "llx" #define PRI_xen_pfn "llx"
typedef uint64_t xen_ulong_t; typedef uint64_t xen_ulong_t;
#define PRI_xen_ulong "llx" #define PRI_xen_ulong "llx"
typedef int64_t xen_long_t;
#define PRI_xen_long "llx"
/* Guest handles for primitive C types. */ /* Guest handles for primitive C types. */
__DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uchar, unsigned char);
__DEFINE_GUEST_HANDLE(uint, unsigned int); __DEFINE_GUEST_HANDLE(uint, unsigned int);
......
...@@ -89,6 +89,7 @@ HYPERCALL2(memory_op); ...@@ -89,6 +89,7 @@ HYPERCALL2(memory_op);
HYPERCALL2(physdev_op); HYPERCALL2(physdev_op);
HYPERCALL3(vcpu_op); HYPERCALL3(vcpu_op);
HYPERCALL1(tmem_op); HYPERCALL1(tmem_op);
HYPERCALL2(multicall);
ENTRY(privcmd_call) ENTRY(privcmd_call)
stmdb sp!, {r4} stmdb sp!, {r4}
......
...@@ -80,6 +80,7 @@ HYPERCALL2(memory_op); ...@@ -80,6 +80,7 @@ HYPERCALL2(memory_op);
HYPERCALL2(physdev_op); HYPERCALL2(physdev_op);
HYPERCALL3(vcpu_op); HYPERCALL3(vcpu_op);
HYPERCALL1(tmem_op); HYPERCALL1(tmem_op);
HYPERCALL2(multicall);
ENTRY(privcmd_call) ENTRY(privcmd_call)
mov x16, x0 mov x16, x0
......
...@@ -343,7 +343,7 @@ HYPERVISOR_memory_op(unsigned int cmd, void *arg) ...@@ -343,7 +343,7 @@ HYPERVISOR_memory_op(unsigned int cmd, void *arg)
} }
static inline int 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); return _hypercall2(int, multicall, call_list, nr_calls);
} }
......
...@@ -54,6 +54,9 @@ typedef unsigned long xen_pfn_t; ...@@ -54,6 +54,9 @@ typedef unsigned long xen_pfn_t;
#define PRI_xen_pfn "lx" #define PRI_xen_pfn "lx"
typedef unsigned long xen_ulong_t; typedef unsigned long xen_ulong_t;
#define PRI_xen_ulong "lx" #define PRI_xen_ulong "lx"
typedef long xen_long_t;
#define PRI_xen_long "lx"
/* Guest handles for primitive C types. */ /* Guest handles for primitive C types. */
__DEFINE_GUEST_HANDLE(uchar, unsigned char); __DEFINE_GUEST_HANDLE(uchar, unsigned char);
__DEFINE_GUEST_HANDLE(uint, unsigned int); __DEFINE_GUEST_HANDLE(uint, unsigned int);
......
...@@ -275,9 +275,9 @@ DEFINE_GUEST_HANDLE_STRUCT(mmu_update); ...@@ -275,9 +275,9 @@ DEFINE_GUEST_HANDLE_STRUCT(mmu_update);
* NB. The fields are natural register size for this architecture. * NB. The fields are natural register size for this architecture.
*/ */
struct multicall_entry { struct multicall_entry {
unsigned long op; xen_ulong_t op;
long result; xen_long_t result;
unsigned long args[6]; xen_ulong_t args[6];
}; };
DEFINE_GUEST_HANDLE_STRUCT(multicall_entry); DEFINE_GUEST_HANDLE_STRUCT(multicall_entry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment