| Message ID | 20211124122055.64424-13-jiangshanlai@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: X86: misc fixes and cleanup | expand |
On 11/24/21 13:20, Lai Jiangshan wrote: > From: Lai Jiangshan <laijs@linux.alibaba.com> > > Walking from the root page of the shadow page table should start with > the level of the shadow page table: shadow_root_level. > > Also change a small defect in audit_mappings(), it is believed > that the current walking level is more valuable to print. > > Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com> > --- > arch/x86/kvm/mmu/mmu_audit.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu_audit.c b/arch/x86/kvm/mmu/mmu_audit.c > index 9e7dcf999f08..6bbbf85b3e46 100644 > --- a/arch/x86/kvm/mmu/mmu_audit.c > +++ b/arch/x86/kvm/mmu/mmu_audit.c > @@ -63,7 +63,7 @@ static void mmu_spte_walk(struct kvm_vcpu *vcpu, inspect_spte_fn fn) > hpa_t root = vcpu->arch.mmu->root_hpa; > > sp = to_shadow_page(root); > - __mmu_spte_walk(vcpu, sp, fn, vcpu->arch.mmu->root_level); > + __mmu_spte_walk(vcpu, sp, fn, vcpu->arch.mmu->shadow_root_level); > return; > } > > @@ -119,8 +119,7 @@ static void audit_mappings(struct kvm_vcpu *vcpu, u64 *sptep, int level) > hpa = pfn << PAGE_SHIFT; > if ((*sptep & PT64_BASE_ADDR_MASK) != hpa) > audit_printk(vcpu->kvm, "levels %d pfn %llx hpa %llx " > - "ent %llxn", vcpu->arch.mmu->root_level, pfn, > - hpa, *sptep); > + "ent %llxn", level, pfn, hpa, *sptep); > } > > static void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep) > Queued all except patch 11, thanks. Paolo
diff --git a/arch/x86/kvm/mmu/mmu_audit.c b/arch/x86/kvm/mmu/mmu_audit.c index 9e7dcf999f08..6bbbf85b3e46 100644 --- a/arch/x86/kvm/mmu/mmu_audit.c +++ b/arch/x86/kvm/mmu/mmu_audit.c @@ -63,7 +63,7 @@ static void mmu_spte_walk(struct kvm_vcpu *vcpu, inspect_spte_fn fn) hpa_t root = vcpu->arch.mmu->root_hpa; sp = to_shadow_page(root); - __mmu_spte_walk(vcpu, sp, fn, vcpu->arch.mmu->root_level); + __mmu_spte_walk(vcpu, sp, fn, vcpu->arch.mmu->shadow_root_level); return; } @@ -119,8 +119,7 @@ static void audit_mappings(struct kvm_vcpu *vcpu, u64 *sptep, int level) hpa = pfn << PAGE_SHIFT; if ((*sptep & PT64_BASE_ADDR_MASK) != hpa) audit_printk(vcpu->kvm, "levels %d pfn %llx hpa %llx " - "ent %llxn", vcpu->arch.mmu->root_level, pfn, - hpa, *sptep); + "ent %llxn", level, pfn, hpa, *sptep); } static void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep)