| Message ID | 20220921201607.3156750-5-seanjc@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/hyperv: KVM: VMCB enlightenment cleanups | expand |
From: Sean Christopherson <seanjc@google.com> Sent: Wednesday, September 21, 2022 1:16 PM > > Now that KVM isn't littered with "struct hv_enlightenments" casts, rename > the struct to "hv_vmcb_enlightenments" to highlight the fact that the > struct is specifically for SVM's VMCB. > > No functional change intended. > > Signed-off-by: Sean Christopherson <seanjc@google.com> > --- > arch/x86/include/asm/hyperv-tlfs.h | 2 +- > arch/x86/include/asm/svm.h | 2 +- > arch/x86/kvm/svm/nested.c | 2 +- > arch/x86/kvm/svm/svm.h | 2 +- > arch/x86/kvm/svm/svm_onhyperv.c | 2 +- > arch/x86/kvm/svm/svm_onhyperv.h | 6 +++--- > tools/testing/selftests/kvm/include/x86_64/svm.h | 4 ++-- > tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c | 2 +- > 8 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h > index 4c4f81daf5a2..f7a431bcb2c3 100644 > --- a/arch/x86/include/asm/hyperv-tlfs.h > +++ b/arch/x86/include/asm/hyperv-tlfs.h > @@ -588,7 +588,7 @@ struct hv_enlightened_vmcs { > * Hyper-V uses the software reserved 32 bytes in VMCB control area to expose > * SVM enlightenments to guests. > */ > -struct hv_enlightenments { > +struct hv_vmcb_enlightenments { > struct __packed hv_enlightenments_control { > u32 nested_flush_hypercall:1; > u32 msr_bitmap:1; > diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h > index 6befed2b30a6..621f064bb7cc 100644 > --- a/arch/x86/include/asm/svm.h > +++ b/arch/x86/include/asm/svm.h > @@ -164,7 +164,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area { > * for use by hypervisor/software. > */ > union { > - struct hv_enlightenments hv_enlightenments; > + struct hv_vmcb_enlightenments hv_enlightenments; > u8 reserved_sw[32]; > }; > }; > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index a6a87d9743ce..bc9fb4dbf0ae 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -201,7 +201,7 @@ void recalc_intercepts(struct vcpu_svm *svm) > */ > static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) > { > - struct hv_enlightenments *hve = &svm->nested.ctl.hv_enlightenments; > + struct hv_vmcb_enlightenments *hve = &svm->nested.ctl.hv_enlightenments; > int i; > > /* > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index 9eb2fc76732f..5e1178bc9a64 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -152,7 +152,7 @@ struct vmcb_ctrl_area_cached { > u64 virt_ext; > u32 clean; > union { > - struct hv_enlightenments hv_enlightenments; > + struct hv_vmcb_enlightenments hv_enlightenments; > u8 reserved_sw[32]; > }; > }; > diff --git a/arch/x86/kvm/svm/svm_onhyperv.c b/arch/x86/kvm/svm/svm_onhyperv.c > index 5d4036611a37..0b657c7cd21b 100644 > --- a/arch/x86/kvm/svm/svm_onhyperv.c > +++ b/arch/x86/kvm/svm/svm_onhyperv.c > @@ -16,7 +16,7 @@ > > int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu) > { > - struct hv_enlightenments *hve; > + struct hv_vmcb_enlightenments *hve; > struct hv_partition_assist_pg **p_hv_pa_pg = > &to_kvm_hv(vcpu->kvm)->hv_pa_pg; > > diff --git a/arch/x86/kvm/svm/svm_onhyperv.h > b/arch/x86/kvm/svm/svm_onhyperv.h > index c8f8045305be..e08cd7192559 100644 > --- a/arch/x86/kvm/svm/svm_onhyperv.h > +++ b/arch/x86/kvm/svm/svm_onhyperv.h > @@ -18,7 +18,7 @@ int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu); > > static inline void svm_hv_init_vmcb(struct vmcb *vmcb) > { > - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; > + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; > > BUILD_BUG_ON(sizeof(vmcb->control.hv_enlightenments) != > sizeof(vmcb->control.reserved_sw)); > @@ -63,7 +63,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments( > struct kvm_vcpu *vcpu) > { > struct vmcb *vmcb = to_svm(vcpu)->vmcb; > - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; > + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; > > if (hve->hv_enlightenments_control.msr_bitmap) > vmcb_mark_dirty(vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS); > @@ -71,7 +71,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments( > > static inline void svm_hv_update_vp_id(struct vmcb *vmcb, struct kvm_vcpu *vcpu) > { > - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; > + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; > u32 vp_index = kvm_hv_get_vpindex(vcpu); > > if (hve->hv_vp_id != vp_index) { > diff --git a/tools/testing/selftests/kvm/include/x86_64/svm.h > b/tools/testing/selftests/kvm/include/x86_64/svm.h > index 0c32549c6b64..49292190c219 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/svm.h > +++ b/tools/testing/selftests/kvm/include/x86_64/svm.h > @@ -58,7 +58,7 @@ enum { > INTERCEPT_RDPRU, > }; > > -struct hv_enlightenments { > +struct hv_vmcb_enlightenments { > struct __packed hv_enlightenments_control { > u32 nested_flush_hypercall:1; > u32 msr_bitmap:1; > @@ -124,7 +124,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area { > * for use by hypervisor/software. > */ > union { > - struct hv_enlightenments hv_enlightenments; > + struct hv_vmcb_enlightenments hv_enlightenments; > u8 reserved_sw[32]; > }; > }; > diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c > b/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c > index 81b204ee509a..f8e43c798c86 100644 > --- a/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c > +++ b/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c > @@ -46,7 +46,7 @@ static void __attribute__((__flatten__)) guest_code(struct > svm_test_data *svm) > { > unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE]; > struct vmcb *vmcb = svm->vmcb; > - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; > + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; > > GUEST_SYNC(1); > > -- > 2.37.3.968.ga6b4b080e4-goog Reviewed-by: Michael Kelley <mikelley@microsoft.com>
diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index 4c4f81daf5a2..f7a431bcb2c3 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -588,7 +588,7 @@ struct hv_enlightened_vmcs { * Hyper-V uses the software reserved 32 bytes in VMCB control area to expose * SVM enlightenments to guests. */ -struct hv_enlightenments { +struct hv_vmcb_enlightenments { struct __packed hv_enlightenments_control { u32 nested_flush_hypercall:1; u32 msr_bitmap:1; diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 6befed2b30a6..621f064bb7cc 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -164,7 +164,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area { * for use by hypervisor/software. */ union { - struct hv_enlightenments hv_enlightenments; + struct hv_vmcb_enlightenments hv_enlightenments; u8 reserved_sw[32]; }; }; diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index a6a87d9743ce..bc9fb4dbf0ae 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -201,7 +201,7 @@ void recalc_intercepts(struct vcpu_svm *svm) */ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) { - struct hv_enlightenments *hve = &svm->nested.ctl.hv_enlightenments; + struct hv_vmcb_enlightenments *hve = &svm->nested.ctl.hv_enlightenments; int i; /* diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 9eb2fc76732f..5e1178bc9a64 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -152,7 +152,7 @@ struct vmcb_ctrl_area_cached { u64 virt_ext; u32 clean; union { - struct hv_enlightenments hv_enlightenments; + struct hv_vmcb_enlightenments hv_enlightenments; u8 reserved_sw[32]; }; }; diff --git a/arch/x86/kvm/svm/svm_onhyperv.c b/arch/x86/kvm/svm/svm_onhyperv.c index 5d4036611a37..0b657c7cd21b 100644 --- a/arch/x86/kvm/svm/svm_onhyperv.c +++ b/arch/x86/kvm/svm/svm_onhyperv.c @@ -16,7 +16,7 @@ int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu) { - struct hv_enlightenments *hve; + struct hv_vmcb_enlightenments *hve; struct hv_partition_assist_pg **p_hv_pa_pg = &to_kvm_hv(vcpu->kvm)->hv_pa_pg; diff --git a/arch/x86/kvm/svm/svm_onhyperv.h b/arch/x86/kvm/svm/svm_onhyperv.h index c8f8045305be..e08cd7192559 100644 --- a/arch/x86/kvm/svm/svm_onhyperv.h +++ b/arch/x86/kvm/svm/svm_onhyperv.h @@ -18,7 +18,7 @@ int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu); static inline void svm_hv_init_vmcb(struct vmcb *vmcb) { - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; BUILD_BUG_ON(sizeof(vmcb->control.hv_enlightenments) != sizeof(vmcb->control.reserved_sw)); @@ -63,7 +63,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments( struct kvm_vcpu *vcpu) { struct vmcb *vmcb = to_svm(vcpu)->vmcb; - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; if (hve->hv_enlightenments_control.msr_bitmap) vmcb_mark_dirty(vmcb, VMCB_HV_NESTED_ENLIGHTENMENTS); @@ -71,7 +71,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments( static inline void svm_hv_update_vp_id(struct vmcb *vmcb, struct kvm_vcpu *vcpu) { - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; u32 vp_index = kvm_hv_get_vpindex(vcpu); if (hve->hv_vp_id != vp_index) { diff --git a/tools/testing/selftests/kvm/include/x86_64/svm.h b/tools/testing/selftests/kvm/include/x86_64/svm.h index 0c32549c6b64..49292190c219 100644 --- a/tools/testing/selftests/kvm/include/x86_64/svm.h +++ b/tools/testing/selftests/kvm/include/x86_64/svm.h @@ -58,7 +58,7 @@ enum { INTERCEPT_RDPRU, }; -struct hv_enlightenments { +struct hv_vmcb_enlightenments { struct __packed hv_enlightenments_control { u32 nested_flush_hypercall:1; u32 msr_bitmap:1; @@ -124,7 +124,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area { * for use by hypervisor/software. */ union { - struct hv_enlightenments hv_enlightenments; + struct hv_vmcb_enlightenments hv_enlightenments; u8 reserved_sw[32]; }; }; diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c b/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c index 81b204ee509a..f8e43c798c86 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c @@ -46,7 +46,7 @@ static void __attribute__((__flatten__)) guest_code(struct svm_test_data *svm) { unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE]; struct vmcb *vmcb = svm->vmcb; - struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments; + struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments; GUEST_SYNC(1);
Now that KVM isn't littered with "struct hv_enlightenments" casts, rename the struct to "hv_vmcb_enlightenments" to highlight the fact that the struct is specifically for SVM's VMCB. No functional change intended. Signed-off-by: Sean Christopherson <seanjc@google.com> --- arch/x86/include/asm/hyperv-tlfs.h | 2 +- arch/x86/include/asm/svm.h | 2 +- arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/svm/svm_onhyperv.c | 2 +- arch/x86/kvm/svm/svm_onhyperv.h | 6 +++--- tools/testing/selftests/kvm/include/x86_64/svm.h | 4 ++-- tools/testing/selftests/kvm/x86_64/hyperv_svm_test.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-)