diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-04-17 19:40:10 -0300 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2009-04-27 10:37:04 -0700 |
| commit | a6d2078da9aeb83f21277573b240290fa196b5f9 (patch) | |
| tree | 0827fea28283d1dc3e8c71647496262ace7fc743 | |
| parent | fc66cf4790189b5ec4f8b9e8aacc8d37cc8e3daa (diff) | |
KVM: MMU: handle compound pages in kvm_is_mmio_pfn
upstream commit: fc5659c8c6b6c4e02ac354b369017c1bf231f347
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>
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | 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 47be50a3bf2e..65c00b34248f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -581,8 +581,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; } |