x86/hvm: Drop .is_singlestep_supported() callback
PATCH 1/1 x86/hvm: Drop .is_singlestep_supported() callback
There is absolutely no need for a function pointer call here.
Drop the hook, introduce a singlestep_supported boolean, and configure it in start_vmx() like all other optional functionality.
No functional change, but rather more efficient logic.
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>
CC: Tamas K Lengyel <[email protected]>
CC: Jun Nakajima <[email protected]>
CC: Kevin Tian <[email protected]>
Based on Jan's "altcall all hvm ops" patch, but not logically related. This had escaped my previous attempts to drop inappropriate function pointer use.
The hvm_funcs data fields are a mess. All the booleans and 'hvm_capabilities' want merging into a single bitfield, so we're not wasting 8 bytes of space to hold 6 bits of information.
--- xen/arch/x86/hvm/vmx/vmx.c | 8 ++------ xen/arch/x86/include/asm/hvm/hvm.h | 7 +++---- 2 files changed, 5 insertions(+), 10 deletions(-)
xen/arch/x86/hvm/vmx/vmx.c +2 -6
@@ -2120,11 +2120,6 @@ static void vmx_enable_msr_interception(struct domain *d, uint32_t msr)vmx_set_msr_intercept (v, msr,VMX_MSR_W ); } -static bool_t vmx_is_singlestep_supported (void ) -{ -return !!cpu_has_monitor_trap_flag; -} -static void vmx_vcpu_update_eptp (struct vcpu *v) {struct domain *d = v->domain;
@@ -2454,7 +2449,6 @@ static struct hvm_function_table __initdata vmx_function_table = { .nhvm_domain_relinquish_resources = nvmx_domain_relinquish_resources, .nhvm_hap_walk_L1_p2m = nvmx_hap_walk_L1_p2m, .enable_msr_interception = vmx_enable_msr_interception, - .is_singlestep_supported = vmx_is_singlestep_supported, .altp2m_vcpu_update_p2m = vmx_vcpu_update_eptp, .altp2m_vcpu_update_vmfunc_ve = vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve = vmx_vcpu_emulate_ve,
@@ -2661,6 +2655,8 @@ const struct hvm_function_table * __init start_vmx(void)return NULL ; } + vmx_function_table.singlestep_supported = cpu_has_monitor_trap_flag; +if ( cpu_has_vmx_dt_exiting ) vmx_function_table.set_descriptor_access_exiting = vmx_set_descriptor_access_exiting;
xen/arch/x86/include/asm/hvm/hvm.h +3 -4
@@ -97,6 +97,7 @@ struct hvm_function_table {/* Necessary hardware support for alternate p2m's? */ bool altp2m_supported; +bool singlestep_supported;/* Hardware virtual interrupt delivery enable? */ bool virtual_intr_delivery_enabled;
@@ -208,7 +209,6 @@ struct hvm_function_table { uint8_t *p2m_acc, struct npfec npfec);void (*enable_msr_interception)(struct domain *d,uint32_t msr); -bool_t (*is_singlestep_supported)(void);/* Alternate p2m */ void (*altp2m_vcpu_update_p2m)(struct vcpu *v);
@@ -644,10 +644,9 @@ static inline void hvm_enable_msr_interception(struct domain *d, uint32_t msr)alternative_vcall (hvm_funcs.enable_msr_interception, d, msr); } -static inline bool_t hvm_is_singlestep_supported (void ) +static inline bool hvm_is_singlestep_supported (void ) { -return (hvm_funcs.is_singlestep_supported && -alternative_call (hvm_funcs.is_singlestep_supported)); +return hvm_funcs.singlestep_supported; }static inline bool hvm_hap_supported (void )
Signature · 1 line
2.11.0
Quoted 8 lines · Andrew Cooper
There is absolutely no need for a function pointer call here.
Drop the hook, introduce a
singlestep_supportedboolean, and configure it instart_vmx()like all other optional functionality.No functional change, but rather more efficient logic.
Signed-off-by Andrew Cooper <[email protected]>
Quoted 9 lines · Andrew Cooper
There is absolutely no need for a function pointer call here.
Drop the hook, introduce a
singlestep_supportedboolean, and configure it instart_vmx()like all other optional functionality.No functional change, but rather more efficient logic.
Signed-off-by Andrew Cooper <[email protected]>