@@ -26,6 +26,7 @@
#include <asm/hvm/emulate.h>
#include <asm/hvm/support.h>
#include <asm/hvm/viridian.h>
+#include <asm/multicall.h>
#include <public/hvm/hvm_op.h>
#include <public/hvm/params.h>
@@ -125,6 +126,7 @@ static const struct {
hypercall_fn_t *native, *compat;
} hvm_hypercall_table[] = {
HVM_CALL(memory_op),
+ COMPAT_CALL(multicall),
#ifdef CONFIG_GRANT_TABLE
HVM_CALL(grant_table_op),
#endif
@@ -334,6 +336,39 @@ int hvm_hypercall(struct cpu_user_regs *
return curr->hcall_preempted ? HVM_HCALL_preempted : HVM_HCALL_completed;
}
+enum mc_disposition hvm_do_multicall_call(struct mc_state *state)
+{
+ struct vcpu *curr = current;
+ hypercall_fn_t *func = NULL;
+
+ if ( hvm_guest_x86_mode(curr) == 8 )
+ {
+ struct multicall_entry *call = &state->call;
+
+ if ( call->op < ARRAY_SIZE(hvm_hypercall_table) )
+ func = array_access_nospec(hvm_hypercall_table, call->op).native;
+ if ( func )
+ call->result = func(call->args[0], call->args[1], call->args[2],
+ call->args[3], call->args[4], call->args[5]);
+ else
+ call->result = -ENOSYS;
+ }
+ else
+ {
+ struct compat_multicall_entry *call = &state->compat_call;
+
+ if ( call->op < ARRAY_SIZE(hvm_hypercall_table) )
+ func = array_access_nospec(hvm_hypercall_table, call->op).compat;
+ if ( func )
+ call->result = func(call->args[0], call->args[1], call->args[2],
+ call->args[3], call->args[4], call->args[5]);
+ else
+ call->result = -ENOSYS;
+ }
+
+ return !hvm_get_cpl(curr) ? mc_continue : mc_preempt;
+}
+
/*
* Local variables:
* mode: C
@@ -20,6 +20,7 @@
*/
#include <xen/hypercall.h>
+#include <asm/multicall.h>
#ifdef CONFIG_COMPAT
#define ARGS(x, n) \
@@ -273,13 +274,18 @@ int hypercall_xlat_continuation(unsigned
return rc;
}
-#ifndef CONFIG_PV
-/* Stub for arch_do_multicall_call */
-enum mc_disposition arch_do_multicall_call(struct mc_state *mc)
+enum mc_disposition arch_do_multicall_call(struct mc_state *state)
{
+ const struct domain *currd = current->domain;
+
+ if ( is_pv_domain(currd) )
+ return pv_do_multicall_call(state);
+
+ if ( is_hvm_domain(currd) )
+ return hvm_do_multicall_call(state);
+
return mc_exit;
}
-#endif
/*
* Local variables:
@@ -23,6 +23,7 @@
#include <xen/hypercall.h>
#include <xen/nospec.h>
#include <xen/trace.h>
+#include <asm/multicall.h>
#include <irq_vectors.h>
#ifdef CONFIG_PV32
@@ -245,7 +246,7 @@ void pv_hypercall(struct cpu_user_regs *
perfc_incr(hypercalls);
}
-enum mc_disposition arch_do_multicall_call(struct mc_state *state)
+enum mc_disposition pv_do_multicall_call(struct mc_state *state)
{
struct vcpu *curr = current;
unsigned long op;
@@ -0,0 +1,12 @@
+/******************************************************************************
+ * asm-x86/multicall.h
+ */
+
+#ifndef __ASM_X86_MULTICALL_H__
+#define __ASM_X86_MULTICALL_H__
+
+#include <xen/multicall.h>
+
+typeof(arch_do_multicall_call) pv_do_multicall_call, hvm_do_multicall_call;
+
+#endif /* __ASM_X86_MULTICALL_H__ */