|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] x86: slim down hypercall handling when !PV32
commit 527922008bcedb53f01cf91428303d650fb67360
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Apr 15 13:35:32 2021 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Apr 15 13:35:32 2021 +0200
x86: slim down hypercall handling when !PV32
In such a build various of the compat handlers aren't needed. Don't
reference them from the hypercall table, and compile out those which
aren't needed for HVM. Also compile out switch_compat(), which has no
purpose in such a build.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Wei Liu <wl@xxxxxxx>
---
xen/arch/x86/Makefile | 3 ++-
xen/arch/x86/hvm/hypercall.c | 4 +++-
xen/arch/x86/mm.c | 4 +++-
xen/arch/x86/pv/callback.c | 14 ++++++++++++--
xen/arch/x86/pv/descriptor-tables.c | 24 ++++++++++++++----------
xen/arch/x86/pv/domain.c | 2 ++
xen/arch/x86/pv/hypercall.c | 10 +++++++++-
xen/arch/x86/pv/iret.c | 2 ++
xen/arch/x86/pv/shim.c | 10 +++++++---
xen/include/asm-x86/compat.h | 8 ++++++++
xen/include/asm-x86/hypercall.h | 5 ++++-
xen/include/xen/compat.h | 3 ---
12 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index b6567c4127..399ee508c2 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -17,7 +17,8 @@ obj-bin-y += bzimage.init.o
obj-bin-y += clear_page.o
obj-bin-y += copy_page.o
obj-y += cpuid.o
-obj-$(CONFIG_PV) += compat.o x86_64/compat.o
+obj-$(CONFIG_PV) += compat.o
+obj-$(CONFIG_PV32) += x86_64/compat.o
obj-$(CONFIG_KEXEC) += crash.o
obj-$(CONFIG_GDBSX) += debug.o
obj-y += delay.o
diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
index b084afcbce..2d27fcbd2c 100644
--- a/xen/arch/x86/hvm/hypercall.c
+++ b/xen/arch/x86/hvm/hypercall.c
@@ -121,7 +121,9 @@ static long hvm_physdev_op(int cmd,
XEN_GUEST_HANDLE_PARAM(void) arg)
#define do_arch_1 paging_domctl_continuation
-static const hypercall_table_t hvm_hypercall_table[] = {
+static const struct {
+ hypercall_fn_t *native, *compat;
+} hvm_hypercall_table[] = {
HVM_CALL(memory_op),
#ifdef CONFIG_GRANT_TABLE
HVM_CALL(grant_table_op),
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 69d04ad809..b7a10bbdd4 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -4512,7 +4512,9 @@ long do_update_va_mapping_otherdomain(unsigned long va,
u64 val64,
return rc;
}
+#endif /* CONFIG_PV */
+#ifdef CONFIG_PV32
int compat_update_va_mapping(unsigned int va, uint32_t lo, uint32_t hi,
unsigned int flags)
{
@@ -4547,7 +4549,7 @@ int compat_update_va_mapping_otherdomain(unsigned int va,
return rc;
}
-#endif /* CONFIG_PV */
+#endif /* CONFIG_PV32 */
typedef struct e820entry e820entry_t;
DEFINE_XEN_GUEST_HANDLE(e820entry_t);
diff --git a/xen/arch/x86/pv/callback.c b/xen/arch/x86/pv/callback.c
index 97242cd3d4..42a6aa0831 100644
--- a/xen/arch/x86/pv/callback.c
+++ b/xen/arch/x86/pv/callback.c
@@ -19,12 +19,11 @@
#include <xen/event.h>
#include <xen/hypercall.h>
#include <xen/guest_access.h>
-#include <compat/callback.h>
-#include <compat/nmi.h>
#include <asm/shared.h>
#include <public/callback.h>
+#include <public/nmi.h>
static int register_guest_nmi_callback(unsigned long address)
{
@@ -203,6 +202,11 @@ long do_set_callbacks(unsigned long event_address,
return 0;
}
+#ifdef CONFIG_PV32
+
+#include <compat/callback.h>
+#include <compat/nmi.h>
+
static long compat_register_guest_callback(struct compat_callback_register
*reg)
{
long ret = 0;
@@ -343,6 +347,8 @@ long compat_set_callbacks(unsigned long event_selector,
return 0;
}
+#endif /* CONFIG_PV32 */
+
long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps)
{
struct trap_info cur;
@@ -388,6 +394,7 @@ long
do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps)
return rc;
}
+#ifdef CONFIG_PV32
int compat_set_trap_table(XEN_GUEST_HANDLE(trap_info_compat_t) traps)
{
struct vcpu *curr = current;
@@ -429,6 +436,7 @@ int
compat_set_trap_table(XEN_GUEST_HANDLE(trap_info_compat_t) traps)
return rc;
}
+#endif
long do_nmi_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
@@ -455,6 +463,7 @@ long do_nmi_op(unsigned int cmd,
XEN_GUEST_HANDLE_PARAM(void) arg)
return rc;
}
+#ifdef CONFIG_PV32
int compat_nmi_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
{
struct compat_nmi_callback cb;
@@ -479,6 +488,7 @@ int compat_nmi_op(unsigned int cmd,
XEN_GUEST_HANDLE_PARAM(void) arg)
return rc;
}
+#endif
/*
* Local variables:
diff --git a/xen/arch/x86/pv/descriptor-tables.c
b/xen/arch/x86/pv/descriptor-tables.c
index 39c1a2311a..5e84704400 100644
--- a/xen/arch/x86/pv/descriptor-tables.c
+++ b/xen/arch/x86/pv/descriptor-tables.c
@@ -149,6 +149,8 @@ long do_set_gdt(XEN_GUEST_HANDLE_PARAM(xen_ulong_t)
frame_list,
return ret;
}
+#ifdef CONFIG_PV32
+
int compat_set_gdt(XEN_GUEST_HANDLE_PARAM(uint) frame_list,
unsigned int entries)
{
@@ -185,6 +187,18 @@ int compat_set_gdt(XEN_GUEST_HANDLE_PARAM(uint) frame_list,
return ret;
}
+int compat_update_descriptor(uint32_t pa_lo, uint32_t pa_hi,
+ uint32_t desc_lo, uint32_t desc_hi)
+{
+ seg_desc_t d;
+
+ d.raw = ((uint64_t)desc_hi << 32) | desc_lo;
+
+ return do_update_descriptor(pa_lo | ((uint64_t)pa_hi << 32), d);
+}
+
+#endif /* CONFIG_PV32 */
+
static bool check_descriptor(const struct domain *dom, seg_desc_t *d)
{
unsigned int a = d->a, b = d->b, cs, dpl;
@@ -334,16 +348,6 @@ long do_update_descriptor(uint64_t gaddr, seg_desc_t d)
return ret;
}
-int compat_update_descriptor(uint32_t pa_lo, uint32_t pa_hi,
- uint32_t desc_lo, uint32_t desc_hi)
-{
- seg_desc_t d;
-
- d.raw = ((uint64_t)desc_hi << 32) | desc_lo;
-
- return do_update_descriptor(pa_lo | ((uint64_t)pa_hi << 32), d);
-}
-
/*
* Local variables:
* mode: C
diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c
index 23d6009143..f1cb92585e 100644
--- a/xen/arch/x86/pv/domain.c
+++ b/xen/arch/x86/pv/domain.c
@@ -212,6 +212,7 @@ unsigned long pv_make_cr4(const struct vcpu *v)
return cr4;
}
+#ifdef CONFIG_PV32
int switch_compat(struct domain *d)
{
struct vcpu *v;
@@ -256,6 +257,7 @@ int switch_compat(struct domain *d)
return rc;
}
+#endif
static int pv_create_gdt_ldt_l1tab(struct vcpu *v)
{
diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c
index 20795b4b57..5d02eebc8d 100644
--- a/xen/arch/x86/pv/hypercall.c
+++ b/xen/arch/x86/pv/hypercall.c
@@ -25,12 +25,18 @@
#include <xen/trace.h>
#include <irq_vectors.h>
+#ifdef CONFIG_PV32
#define HYPERCALL(x) \
[ __HYPERVISOR_ ## x ] = { (hypercall_fn_t *) do_ ## x, \
(hypercall_fn_t *) do_ ## x }
#define COMPAT_CALL(x) \
[ __HYPERVISOR_ ## x ] = { (hypercall_fn_t *) do_ ## x, \
(hypercall_fn_t *) compat_ ## x }
+#else
+#define HYPERCALL(x) \
+ [ __HYPERVISOR_ ## x ] = { (hypercall_fn_t *) do_ ## x }
+#define COMPAT_CALL(x) HYPERCALL(x)
+#endif
#define do_arch_1 paging_domctl_continuation
@@ -176,6 +182,7 @@ void pv_hypercall(struct cpu_user_regs *regs)
}
#endif
}
+#ifdef CONFIG_PV32
else
{
unsigned int ebx = regs->ebx;
@@ -225,6 +232,7 @@ void pv_hypercall(struct cpu_user_regs *regs)
}
#endif
}
+#endif /* CONFIG_PV32 */
/*
* PV guests use SYSCALL or INT $0x82 to make a hypercall, both of which
@@ -255,7 +263,7 @@ enum mc_disposition arch_do_multicall_call(struct mc_state
*state)
else
call->result = -ENOSYS;
}
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_PV32
else
{
struct compat_multicall_entry *call = &state->compat_call;
diff --git a/xen/arch/x86/pv/iret.c b/xen/arch/x86/pv/iret.c
index b508dc17b7..29a2f7cc45 100644
--- a/xen/arch/x86/pv/iret.c
+++ b/xen/arch/x86/pv/iret.c
@@ -104,6 +104,7 @@ unsigned long do_iret(void)
return 0;
}
+#ifdef CONFIG_PV32
unsigned int compat_iret(void)
{
struct cpu_user_regs *regs = guest_cpu_user_regs();
@@ -223,6 +224,7 @@ unsigned int compat_iret(void)
*/
return regs->eax;
}
+#endif
/*
* Local variables:
diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c
index b4e83e0778..92cb1adeed 100644
--- a/xen/arch/x86/pv/shim.c
+++ b/xen/arch/x86/pv/shim.c
@@ -255,13 +255,17 @@ void __init pv_shim_setup_dom(struct domain *d,
l4_pgentry_t *l4start,
*/
rw_pv_hypercall_table = __va(__pa(pv_hypercall_table));
rw_pv_hypercall_table[__HYPERVISOR_event_channel_op].native =
- rw_pv_hypercall_table[__HYPERVISOR_event_channel_op].compat =
(hypercall_fn_t *)pv_shim_event_channel_op;
-
rw_pv_hypercall_table[__HYPERVISOR_grant_table_op].native =
- rw_pv_hypercall_table[__HYPERVISOR_grant_table_op].compat =
(hypercall_fn_t *)pv_shim_grant_table_op;
+#ifdef CONFIG_PV32
+ rw_pv_hypercall_table[__HYPERVISOR_event_channel_op].compat =
+ (hypercall_fn_t *)pv_shim_event_channel_op;
+ rw_pv_hypercall_table[__HYPERVISOR_grant_table_op].compat =
+ (hypercall_fn_t *)pv_shim_grant_table_op;
+#endif
+
guest = d;
/*
diff --git a/xen/include/asm-x86/compat.h b/xen/include/asm-x86/compat.h
index f9df74ece8..0c8719f9b0 100644
--- a/xen/include/asm-x86/compat.h
+++ b/xen/include/asm-x86/compat.h
@@ -6,3 +6,11 @@
typedef uint32_t compat_ptr_t;
typedef unsigned long full_ptr_t;
+
+struct domain;
+#ifdef CONFIG_PV32
+int switch_compat(struct domain *);
+#else
+#include <xen/errno.h>
+static inline int switch_compat(struct domain *d) { return -EOPNOTSUPP; }
+#endif
diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h
index 1cd8046464..686f3a3803 100644
--- a/xen/include/asm-x86/hypercall.h
+++ b/xen/include/asm-x86/hypercall.h
@@ -16,7 +16,10 @@ typedef unsigned long hypercall_fn_t(
unsigned long, unsigned long, unsigned long);
typedef struct {
- hypercall_fn_t *native, *compat;
+ hypercall_fn_t *native;
+#ifdef CONFIG_PV32
+ hypercall_fn_t *compat;
+#endif
} hypercall_table_t;
typedef struct {
diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h
index 895e2ff68d..91db042963 100644
--- a/xen/include/xen/compat.h
+++ b/xen/include/xen/compat.h
@@ -227,9 +227,6 @@ void xlat_start_info(struct start_info *, enum
XLAT_start_info_console);
struct vcpu_runstate_info;
void xlat_vcpu_runstate_info(struct vcpu_runstate_info *);
-struct domain;
-int switch_compat(struct domain *);
-
#else
#define compat_handle_is_null(hnd) 0
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |