More viridian code cleanup
cover More viridian code cleanup
This series contains an updated patch from last batch and two new patches.
Wei Liu (3):
x86/viridian: drop a wrong invalid value from reference TSC
implementation
x86/viridian: drop virdian_sint_msr
x86/viridian: drop viridian_stimer_config_msr
xen/arch/x86/hvm/viridian/synic.c | 20 +++++------ xen/arch/x86/hvm/viridian/time.c | 44 ++++++++++--------------- xen/include/asm-x86/guest/hyperv-tlfs.h | 3 +- xen/include/asm-x86/hvm/viridian.h | 35 ++------------------ 4 files changed, 32 insertions(+), 70 deletions(-)
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/3 x86/viridian: drop a wrong invalid value from reference TSC implementation
The only invalid value mentioned in Hyper-V TLFS 5.0c is 0. Michael Kelley confirmed that 0xFFFFFFFF was never used [0].
[0] https://lists.xen.org/archives/html/xen-devel/2019-12/msg01564.html
--- xen/arch/x86/hvm/viridian/time.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
xen/arch/x86/hvm/viridian/time.c +4 -12
@@ -45,14 +45,9 @@ static void update_reference_tsc(const struct domain *d, bool initialize)if ( !host_tsc_is_safe () || d->arch.vtsc ) {/* -* The specification states that valid values of TscSequence range -* from 0 to 0xFFFFFFFE. The value 0xFFFFFFFF is used to indicate -* this mechanism is no longer a reliable source of time and that -* the VM should fall back to a different source. -* -* Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually -* violate the spec. and rely on a value of 0 to indicate that this -* enlightenment should no longer be used. +* The value 0 is used to indicate this mechanism is no longer a +* reliable source of time and that the VM should fall back to a +* different source. */ p->tsc_sequence =0 ;
@@ -77,10 +72,7 @@ static void update_reference_tsc(const struct domain *d, bool initialize)smp_wmb (); seq = p->tsc_sequence +1 ; -if ( seq ==0xFFFFFFFF || seq ==0 )/* Avoid both 'invalid' values */ - seq =1 ; - - p->tsc_sequence = seq; + p->tsc_sequence = seq ? seq :1 ;/* Avoid 'invalid' value 0 */ }static uint64_t trc_val (const struct domain *d,int64_t offset)
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/3] x86/viridian: drop a wrong invalid value from reference TSC implementation
V2?
Quoted 12 lines
-----Original Message-----
From: Wei Liu <[email protected]> On Behalf Of Wei Liu
Sent: 22 December 2019 23:21
To: Xen Development List <[email protected]>
Cc: Michael Kelley <[email protected]>; Durrant, Paul <[email protected]>; Wei Liu <[email protected]>; Paul Durrant <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: [PATCH 1/3] x86/viridian: drop a wrong invalid value from reference TSC implementation
Quoted 6 lines
The only invalid value mentioned in Hyper-V TLFS 5.0c is 0. Michael Kelley confirmed that
0xFFFFFFFFwas never used [0].[0] https://lists.xen.org/archives/html/xen-devel/2019-12/msg01564.html
Signed-off-by Wei Liu <[email protected]>
Quoted 43 lines
--- xen/arch/x86/hvm/viridian/time.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)xen/arch/x86/hvm/viridian/time.c +0
-1@@ -45,14 +45,9 @@ static void update_reference_tsc(const struct domain *d, bool initialize)if ( !host_tsc_is_safe () || d->arch.vtsc ) {/* -* The specification states that valid values of TscSequence range
xen/arch/x86/hvm/viridian/time.c +0
-6-* from 0 to 0xFFFFFFFE. The value 0xFFFFFFFF is used to indicate -* this mechanism is no longer a reliable source of time and that -* the VM should fall back to a different source. -* -* Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually -* violate the spec. and rely on a value of 0 to indicate that this
xen/arch/x86/hvm/viridian/time.c +4
-5-* enlightenment should no longer be used. +* The value 0 is used to indicate this mechanism is no longer a +* reliable source of time and that the VM should fall back to a +* different source. */ p->tsc_sequence =0 ;@@ -77,10 +72,7 @@ static void update_reference_tsc(const struct domain*d, bool initialize) smp_wmb(); seq = p->tsc_sequence + 1; -if ( seq ==0xFFFFFFFF || seq ==0 )/* Avoid both 'invalid' values */ - seq =1 ; - - p->tsc_sequence = seq; + p->tsc_sequence = seq ? seq :1 ;/* Avoid 'invalid' value 0 */ }
Quoted 3 lines
static
uint64_ttrc_val(const struct domain *d, int64_t offset)
--
2.20.1
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/3 x86/viridian: drop virdian_sint_msr
In reply to Wei LiuUse hv_synic_sint in hyperv-tlfs.h instead.
This requires adding the missing "polling" member to hv_synic_sint.
No functional change.
--- xen/arch/x86/hvm/viridian/synic.c | 20 ++++++++++---------- xen/include/asm-x86/guest/hyperv-tlfs.h | 3 ++- xen/include/asm-x86/hvm/viridian.h | 16 +--------------- 3 files changed, 13 insertions(+), 26 deletions(-)
xen/arch/x86/hvm/viridian/synic.c +10 -10
@@ -143,7 +143,7 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: {unsigned int sintx = idx -HV_X64_MSR_SINT0 ; -union viridian_sint_msr new, *vs = +union hv_synic_sint new, *vs = &array_access_nospec (vv->sint, sintx);uint8_t vector;
@@ -151,7 +151,7 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)return X86EMUL_EXCEPTION ;/* Vectors must be in the range 0x10-0xff inclusive */ - new.raw = val; + new.as_uint64 = val;if ( new.vector <0x10 )return X86EMUL_EXCEPTION ;
@@ -256,13 +256,13 @@ int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val) case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: {unsigned int sintx = idx -HV_X64_MSR_SINT0 ; -const union viridian_sint_msr *vs = +const union hv_synic_sint *vs = &array_access_nospec (vv->sint, sintx);if ( !(viridian_feature_mask (d) & HVMPV_synic) )return X86EMUL_EXCEPTION ; - *val = vs->raw; + *val = vs->as_uint64;break ; }
@@ -284,7 +284,7 @@ int viridian_synic_vcpu_init(const struct vcpu *v)* initally masked. */ for ( i =0 ; i <ARRAY_SIZE (vv->sint); i++ ) - vv->sint[i].mask =1 ; + vv->sint[i].masked =1 ;/* Initialize the mapping array with invalid values */ for ( i =0 ; i <ARRAY_SIZE (vv->vector_to_sintx); i++ )
@@ -321,7 +321,7 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx, uint64_t delivery) {struct viridian_vcpu *vv = v->arch.hvm.viridian; -const union viridian_sint_msr *vs = &vv->sint[sintx]; +const union hv_synic_sint *vs = &vv->sint[sintx];struct hv_message *msg = vv->simp.ptr;struct {uint32_t TimerIndex;
@@ -360,7 +360,7 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx,BUILD_BUG_ON (sizeof (payload) >sizeof (msg->u.payload));memcpy (msg->u.payload, &payload,sizeof (payload)); -if ( !vs->mask ) +if ( !vs->masked )vlapic_set_irq (vcpu_vlapic (v), vs->vector,0 );return true;
@@ -371,7 +371,7 @@ bool viridian_synic_is_auto_eoi_sint(const struct vcpu *v, {const struct viridian_vcpu *vv = v->arch.hvm.viridian;unsigned int sintx = vv->vector_to_sintx[vector]; -const union viridian_sint_msr *vs = +const union hv_synic_sint *vs = &array_access_nospec (vv->sint, sintx);if ( sintx >=ARRAY_SIZE (vv->sint) )
@@ -401,7 +401,7 @@ void viridian_synic_save_vcpu_ctxt(const struct vcpu *v,BUILD_BUG_ON (ARRAY_SIZE (vv->sint) !=ARRAY_SIZE (ctxt->sint_msr));for ( i =0 ; i <ARRAY_SIZE (vv->sint); i++ ) - ctxt->sint_msr[i] = vv->sint[i].raw; + ctxt->sint_msr[i] = vv->sint[i].as_uint64; ctxt->simp_msr = vv->simp.msr.raw;
@@ -430,7 +430,7 @@ void viridian_synic_load_vcpu_ctxt( {uint8_t vector; - vv->sint[i].raw = ctxt->sint_msr[i]; + vv->sint[i].as_uint64 = ctxt->sint_msr[i]; vector = vv->sint[i].vector;if ( vector <0x10 )
xen/include/asm-x86/guest/hyperv-tlfs.h +2 -1
@@ -819,7 +819,8 @@ union hv_synic_sint { u64 reserved1:8; u64 masked:1; u64 auto_eoi:1; - u64 reserved2:46; + u64 polling:1; + u64 reserved2:45; } __packed; };
xen/include/asm-x86/hvm/viridian.h +1 -15
@@ -28,20 +28,6 @@ struct viridian_pagevoid *ptr; }; -union viridian_sint_msr -{ -uint64_t raw; -struct - { -uint64_t vector:8 ; -uint64_t reserved_preserved1:8 ; -uint64_t mask:1 ; -uint64_t auto_eoi:1 ; -uint64_t polling:1 ; -uint64_t reserved_preserved2:45 ; - }; -}; -union viridian_stimer_config_msr {uint64_t raw;
@@ -77,7 +63,7 @@ struct viridian_vcpuuint64_t scontrol;uint64_t siefp;struct viridian_page simp; -union viridian_sint_msr sint[16 ]; +union hv_synic_sint sint[16 ];uint8_t vector_to_sintx[256 ];struct viridian_stimer stimer[4 ];unsigned int stimer_enabled;
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 2/3] x86/viridian: drop virdian_sint_msr
Quoted 11 lines
-----Original Message-----
From: Wei Liu <[email protected]> On Behalf Of Wei Liu
Sent: 22 December 2019 23:21
To: Xen Development List <[email protected]>
Cc: Michael Kelley <[email protected]>; Durrant, Paul <[email protected]>; Wei Liu <[email protected]>; Paul Durrant <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: [PATCH 2/3] x86/viridian: dropvirdian_sint_msr
Quoted 7 lines
Use
hv_synic_sintinhyperv-tlfs.hinstead.This requires adding the missing "polling" member to
hv_synic_sint.No functional change.
Signed-off-by Wei Liu <[email protected]>
Quoted 157 lines
--- xen/arch/x86/hvm/viridian/synic.c | 20 ++++++++++---------- xen/include/asm-x86/guest/hyperv-tlfs.h | 3 ++- xen/include/asm-x86/hvm/viridian.h | 16 +--------------- 3 files changed, 13 insertions(+), 26 deletions(-)xen/arch/x86/hvm/viridian/synic.c +6
-6@@ -143,7 +143,7 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: {unsigned int sintx = idx -HV_X64_MSR_SINT0 ; -union viridian_sint_msr new, *vs = +union hv_synic_sint new, *vs = &array_access_nospec (vv->sint, sintx);uint8_t vector;@@ -151,7 +151,7 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)return X86EMUL_EXCEPTION ;/* Vectors must be in the range 0x10-0xff inclusive */ - new.raw = val; + new.as_uint64 = val;if ( new.vector <0x10 )return X86EMUL_EXCEPTION ;@@ -256,13 +256,13 @@ int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val) case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: { unsigned int sintx = idx - HV_X64_MSR_SINT0; -const union viridian_sint_msr *vs = +const union hv_synic_sint *vs = &array_access_nospec (vv->sint, sintx);if ( !(viridian_feature_mask (d) & HVMPV_synic) )return X86EMUL_EXCEPTION ; - *val = vs->raw; + *val = vs->as_uint64;break ; }@@ -284,7 +284,7 @@ int viridian_synic_vcpu_init(const struct vcpu *v)* initally masked. */ for ( i =0 ; i <ARRAY_SIZE (vv->sint); i++ ) - vv->sint[i].mask =1 ; + vv->sint[i].masked =1 ;/* Initialize the mapping array with invalid values */ for ( i =0 ; i <ARRAY_SIZE (vv->vector_to_sintx); i++ )@@ -321,7 +321,7 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v, unsigned int sintx, uint64_t delivery) {struct viridian_vcpu *vv = v->arch.hvm.viridian; -const union viridian_sint_msr *vs = &vv->sint[sintx]; +const union hv_synic_sint *vs = &vv->sint[sintx];struct hv_message *msg = vv->simp.ptr;struct {uint32_t TimerIndex;xen/arch/x86/hvm/viridian/synic.c +1
-1@@ -360,7 +360,7 @@ bool viridian_synic_deliver_timer_msg(struct vcpu *v,unsigned int sintx, BUILD_BUG_ON(sizeof(payload) > sizeof(msg->u.payload));memcpy (msg->u.payload, &payload,sizeof (payload)); -if ( !vs->mask ) +if ( !vs->masked )vlapic_set_irq (vcpu_vlapic (v), vs->vector,0 );return true;xen/arch/x86/hvm/viridian/synic.c +1
-1@@ -371,7 +371,7 @@ bool viridian_synic_is_auto_eoi_sint(const struct vcpu *v, {const struct viridian_vcpu *vv = v->arch.hvm.viridian;unsigned int sintx = vv->vector_to_sintx[vector]; -const union viridian_sint_msr *vs = +const union hv_synic_sint *vs = &array_access_nospec (vv->sint, sintx);if ( sintx >= ARRAY_SIZE(vv->sint) )xen/arch/x86/hvm/viridian/synic.c +2
-2@@ -401,7 +401,7 @@ void viridian_synic_save_vcpu_ctxt(const struct vcpu *v,BUILD_BUG_ON (ARRAY_SIZE (vv->sint) !=ARRAY_SIZE (ctxt->sint_msr));for ( i =0 ; i <ARRAY_SIZE (vv->sint); i++ ) - ctxt->sint_msr[i] = vv->sint[i].raw; + ctxt->sint_msr[i] = vv->sint[i].as_uint64; ctxt->simp_msr = vv->simp.msr.raw;@@ -430,7 +430,7 @@ void viridian_synic_load_vcpu_ctxt( {uint8_t vector; - vv->sint[i].raw = ctxt->sint_msr[i]; + vv->sint[i].as_uint64 = ctxt->sint_msr[i]; vector = vv->sint[i].vector;if ( vector <0x10 )xen/include/asm- renamed from xen/include/asm-x86/guest/hyperv-tlfs.h +0
-0
x86/guest/hyperv-tlfs.h
index4402854c80..fe9fb232d0100644xen/include/asm-x86/guest/hyperv-tlfs.h +2
-1@@ -819,7 +819,8 @@ union hv_synic_sint { u64 reserved1:8; u64 masked:1; u64 auto_eoi:1; - u64 reserved2:46; + u64 polling:1; + u64 reserved2:45; } __packed; };xen/include/asm- renamed from xen/include/asm-x86/hvm/viridian.h +0
-0
x86/hvm/viridian.h
indexcfbaede158..d694d83521100644xen/include/asm-x86/hvm/viridian.h +1
-16@@ -28,20 +28,6 @@ struct viridian_pagevoid *ptr; }; -union viridian_sint_msr -{ -uint64_t raw; -struct - { -uint64_t vector:8 ; -uint64_t reserved_preserved1:8 ; -uint64_t mask:1 ; -uint64_t auto_eoi:1 ; -uint64_t polling:1 ; -uint64_t reserved_preserved2:45 ; - }; -}; -union viridian_stimer_config_msr {uint64_t raw;@@ -77,7 +63,7 @@ struct viridian_vcpuuint64_t scontrol;uint64_t siefp;struct viridian_page simp; -union viridian_sint_msr sint[16 ]; +union hv_synic_sint sint[16 ];uint8_t vector_to_sintx[256 ];struct viridian_stimer stimer[4 ];unsigned int stimer_enabled; --
Quoted 1 line
2.20.1
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 3/3 x86/viridian: drop viridian_stimer_config_msr
In reply to Wei LiuUse hv_stimer_config instead. No functional change.
--- xen/arch/x86/hvm/viridian/time.c | 28 ++++++++++++++-------------- xen/include/asm-x86/hvm/viridian.h | 19 +------------------ 2 files changed, 15 insertions(+), 32 deletions(-)
xen/arch/x86/hvm/viridian/time.c +14 -14
@@ -220,7 +220,7 @@ static void poll_stimer(struct vcpu *v, unsigned int stimerx)* is disabled make sure the pending bit is cleared to avoid re- * polling. */ -if ( !vs->config.enabled ) +if ( !vs->config.enable ) {clear_bit (stimerx, &vv->stimer_pending);return ;
@@ -239,7 +239,7 @@ static void poll_stimer(struct vcpu *v, unsigned int stimerx)if ( vs->config.periodic )start_stimer (vs);else - vs->config.enabled =0 ; + vs->config.enable =0 ; }void viridian_time_poll_timers (struct vcpu *v)
@@ -285,7 +285,7 @@ static void time_vcpu_thaw(struct vcpu *v) {struct viridian_stimer *vs = &vv->stimer[i]; -if ( vs->config.enabled ) +if ( vs->config.enable )start_stimer (vs); } }
@@ -355,12 +355,12 @@ int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)stop_stimer (vs); - vs->config.raw = val; + vs->config.as_uint64 = val;if ( !vs->config.sintx ) - vs->config.enabled =0 ; + vs->config.enable =0 ; -if ( vs->config.enabled ) +if ( vs->config.enable )start_stimer (vs);break ;
@@ -383,11 +383,11 @@ int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) vs->count = val;if ( !vs->count ) - vs->config.enabled =0 ; + vs->config.enable =0 ;else if ( vs->config.auto_enable ) - vs->config.enabled =1 ; + vs->config.enable =1 ; -if ( vs->config.enabled ) +if ( vs->config.enable )start_stimer (vs);break ;
@@ -454,7 +454,7 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val)unsigned int stimerx = (idx -HV_X64_MSR_STIMER0_CONFIG ) /2 ;const struct viridian_stimer *vs = &array_access_nospec (vv->stimer, stimerx); -union viridian_stimer_config_msr config = vs->config; +union hv_stimer_config config = vs->config;if ( !(viridian_feature_mask (d) & HVMPV_stimer) )return X86EMUL_EXCEPTION ;
@@ -464,9 +464,9 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val)* the enabled flag is clear. */ if ( !config.periodic &&test_bit (stimerx, &vv->stimer_pending) ) - config.enabled =0 ; + config.enable =0 ; - *val = config.raw; + *val = config.as_uint64;break ; }
@@ -549,7 +549,7 @@ void viridian_time_save_vcpu_ctxt( {const struct viridian_stimer *vs = &vv->stimer[i]; - ctxt->stimer_config_msr[i] = vs->config.raw; + ctxt->stimer_config_msr[i] = vs->config.as_uint64; ctxt->stimer_count_msr[i] = vs->count; } }
@@ -564,7 +564,7 @@ void viridian_time_load_vcpu_ctxt( {struct viridian_stimer *vs = &vv->stimer[i]; - vs->config.raw = ctxt->stimer_config_msr[i]; + vs->config.as_uint64 = ctxt->stimer_config_msr[i]; vs->count = ctxt->stimer_count_msr[i]; } }
xen/include/asm-x86/hvm/viridian.h +1 -18
@@ -28,27 +28,10 @@ struct viridian_pagevoid *ptr; }; -union viridian_stimer_config_msr -{ -uint64_t raw; -struct - { -uint64_t enabled:1 ; -uint64_t periodic:1 ; -uint64_t lazy:1 ; -uint64_t auto_enable:1 ; -uint64_t vector:8 ; -uint64_t direct_mode:1 ; -uint64_t reserved_zero1:3 ; -uint64_t sintx:4 ; -uint64_t reserved_zero2:44 ; - }; -}; -struct viridian_stimer {struct vcpu *v;struct timer timer; -union viridian_stimer_config_msr config; +union hv_stimer_config config;uint64_t count;uint64_t expiration;bool started;
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 3/3] x86/viridian: drop viridian_stimer_config_msr
Quoted 11 lines
-----Original Message-----
From: Wei Liu <[email protected]> On Behalf Of Wei Liu
Sent: 22 December 2019 23:21
To: Xen Development List <[email protected]>
Cc: Michael Kelley <[email protected]>; Durrant, Paul <[email protected]>; Wei Liu <[email protected]>; Paul Durrant <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: [PATCH 3/3] x86/viridian: dropviridian_stimer_config_msr
Quoted 3 lines
Use
hv_stimer_configinstead. No functional change.Signed-off-by Wei Liu <[email protected]>
Quoted 148 lines
--- xen/arch/x86/hvm/viridian/time.c | 28 ++++++++++++++-------------- xen/include/asm-x86/hvm/viridian.h | 19 +------------------ 2 files changed, 15 insertions(+), 32 deletions(-)xen/arch/x86/hvm/viridian/time.c +1
-1@@ -220,7 +220,7 @@ static void poll_stimer(struct vcpu *v, unsigned intstimerx) * is disabled make sure the pending bit is cleared to avoid re- * polling. */ -if ( !vs->config.enabled ) +if ( !vs->config.enable ) {clear_bit (stimerx, &vv->stimer_pending);return;xen/arch/x86/hvm/viridian/time.c +1
-1@@ -239,7 +239,7 @@ static void poll_stimer(struct vcpu *v, unsigned int stimerx)if ( vs->config.periodic )start_stimer (vs);else - vs->config.enabled =0 ; + vs->config.enable =0 ; }void
viridian_time_poll_timers(struct vcpu *v)xen/arch/x86/hvm/viridian/time.c +4
-4@@ -285,7 +285,7 @@ static void time_vcpu_thaw(struct vcpu *v) {struct viridian_stimer *vs = &vv->stimer[i]; -if ( vs->config.enabled ) +if ( vs->config.enable )start_stimer (vs); } }@@ -355,12 +355,12 @@ int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)stop_stimer (vs); - vs->config.raw = val; + vs->config.as_uint64 = val;if ( !vs->config.sintx ) - vs->config.enabled =0 ; + vs->config.enable =0 ; -if ( vs->config.enabled ) +if ( vs->config.enable )start_stimer (vs);break;xen/arch/x86/hvm/viridian/time.c +3
-3@@ -383,11 +383,11 @@ int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val) vs->count = val;if ( !vs->count ) - vs->config.enabled =0 ; + vs->config.enable =0 ;else if ( vs->config.auto_enable ) - vs->config.enabled =1 ; + vs->config.enable =1 ; -if ( vs->config.enabled ) +if ( vs->config.enable )start_stimer (vs);break;xen/arch/x86/hvm/viridian/time.c +1
-1@@ -454,7 +454,7 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val)unsigned int stimerx = (idx -HV_X64_MSR_STIMER0_CONFIG ) /2 ;const struct viridian_stimer *vs = &array_access_nospec (vv->stimer, stimerx); -union viridian_stimer_config_msr config = vs->config; +union hv_stimer_config config = vs->config;if ( !(viridian_feature_mask (d) & HVMPV_stimer) )return X86EMUL_EXCEPTION;xen/arch/x86/hvm/viridian/time.c +4
-4@@ -464,9 +464,9 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_tidx, uint64_t *val) * the enabled flag is clear. */ if ( !config.periodic &&test_bit (stimerx, &vv->stimer_pending) ) - config.enabled =0 ; + config.enable =0 ; - *val = config.raw; + *val = config.as_uint64;break ; }@@ -549,7 +549,7 @@ void viridian_time_save_vcpu_ctxt( {const struct viridian_stimer *vs = &vv->stimer[i]; - ctxt->stimer_config_msr[i] = vs->config.raw; + ctxt->stimer_config_msr[i] = vs->config.as_uint64; ctxt->stimer_count_msr[i] = vs->count; } }@@ -564,7 +564,7 @@ void viridian_time_load_vcpu_ctxt( {struct viridian_stimer *vs = &vv->stimer[i]; - vs->config.raw = ctxt->stimer_config_msr[i]; + vs->config.as_uint64 = ctxt->stimer_config_msr[i]; vs->count = ctxt->stimer_count_msr[i]; } }xen/include/asm- renamed from xen/include/asm-x86/hvm/viridian.h +0
-0
x86/hvm/viridian.h
indexd694d83521..d9138562e6100644xen/include/asm-x86/hvm/viridian.h +1
-19@@ -28,27 +28,10 @@ struct viridian_pagevoid *ptr; }; -union viridian_stimer_config_msr -{ -uint64_t raw; -struct - { -uint64_t enabled:1 ; -uint64_t periodic:1 ; -uint64_t lazy:1 ; -uint64_t auto_enable:1 ; -uint64_t vector:8 ; -uint64_t direct_mode:1 ; -uint64_t reserved_zero1:3 ; -uint64_t sintx:4 ; -uint64_t reserved_zero2:44 ; - }; -}; -struct viridian_stimer {struct vcpu *v;struct timer timer; -union viridian_stimer_config_msr config; +union hv_stimer_config config;uint64_t count;uint64_t expiration;bool started; --
Quoted 1 line
2.20.1
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel