Commit aed89418 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Revert "KVM: x86: Mark GPRs dirty when written" 



Revert the dirty/available tracking of GPRs now that KVM copies the GPRs
to the GHCB on any post-VMGEXIT VMRUN, even if a GPR is not dirty.  Per
commit de3cd117 ("KVM: x86: Omit caching logic for always-available
GPRs"), tracking for GPRs noticeably impacts KVM's code footprint.

This reverts commit 1c04d8c9.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210122235049.3107620-3-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 25009140

arch/x86/kvm/kvm_cache_regs.h

+25 −26
Original line number Diff line number Diff line
@@ -9,31 +9,6 @@ 
	(X86_CR4_PVI | X86_CR4_DE | X86_CR4_PCE | X86_CR4_OSFXSR  \

	 | X86_CR4_OSXMMEXCPT | X86_CR4_PGE | X86_CR4_TSD | X86_CR4_FSGSBASE)



static inline bool kvm_register_is_available(struct kvm_vcpu *vcpu,

					     enum kvm_reg reg)

{

	return test_bit(reg, (unsigned long *)&vcpu->arch.regs_avail);

}



static inline bool kvm_register_is_dirty(struct kvm_vcpu *vcpu,

					 enum kvm_reg reg)

{

	return test_bit(reg, (unsigned long *)&vcpu->arch.regs_dirty);

}



static inline void kvm_register_mark_available(struct kvm_vcpu *vcpu,

					       enum kvm_reg reg)

{

	__set_bit(reg, (unsigned long *)&vcpu->arch.regs_avail);

}



static inline void kvm_register_mark_dirty(struct kvm_vcpu *vcpu,

					   enum kvm_reg reg)

{

	__set_bit(reg, (unsigned long *)&vcpu->arch.regs_avail);

	__set_bit(reg, (unsigned long *)&vcpu->arch.regs_dirty);

}



#define BUILD_KVM_GPR_ACCESSORS(lname, uname)				      \

static __always_inline unsigned long kvm_##lname##_read(struct kvm_vcpu *vcpu)\

{									      \
@@ -43,7 +18,6 @@ static __always_inline void kvm_##lname##_write(struct kvm_vcpu *vcpu, \ 
						unsigned long val)	      \

{									      \

	vcpu->arch.regs[VCPU_REGS_##uname] = val;			      \

	kvm_register_mark_dirty(vcpu, VCPU_REGS_##uname);		      \

}

BUILD_KVM_GPR_ACCESSORS(rax, RAX)

BUILD_KVM_GPR_ACCESSORS(rbx, RBX)
@@ -63,6 +37,31 @@ BUILD_KVM_GPR_ACCESSORS(r14, R14) 
BUILD_KVM_GPR_ACCESSORS(r15, R15)

#endif



static inline bool kvm_register_is_available(struct kvm_vcpu *vcpu,

					     enum kvm_reg reg)

{

	return test_bit(reg, (unsigned long *)&vcpu->arch.regs_avail);

}



static inline bool kvm_register_is_dirty(struct kvm_vcpu *vcpu,

					 enum kvm_reg reg)

{

	return test_bit(reg, (unsigned long *)&vcpu->arch.regs_dirty);

}



static inline void kvm_register_mark_available(struct kvm_vcpu *vcpu,

					       enum kvm_reg reg)

{

	__set_bit(reg, (unsigned long *)&vcpu->arch.regs_avail);

}



static inline void kvm_register_mark_dirty(struct kvm_vcpu *vcpu,

					   enum kvm_reg reg)

{

	__set_bit(reg, (unsigned long *)&vcpu->arch.regs_avail);

	__set_bit(reg, (unsigned long *)&vcpu->arch.regs_dirty);

}



static inline unsigned long kvm_register_read(struct kvm_vcpu *vcpu, int reg)

{

	if (WARN_ON_ONCE((unsigned int)reg >= NR_VCPU_REGS))