From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v3 1/7] KVM: MMU: fix release noslot pfn
Date: Fri, 21 Sep 2012 14:57:19 +0800 [thread overview]
Message-ID: <505C0FCF.2070308@linux.vnet.ibm.com> (raw)
In-Reply-To: <505C0FA8.5070007@linux.vnet.ibm.com>
We can not directly call kvm_release_pfn_clean to release the pfn
since we can meet noslot pfn which is used to cache mmio info into
spte
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
arch/x86/kvm/mmu.c | 6 ++++--
arch/x86/kvm/paging_tmpl.h | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index aa0b469..0f56169 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2877,7 +2877,8 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, u32 error_code,
out_unlock:
spin_unlock(&vcpu->kvm->mmu_lock);
- kvm_release_pfn_clean(pfn);
+ if (likely(!is_noslot_pfn(pfn)))
+ kvm_release_pfn_clean(pfn);
return 0;
}
@@ -3345,7 +3346,8 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code,
out_unlock:
spin_unlock(&vcpu->kvm->mmu_lock);
- kvm_release_pfn_clean(pfn);
+ if (likely(!is_noslot_pfn(pfn)))
+ kvm_release_pfn_clean(pfn);
return 0;
}
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index bf8c42b..9ce6bc0 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -544,7 +544,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
out_gpte_changed:
if (sp)
kvm_mmu_put_page(sp, it.sptep);
- kvm_release_pfn_clean(pfn);
+ if (likely(!is_noslot_pfn(pfn)))
+ kvm_release_pfn_clean(pfn);
return NULL;
}
@@ -645,7 +646,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,
out_unlock:
spin_unlock(&vcpu->kvm->mmu_lock);
- kvm_release_pfn_clean(pfn);
+ if (likely(!is_noslot_pfn(pfn)))
+ kvm_release_pfn_clean(pfn);
return 0;
}
--
1.7.7.6
next prev parent reply other threads:[~2012-09-21 6:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 6:56 [PATCH v3 0/7] KVM: MMU: fix release pfn in mmu code Xiao Guangrong
2012-09-21 6:57 ` Xiao Guangrong [this message]
2012-09-23 9:13 ` [PATCH v3 1/7] KVM: MMU: fix release noslot pfn Gleb Natapov
2012-09-24 4:59 ` Xiao Guangrong
2012-09-24 11:24 ` Gleb Natapov
2012-09-24 11:49 ` Xiao Guangrong
2012-09-24 12:04 ` Gleb Natapov
2012-09-24 12:32 ` Xiao Guangrong
2012-09-27 16:25 ` Avi Kivity
2012-09-21 6:57 ` [PATCH v3 2/7] KVM: MMU: remove mmu_is_invalid Xiao Guangrong
2012-09-21 6:58 ` [PATCH v3 3/7] KVM: MMU: do not release pfn in mmu_set_spte Xiao Guangrong
2012-09-21 6:58 ` [PATCH v3 4/7] KVM: MMU: cleanup FNAME(page_fault) Xiao Guangrong
2012-09-21 6:59 ` [PATCH v3 5/7] KVM: MMU: introduce FNAME(prefetch_gpte) Xiao Guangrong
2012-09-21 6:59 ` [PATCH v3 6/7] KVM: MMU: move prefetch_invalid_gpte out of pagaing_tmp.h Xiao Guangrong
2012-09-21 7:00 ` [PATCH v3 7/7] KVM: MMU: introduce page_fault_start/page_fault_end Xiao Guangrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=505C0FCF.2070308@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome