aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorPallipadi, Venkatesh <venkatesh.pallipadi@intel.com>2009-03-12 20:45:27 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-12 23:28:50 -0400
commit4bb9c5c02153dfc89a6c73a6f32091413805ad7d (patch)
tree408dee350cab80fbe7884b6640d651ef8ec44601 /arch/x86/mm
parent6a5c05f002c3e4f24887a5fe8e7df757d339d368 (diff)
VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoff
Impact: fix false positive PAT warnings - also fix VirtalBox hang Use of vma->vm_pgoff to identify the pfnmaps that are fully mapped at mmap time is broken. vm_pgoff is set by generic mmap code even for cases where drivers are setting up the mappings at the fault time. The problem was originally reported here: http://marc.info/?l=linux-kernel&m=123383810628583&w=2 Change is_linear_pfn_mapping logic to overload VM_INSERTPAGE flag along with VM_PFNMAP to mean full PFNMAP setup at mmap time. Problem also tracked at: http://bugzilla.kernel.org/show_bug.cgi?id=12800 Reported-by: Thomas Hellstrom <thellstrom@vmware.com> Tested-by: Frans Pop <elendil@planet.nl> Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Suresh Siddha <suresh.b.siddha>@intel.com> Cc: Nick Piggin <npiggin@suse.de> Cc: "ebiederm@xmission.com" <ebiederm@xmission.com> Cc: <stable@kernel.org> # only for 2.6.29.1, not .28 LKML-Reference: <20090313004527.GA7176@linux-os.sc.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/pat.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index e0ab173b6974..21bc1f787ae2 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -641,10 +641,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
641 is_ram = pat_pagerange_is_ram(paddr, paddr + size); 641 is_ram = pat_pagerange_is_ram(paddr, paddr + size);
642 642
643 /* 643 /*
644 * reserve_pfn_range() doesn't support RAM pages. 644 * reserve_pfn_range() doesn't support RAM pages. Maintain the current
645 * behavior with RAM pages by returning success.
645 */ 646 */
646 if (is_ram != 0) 647 if (is_ram != 0)
647 return -EINVAL; 648 return 0;
648 649
649 ret = reserve_memtype(paddr, paddr + size, want_flags, &flags); 650 ret = reserve_memtype(paddr, paddr + size, want_flags, &flags);
650 if (ret) 651 if (ret)