kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v2 01/10] KVM: iommu: fix releasing unmapped page
Date: Fri, 03 Aug 2012 15:36:52 +0800	[thread overview]
Message-ID: <501B7F94.7090308@linux.vnet.ibm.com> (raw)

There are two bugs:
- the 'error page' is forgot to be released
  [ it is unneeded after commit a2766325cf9f9, for backport, we
    still do kvm_release_pfn_clean for the error pfn ]

- guest pages are always released regardless of the unmapped page
  (e,g, caused by hwpoison)

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
 virt/kvm/iommu.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index c03f1fb..6a67bea 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -107,6 +107,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
 		 */
 		pfn = kvm_pin_pages(slot, gfn, page_size);
 		if (is_error_pfn(pfn)) {
+			kvm_release_pfn_clean(pfn);
 			gfn += 1;
 			continue;
 		}
@@ -300,6 +301,12 @@ static void kvm_iommu_put_pages(struct kvm *kvm,

 		/* Get physical address */
 		phys = iommu_iova_to_phys(domain, gfn_to_gpa(gfn));
+
+		if (!phys) {
+			gfn++;
+			continue;
+		}
+
 		pfn  = phys >> PAGE_SHIFT;

 		/* Unmap address from IO address space */
-- 
1.7.7.6

             reply	other threads:[~2012-08-03  7:36 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-03  7:36 Xiao Guangrong [this message]
2012-08-03  7:37 ` [PATCH v2 02/10] KVM: introduce KVM_PFN_ERR_FAULT Xiao Guangrong
2012-08-06 13:01   ` Avi Kivity
2012-08-06 13:03     ` Avi Kivity
2012-08-03  7:38 ` [PATCH v2 03/10] KVM: introduce KVM_PFN_ERR_HWPOISON Xiao Guangrong
2012-08-03  7:39 ` [PATCH v2 04/10] KVM: introduce KVM_PFN_ERR_BAD Xiao Guangrong
2012-08-03  7:39 ` [PATCH v2 05/10] KVM: inline is_*_pfn functions Xiao Guangrong
2012-08-03  7:40 ` [PATCH v2 06/10] KVM: remove the unused declare Xiao Guangrong
2012-08-03  7:41 ` [PATCH v2 07/10] KVM: introduce KVM_ERR_PTR_BAD_PAGE Xiao Guangrong
2012-08-03  7:42 ` [PATCH v2 08/10] KVM: do not release the error pfn Xiao Guangrong
2012-08-03  7:42 ` [PATCH v2 09/10] KVM: do not release the error page Xiao Guangrong
2012-08-03  7:43 ` [PATCH v2 10/10] KVM: let the error pfn not depend on error code Xiao Guangrong
2012-08-03 19:17 ` [PATCH v2 01/10] KVM: iommu: fix releasing unmapped page Marcelo Tosatti
2012-08-06 13:05 ` Avi Kivity

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=501B7F94.7090308@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;
as well as URLs for NNTP newsgroup(s).