Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: x86: Rename access permissions cache member in struct kvm_vcpu_arch

Rename "access" to "mmio_access" to match the other MMIO cache members
and to make it more obvious that it's tracking the access permissions
for the MMIO cache.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Sean Christopherson and committed by
Paolo Bonzini
871bd034 c8e16b78

+5 -5
+2 -2
Documentation/virt/kvm/mmu.txt
··· 294 294 - walk shadow page table 295 295 - check for valid generation number in the spte (see "Fast invalidation of 296 296 MMIO sptes" below) 297 - - cache the information to vcpu->arch.mmio_gva, vcpu->arch.access and 297 + - cache the information to vcpu->arch.mmio_gva, vcpu->arch.mmio_access and 298 298 vcpu->arch.mmio_gfn, and call the emulator 299 299 - If both P bit and R/W bit of error code are set, this could possibly 300 300 be handled as a "fast page fault" (fixed without taking the MMU lock). See ··· 304 304 - if permissions are insufficient, reflect the fault back to the guest 305 305 - determine the host page 306 306 - if this is an mmio request, there is no host page; cache the info to 307 - vcpu->arch.mmio_gva, vcpu->arch.access and vcpu->arch.mmio_gfn 307 + vcpu->arch.mmio_gva, vcpu->arch.mmio_access and vcpu->arch.mmio_gfn 308 308 - walk the shadow page table to find the spte for the translation, 309 309 instantiating missing intermediate page tables as necessary 310 310 - If this is an mmio request, cache the mmio info to the spte and set some
+1 -1
arch/x86/include/asm/kvm_host.h
··· 717 717 718 718 /* Cache MMIO info */ 719 719 u64 mmio_gva; 720 - unsigned access; 720 + unsigned mmio_access; 721 721 gfn_t mmio_gfn; 722 722 u64 mmio_gen; 723 723
+1 -1
arch/x86/kvm/x86.c
··· 5377 5377 */ 5378 5378 if (vcpu_match_mmio_gva(vcpu, gva) 5379 5379 && !permission_fault(vcpu, vcpu->arch.walk_mmu, 5380 - vcpu->arch.access, 0, access)) { 5380 + vcpu->arch.mmio_access, 0, access)) { 5381 5381 *gpa = vcpu->arch.mmio_gfn << PAGE_SHIFT | 5382 5382 (gva & (PAGE_SIZE - 1)); 5383 5383 trace_vcpu_match_mmio(gva, *gpa, write, false);
+1 -1
arch/x86/kvm/x86.h
··· 196 196 * actually a nGPA. 197 197 */ 198 198 vcpu->arch.mmio_gva = mmu_is_nested(vcpu) ? 0 : gva & PAGE_MASK; 199 - vcpu->arch.access = access; 199 + vcpu->arch.mmio_access = access; 200 200 vcpu->arch.mmio_gfn = gfn; 201 201 vcpu->arch.mmio_gen = gen; 202 202 }