Skip to contentSkip to conversation

kvm: x86: Don't dirty guest memory on every vcpu_put()

PATCH In review Jim Mattson 5 participants 7 messages Jan 16, 2020 – May 13, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm: x86: Don't dirty guest memory on every vcpu_put()

Beginning with commit 0b9f6c4615c99 ("x86/kvm: Support the vCPU preemption check"), the KVM_VCPU_PREEMPTED flag is set in the guest copy of the kvm_steal_time struct on every call to vcpu_put(). As a result, guest memory is dirtied on every call to vcpu_put(), even when the VM is quiescent.

To avoid dirtying guest memory unnecessarily, don't bother setting the flag in the guest copy of the struct if it is already set in the kernel copy of the struct.

If a different vCPU thread clears the guest copy of the flag, it will no longer get reset on the next call to vcpu_put, but it's not clear that resetting the flag in this case was intentional to begin with.

---
 arch/x86/kvm/x86.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/kvm/x86.c +3 -0
index cf917139de6b..3dc17b173f88 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
 	if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
 		return;
 
+	if (vcpu->arch.st.steal.preempted & KVM_VCPU_PREEMPTED)
+		return;
+
 	vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
 	kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
Signature · 1 line
2.25.0.rc1.283.g88dfdc4193-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Jim Mattson

Beginning with commit 0b9f6c4615c99 ("x86/kvm: Support the vCPU preemption check"), the KVM_VCPU_PREEMPTED flag is set in the guest copy of the kvm_steal_time struct on every call to vcpu_put(). As a result, guest memory is dirtied on every call to vcpu_put(), even when the VM is quiescent.

Quoted 3 lines

To avoid dirtying guest memory unnecessarily, don't bother setting the flag in the guest copy of the struct if it is already set in the kernel copy of the struct.

I suggest adding this comment to code as-well.

Quoted 4 lines

If a different vCPU thread clears the guest copy of the flag, it will no longer get reset on the next call to vcpu_put, but it's not clear that resetting the flag in this case was intentional to begin with.

I agree… I find it hard to believe that guest vCPU is allowed to clear the flag and expect host to set it again on the next vcpu_put() call. Doesn’t really make sense.

Quoted 5 lines

Good catch.

-Liran

Quoted 22 lines

---
arch/x86/kvm/x86.c | 3 +++

1 file changed, 3 insertions(+)
arch/x86/kvm/x86.c +3 -0
index cf917139de6b..3dc17b173f88 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
 	if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
 		return;
 
+	if (vcpu->arch.st.steal.preempted & KVM_VCPU_PREEMPTED)
+		return;
+
 	vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
 	kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
Signature · 1 line
2.25.0.rc1.283.g88dfdc4193-goog
#2 lore raw
Quoted 11 lines · Liran Alon
Quoted 11 lines · Jim Mattson

Beginning with commit 0b9f6c4615c99 ("x86/kvm: Support the vCPU preemption check"), the KVM_VCPU_PREEMPTED flag is set in the guest copy of the kvm_steal_time struct on every call to vcpu_put(). As a result, guest memory is dirtied on every call to vcpu_put(), even when the VM is quiescent.

Quoted 5 lines
Quoted 3 lines

To avoid dirtying guest memory unnecessarily, don't bother setting the flag in the guest copy of the struct if it is already set in the kernel copy of the struct.

I suggest adding this comment to code as-well.

Ping. I don't know if a v2 of this change with the comment in code is needed for acceptance, but I don't want this to fall through the cracks and get lost.

Quoted 43 lines
Quoted 5 lines

If a different vCPU thread clears the guest copy of the flag, it will no longer get reset on the next call to vcpu_put, but it's not clear that resetting the flag in this case was intentional to begin with.

I agree… I find it hard to believe that guest vCPU is allowed to clear the flag and expect host to set it again on the next vcpu_put() call. Doesn’t really make sense.

Quoted 5 lines

Good catch.

-Liran

Quoted 22 lines

---
arch/x86/kvm/x86.c | 3 +++

1 file changed, 3 insertions(+)
arch/x86/kvm/x86.c +3 -1
index cf917139de6b..3dc17b173f88 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
      if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
              return;
 
+     if (vcpu->arch.st.steal.preempted & KVM_VCPU_PREEMPTED)
+             return;
+
      vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
      kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
--

2.25.0.rc1.283.g88dfdc4193-goog

maintainer Reviewed-by Joao Martins
#3 lore raw
Quoted 16 lines · Ben Gardon
Quoted 15 lines · Liran Alon
Quoted 14 lines · Jim Mattson

Beginning with commit 0b9f6c4615c99 ("x86/kvm: Support the vCPU preemption check"), the KVM_VCPU_PREEMPTED flag is set in the guest copy of the kvm_steal_time struct on every call to vcpu_put(). As a result, guest memory is dirtied on every call to vcpu_put(), even when the VM is quiescent.

To avoid dirtying guest memory unnecessarily, don't bother setting the flag in the guest copy of the struct if it is already set in the kernel copy of the struct.

Quoted 5 lines
Quoted 1 line

I suggest adding this comment to code as-well.

Ping. I don't know if a v2 of this change with the comment in code is needed for acceptance, but I don't want this to fall through the cracks and get lost.

A version of this was committed a while ago. The CVE number makes me think it went stealthily...

commit 8c6de56a42e0c657955e12b882a81ef07d1d073e

Author: Boris Ostrovsky <[email protected]>
Date:   Wed Oct 30 19:01:31 2019 +0000

x86/kvm: Be careful not to clear KVM_VCPU_FLUSH_TLB bit

kvm_steal_time_set_preempted() may accidentally clear KVM_VCPU_FLUSH_TLB bit if it is called more than once while VCPU is preempted.

This is part of CVE-2019-3016.

(This bug was also independently discovered by Jim Mattson <[email protected]>)

arch/x86/kvm/x86.c +3 -0
index cf917139de6b..8c9369151e9f 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
        if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
                return;
 
+       if (vcpu->arch.st.steal.preempted)
+               return;
+
        vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
        kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
Quoted 41 lines
Quoted 41 lines
Quoted 3 lines

If a different vCPU thread clears the guest copy of the flag, it will no longer get reset on the next call to vcpu_put, but it's not clear that resetting the flag in this case was intentional to begin with.

I agree… I find it hard to believe that guest vCPU is allowed to clear the flag and expect host to set it again on the next vcpu_put() call. Doesn’t really make sense.

Quoted 5 lines

Good catch.

-Liran

Quoted 22 lines

---
arch/x86/kvm/x86.c | 3 +++

1 file changed, 3 insertions(+)
arch/x86/kvm/x86.c +3 -1
index cf917139de6b..3dc17b173f88 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
      if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
              return;
 
+     if (vcpu->arch.st.steal.preempted & KVM_VCPU_PREEMPTED)
+             return;
+
      vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
      kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
--

2.25.0.rc1.283.g88dfdc4193-goog

#4 lore raw
Quoted 18 lines · Sean Christopherson
Quoted 16 lines · Ben Gardon
Quoted 15 lines · Liran Alon
Quoted 14 lines · Jim Mattson

Beginning with commit 0b9f6c4615c99 ("x86/kvm: Support the vCPU preemption check"), the KVM_VCPU_PREEMPTED flag is set in the guest copy of the kvm_steal_time struct on every call to vcpu_put(). As a result, guest memory is dirtied on every call to vcpu_put(), even when the VM is quiescent.

To avoid dirtying guest memory unnecessarily, don't bother setting the flag in the guest copy of the struct if it is already set in the kernel copy of the struct.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

I suggest adding this comment to code as-well.

Ping. I don't know if a v2 of this change with the comment in code is needed for acceptance, but I don't want this to fall through the cracks and get lost.

A version of this was committed a while ago. The CVE number makes me think it went stealthily...

That's great to know. Thanks for digging that up Sean.

Quoted 77 lines

commit 8c6de56a42e0c657955e12b882a81ef07d1d073e

Author: Boris Ostrovsky <[email protected]>
Date:   Wed Oct 30 19:01:31 2019 +0000

x86/kvm: Be careful not to clear KVM_VCPU_FLUSH_TLB bit

kvm_steal_time_set_preempted() may accidentally clear KVM_VCPU_FLUSH_TLB bit if it is called more than once while VCPU is preempted.

This is part of CVE-2019-3016.

(This bug was also independently discovered by Jim Mattson <[email protected]>)

arch/x86/kvm/x86.c +3 -0
index cf917139de6b..8c9369151e9f 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
        if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
                return;
 
+       if (vcpu->arch.st.steal.preempted)
+               return;
+
        vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
        kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
Quoted 43 lines
Quoted 43 lines
Quoted 5 lines

If a different vCPU thread clears the guest copy of the flag, it will no longer get reset on the next call to vcpu_put, but it's not clear that resetting the flag in this case was intentional to begin with.

I agree… I find it hard to believe that guest vCPU is allowed to clear the flag and expect host to set it again on the next vcpu_put() call. Doesn’t really make sense.

Quoted 5 lines

Good catch.

-Liran

Quoted 22 lines

---
arch/x86/kvm/x86.c | 3 +++

1 file changed, 3 insertions(+)
arch/x86/kvm/x86.c +3 -1
index cf917139de6b..3dc17b173f88 100644
@@ -3504,6 +3504,9 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)
      if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED))
              return;
 
+     if (vcpu->arch.st.steal.preempted & KVM_VCPU_PREEMPTED)
+             return;
+
      vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED;
 
      kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime,
--

2.25.0.rc1.283.g88dfdc4193-goog

maintainer
#5 lore raw
Quoted 4 lines · Ben Gardon
Quoted 2 lines

A version of this was committed a while ago. The CVE number makes me think it went stealthily...

That's great to know. Thanks for digging that up Sean.

I usually try to send CVE/embargoed patches after the fact to the list, using with an [FYI PATCH] prefix.

Paolo

maintainer
#6 lore raw
In reply to Ben Gardon
Quoted 4 lines · Ben Gardon
Quoted 2 lines

A version of this was committed a while ago. The CVE number makes me think it went stealthily...

That's great to know. Thanks for digging that up Sean.

I usually try to send CVE/embargoed patches after the fact to the list, using an [FYI PATCH] prefix.

Paolo