arch, mm: make kernel_page_present() always available
For architectures that enable ARCH_HAS_SET_MEMORY having the ability to verify that a page is mapped in the kernel direct map can be useful regardless of hibernation. Add RISC-V implementation of kernel_page_present(), update its forward declarations and stubs to be a part of set_memory API and remove ugly ifdefery in inlcude/linux/mm.h around current declarations of kernel_page_present(). Link: https://lkml.kernel.org/r/20201109192128.960-5-rppt@kernel.org Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Andy Lutomirski <luto@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Christoph Lameter <cl@linux.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: David Rientjes <rientjes@google.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Edgecombe, Rick P" <rick.p.edgecombe@intel.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Len Brown <len.brown@intel.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
5d6ad668f3
commit
32a0de886e
@@ -140,6 +140,7 @@ int set_memory_valid(unsigned long addr, int numpages, int enable);
|
|||||||
|
|
||||||
int set_direct_map_invalid_noflush(struct page *page);
|
int set_direct_map_invalid_noflush(struct page *page);
|
||||||
int set_direct_map_default_noflush(struct page *page);
|
int set_direct_map_default_noflush(struct page *page);
|
||||||
|
bool kernel_page_present(struct page *page);
|
||||||
|
|
||||||
#include <asm-generic/cacheflush.h>
|
#include <asm-generic/cacheflush.h>
|
||||||
|
|
||||||
|
|||||||
@@ -186,8 +186,8 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)
|
|||||||
|
|
||||||
set_memory_valid((unsigned long)page_address(page), numpages, enable);
|
set_memory_valid((unsigned long)page_address(page), numpages, enable);
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_DEBUG_PAGEALLOC */
|
||||||
|
|
||||||
#ifdef CONFIG_HIBERNATION
|
|
||||||
/*
|
/*
|
||||||
* This function is used to determine if a linear map page has been marked as
|
* This function is used to determine if a linear map page has been marked as
|
||||||
* not-valid. Walk the page table and check the PTE_VALID bit. This is based
|
* not-valid. Walk the page table and check the PTE_VALID bit. This is based
|
||||||
@@ -234,5 +234,3 @@ bool kernel_page_present(struct page *page)
|
|||||||
ptep = pte_offset_kernel(pmdp, addr);
|
ptep = pte_offset_kernel(pmdp, addr);
|
||||||
return pte_valid(READ_ONCE(*ptep));
|
return pte_valid(READ_ONCE(*ptep));
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_HIBERNATION */
|
|
||||||
#endif /* CONFIG_DEBUG_PAGEALLOC */
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; }
|
|||||||
|
|
||||||
int set_direct_map_invalid_noflush(struct page *page);
|
int set_direct_map_invalid_noflush(struct page *page);
|
||||||
int set_direct_map_default_noflush(struct page *page);
|
int set_direct_map_default_noflush(struct page *page);
|
||||||
|
bool kernel_page_present(struct page *page);
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
|
|||||||
@@ -198,3 +198,32 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)
|
|||||||
__pgprot(0), __pgprot(_PAGE_PRESENT));
|
__pgprot(0), __pgprot(_PAGE_PRESENT));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
bool kernel_page_present(struct page *page)
|
||||||
|
{
|
||||||
|
unsigned long addr = (unsigned long)page_address(page);
|
||||||
|
pgd_t *pgd;
|
||||||
|
pud_t *pud;
|
||||||
|
p4d_t *p4d;
|
||||||
|
pmd_t *pmd;
|
||||||
|
pte_t *pte;
|
||||||
|
|
||||||
|
pgd = pgd_offset_k(addr);
|
||||||
|
if (!pgd_present(*pgd))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
p4d = p4d_offset(pgd, addr);
|
||||||
|
if (!p4d_present(*p4d))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
pud = pud_offset(p4d, addr);
|
||||||
|
if (!pud_present(*pud))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
pmd = pmd_offset(pud, addr);
|
||||||
|
if (!pmd_present(*pmd))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
pte = pte_offset_kernel(pmd, addr);
|
||||||
|
return pte_present(*pte);
|
||||||
|
}
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ int set_pages_rw(struct page *page, int numpages);
|
|||||||
|
|
||||||
int set_direct_map_invalid_noflush(struct page *page);
|
int set_direct_map_invalid_noflush(struct page *page);
|
||||||
int set_direct_map_default_noflush(struct page *page);
|
int set_direct_map_default_noflush(struct page *page);
|
||||||
|
bool kernel_page_present(struct page *page);
|
||||||
|
|
||||||
extern int kernel_set_to_readonly;
|
extern int kernel_set_to_readonly;
|
||||||
|
|
||||||
|
|||||||
@@ -2226,8 +2226,8 @@ void __kernel_map_pages(struct page *page, int numpages, int enable)
|
|||||||
|
|
||||||
arch_flush_lazy_mmu_mode();
|
arch_flush_lazy_mmu_mode();
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_DEBUG_PAGEALLOC */
|
||||||
|
|
||||||
#ifdef CONFIG_HIBERNATION
|
|
||||||
bool kernel_page_present(struct page *page)
|
bool kernel_page_present(struct page *page)
|
||||||
{
|
{
|
||||||
unsigned int level;
|
unsigned int level;
|
||||||
@@ -2239,8 +2239,6 @@ bool kernel_page_present(struct page *page)
|
|||||||
pte = lookup_address((unsigned long)page_address(page), &level);
|
pte = lookup_address((unsigned long)page_address(page), &level);
|
||||||
return (pte_val(*pte) & _PAGE_PRESENT);
|
return (pte_val(*pte) & _PAGE_PRESENT);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_HIBERNATION */
|
|
||||||
#endif /* CONFIG_DEBUG_PAGEALLOC */
|
|
||||||
|
|
||||||
int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address,
|
int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address,
|
||||||
unsigned numpages, unsigned long page_flags)
|
unsigned numpages, unsigned long page_flags)
|
||||||
|
|||||||
@@ -2949,16 +2949,9 @@ static inline void debug_pagealloc_unmap_pages(struct page *page, int numpages)
|
|||||||
if (debug_pagealloc_enabled_static())
|
if (debug_pagealloc_enabled_static())
|
||||||
__kernel_map_pages(page, numpages, 0);
|
__kernel_map_pages(page, numpages, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_HIBERNATION
|
|
||||||
extern bool kernel_page_present(struct page *page);
|
|
||||||
#endif /* CONFIG_HIBERNATION */
|
|
||||||
#else /* CONFIG_DEBUG_PAGEALLOC */
|
#else /* CONFIG_DEBUG_PAGEALLOC */
|
||||||
static inline void debug_pagealloc_map_pages(struct page *page, int numpages) {}
|
static inline void debug_pagealloc_map_pages(struct page *page, int numpages) {}
|
||||||
static inline void debug_pagealloc_unmap_pages(struct page *page, int numpages) {}
|
static inline void debug_pagealloc_unmap_pages(struct page *page, int numpages) {}
|
||||||
#ifdef CONFIG_HIBERNATION
|
|
||||||
static inline bool kernel_page_present(struct page *page) { return true; }
|
|
||||||
#endif /* CONFIG_HIBERNATION */
|
|
||||||
#endif /* CONFIG_DEBUG_PAGEALLOC */
|
#endif /* CONFIG_DEBUG_PAGEALLOC */
|
||||||
|
|
||||||
#ifdef __HAVE_ARCH_GATE_AREA
|
#ifdef __HAVE_ARCH_GATE_AREA
|
||||||
|
|||||||
@@ -23,6 +23,11 @@ static inline int set_direct_map_default_noflush(struct page *page)
|
|||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool kernel_page_present(struct page *page)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef set_mce_nospec
|
#ifndef set_mce_nospec
|
||||||
|
|||||||
Reference in New Issue
Block a user