From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 13 May 2026 16:38:31 +0000 (-0400)
Subject: Merge branch 'kvm-apx-prepare' into HEAD
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b7fbe9a1bf9ee6c967ef77d366ca58c35fcf1887;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'kvm-apx-prepare' into HEAD

Clean up KVM's register tracking and storage, primarily to prepare for
APX support, which expands the maximum number of GPRs from 16 to 32.
---

b7fbe9a1bf9ee6c967ef77d366ca58c35fcf1887
diff --cc arch/x86/kvm/svm/svm.c
index 4519a1f925845,2b73d26501552..b78dd8805ebb8
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -4576,9 -4554,9 +4576,9 @@@ static __no_kcsan fastpath_t svm_vcpu_r
  		vcpu->arch.apf.host_apf_flags =
  			kvm_read_and_reset_apf_flags();
  
- 	vcpu->arch.regs_avail &= ~SVM_REGS_LAZY_LOAD_SET;
+ 	kvm_clear_available_registers(vcpu, SVM_REGS_LAZY_LOAD_SET);
  
 -	if (!msr_write_intercepted(vcpu, MSR_AMD64_PERF_CNTR_GLOBAL_CTL))
 +	if (!msr_write_intercepted(svm, MSR_AMD64_PERF_CNTR_GLOBAL_CTL))
  		rdmsrq(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, vcpu_to_pmu(vcpu)->global_ctrl);
  
  	trace_kvm_exit(vcpu, KVM_ISA_SVM);
diff --cc arch/x86/kvm/vmx/vmx.c
index cc14a6b96681f,61eeafcd70f12..1701db1b2e182
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@@ -7485,10 -7468,11 +7485,10 @@@ static noinstr void vmx_vcpu_enter_exit
  	if (vcpu->arch.cr2 != native_read_cr2())
  		native_write_cr2(vcpu->arch.cr2);
  
 -	vmx->fail = __vmx_vcpu_run(vmx, (unsigned long *)&vcpu->arch.regs,
 -				   flags);
 +	vmx->fail = __vmx_vcpu_run(vmx, flags);
  
  	vcpu->arch.cr2 = native_read_cr2();
- 	vcpu->arch.regs_avail &= ~VMX_REGS_LAZY_LOAD_SET;
+ 	kvm_clear_available_registers(vcpu, VMX_REGS_LAZY_LOAD_SET);
  
  	vmx->idt_vectoring_info = 0;