| Message ID | 4E01FBF4.9070004@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 22, 2011 at 10:28:04PM +0800, Xiao Guangrong wrote: > Properly check the last mapping, and do not walk to the next level if last spte > is met > > Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> > --- > arch/x86/kvm/mmu.c | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c > index 9c629b5..f474e93 100644 > --- a/arch/x86/kvm/mmu.c > +++ b/arch/x86/kvm/mmu.c > @@ -1517,10 +1517,6 @@ static bool shadow_walk_okay(struct kvm_shadow_walk_iterator *iterator) > if (iterator->level < PT_PAGE_TABLE_LEVEL) > return false; > > - if (iterator->level == PT_PAGE_TABLE_LEVEL) Change to >= PT_PAGE_TABLE_LEVEL, checks should be in shadow_walk_okay. > - if (is_large_pte(*iterator->sptep)) > - return false; > - > iterator->index = SHADOW_PT_INDEX(iterator->addr, iterator->level); > iterator->sptep = ((u64 *)__va(iterator->shadow_addr)) + iterator->index; > return true; -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/23/2011 01:13 AM, Marcelo Tosatti wrote: > On Wed, Jun 22, 2011 at 10:28:04PM +0800, Xiao Guangrong wrote: >> Properly check the last mapping, and do not walk to the next level if last spte >> is met >> >> Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> >> --- >> arch/x86/kvm/mmu.c | 9 +++++---- >> 1 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c >> index 9c629b5..f474e93 100644 >> --- a/arch/x86/kvm/mmu.c >> +++ b/arch/x86/kvm/mmu.c >> @@ -1517,10 +1517,6 @@ static bool shadow_walk_okay(struct kvm_shadow_walk_iterator *iterator) >> if (iterator->level < PT_PAGE_TABLE_LEVEL) >> return false; >> >> - if (iterator->level == PT_PAGE_TABLE_LEVEL) > > Change to >= PT_PAGE_TABLE_LEVEL, checks should be in shadow_walk_okay. > OK, will fix, thanks! -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/23/2011 01:13 AM, Marcelo Tosatti wrote: > On Wed, Jun 22, 2011 at 10:28:04PM +0800, Xiao Guangrong wrote: >> Properly check the last mapping, and do not walk to the next level if last spte >> is met >> >> Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> >> --- >> arch/x86/kvm/mmu.c | 9 +++++---- >> 1 files changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c >> index 9c629b5..f474e93 100644 >> --- a/arch/x86/kvm/mmu.c >> +++ b/arch/x86/kvm/mmu.c >> @@ -1517,10 +1517,6 @@ static bool shadow_walk_okay(struct kvm_shadow_walk_iterator *iterator) >> if (iterator->level < PT_PAGE_TABLE_LEVEL) >> return false; >> >> - if (iterator->level == PT_PAGE_TABLE_LEVEL) > > Change to >= PT_PAGE_TABLE_LEVEL, checks should be in shadow_walk_okay. > Marcelo, Sorry, i did not remember, we can not check the last spte in shadow_walk_okay, otherwise the last spte is skipped in the loop. :-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 9c629b5..f474e93 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1517,10 +1517,6 @@ static bool shadow_walk_okay(struct kvm_shadow_walk_iterator *iterator) if (iterator->level < PT_PAGE_TABLE_LEVEL) return false; - if (iterator->level == PT_PAGE_TABLE_LEVEL) - if (is_large_pte(*iterator->sptep)) - return false; - iterator->index = SHADOW_PT_INDEX(iterator->addr, iterator->level); iterator->sptep = ((u64 *)__va(iterator->shadow_addr)) + iterator->index; return true; @@ -1528,6 +1524,11 @@ static bool shadow_walk_okay(struct kvm_shadow_walk_iterator *iterator) static void shadow_walk_next(struct kvm_shadow_walk_iterator *iterator) { + if (is_last_spte(*iterator->sptep, iterator->level)) { + iterator->level = 0; + return; + } + iterator->shadow_addr = *iterator->sptep & PT64_BASE_ADDR_MASK; --iterator->level; }
Properly check the last mapping, and do not walk to the next level if last spte is met Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> --- arch/x86/kvm/mmu.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)