|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.13] x86/HVM: expose VM assist hypercall
commit 2e8d8edc1fe12e0d513d4907b19b00bcc3dc015c
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Apr 27 15:05:16 2020 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Apr 27 15:05:16 2020 +0200
x86/HVM: expose VM assist hypercall
In preparation for the addition of VMASST_TYPE_runstate_update_flag
commit 72c538cca957 ("arm: add support for vm_assist hypercall") enabled
the hypercall for Arm. I consider it not logical that it then isn't also
exposed to x86 HVM guests (with the same single feature permitted to be
enabled as Arm has); Linux actually tries to use it afaict.
Rather than introducing yet another thin wrapper around vm_assist(),
make that function the main handler, requiring a per-arch
arch_vm_assist_valid_mask() definition instead.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
master commit: f13404d57f55a97838f1c16a366fbc3231ec21f1
master date: 2020-04-22 12:58:25 +0200
---
xen/arch/x86/domain.c | 3 +++
xen/arch/x86/hvm/hypercall.c | 1 +
xen/arch/x86/pv/hypercall.c | 2 +-
xen/common/compat/kernel.c | 5 -----
xen/common/domain.c | 13 ++++++++-----
xen/common/kernel.c | 7 -------
xen/include/asm-arm/config.h | 2 --
xen/include/asm-arm/domain.h | 2 ++
xen/include/asm-x86/config.h | 11 -----------
xen/include/asm-x86/domain.h | 19 +++++++++++++++++++
xen/include/xen/hypercall.h | 2 --
xen/include/xen/lib.h | 2 --
12 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index d42a32c8a9..7040ff4af7 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -939,6 +939,9 @@ int arch_set_info_guest(
v->arch.dr6 = c(debugreg[6]);
v->arch.dr7 = c(debugreg[7]);
+ if ( v->vcpu_id == 0 )
+ d->vm_assist = c.nat->vm_assist;
+
hvm_set_info_guest(v);
goto out;
}
diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
index 33dd2d99d2..0d24550dcc 100644
--- a/xen/arch/x86/hvm/hypercall.c
+++ b/xen/arch/x86/hvm/hypercall.c
@@ -124,6 +124,7 @@ static const hypercall_table_t hvm_hypercall_table[] = {
#ifdef CONFIG_GRANT_TABLE
HVM_CALL(grant_table_op),
#endif
+ HYPERCALL(vm_assist),
COMPAT_CALL(vcpu_op),
HVM_CALL(physdev_op),
COMPAT_CALL(xen_version),
diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c
index 0c84c0b3a0..55a37d3698 100644
--- a/xen/arch/x86/pv/hypercall.c
+++ b/xen/arch/x86/pv/hypercall.c
@@ -56,7 +56,7 @@ const hypercall_table_t pv_hypercall_table[] = {
#ifdef CONFIG_GRANT_TABLE
COMPAT_CALL(grant_table_op),
#endif
- COMPAT_CALL(vm_assist),
+ HYPERCALL(vm_assist),
COMPAT_CALL(update_va_mapping_otherdomain),
COMPAT_CALL(iret),
COMPAT_CALL(vcpu_op),
diff --git a/xen/common/compat/kernel.c b/xen/common/compat/kernel.c
index 5c6e7322f8..804b919bdc 100644
--- a/xen/common/compat/kernel.c
+++ b/xen/common/compat/kernel.c
@@ -37,11 +37,6 @@ CHECK_TYPE(capabilities_info);
CHECK_TYPE(domain_handle);
-#ifdef COMPAT_VM_ASSIST_VALID
-#undef VM_ASSIST_VALID
-#define VM_ASSIST_VALID COMPAT_VM_ASSIST_VALID
-#endif
-
#define DO(fn) int compat_##fn
#define COMPAT
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 611116c7fc..0902a15e8d 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -1601,20 +1601,23 @@ long do_vcpu_op(int cmd, unsigned int vcpuid,
XEN_GUEST_HANDLE_PARAM(void) arg)
return rc;
}
-#ifdef VM_ASSIST_VALID
-long vm_assist(struct domain *p, unsigned int cmd, unsigned int type,
- unsigned long valid)
+#ifdef arch_vm_assist_valid_mask
+long do_vm_assist(unsigned int cmd, unsigned int type)
{
+ struct domain *currd = current->domain;
+ const unsigned long valid = arch_vm_assist_valid_mask(currd);
+
if ( type >= BITS_PER_LONG || !test_bit(type, &valid) )
return -EINVAL;
switch ( cmd )
{
case VMASST_CMD_enable:
- set_bit(type, &p->vm_assist);
+ set_bit(type, &currd->vm_assist);
return 0;
+
case VMASST_CMD_disable:
- clear_bit(type, &p->vm_assist);
+ clear_bit(type, &currd->vm_assist);
return 0;
}
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 760917dab5..de2fd1e334 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -565,13 +565,6 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
return -ENOSYS;
}
-#ifdef VM_ASSIST_VALID
-DO(vm_assist)(unsigned int cmd, unsigned int type)
-{
- return vm_assist(current->domain, cmd, type, VM_ASSIST_VALID);
-}
-#endif
-
/*
* Local variables:
* mode: C
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index bc89e84f4d..fbb4b23a69 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -195,8 +195,6 @@ extern unsigned long frametable_virt_end;
#define watchdog_disable() ((void)0)
#define watchdog_enable() ((void)0)
-#define VM_ASSIST_VALID (1UL << VMASST_TYPE_runstate_update_flag)
-
#endif /* __ARM_CONFIG_H__ */
/*
* Local variables:
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index 16a7150a95..b405cd539e 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -269,6 +269,8 @@ static inline void free_vcpu_guest_context(struct
vcpu_guest_context *vgc)
static inline void arch_vcpu_block(struct vcpu *v) {}
+#define arch_vm_assist_valid_mask(d) (1UL << VMASST_TYPE_runstate_update_flag)
+
#endif /* __ASM_DOMAIN_H__ */
/*
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index dab7d7bade..8d79a71398 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -308,17 +308,6 @@ extern unsigned long xen_phys_start;
#define ARG_XLAT_START(v) \
(ARG_XLAT_VIRT_START + ((v)->vcpu_id << ARG_XLAT_VA_SHIFT))
-#define NATIVE_VM_ASSIST_VALID ((1UL << VMASST_TYPE_4gb_segments) | \
- (1UL << VMASST_TYPE_4gb_segments_notify) | \
- (1UL << VMASST_TYPE_writable_pagetables) | \
- (1UL << VMASST_TYPE_pae_extended_cr3) | \
- (1UL << VMASST_TYPE_architectural_iopl) | \
- (1UL << VMASST_TYPE_runstate_update_flag)| \
- (1UL << VMASST_TYPE_m2p_strict))
-#define VM_ASSIST_VALID NATIVE_VM_ASSIST_VALID
-#define COMPAT_VM_ASSIST_VALID (NATIVE_VM_ASSIST_VALID & \
- ((1UL << COMPAT_BITS_PER_LONG) - 1))
-
#define ELFSIZE 64
#define ARCH_CRASH_SAVE_VMCOREINFO
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index 9dc7556980..81f32bb56d 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -694,6 +694,25 @@ static inline void pv_inject_sw_interrupt(unsigned int
vector)
pv_inject_event(&event);
}
+#define PV32_VM_ASSIST_MASK ((1UL << VMASST_TYPE_4gb_segments) | \
+ (1UL << VMASST_TYPE_4gb_segments_notify) | \
+ (1UL << VMASST_TYPE_writable_pagetables) | \
+ (1UL << VMASST_TYPE_pae_extended_cr3) | \
+ (1UL << VMASST_TYPE_architectural_iopl) | \
+ (1UL << VMASST_TYPE_runstate_update_flag))
+/*
+ * Various of what PV32_VM_ASSIST_MASK has isn't really applicable to 64-bit,
+ * but we can't make such requests fail all of the sudden.
+ */
+#define PV64_VM_ASSIST_MASK (PV32_VM_ASSIST_MASK | \
+ (1UL << VMASST_TYPE_m2p_strict))
+#define HVM_VM_ASSIST_MASK (1UL << VMASST_TYPE_runstate_update_flag)
+
+#define arch_vm_assist_valid_mask(d) \
+ (is_hvm_domain(d) ? HVM_VM_ASSIST_MASK \
+ : is_pv_32bit_domain(d) ? PV32_VM_ASSIST_MASK \
+ : PV64_VM_ASSIST_MASK)
+
#endif /* __ASM_DOMAIN_H__ */
/*
diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h
index ad8ad27b23..d82a293377 100644
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -192,8 +192,6 @@ extern int compat_xsm_op(
extern int compat_kexec_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void)
uarg);
-extern int compat_vm_assist(unsigned int cmd, unsigned int type);
-
DEFINE_XEN_GUEST_HANDLE(multicall_entry_compat_t);
extern int compat_multicall(
XEN_GUEST_HANDLE_PARAM(multicall_entry_compat_t) call_list,
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 8fbe84032d..3c27ba902d 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -120,8 +120,6 @@ extern void guest_printk(const struct domain *d, const char
*format, ...)
__attribute__ ((format (printf, 2, 3)));
extern void noreturn panic(const char *format, ...)
__attribute__ ((format (printf, 1, 2)));
-extern long vm_assist(struct domain *, unsigned int cmd, unsigned int type,
- unsigned long valid);
extern int __printk_ratelimit(int ratelimit_ms, int ratelimit_burst);
extern int printk_ratelimit(void);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.13
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |