Mike Rapoport
68d4b5fef2
Patch series "mm: ensure consistency of memory map poisoning".
Currently memory map allocation for FLATMEM case does not poison the
struct pages regardless of CONFIG_PAGE_POISON setting.
This happens because allocation of the memory map for FLATMEM and SPARSMEM
use different memblock functions and those that are used for SPARSMEM case
(namely memblock_alloc_try_nid_raw() and memblock_alloc_exact_nid_raw())
implicitly poison the allocated memory.
Another side effect of this implicit poisoning is that early setup code
that uses the same functions to allocate memory burns cycles for the
memory poisoning even if it was not intended.
These patches introduce memmap_alloc() wrapper that ensure that the memory
map allocation is consistent for different memory models.
This patch (of 4):
Currently memory map for the holes is initialized only when SPARSEMEM
memory model is used. Yet, even with FLATMEM there could be holes in the
physical memory layout that have memory map entries.
For instance, the memory reserved using e820 API on i386 or
"reserved-memory" nodes in device tree would not appear in memblock.memory
and hence the struct pages for such holes will be skipped during memory
map initialization.
These struct pages will be zeroed because the memory map for FLATMEM
systems is allocated with memblock_alloc_node() that clears the allocated
memory. While zeroed struct pages do not cause immediate problems, the
correct behaviour is to initialize every page using __init_single_page().
Besides, enabling page poison for FLATMEM case will trigger
PF_POISONED_CHECK() unless the memory map is properly initialized.
Make sure init_unavailable_range() is called for both SPARSEMEM and
FLATMEM so that struct pages representing memory holes would appear as
PG_Reserved with any memory layout.
[rppt@kernel.org: fix microblaze]
Link: https://lkml.kernel.org/r/YQWW3RCE4eWBuMu/@kernel.org
(cherry picked from commit c3ab6baf6a)
Bug: 258556132
Link: https://lkml.kernel.org/r/20210714123739.16493-1-rppt@kernel.org
Link: https://lkml.kernel.org/r/20210714123739.16493-2-rppt@kernel.org
Change-Id: Ib60682288ba76e65384de91b70a08662ead12934
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
206 lines
5.8 KiB
C
206 lines
5.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* VM ops
|
|
*
|
|
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
|
|
* Copyright (C) 2008-2009 PetaLogix
|
|
* Copyright (C) 2006 Atmark Techno, Inc.
|
|
* Changes for MMU support:
|
|
* Copyright (C) 2007 Xilinx, Inc. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _ASM_MICROBLAZE_PAGE_H
|
|
#define _ASM_MICROBLAZE_PAGE_H
|
|
|
|
#include <linux/pfn.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/asm-compat.h>
|
|
#include <linux/const.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/* PAGE_SHIFT determines the page size */
|
|
#if defined(CONFIG_MICROBLAZE_64K_PAGES)
|
|
#define PAGE_SHIFT 16
|
|
#elif defined(CONFIG_MICROBLAZE_16K_PAGES)
|
|
#define PAGE_SHIFT 14
|
|
#else
|
|
#define PAGE_SHIFT 12
|
|
#endif
|
|
#define PAGE_SIZE (ASM_CONST(1) << PAGE_SHIFT)
|
|
#define PAGE_MASK (~(PAGE_SIZE-1))
|
|
|
|
#define LOAD_OFFSET ASM_CONST((CONFIG_KERNEL_START-CONFIG_KERNEL_BASE_ADDR))
|
|
|
|
#define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/* MS be sure that SLAB allocates aligned objects */
|
|
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
|
|
|
|
#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
|
|
|
|
#define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
|
|
#define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1)))
|
|
|
|
#ifndef CONFIG_MMU
|
|
/*
|
|
* PAGE_OFFSET -- the first address of the first page of memory. When not
|
|
* using MMU this corresponds to the first free page in physical memory (aligned
|
|
* on a page boundary).
|
|
*/
|
|
extern unsigned int __page_offset;
|
|
#define PAGE_OFFSET __page_offset
|
|
|
|
#else /* CONFIG_MMU */
|
|
|
|
/*
|
|
* PAGE_OFFSET -- the first address of the first page of memory. With MMU
|
|
* it is set to the kernel start address (aligned on a page boundary).
|
|
*
|
|
* CONFIG_KERNEL_START is defined in arch/microblaze/config.in and used
|
|
* in arch/microblaze/Makefile.
|
|
*/
|
|
#define PAGE_OFFSET CONFIG_KERNEL_START
|
|
|
|
/*
|
|
* The basic type of a PTE - 32 bit physical addressing.
|
|
*/
|
|
typedef unsigned long pte_basic_t;
|
|
#define PTE_FMT "%.8lx"
|
|
|
|
#endif /* CONFIG_MMU */
|
|
|
|
# define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
|
|
# define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE)
|
|
|
|
# define clear_user_page(pgaddr, vaddr, page) memset((pgaddr), 0, PAGE_SIZE)
|
|
# define copy_user_page(vto, vfrom, vaddr, topg) \
|
|
memcpy((vto), (vfrom), PAGE_SIZE)
|
|
|
|
/*
|
|
* These are used to make use of C type-checking..
|
|
*/
|
|
typedef struct page *pgtable_t;
|
|
typedef struct { unsigned long pte; } pte_t;
|
|
typedef struct { unsigned long pgprot; } pgprot_t;
|
|
/* FIXME this can depend on linux kernel version */
|
|
# ifdef CONFIG_MMU
|
|
typedef struct { unsigned long pgd; } pgd_t;
|
|
# else /* CONFIG_MMU */
|
|
typedef struct { unsigned long ste[64]; } pmd_t;
|
|
typedef struct { pmd_t pue[1]; } pud_t;
|
|
typedef struct { pud_t p4e[1]; } p4d_t;
|
|
typedef struct { p4d_t pge[1]; } pgd_t;
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# define pte_val(x) ((x).pte)
|
|
# define pgprot_val(x) ((x).pgprot)
|
|
|
|
# ifdef CONFIG_MMU
|
|
# define pgd_val(x) ((x).pgd)
|
|
# else /* CONFIG_MMU */
|
|
# define pmd_val(x) ((x).ste[0])
|
|
# define pud_val(x) ((x).pue[0])
|
|
# define pgd_val(x) ((x).pge[0])
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# define __pte(x) ((pte_t) { (x) })
|
|
# define __pgd(x) ((pgd_t) { (x) })
|
|
# define __pgprot(x) ((pgprot_t) { (x) })
|
|
|
|
/**
|
|
* Conversions for virtual address, physical address, pfn, and struct
|
|
* page are defined in the following files.
|
|
*
|
|
* virt -+
|
|
* | asm-microblaze/page.h
|
|
* phys -+
|
|
* | linux/pfn.h
|
|
* pfn -+
|
|
* | asm-generic/memory_model.h
|
|
* page -+
|
|
*
|
|
*/
|
|
|
|
extern unsigned long max_low_pfn;
|
|
extern unsigned long min_low_pfn;
|
|
extern unsigned long max_pfn;
|
|
|
|
extern unsigned long memory_start;
|
|
extern unsigned long memory_size;
|
|
extern unsigned long lowmem_size;
|
|
|
|
extern unsigned long kernel_tlb;
|
|
|
|
extern int page_is_ram(unsigned long pfn);
|
|
|
|
# define phys_to_pfn(phys) (PFN_DOWN(phys))
|
|
# define pfn_to_phys(pfn) (PFN_PHYS(pfn))
|
|
|
|
# define virt_to_pfn(vaddr) (phys_to_pfn((__pa(vaddr))))
|
|
# define pfn_to_virt(pfn) __va(pfn_to_phys((pfn)))
|
|
|
|
# ifdef CONFIG_MMU
|
|
|
|
# define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
|
|
# define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
|
|
# define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
|
|
|
|
# else /* CONFIG_MMU */
|
|
# define virt_to_page(vaddr) (pfn_to_page(virt_to_pfn(vaddr)))
|
|
# define page_to_virt(page) (pfn_to_virt(page_to_pfn(page)))
|
|
# define page_to_phys(page) (pfn_to_phys(page_to_pfn(page)))
|
|
# define page_to_bus(page) (page_to_phys(page))
|
|
# define phys_to_page(paddr) (pfn_to_page(phys_to_pfn(paddr)))
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# ifndef CONFIG_MMU
|
|
# define pfn_valid(pfn) (((pfn) >= min_low_pfn) && \
|
|
((pfn) <= (min_low_pfn + max_mapnr)))
|
|
# define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)
|
|
# else /* CONFIG_MMU */
|
|
# define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT)
|
|
# define pfn_valid(pfn) ((pfn) >= ARCH_PFN_OFFSET && \
|
|
(pfn) < (max_mapnr + ARCH_PFN_OFFSET))
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# endif /* __ASSEMBLY__ */
|
|
|
|
#define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr)))
|
|
|
|
# define __pa(x) __virt_to_phys((unsigned long)(x))
|
|
# define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
|
|
|
|
/* Convert between virtual and physical address for MMU. */
|
|
/* Handle MicroBlaze processor with virtual memory. */
|
|
#ifndef CONFIG_MMU
|
|
#define __virt_to_phys(addr) addr
|
|
#define __phys_to_virt(addr) addr
|
|
#define tophys(rd, rs) addik rd, rs, 0
|
|
#define tovirt(rd, rs) addik rd, rs, 0
|
|
#else
|
|
#define __virt_to_phys(addr) \
|
|
((addr) + CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START)
|
|
#define __phys_to_virt(addr) \
|
|
((addr) + CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
|
|
#define tophys(rd, rs) \
|
|
addik rd, rs, (CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START)
|
|
#define tovirt(rd, rs) \
|
|
addik rd, rs, (CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
|
|
#endif /* CONFIG_MMU */
|
|
|
|
#define TOPHYS(addr) __virt_to_phys(addr)
|
|
|
|
#ifdef CONFIG_MMU
|
|
|
|
#endif /* CONFIG_MMU */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#include <asm-generic/memory_model.h>
|
|
#include <asm-generic/getorder.h>
|
|
|
|
#endif /* _ASM_MICROBLAZE_PAGE_H */
|