Commit e23d3fef authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Paolo Bonzini

KVM: MMU: check kvm_mmu_pages and mmu_page_path indices

Give a special invalid index to the root of the walk, so that we
can check the consistency of kvm_mmu_pages and mmu_page_path.
Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
[Extracted from a bigger patch proposed by Guangrong. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0a47cd85
...@@ -1870,6 +1870,8 @@ static int __mmu_unsync_walk(struct kvm_mmu_page *sp, ...@@ -1870,6 +1870,8 @@ static int __mmu_unsync_walk(struct kvm_mmu_page *sp,
return nr_unsync_leaf; return nr_unsync_leaf;
} }
#define INVALID_INDEX (-1)
static int mmu_unsync_walk(struct kvm_mmu_page *sp, static int mmu_unsync_walk(struct kvm_mmu_page *sp,
struct kvm_mmu_pages *pvec) struct kvm_mmu_pages *pvec)
{ {
...@@ -1877,7 +1879,7 @@ static int mmu_unsync_walk(struct kvm_mmu_page *sp, ...@@ -1877,7 +1879,7 @@ static int mmu_unsync_walk(struct kvm_mmu_page *sp,
if (!sp->unsync_children) if (!sp->unsync_children)
return 0; return 0;
mmu_pages_add(pvec, sp, 0); mmu_pages_add(pvec, sp, INVALID_INDEX);
return __mmu_unsync_walk(sp, pvec); return __mmu_unsync_walk(sp, pvec);
} }
...@@ -2026,6 +2028,8 @@ static int mmu_pages_first(struct kvm_mmu_pages *pvec, ...@@ -2026,6 +2028,8 @@ static int mmu_pages_first(struct kvm_mmu_pages *pvec,
if (pvec->nr == 0) if (pvec->nr == 0)
return 0; return 0;
WARN_ON(pvec->page[0].idx != INVALID_INDEX);
sp = pvec->page[0].sp; sp = pvec->page[0].sp;
level = sp->role.level; level = sp->role.level;
WARN_ON(level == PT_PAGE_TABLE_LEVEL); WARN_ON(level == PT_PAGE_TABLE_LEVEL);
...@@ -2050,6 +2054,7 @@ static void mmu_pages_clear_parents(struct mmu_page_path *parents) ...@@ -2050,6 +2054,7 @@ static void mmu_pages_clear_parents(struct mmu_page_path *parents)
if (!sp) if (!sp)
return; return;
WARN_ON(idx == INVALID_INDEX);
clear_unsync_child_bit(sp, idx); clear_unsync_child_bit(sp, idx);
level++; level++;
} while (!sp->unsync_children); } while (!sp->unsync_children);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment