Skip to content

Commit a01b45e

Browse files
Maxim Levitskybonzini
authored andcommitted
KVM: x86: rename apic_access_page_done to apic_access_memslot_enabled
This better reflects the purpose of this variable on AMD, since on AMD the AVIC's memory slot can be enabled and disabled dynamically. Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Message-Id: <20210623113002.111448-4-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 88213da commit a01b45e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/x86/include/asm/kvm_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ struct kvm_arch {
10541054
struct kvm_apic_map __rcu *apic_map;
10551055
atomic_t apic_map_dirty;
10561056

1057-
bool apic_access_page_done;
1057+
bool apic_access_memslot_enabled;
10581058
unsigned long apicv_inhibit_reasons;
10591059

10601060
gpa_t wall_clock;

arch/x86/kvm/svm/avic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ static int avic_update_access_page(struct kvm *kvm, bool activate)
236236
* APICv mode change, which update APIC_ACCESS_PAGE_PRIVATE_MEMSLOT
237237
* memory region. So, we need to ensure that kvm->mm == current->mm.
238238
*/
239-
if ((kvm->arch.apic_access_page_done == activate) ||
239+
if ((kvm->arch.apic_access_memslot_enabled == activate) ||
240240
(kvm->mm != current->mm))
241241
goto out;
242242

@@ -249,7 +249,7 @@ static int avic_update_access_page(struct kvm *kvm, bool activate)
249249
goto out;
250250
}
251251

252-
kvm->arch.apic_access_page_done = activate;
252+
kvm->arch.apic_access_memslot_enabled = activate;
253253
out:
254254
mutex_unlock(&kvm->slots_lock);
255255
return r;

arch/x86/kvm/vmx/vmx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3621,7 +3621,7 @@ static int alloc_apic_access_page(struct kvm *kvm)
36213621
int ret = 0;
36223622

36233623
mutex_lock(&kvm->slots_lock);
3624-
if (kvm->arch.apic_access_page_done)
3624+
if (kvm->arch.apic_access_memslot_enabled)
36253625
goto out;
36263626
hva = __x86_set_memory_region(kvm, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT,
36273627
APIC_DEFAULT_PHYS_BASE, PAGE_SIZE);
@@ -3641,7 +3641,7 @@ static int alloc_apic_access_page(struct kvm *kvm)
36413641
* is able to migrate it.
36423642
*/
36433643
put_page(page);
3644-
kvm->arch.apic_access_page_done = true;
3644+
kvm->arch.apic_access_memslot_enabled = true;
36453645
out:
36463646
mutex_unlock(&kvm->slots_lock);
36473647
return ret;

0 commit comments

Comments
 (0)