* [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches
@ 2013-08-04 15:17 Jan Kiszka
2013-08-05 2:19 ` Arthur Chunqi Li
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jan Kiszka @ 2013-08-04 15:17 UTC (permalink / raw)
To: Gleb Natapov, Paolo Bonzini
Cc: kvm, "李春奇 <Arthur Chunqi Li>"
From: Jan Kiszka <jan.kiszka@siemens.com>
When asking vmx to load the PAT MSR for us while switching from L1 to L2
or vice versa, we have to update arch.pat as well as it may later be
used again to load or read out the MSR content.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Arthur, please add your tested-by also officially.
arch/x86/kvm/vmx.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 45fd70c..396572d 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7535,9 +7535,10 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls |
(vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE));
- if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT)
+ if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT) {
vmcs_write64(GUEST_IA32_PAT, vmcs12->guest_ia32_pat);
- else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
+ vcpu->arch.pat = vmcs12->guest_ia32_pat;
+ } else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);
@@ -8025,8 +8026,10 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
- if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
+ if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT) {
vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
+ vcpu->arch.pat = vmcs12->host_ia32_pat;
+ }
if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
vmcs12->host_ia32_perf_global_ctrl);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches
2013-08-04 15:17 [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches Jan Kiszka
@ 2013-08-05 2:19 ` Arthur Chunqi Li
2013-08-05 6:27 ` Jan Kiszka
2013-08-05 8:40 ` Gleb Natapov
2013-08-06 10:45 ` Arthur Chunqi Li
2 siblings, 1 reply; 5+ messages in thread
From: Arthur Chunqi Li @ 2013-08-05 2:19 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Gleb Natapov, Paolo Bonzini, kvm
On Sun, Aug 4, 2013 at 11:17 PM, Jan Kiszka <jan.kiszka@web.de> wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> When asking vmx to load the PAT MSR for us while switching from L1 to L2
> or vice versa, we have to update arch.pat as well as it may later be
> used again to load or read out the MSR content.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> Arthur, please add your tested-by also officially.
This patch is generally good expect that we need to add
VM_EXIT_LOAD_IA32_PAT/VM_EXIT_SAVE_IA32_PAT to
nested_vmx_exit_ctls_high in function nested_vmx_setup_ctls_msrs() to
enable these two features. Currently only VM_ENTRY_LOAD_IA32_PAT is
enabled while all three are implemented.
Arthur
>
> arch/x86/kvm/vmx.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 45fd70c..396572d 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -7535,9 +7535,10 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
> vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls |
> (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE));
>
> - if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT)
> + if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT) {
> vmcs_write64(GUEST_IA32_PAT, vmcs12->guest_ia32_pat);
> - else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
> + vcpu->arch.pat = vmcs12->guest_ia32_pat;
> + } else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
> vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);
>
>
> @@ -8025,8 +8026,10 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
> vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
>
> - if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
> + if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT) {
> vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
> + vcpu->arch.pat = vmcs12->host_ia32_pat;
> + }
> if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
> vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
> vmcs12->host_ia32_perf_global_ctrl);
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches
2013-08-05 2:19 ` Arthur Chunqi Li
@ 2013-08-05 6:27 ` Jan Kiszka
0 siblings, 0 replies; 5+ messages in thread
From: Jan Kiszka @ 2013-08-05 6:27 UTC (permalink / raw)
To: Arthur Chunqi Li; +Cc: Gleb Natapov, Paolo Bonzini, kvm
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
On 2013-08-05 04:19, Arthur Chunqi Li wrote:
> On Sun, Aug 4, 2013 at 11:17 PM, Jan Kiszka <jan.kiszka@web.de> wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> When asking vmx to load the PAT MSR for us while switching from L1 to L2
>> or vice versa, we have to update arch.pat as well as it may later be
>> used again to load or read out the MSR content.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>
>> Arthur, please add your tested-by also officially.
> This patch is generally good expect that we need to add
> VM_EXIT_LOAD_IA32_PAT/VM_EXIT_SAVE_IA32_PAT to
> nested_vmx_exit_ctls_high in function nested_vmx_setup_ctls_msrs() to
> enable these two features. Currently only VM_ENTRY_LOAD_IA32_PAT is
> enabled while all three are implemented.
Yes, feel free to follow up with a corresponding patch.
Jan
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches
2013-08-04 15:17 [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches Jan Kiszka
2013-08-05 2:19 ` Arthur Chunqi Li
@ 2013-08-05 8:40 ` Gleb Natapov
2013-08-06 10:45 ` Arthur Chunqi Li
2 siblings, 0 replies; 5+ messages in thread
From: Gleb Natapov @ 2013-08-05 8:40 UTC (permalink / raw)
To: Jan Kiszka
Cc: Paolo Bonzini, kvm,
"李春奇 <Arthur Chunqi Li>"
On Sun, Aug 04, 2013 at 05:17:27PM +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> When asking vmx to load the PAT MSR for us while switching from L1 to L2
> or vice versa, we have to update arch.pat as well as it may later be
> used again to load or read out the MSR content.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Gleb Natapov <gleb@redhat.com>
> ---
>
> Arthur, please add your tested-by also officially.
>
> arch/x86/kvm/vmx.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 45fd70c..396572d 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -7535,9 +7535,10 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
> vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls |
> (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE));
>
> - if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT)
> + if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT) {
> vmcs_write64(GUEST_IA32_PAT, vmcs12->guest_ia32_pat);
> - else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
> + vcpu->arch.pat = vmcs12->guest_ia32_pat;
> + } else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
> vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);
>
>
> @@ -8025,8 +8026,10 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
> vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
>
> - if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
> + if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT) {
> vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
> + vcpu->arch.pat = vmcs12->host_ia32_pat;
> + }
> if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
> vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
> vmcs12->host_ia32_perf_global_ctrl);
> --
> 1.7.3.4
--
Gleb.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches
2013-08-04 15:17 [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches Jan Kiszka
2013-08-05 2:19 ` Arthur Chunqi Li
2013-08-05 8:40 ` Gleb Natapov
@ 2013-08-06 10:45 ` Arthur Chunqi Li
2 siblings, 0 replies; 5+ messages in thread
From: Arthur Chunqi Li @ 2013-08-06 10:45 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Gleb Natapov, Paolo Bonzini, kvm
On Sun, Aug 4, 2013 at 11:17 PM, Jan Kiszka <jan.kiszka@web.de> wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> When asking vmx to load the PAT MSR for us while switching from L1 to L2
> or vice versa, we have to update arch.pat as well as it may later be
> used again to load or read out the MSR content.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Tested-by: Arthur Chunqi Li <yzt356@gmail.com>
Should cooperate with patch
http://www.mail-archive.com/kvm@vger.kernel.org/msg94349.html,
VM_EXIT_SAVE_IA32_PAT and VM_EXIT_LOAD_IA32_PAT should be advertised.
> ---
>
> Arthur, please add your tested-by also officially.
>
> arch/x86/kvm/vmx.c | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 45fd70c..396572d 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -7535,9 +7535,10 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
> vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls |
> (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE));
>
> - if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT)
> + if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT) {
> vmcs_write64(GUEST_IA32_PAT, vmcs12->guest_ia32_pat);
> - else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
> + vcpu->arch.pat = vmcs12->guest_ia32_pat;
> + } else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
> vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);
>
>
> @@ -8025,8 +8026,10 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
> vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
> vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
>
> - if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
> + if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT) {
> vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
> + vcpu->arch.pat = vmcs12->host_ia32_pat;
> + }
> if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
> vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
> vmcs12->host_ia32_perf_global_ctrl);
> --
> 1.7.3.4
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-06 10:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-04 15:17 [PATCH] nVMX: Keep arch.pat in sync on L1-L2 switches Jan Kiszka
2013-08-05 2:19 ` Arthur Chunqi Li
2013-08-05 6:27 ` Jan Kiszka
2013-08-05 8:40 ` Gleb Natapov
2013-08-06 10:45 ` Arthur Chunqi Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox