]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: SVM: Rename "fault_address" to "gpa" in npf_interception()
authorSean Christopherson <seanjc@google.com>
Thu, 13 Nov 2025 22:16:41 +0000 (14:16 -0800)
committerSean Christopherson <seanjc@google.com>
Thu, 8 Jan 2026 20:12:10 +0000 (12:12 -0800)
Rename "fault_address" to "gpa" in KVM's #NPF handler and track it as a
gpa_t to more precisely document what type of address is being captured,
and because "gpa" is much more succinct.

No functional change intended.

Link: https://patch.msgid.link/20251113221642.1673023-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/svm/svm.c

index 24d59ccfa40d9a79eb1d570207fa5debdff5a2fa..af018c1196b5a15aeb44b06ebb15afb6a7768f07 100644 (file)
@@ -1867,8 +1867,8 @@ static int npf_interception(struct kvm_vcpu *vcpu)
        struct vcpu_svm *svm = to_svm(vcpu);
        int rc;
 
-       u64 fault_address = svm->vmcb->control.exit_info_2;
        u64 error_code = svm->vmcb->control.exit_info_1;
+       gpa_t gpa = svm->vmcb->control.exit_info_2;
 
        /*
         * WARN if hardware generates a fault with an error code that collides
@@ -1882,14 +1882,14 @@ static int npf_interception(struct kvm_vcpu *vcpu)
        if (sev_snp_guest(vcpu->kvm) && (error_code & PFERR_GUEST_ENC_MASK))
                error_code |= PFERR_PRIVATE_ACCESS;
 
-       trace_kvm_page_fault(vcpu, fault_address, error_code);
-       rc = kvm_mmu_page_fault(vcpu, fault_address, error_code,
+       trace_kvm_page_fault(vcpu, gpa, error_code);
+       rc = kvm_mmu_page_fault(vcpu, gpa, error_code,
                                static_cpu_has(X86_FEATURE_DECODEASSISTS) ?
                                svm->vmcb->control.insn_bytes : NULL,
                                svm->vmcb->control.insn_len);
 
        if (rc > 0 && error_code & PFERR_GUEST_RMP_MASK)
-               sev_handle_rmp_fault(vcpu, fault_address, error_code);
+               sev_handle_rmp_fault(vcpu, gpa, error_code);
 
        return rc;
 }