|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] Revert "x86: make Viridian support optional"
commit 1fffcf10cd71f5d5669d6f5a67fa53b8912c4ef1
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Mar 24 14:36:57 2025 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Mar 24 14:36:57 2025 +0100
Revert "x86: make Viridian support optional"
This reverts commit e0cf36bf295b40cac71af26b35eedee216e156ff. It
introduced not just UBSAN failures, but apparentlz actual NULL
de-references.
---
xen/arch/x86/hvm/Kconfig | 10 ----------
xen/arch/x86/hvm/Makefile | 2 +-
xen/arch/x86/hvm/hvm.c | 27 +++++++++------------------
xen/arch/x86/hvm/vlapic.c | 11 ++++-------
xen/arch/x86/include/asm/hvm/domain.h | 2 --
xen/arch/x86/include/asm/hvm/hvm.h | 3 +--
xen/arch/x86/include/asm/hvm/vcpu.h | 2 --
7 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/xen/arch/x86/hvm/Kconfig b/xen/arch/x86/hvm/Kconfig
index 4b4f07495b..2def0f98e2 100644
--- a/xen/arch/x86/hvm/Kconfig
+++ b/xen/arch/x86/hvm/Kconfig
@@ -63,16 +63,6 @@ config ALTP2M
If unsure, stay with defaults.
-config HVM_VIRIDIAN
- bool "Hyper-V enlightenments for guests" if EXPERT
- default y
- help
- Support optimizations for Hyper-V guests such as faster hypercalls,
- efficient timer and interrupt handling, and enhanced paravirtualized
- I/O. This is to improve performance and compatibility of Windows VMs.
-
- If unsure, say Y.
-
config MEM_PAGING
bool "Xen memory paging support (UNSUPPORTED)" if UNSUPPORTED
depends on VM_EVENT
diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile
index 6cc2e74fc4..4c1fa5c6c2 100644
--- a/xen/arch/x86/hvm/Makefile
+++ b/xen/arch/x86/hvm/Makefile
@@ -1,6 +1,6 @@
obj-$(CONFIG_AMD_SVM) += svm/
obj-$(CONFIG_INTEL_VMX) += vmx/
-obj-$(CONFIG_HVM_VIRIDIAN) += viridian/
+obj-y += viridian/
obj-y += asid.o
obj-y += dm.o
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 529068e80c..5950f3160f 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -695,12 +695,9 @@ int hvm_domain_initialise(struct domain *d,
if ( hvm_tsc_scaling_supported )
d->arch.hvm.tsc_scaling_ratio = hvm_default_tsc_scaling_ratio;
- if ( is_viridian_domain(d) )
- {
- rc = viridian_domain_init(d);
- if ( rc )
- goto fail2;
- }
+ rc = viridian_domain_init(d);
+ if ( rc )
+ goto fail2;
rc = alternative_call(hvm_funcs.domain_initialise, d);
if ( rc != 0 )
@@ -736,8 +733,7 @@ void hvm_domain_relinquish_resources(struct domain *d)
if ( hvm_funcs.nhvm_domain_relinquish_resources )
alternative_vcall(hvm_funcs.nhvm_domain_relinquish_resources, d);
- if ( is_viridian_domain(d) )
- viridian_domain_deinit(d);
+ viridian_domain_deinit(d);
ioreq_server_destroy_all(d);
@@ -1641,12 +1637,9 @@ int hvm_vcpu_initialise(struct vcpu *v)
&& (rc = nestedhvm_vcpu_initialise(v)) < 0 ) /* teardown:
nestedhvm_vcpu_destroy */
goto fail5;
- if ( is_viridian_domain(d) )
- {
- rc = viridian_vcpu_init(v);
- if ( rc )
- goto fail6;
- }
+ rc = viridian_vcpu_init(v);
+ if ( rc )
+ goto fail6;
rc = ioreq_server_add_vcpu_all(d, v);
if ( rc != 0 )
@@ -1676,15 +1669,13 @@ int hvm_vcpu_initialise(struct vcpu *v)
fail2:
hvm_vcpu_cacheattr_destroy(v);
fail1:
- if ( is_viridian_domain(d) )
- viridian_vcpu_deinit(v);
+ viridian_vcpu_deinit(v);
return rc;
}
void hvm_vcpu_destroy(struct vcpu *v)
{
- if ( is_viridian_domain(v->domain) )
- viridian_vcpu_deinit(v);
+ viridian_vcpu_deinit(v);
ioreq_server_remove_vcpu_all(v->domain, v);
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 3d76ce3f0d..065b2aab5b 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -426,8 +426,7 @@ void vlapic_EOI_set(struct vlapic *vlapic)
* priority vector and then recurse to handle the lower priority
* vector.
*/
- bool missed_eoi = has_viridian_apic_assist(v->domain) &&
- viridian_apic_assist_completed(v);
+ bool missed_eoi = viridian_apic_assist_completed(v);
int vector;
again:
@@ -443,7 +442,7 @@ void vlapic_EOI_set(struct vlapic *vlapic)
* NOTE: It is harmless to call viridian_apic_assist_clear() on a
* recursion, even though it is not necessary.
*/
- if ( has_viridian_apic_assist(v->domain) && !missed_eoi )
+ if ( !missed_eoi )
viridian_apic_assist_clear(v);
vlapic_clear_vector(vector, &vlapic->regs->data[APIC_ISR]);
@@ -1361,8 +1360,7 @@ int vlapic_has_pending_irq(struct vcpu *v)
* If so, we need to emulate the EOI here before comparing ISR
* with IRR.
*/
- if ( has_viridian_apic_assist(v->domain) &&
- viridian_apic_assist_completed(v) )
+ if ( viridian_apic_assist_completed(v) )
vlapic_EOI_set(vlapic);
isr = vlapic_find_highest_isr(vlapic);
@@ -1375,8 +1373,7 @@ int vlapic_has_pending_irq(struct vcpu *v)
if ( isr >= 0 &&
(irr & 0xf0) <= (isr & 0xf0) )
{
- if ( has_viridian_apic_assist(v->domain) )
- viridian_apic_assist_clear(v);
+ viridian_apic_assist_clear(v);
return -1;
}
diff --git a/xen/arch/x86/include/asm/hvm/domain.h
b/xen/arch/x86/include/asm/hvm/domain.h
index 07eec231f0..333501d5f2 100644
--- a/xen/arch/x86/include/asm/hvm/domain.h
+++ b/xen/arch/x86/include/asm/hvm/domain.h
@@ -111,9 +111,7 @@ struct hvm_domain {
/* hypervisor intercepted msix table */
struct list_head msixtbl_list;
-#ifdef CONFIG_HVM_VIRIDIAN
struct viridian_domain *viridian;
-#endif
/*
* TSC value that VCPUs use to calculate their tsc_offset value.
diff --git a/xen/arch/x86/include/asm/hvm/hvm.h
b/xen/arch/x86/include/asm/hvm/hvm.h
index 9c30457ece..963e820113 100644
--- a/xen/arch/x86/include/asm/hvm/hvm.h
+++ b/xen/arch/x86/include/asm/hvm/hvm.h
@@ -507,8 +507,7 @@ hvm_get_cpl(struct vcpu *v)
(has_hvm_params(d) ? (d)->arch.hvm.params[HVM_PARAM_VIRIDIAN] : 0)
#define is_viridian_domain(d) \
- (IS_ENABLED(CONFIG_HVM_VIRIDIAN) && \
- is_hvm_domain(d) && (viridian_feature_mask(d) & HVMPV_base_freq))
+ (is_hvm_domain(d) && (viridian_feature_mask(d) & HVMPV_base_freq))
#define is_viridian_vcpu(v) \
is_viridian_domain((v)->domain)
diff --git a/xen/arch/x86/include/asm/hvm/vcpu.h
b/xen/arch/x86/include/asm/hvm/vcpu.h
index 4c5a76a707..196fed6d5d 100644
--- a/xen/arch/x86/include/asm/hvm/vcpu.h
+++ b/xen/arch/x86/include/asm/hvm/vcpu.h
@@ -172,9 +172,7 @@ struct hvm_vcpu {
/* Pending hw/sw interrupt (.vector = -1 means nothing pending). */
struct x86_event inject_event;
-#ifdef CONFIG_HVM_VIRIDIAN
struct viridian_vcpu *viridian;
-#endif
};
#endif /* __ASM_X86_HVM_VCPU_H__ */
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |