From: Maxim Levitsky <mlevitsk@redhat.com>
To: Yang Weijiang <weijiang.yang@intel.com>,
seanjc@google.com, pbonzini@redhat.com, dave.hansen@intel.com,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, chao.gao@intel.com,
rick.p.edgecombe@intel.com, john.allen@amd.com
Subject: Re: [PATCH v7 09/26] KVM: x86: Rename kvm_{g,s}et_msr() to menifest emulation operations
Date: Thu, 30 Nov 2023 19:36:37 +0200 [thread overview]
Message-ID: <b23c9dbc953b6bae4d3bff4aa1dff4c349a49a04.camel@redhat.com> (raw)
In-Reply-To: <20231124055330.138870-10-weijiang.yang@intel.com>
On Fri, 2023-11-24 at 00:53 -0500, Yang Weijiang wrote:
> Rename kvm_{g,s}et_msr() to kvm_emulate_msr_{read,write}() to make it
> more obvious that KVM uses these helpers to emulate guest behaviors,
> i.e., host_initiated == false in these helpers.
>
> Suggested-by: Sean Christopherson <seanjc@google.com>
> Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
> ---
> arch/x86/include/asm/kvm_host.h | 4 ++--
> arch/x86/kvm/smm.c | 4 ++--
> arch/x86/kvm/vmx/nested.c | 13 +++++++------
> arch/x86/kvm/x86.c | 10 +++++-----
> 4 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index d7036982332e..5cfa18aaf33f 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1967,8 +1967,8 @@ void kvm_prepare_emulation_failure_exit(struct kvm_vcpu *vcpu);
> void kvm_enable_efer_bits(u64);
> bool kvm_valid_efer(struct kvm_vcpu *vcpu, u64 efer);
> int __kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data, bool host_initiated);
> -int kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data);
> -int kvm_set_msr(struct kvm_vcpu *vcpu, u32 index, u64 data);
> +int kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data);
> +int kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data);
> int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu);
> int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu);
> int kvm_emulate_as_nop(struct kvm_vcpu *vcpu);
> diff --git a/arch/x86/kvm/smm.c b/arch/x86/kvm/smm.c
> index dc3d95fdca7d..45c855389ea7 100644
> --- a/arch/x86/kvm/smm.c
> +++ b/arch/x86/kvm/smm.c
> @@ -535,7 +535,7 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *ctxt,
>
> vcpu->arch.smbase = smstate->smbase;
>
> - if (kvm_set_msr(vcpu, MSR_EFER, smstate->efer & ~EFER_LMA))
> + if (kvm_emulate_msr_write(vcpu, MSR_EFER, smstate->efer & ~EFER_LMA))
> return X86EMUL_UNHANDLEABLE;
>
> rsm_load_seg_64(vcpu, &smstate->tr, VCPU_SREG_TR);
> @@ -626,7 +626,7 @@ int emulator_leave_smm(struct x86_emulate_ctxt *ctxt)
>
> /* And finally go back to 32-bit mode. */
> efer = 0;
> - kvm_set_msr(vcpu, MSR_EFER, efer);
> + kvm_emulate_msr_write(vcpu, MSR_EFER, efer);
> }
> #endif
>
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index c5ec0ef51ff7..2034337681f9 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -927,7 +927,7 @@ static u32 nested_vmx_load_msr(struct kvm_vcpu *vcpu, u64 gpa, u32 count)
> __func__, i, e.index, e.reserved);
> goto fail;
> }
> - if (kvm_set_msr(vcpu, e.index, e.value)) {
> + if (kvm_emulate_msr_write(vcpu, e.index, e.value)) {
> pr_debug_ratelimited(
> "%s cannot write MSR (%u, 0x%x, 0x%llx)\n",
> __func__, i, e.index, e.value);
> @@ -963,7 +963,7 @@ static bool nested_vmx_get_vmexit_msr_value(struct kvm_vcpu *vcpu,
> }
> }
>
> - if (kvm_get_msr(vcpu, msr_index, data)) {
> + if (kvm_emulate_msr_read(vcpu, msr_index, data)) {
> pr_debug_ratelimited("%s cannot read MSR (0x%x)\n", __func__,
> msr_index);
> return false;
> @@ -2649,7 +2649,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
>
> if ((vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL) &&
> kvm_pmu_has_perf_global_ctrl(vcpu_to_pmu(vcpu)) &&
> - WARN_ON_ONCE(kvm_set_msr(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,
> + WARN_ON_ONCE(kvm_emulate_msr_write(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,
> vmcs12->guest_ia32_perf_global_ctrl))) {
> *entry_failure_code = ENTRY_FAIL_DEFAULT;
> return -EINVAL;
> @@ -4524,8 +4524,9 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> }
> if ((vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL) &&
> kvm_pmu_has_perf_global_ctrl(vcpu_to_pmu(vcpu)))
> - WARN_ON_ONCE(kvm_set_msr(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,
> - vmcs12->host_ia32_perf_global_ctrl));
> + WARN_ON_ONCE(kvm_emulate_msr_write(vcpu,
> + MSR_CORE_PERF_GLOBAL_CTRL,
> + vmcs12->host_ia32_perf_global_ctrl));
>
> /* Set L1 segment info according to Intel SDM
> 27.5.2 Loading Host Segment and Descriptor-Table Registers */
> @@ -4700,7 +4701,7 @@ static void nested_vmx_restore_host_state(struct kvm_vcpu *vcpu)
> goto vmabort;
> }
>
> - if (kvm_set_msr(vcpu, h.index, h.value)) {
> + if (kvm_emulate_msr_write(vcpu, h.index, h.value)) {
> pr_debug_ratelimited(
> "%s WRMSR failed (%u, 0x%x, 0x%llx)\n",
> __func__, j, h.index, h.value);
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 2c924075f6f1..b9c2c0cd4cf5 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1973,17 +1973,17 @@ static int kvm_set_msr_with_filter(struct kvm_vcpu *vcpu, u32 index, u64 data)
> return kvm_set_msr_ignored_check(vcpu, index, data, false);
> }
>
> -int kvm_get_msr(struct kvm_vcpu *vcpu, u32 index, u64 *data)
> +int kvm_emulate_msr_read(struct kvm_vcpu *vcpu, u32 index, u64 *data)
> {
> return kvm_get_msr_ignored_check(vcpu, index, data, false);
> }
> -EXPORT_SYMBOL_GPL(kvm_get_msr);
> +EXPORT_SYMBOL_GPL(kvm_emulate_msr_read);
>
> -int kvm_set_msr(struct kvm_vcpu *vcpu, u32 index, u64 data)
> +int kvm_emulate_msr_write(struct kvm_vcpu *vcpu, u32 index, u64 data)
> {
> return kvm_set_msr_ignored_check(vcpu, index, data, false);
> }
> -EXPORT_SYMBOL_GPL(kvm_set_msr);
> +EXPORT_SYMBOL_GPL(kvm_emulate_msr_write);
>
> static void complete_userspace_rdmsr(struct kvm_vcpu *vcpu)
> {
> @@ -8329,7 +8329,7 @@ static int emulator_set_msr_with_filter(struct x86_emulate_ctxt *ctxt,
> static int emulator_get_msr(struct x86_emulate_ctxt *ctxt,
> u32 msr_index, u64 *pdata)
> {
> - return kvm_get_msr(emul_to_vcpu(ctxt), msr_index, pdata);
> + return kvm_emulate_msr_read(emul_to_vcpu(ctxt), msr_index, pdata);
> }
>
> static int emulator_check_pmc(struct x86_emulate_ctxt *ctxt,
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
next prev parent reply other threads:[~2023-11-30 17:47 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 5:53 [PATCH v7 00/26] Enable CET Virtualization Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 01/26] x86/fpu/xstate: Always preserve non-user xfeatures/flags in __state_perm Yang Weijiang
2023-11-30 17:24 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 02/26] x86/fpu/xstate: Refine CET user xstate bit enabling Yang Weijiang
2023-11-24 9:40 ` Peter Zijlstra
2023-11-27 2:55 ` Yang, Weijiang
2023-11-28 1:31 ` Edgecombe, Rick P
2023-11-28 8:50 ` Peter Zijlstra
2023-11-28 1:31 ` Edgecombe, Rick P
2023-11-28 7:52 ` Yang, Weijiang
2023-11-30 17:26 ` Maxim Levitsky
2023-12-01 6:51 ` Yang, Weijiang
2023-12-05 9:53 ` Maxim Levitsky
2023-12-06 1:03 ` Yang, Weijiang
2023-12-06 15:57 ` Maxim Levitsky
2023-12-08 14:57 ` Yang, Weijiang
2023-12-08 15:15 ` Maxim Levitsky
2023-12-13 9:30 ` Yang, Weijiang
2023-12-13 13:31 ` Maxim Levitsky
2023-12-13 17:01 ` Chang S. Bae
2023-12-14 3:12 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 03/26] x86/fpu/xstate: Add CET supervisor mode state support Yang Weijiang
2023-11-24 9:45 ` Peter Zijlstra
2023-11-27 4:06 ` Yang, Weijiang
2023-11-28 1:34 ` Edgecombe, Rick P
2023-11-30 17:27 ` Maxim Levitsky
2023-12-01 7:01 ` Yang, Weijiang
2023-12-05 9:53 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 04/26] x86/fpu/xstate: Introduce XFEATURE_MASK_KERNEL_DYNAMIC xfeature set Yang Weijiang
2023-11-28 1:46 ` Edgecombe, Rick P
2023-11-28 8:00 ` Yang, Weijiang
2023-11-30 17:33 ` Maxim Levitsky
2023-12-01 7:49 ` Yang, Weijiang
2023-12-05 9:55 ` Maxim Levitsky
2023-12-06 3:00 ` Yang, Weijiang
2023-12-06 16:11 ` Maxim Levitsky
2023-12-08 15:57 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 05/26] x86/fpu/xstate: Introduce fpu_guest_cfg for guest FPU configuration Yang Weijiang
2023-11-28 14:58 ` Edgecombe, Rick P
2023-11-29 14:12 ` Yang, Weijiang
2023-11-29 17:08 ` Edgecombe, Rick P
2023-11-30 13:28 ` Yang, Weijiang
2023-11-30 17:29 ` Maxim Levitsky
2023-11-30 18:02 ` Edgecombe, Rick P
2023-11-30 17:29 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 06/26] x86/fpu/xstate: Create guest fpstate with guest specific config Yang Weijiang
2023-11-28 15:19 ` Edgecombe, Rick P
2023-11-29 14:16 ` Yang, Weijiang
2023-11-30 17:36 ` Maxim Levitsky
2023-12-01 8:36 ` Yang, Weijiang
2023-12-05 9:57 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 07/26] x86/fpu/xstate: Warn if kernel dynamic xfeatures detected in normal fpstate Yang Weijiang
2023-11-28 15:25 ` Edgecombe, Rick P
2023-11-29 14:18 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 08/26] KVM: x86: Rework cpuid_get_supported_xcr0() to operate on vCPU data Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 09/26] KVM: x86: Rename kvm_{g,s}et_msr() to menifest emulation operations Yang Weijiang
2023-11-30 17:36 ` Maxim Levitsky [this message]
2023-11-24 5:53 ` [PATCH v7 10/26] KVM: x86: Refine xsave-managed guest register/MSR reset handling Yang Weijiang
2023-11-30 17:36 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 11/26] KVM: x86: Add kvm_msr_{read,write}() helpers Yang Weijiang
2023-11-30 17:37 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 12/26] KVM: x86: Report XSS as to-be-saved if there are supported features Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 13/26] KVM: x86: Refresh CPUID on write to guest MSR_IA32_XSS Yang Weijiang
2023-11-30 17:37 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 14/26] KVM: x86: Initialize kvm_caps.supported_xss Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 15/26] KVM: x86: Load guest FPU state when access XSAVE-managed MSRs Yang Weijiang
2023-11-30 17:38 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 16/26] KVM: x86: Add fault checks for guest CR4.CET setting Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 17/26] KVM: x86: Report KVM supported CET MSRs as to-be-saved Yang Weijiang
2023-11-30 17:40 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 18/26] KVM: VMX: Introduce CET VMCS fields and control bits Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 19/26] KVM: x86: Use KVM-governed feature framework to track "SHSTK/IBT enabled" Yang Weijiang
2023-11-30 17:40 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 20/26] KVM: VMX: Emulate read and write to CET MSRs Yang Weijiang
2023-11-30 17:41 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 21/26] KVM: x86: Save and reload SSP to/from SMRAM Yang Weijiang
2023-11-30 17:42 ` Maxim Levitsky
2023-12-01 2:23 ` Chao Gao
2023-12-04 0:45 ` Yang, Weijiang
2023-12-05 10:02 ` Maxim Levitsky
2023-12-01 8:55 ` Yang, Weijiang
2023-11-24 5:53 ` [PATCH v7 22/26] KVM: VMX: Set up interception for CET MSRs Yang Weijiang
2023-11-30 17:44 ` Maxim Levitsky
2023-12-01 6:33 ` Chao Gao
2023-12-05 10:04 ` Maxim Levitsky
2023-12-01 9:45 ` Yang, Weijiang
2023-12-05 10:07 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 23/26] KVM: VMX: Set host constant supervisor states to VMCS fields Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 24/26] KVM: x86: Enable CET virtualization for VMX and advertise to userspace Yang Weijiang
2023-11-30 17:46 ` Maxim Levitsky
2023-12-01 16:15 ` Yang, Weijiang
2023-12-05 10:07 ` Maxim Levitsky
2023-11-24 5:53 ` [PATCH v7 25/26] KVM: nVMX: Introduce new VMX_BASIC bit for event error_code delivery to L1 Yang Weijiang
2023-11-24 5:53 ` [PATCH v7 26/26] KVM: nVMX: Enable CET support for nested guest Yang Weijiang
2023-11-30 17:53 ` Maxim Levitsky
2023-12-04 8:50 ` Yang, Weijiang
2023-12-05 10:12 ` Maxim Levitsky
2023-12-06 9:22 ` Yang, Weijiang
2023-12-06 17:24 ` Maxim Levitsky
2023-12-08 15:15 ` Yang, Weijiang
2023-12-08 15:22 ` Maxim Levitsky
2023-12-12 8:56 ` Yang, Weijiang
2023-12-12 11:09 ` Maxim Levitsky
2023-12-15 2:29 ` [PATCH v7 00/26] Enable CET Virtualization Yang, Weijiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b23c9dbc953b6bae4d3bff4aa1dff4c349a49a04.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=chao.gao@intel.com \
--cc=dave.hansen@intel.com \
--cc=john.allen@amd.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=seanjc@google.com \
--cc=weijiang.yang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).