Messages in this thread Patch in this message | | | From | Chris Metcalf <> | Date | Fri, 6 Apr 2012 13:41:54 -0400 | Subject | [PATCH 2/6] arch/tile: fix set_pte() to properly handle kernel MMIO mappings |
| |
We can't look at the 'struct page' for such mappings. And while we're at it, also avoid trying to look up the 'struct page' for memory mappings that are not being managed by Linux, or non-present PTEs.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> --- arch/tile/mm/pgtable.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c index 211558e..591621f 100644 --- a/arch/tile/mm/pgtable.c +++ b/arch/tile/mm/pgtable.c @@ -453,10 +453,18 @@ void __set_pte(pte_t *ptep, pte_t pte) void set_pte(pte_t *ptep, pte_t pte) { - struct page *page = pfn_to_page(pte_pfn(pte)); - - /* Update the home of a PTE if necessary */ - pte = pte_set_home(pte, page_home(page)); + if (pte_present(pte) && + (!CHIP_HAS_MMIO() || hv_pte_get_mode(pte) != HV_PTE_MODE_MMIO)) { + /* The PTE actually references physical memory. */ + unsigned long pfn = pte_pfn(pte); + if (pfn_valid(pfn)) { + /* Update the home of the PTE from the struct page. */ + pte = pte_set_home(pte, page_home(pfn_to_page(pfn))); + } else if (hv_pte_get_mode(pte) == 0) { + /* remap_pfn_range(), etc, must supply PTE mode. */ + panic("set_pte(): out-of-range PFN and mode 0\n"); + } + } __set_pte(ptep, pte); } -- 1.6.5.2
| |