diff mbox

[1/3] kvm mmu: handle compound pages in kvm_is_mmio_pfn

Message ID 1234962540-7131-2-git-send-email-joerg.roedel@amd.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Joerg Roedel Feb. 18, 2009, 1:08 p.m. UTC
The function kvm_is_mmio_pfn is called before put_page is called on a
page by KVM. This is a problem when when this function is called on some
struct page which is part of a compund page. It does not test the
reserved flag of the compound page but of the struct page within the
compount page. This is a problem when KVM works with hugepages allocated
at boot time. These pages have the reserved bit set in all tail pages.
Only the flag in the compount head is cleared. KVM would not put such a
page which results in a memory leak.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 virt/kvm/kvm_main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Comments

Marcelo Tosatti Feb. 18, 2009, 6:10 p.m. UTC | #1
BTW some page bits are erroneously transferred to the struct page's
within the compound page. We've got away with that so far because
these bits (such as dirty and accessed) are not used by the limited
hugetlb/hugetlbfs implementation ATM.

Acked-by: Marcelo Tosatti <mtosatti@redhat.com>

On Wed, Feb 18, 2009 at 02:08:58PM +0100, Joerg Roedel wrote:
> The function kvm_is_mmio_pfn is called before put_page is called on a
> page by KVM. This is a problem when when this function is called on some
> struct page which is part of a compund page. It does not test the
> reserved flag of the compound page but of the struct page within the
> compount page. This is a problem when KVM works with hugepages allocated
> at boot time. These pages have the reserved bit set in all tail pages.
> Only the flag in the compount head is cleared. KVM would not put such a
> page which results in a memory leak.
> 
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> ---
>  virt/kvm/kvm_main.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 266bdaf..0ed662d 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -535,8 +535,10 @@ static inline int valid_vcpu(int n)
>  
>  inline int kvm_is_mmio_pfn(pfn_t pfn)
>  {
> -	if (pfn_valid(pfn))
> -		return PageReserved(pfn_to_page(pfn));
> +	if (pfn_valid(pfn)) {
> +		struct page *page = compound_head(pfn_to_page(pfn));
> +		return PageReserved(page);
> +	}
>  
>  	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
diff mbox

Patch

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 266bdaf..0ed662d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -535,8 +535,10 @@  static inline int valid_vcpu(int n)
 
 inline int kvm_is_mmio_pfn(pfn_t pfn)
 {
-	if (pfn_valid(pfn))
-		return PageReserved(pfn_to_page(pfn));
+	if (pfn_valid(pfn)) {
+		struct page *page = compound_head(pfn_to_page(pfn));
+		return PageReserved(page);
+	}
 
 	return true;
 }