2012-03-05 11:49:27 +00:00
|
|
|
/*
|
|
|
|
* Based on arch/arm/mm/init.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1995-2005 Russell King
|
|
|
|
* Copyright (C) 2012 ARM Ltd.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/export.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/swap.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <linux/mman.h>
|
|
|
|
#include <linux/nodemask.h>
|
|
|
|
#include <linux/initrd.h>
|
|
|
|
#include <linux/gfp.h>
|
|
|
|
#include <linux/memblock.h>
|
|
|
|
#include <linux/sort.h>
|
|
|
|
#include <linux/of_fdt.h>
|
2014-02-27 12:09:22 +00:00
|
|
|
#include <linux/dma-mapping.h>
|
2013-12-12 19:28:33 +00:00
|
|
|
#include <linux/dma-contiguous.h>
|
2014-07-28 19:03:03 +01:00
|
|
|
#include <linux/efi.h>
|
2015-02-05 18:01:53 +00:00
|
|
|
#include <linux/swiotlb.h>
|
2017-01-10 13:35:49 -08:00
|
|
|
#include <linux/mm.h>
|
2012-03-05 11:49:27 +00:00
|
|
|
|
2016-02-16 13:52:42 +01:00
|
|
|
#include <asm/boot.h>
|
2014-07-16 17:42:43 +01:00
|
|
|
#include <asm/fixmap.h>
|
2016-02-16 13:52:40 +01:00
|
|
|
#include <asm/kasan.h>
|
2016-02-16 13:52:42 +01:00
|
|
|
#include <asm/kernel-pgtable.h>
|
arm64: Fix overlapping VA allocations
PCI IO space was intended to be 16MiB, at 32MiB below MODULES_VADDR, but
commit d1e6dc91b532d3d3 ("arm64: Add architectural support for PCI")
extended this to cover the full 32MiB. The final 8KiB of this 32MiB is
also allocated for the fixmap, allowing for potential clashes between
the two.
This change was masked by assumptions in mem_init and the page table
dumping code, which assumed the I/O space to be 16MiB long through
seaparte hard-coded definitions.
This patch changes the definition of the PCI I/O space allocation to
live in asm/memory.h, along with the other VA space allocations. As the
fixmap allocation depends on the number of fixmap entries, this is moved
below the PCI I/O space allocation. Both the fixmap and PCI I/O space
are guarded with 2MB of padding. Sites assuming the I/O space was 16MiB
are moved over use new PCI_IO_{START,END} definitions, which will keep
in sync with the size of the IO space (now restored to 16MiB).
As a useful side effect, the use of the new PCI_IO_{START,END}
definitions prevents a build issue in the dumping code due to a (now
redundant) missing include of io.h for PCI_IOBASE.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
[catalin.marinas@arm.com: reorder FIXADDR and PCI_IO address_markers_idx enum]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2015-01-22 18:20:35 +00:00
|
|
|
#include <asm/memory.h>
|
2012-03-05 11:49:27 +00:00
|
|
|
#include <asm/sections.h>
|
|
|
|
#include <asm/setup.h>
|
|
|
|
#include <asm/sizes.h>
|
|
|
|
#include <asm/tlb.h>
|
2014-11-14 15:54:08 +00:00
|
|
|
#include <asm/alternative.h>
|
2012-03-05 11:49:27 +00:00
|
|
|
|
|
|
|
#include "mm.h"
|
|
|
|
|
2016-02-16 13:52:42 +01:00
|
|
|
/*
|
|
|
|
* We need to be able to catch inadvertent references to memstart_addr
|
|
|
|
* that occur (potentially in generic code) before arm64_memblock_init()
|
|
|
|
* executes, which assigns it its actual value. So use a default value
|
|
|
|
* that cannot be mistaken for a real physical address.
|
|
|
|
*/
|
2016-02-26 17:57:14 +01:00
|
|
|
s64 memstart_addr __read_mostly = -1;
|
2015-02-05 18:01:53 +00:00
|
|
|
phys_addr_t arm64_dma_phys_limit __read_mostly;
|
2012-03-05 11:49:27 +00:00
|
|
|
|
2013-08-25 16:47:48 -05:00
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
2012-03-05 11:49:27 +00:00
|
|
|
static int __init early_initrd(char *p)
|
|
|
|
{
|
|
|
|
unsigned long start, size;
|
|
|
|
char *endp;
|
|
|
|
|
|
|
|
start = memparse(p, &endp);
|
|
|
|
if (*endp == ',') {
|
|
|
|
size = memparse(endp + 1, NULL);
|
|
|
|
|
2016-02-16 13:52:41 +01:00
|
|
|
initrd_start = start;
|
|
|
|
initrd_end = start + size;
|
2012-03-05 11:49:27 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("initrd", early_initrd);
|
2013-08-25 16:47:48 -05:00
|
|
|
#endif
|
2012-03-05 11:49:27 +00:00
|
|
|
|
2014-07-18 11:54:37 +01:00
|
|
|
/*
|
|
|
|
* Return the maximum physical address for ZONE_DMA (DMA_BIT_MASK(32)). It
|
|
|
|
* currently assumes that for memory starting above 4G, 32-bit devices will
|
|
|
|
* use a DMA offset.
|
|
|
|
*/
|
2015-11-20 17:59:10 +08:00
|
|
|
static phys_addr_t __init max_zone_dma_phys(void)
|
2014-07-18 11:54:37 +01:00
|
|
|
{
|
|
|
|
phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32);
|
|
|
|
return min(offset + (1ULL << 32), memblock_end_of_DRAM());
|
|
|
|
}
|
|
|
|
|
2012-03-05 11:49:27 +00:00
|
|
|
static void __init zone_sizes_init(unsigned long min, unsigned long max)
|
|
|
|
{
|
|
|
|
struct memblock_region *reg;
|
|
|
|
unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
|
2014-02-27 12:09:22 +00:00
|
|
|
unsigned long max_dma = min;
|
2012-03-05 11:49:27 +00:00
|
|
|
|
|
|
|
memset(zone_size, 0, sizeof(zone_size));
|
|
|
|
|
|
|
|
/* 4GB maximum for 32-bit only capable devices */
|
2015-10-27 17:40:26 +00:00
|
|
|
#ifdef CONFIG_ZONE_DMA
|
|
|
|
max_dma = PFN_DOWN(arm64_dma_phys_limit);
|
|
|
|
zone_size[ZONE_DMA] = max_dma - min;
|
|
|
|
#endif
|
2014-02-27 12:09:22 +00:00
|
|
|
zone_size[ZONE_NORMAL] = max - max_dma;
|
2012-03-05 11:49:27 +00:00
|
|
|
|
|
|
|
memcpy(zhole_size, zone_size, sizeof(zhole_size));
|
|
|
|
|
|
|
|
for_each_memblock(memory, reg) {
|
|
|
|
unsigned long start = memblock_region_memory_base_pfn(reg);
|
|
|
|
unsigned long end = memblock_region_memory_end_pfn(reg);
|
|
|
|
|
|
|
|
if (start >= max)
|
|
|
|
continue;
|
2014-02-27 12:09:22 +00:00
|
|
|
|
2015-10-27 17:40:26 +00:00
|
|
|
#ifdef CONFIG_ZONE_DMA
|
|
|
|
if (start < max_dma) {
|
2014-02-27 12:09:22 +00:00
|
|
|
unsigned long dma_end = min(end, max_dma);
|
|
|
|
zhole_size[ZONE_DMA] -= dma_end - start;
|
2012-03-05 11:49:27 +00:00
|
|
|
}
|
2015-10-27 17:40:26 +00:00
|
|
|
#endif
|
2014-02-27 12:09:22 +00:00
|
|
|
if (end > max_dma) {
|
2012-03-05 11:49:27 +00:00
|
|
|
unsigned long normal_end = min(end, max);
|
2014-02-27 12:09:22 +00:00
|
|
|
unsigned long normal_start = max(start, max_dma);
|
2012-03-05 11:49:27 +00:00
|
|
|
zhole_size[ZONE_NORMAL] -= normal_end - normal_start;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free_area_init_node(0, zone_size, min, zhole_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_HAVE_ARCH_PFN_VALID
|
2014-08-28 14:00:10 -07:00
|
|
|
#define PFN_MASK ((1UL << (64 - PAGE_SHIFT)) - 1)
|
|
|
|
|
2012-03-05 11:49:27 +00:00
|
|
|
int pfn_valid(unsigned long pfn)
|
|
|
|
{
|
2015-11-30 13:28:16 +01:00
|
|
|
return (pfn & PFN_MASK) == pfn && memblock_is_map_memory(pfn << PAGE_SHIFT);
|
2012-03-05 11:49:27 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(pfn_valid);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef CONFIG_SPARSEMEM
|
2015-11-20 17:59:10 +08:00
|
|
|
static void __init arm64_memory_present(void)
|
2012-03-05 11:49:27 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#else
|
2015-11-20 17:59:10 +08:00
|
|
|
static void __init arm64_memory_present(void)
|
2012-03-05 11:49:27 +00:00
|
|
|
{
|
|
|
|
struct memblock_region *reg;
|
|
|
|
|
|
|
|
for_each_memblock(memory, reg)
|
|
|
|
memory_present(0, memblock_region_memory_base_pfn(reg),
|
|
|
|
memblock_region_memory_end_pfn(reg));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-01-15 16:42:14 +00:00
|
|
|
static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX;
|
2017-09-15 13:52:00 +05:30
|
|
|
static phys_addr_t bootloader_memory_limit;
|
2015-01-15 16:42:14 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Limit the memory size that was specified via FDT.
|
|
|
|
*/
|
|
|
|
static int __init early_mem(char *p)
|
|
|
|
{
|
|
|
|
if (!p)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
memory_limit = memparse(p, &p) & PAGE_MASK;
|
|
|
|
pr_notice("Memory limited to %lldMB\n", memory_limit >> 20);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("mem", early_mem);
|
|
|
|
|
2012-03-05 11:49:27 +00:00
|
|
|
void __init arm64_memblock_init(void)
|
|
|
|
{
|
2016-02-16 13:52:42 +01:00
|
|
|
const s64 linear_region_size = -(s64)PAGE_OFFSET;
|
|
|
|
|
2016-03-02 09:47:13 +01:00
|
|
|
/*
|
|
|
|
* Ensure that the linear region takes up exactly half of the kernel
|
|
|
|
* virtual address space. This way, we can distinguish a linear address
|
|
|
|
* from a kernel/module/vmalloc address by testing a single bit.
|
|
|
|
*/
|
|
|
|
BUILD_BUG_ON(linear_region_size != BIT(VA_BITS - 1));
|
|
|
|
|
2016-02-16 13:52:42 +01:00
|
|
|
/*
|
|
|
|
* Select a suitable value for the base of physical memory.
|
|
|
|
*/
|
|
|
|
memstart_addr = round_down(memblock_start_of_DRAM(),
|
|
|
|
ARM64_MEMSTART_ALIGN);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove the memory that we will not be able to cover with the
|
|
|
|
* linear mapping. Take care not to clip the kernel which may be
|
|
|
|
* high in memory.
|
|
|
|
*/
|
2017-01-10 13:35:49 -08:00
|
|
|
memblock_remove(max_t(u64, memstart_addr + linear_region_size,
|
|
|
|
__pa_symbol(_end)), ULLONG_MAX);
|
2016-03-30 14:25:46 +02:00
|
|
|
if (memstart_addr + linear_region_size < memblock_end_of_DRAM()) {
|
|
|
|
/* ensure that memstart_addr remains sufficiently aligned */
|
|
|
|
memstart_addr = round_up(memblock_end_of_DRAM() - linear_region_size,
|
|
|
|
ARM64_MEMSTART_ALIGN);
|
|
|
|
memblock_remove(0, memstart_addr);
|
|
|
|
}
|
2016-02-16 13:52:42 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Apply the memory limit if it was set. Since the kernel may be loaded
|
|
|
|
* high up in memory, add back the kernel region that must be accessible
|
|
|
|
* via the linear mapping.
|
|
|
|
*/
|
|
|
|
if (memory_limit != (phys_addr_t)ULLONG_MAX) {
|
2017-09-15 13:52:00 +05:30
|
|
|
/*
|
|
|
|
* Save bootloader imposed memory limit before we overwirte
|
|
|
|
* memblock.
|
|
|
|
*/
|
|
|
|
bootloader_memory_limit = memblock_end_of_DRAM();
|
2016-02-16 13:52:42 +01:00
|
|
|
memblock_enforce_memory_limit(memory_limit);
|
2017-01-10 13:35:49 -08:00
|
|
|
memblock_add(__pa_symbol(_text), (u64)(_end - _text));
|
2016-02-16 13:52:42 +01:00
|
|
|
}
|
2015-01-15 16:42:14 +00:00
|
|
|
|
2016-01-29 11:59:03 +01:00
|
|
|
if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
|
|
|
|
extern u16 memstart_offset_seed;
|
|
|
|
u64 range = linear_region_size -
|
|
|
|
(memblock_end_of_DRAM() - memblock_start_of_DRAM());
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the size of the linear region exceeds, by a sufficient
|
|
|
|
* margin, the size of the region that the available physical
|
|
|
|
* memory spans, randomize the linear region as well.
|
|
|
|
*/
|
|
|
|
if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) {
|
2018-12-24 07:40:07 +00:00
|
|
|
range /= ARM64_MEMSTART_ALIGN;
|
2016-01-29 11:59:03 +01:00
|
|
|
memstart_addr -= ARM64_MEMSTART_ALIGN *
|
|
|
|
((range * memstart_offset_seed) >> 16);
|
|
|
|
}
|
|
|
|
}
|
2015-01-15 16:42:14 +00:00
|
|
|
|
2014-06-24 16:51:35 +01:00
|
|
|
/*
|
|
|
|
* Register the kernel text, kernel data, initrd, and initial
|
|
|
|
* pagetables with memblock.
|
|
|
|
*/
|
2017-01-10 13:35:49 -08:00
|
|
|
memblock_reserve(__pa_symbol(_text), _end - _text);
|
2012-03-05 11:49:27 +00:00
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
2016-02-16 13:52:41 +01:00
|
|
|
if (initrd_start) {
|
|
|
|
memblock_reserve(initrd_start, initrd_end - initrd_start);
|
|
|
|
|
|
|
|
/* the generic initrd code expects virtual addresses */
|
|
|
|
initrd_start = __phys_to_virt(initrd_start);
|
|
|
|
initrd_end = __phys_to_virt(initrd_end);
|
|
|
|
}
|
2012-03-05 11:49:27 +00:00
|
|
|
#endif
|
|
|
|
|
2014-09-08 13:01:08 -04:00
|
|
|
early_init_fdt_scan_reserved_mem();
|
2014-06-13 13:41:20 +01:00
|
|
|
|
|
|
|
/* 4GB maximum for 32-bit only capable devices */
|
|
|
|
if (IS_ENABLED(CONFIG_ZONE_DMA))
|
2015-02-05 18:01:53 +00:00
|
|
|
arm64_dma_phys_limit = max_zone_dma_phys();
|
|
|
|
else
|
|
|
|
arm64_dma_phys_limit = PHYS_MASK + 1;
|
2017-12-04 14:13:05 +00:00
|
|
|
high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
|
2015-02-05 18:01:53 +00:00
|
|
|
dma_contiguous_reserve(arm64_dma_phys_limit);
|
2013-12-12 19:28:33 +00:00
|
|
|
|
2012-03-05 11:49:27 +00:00
|
|
|
memblock_allow_resize();
|
|
|
|
memblock_dump_all();
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init bootmem_init(void)
|
|
|
|
{
|
|
|
|
unsigned long min, max;
|
|
|
|
|
|
|
|
min = PFN_UP(memblock_start_of_DRAM());
|
|
|
|
max = PFN_DOWN(memblock_end_of_DRAM());
|
|
|
|
|
2015-04-14 15:48:33 -07:00
|
|
|
early_memtest(min << PAGE_SHIFT, max << PAGE_SHIFT);
|
|
|
|
|
2012-03-05 11:49:27 +00:00
|
|
|
/*
|
|
|
|
* Sparsemem tries to allocate bootmem in memory_present(), so must be
|
|
|
|
* done after the fixed reservations.
|
|
|
|
*/
|
|
|
|
arm64_memory_present();
|
|
|
|
|
|
|
|
sparse_init();
|
|
|
|
zone_sizes_init(min, max);
|
|
|
|
|
|
|
|
max_pfn = max_low_pfn = max;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
|
static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
|
{
|
|
|
|
struct page *start_pg, *end_pg;
|
|
|
|
unsigned long pg, pgend;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert start_pfn/end_pfn to a struct page pointer.
|
|
|
|
*/
|
|
|
|
start_pg = pfn_to_page(start_pfn - 1) + 1;
|
|
|
|
end_pg = pfn_to_page(end_pfn - 1) + 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert to physical addresses, and round start upwards and end
|
|
|
|
* downwards.
|
|
|
|
*/
|
|
|
|
pg = (unsigned long)PAGE_ALIGN(__pa(start_pg));
|
|
|
|
pgend = (unsigned long)__pa(end_pg) & PAGE_MASK;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If there are free pages between these, free the section of the
|
|
|
|
* memmap array.
|
|
|
|
*/
|
|
|
|
if (pg < pgend)
|
|
|
|
free_bootmem(pg, pgend - pg);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The mem_map array can get very big. Free the unused area of the memory map.
|
|
|
|
*/
|
|
|
|
static void __init free_unused_memmap(void)
|
|
|
|
{
|
|
|
|
unsigned long start, prev_end = 0;
|
|
|
|
struct memblock_region *reg;
|
|
|
|
|
|
|
|
for_each_memblock(memory, reg) {
|
|
|
|
start = __phys_to_pfn(reg->base);
|
|
|
|
|
|
|
|
#ifdef CONFIG_SPARSEMEM
|
|
|
|
/*
|
|
|
|
* Take care not to free memmap entries that don't exist due
|
|
|
|
* to SPARSEMEM sections which aren't present.
|
|
|
|
*/
|
|
|
|
start = min(start, ALIGN(prev_end, PAGES_PER_SECTION));
|
|
|
|
#endif
|
|
|
|
/*
|
|
|
|
* If we had a previous bank, and there is a space between the
|
|
|
|
* current bank and the previous, free it.
|
|
|
|
*/
|
|
|
|
if (prev_end && prev_end < start)
|
|
|
|
free_memmap(prev_end, start);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Align up here since the VM subsystem insists that the
|
|
|
|
* memmap entries are valid from the bank end aligned to
|
|
|
|
* MAX_ORDER_NR_PAGES.
|
|
|
|
*/
|
2015-06-16 17:38:47 +01:00
|
|
|
prev_end = ALIGN(__phys_to_pfn(reg->base + reg->size),
|
2012-03-05 11:49:27 +00:00
|
|
|
MAX_ORDER_NR_PAGES);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_SPARSEMEM
|
|
|
|
if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION))
|
|
|
|
free_memmap(prev_end, ALIGN(prev_end, PAGES_PER_SECTION));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* mem_init() marks the free areas in the mem_map and tells us how much memory
|
|
|
|
* is free. This is done after various parts of the system have claimed their
|
|
|
|
* memory after the kernel image.
|
|
|
|
*/
|
|
|
|
void __init mem_init(void)
|
|
|
|
{
|
2015-02-05 18:01:53 +00:00
|
|
|
swiotlb_init(1);
|
|
|
|
|
2014-09-16 18:53:54 +01:00
|
|
|
set_max_mapnr(pfn_to_page(max_pfn) - mem_map);
|
2012-03-05 11:49:27 +00:00
|
|
|
|
|
|
|
#ifndef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
|
free_unused_memmap();
|
|
|
|
#endif
|
2013-07-03 15:03:49 -07:00
|
|
|
/* this will put all unused low memory onto the freelists */
|
2013-07-03 15:03:24 -07:00
|
|
|
free_all_bootmem();
|
2012-03-05 11:49:27 +00:00
|
|
|
|
2013-07-03 15:04:02 -07:00
|
|
|
mem_init_print_info(NULL);
|
2012-03-05 11:49:27 +00:00
|
|
|
|
|
|
|
#define MLK(b, t) b, t, ((t) - (b)) >> 10
|
|
|
|
#define MLM(b, t) b, t, ((t) - (b)) >> 20
|
2014-07-16 17:42:43 +01:00
|
|
|
#define MLG(b, t) b, t, ((t) - (b)) >> 30
|
2012-03-05 11:49:27 +00:00
|
|
|
#define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), SZ_1K)
|
|
|
|
|
|
|
|
pr_notice("Virtual kernel memory layout:\n"
|
2015-10-12 18:52:59 +03:00
|
|
|
#ifdef CONFIG_KASAN
|
|
|
|
" kasan : 0x%16lx - 0x%16lx (%6ld GB)\n"
|
|
|
|
#endif
|
2016-02-16 13:52:40 +01:00
|
|
|
" modules : 0x%16lx - 0x%16lx (%6ld MB)\n"
|
2014-07-16 17:42:43 +01:00
|
|
|
" vmalloc : 0x%16lx - 0x%16lx (%6ld GB)\n"
|
2016-02-16 13:52:40 +01:00
|
|
|
" .init : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
|
" .text : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
2016-02-19 11:50:32 -06:00
|
|
|
" .rodata : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
2016-02-16 13:52:40 +01:00
|
|
|
" .data : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
2012-03-05 11:49:27 +00:00
|
|
|
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
2014-07-16 17:42:43 +01:00
|
|
|
" vmemmap : 0x%16lx - 0x%16lx (%6ld GB maximum)\n"
|
|
|
|
" 0x%16lx - 0x%16lx (%6ld MB actual)\n"
|
2012-03-05 11:49:27 +00:00
|
|
|
#endif
|
2014-07-16 17:42:43 +01:00
|
|
|
" fixed : 0x%16lx - 0x%16lx (%6ld KB)\n"
|
arm64: Fix overlapping VA allocations
PCI IO space was intended to be 16MiB, at 32MiB below MODULES_VADDR, but
commit d1e6dc91b532d3d3 ("arm64: Add architectural support for PCI")
extended this to cover the full 32MiB. The final 8KiB of this 32MiB is
also allocated for the fixmap, allowing for potential clashes between
the two.
This change was masked by assumptions in mem_init and the page table
dumping code, which assumed the I/O space to be 16MiB long through
seaparte hard-coded definitions.
This patch changes the definition of the PCI I/O space allocation to
live in asm/memory.h, along with the other VA space allocations. As the
fixmap allocation depends on the number of fixmap entries, this is moved
below the PCI I/O space allocation. Both the fixmap and PCI I/O space
are guarded with 2MB of padding. Sites assuming the I/O space was 16MiB
are moved over use new PCI_IO_{START,END} definitions, which will keep
in sync with the size of the IO space (now restored to 16MiB).
As a useful side effect, the use of the new PCI_IO_{START,END}
definitions prevents a build issue in the dumping code due to a (now
redundant) missing include of io.h for PCI_IOBASE.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
[catalin.marinas@arm.com: reorder FIXADDR and PCI_IO address_markers_idx enum]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2015-01-22 18:20:35 +00:00
|
|
|
" PCI I/O : 0x%16lx - 0x%16lx (%6ld MB)\n"
|
2016-02-16 13:52:40 +01:00
|
|
|
" memory : 0x%16lx - 0x%16lx (%6ld MB)\n",
|
2015-10-12 18:52:59 +03:00
|
|
|
#ifdef CONFIG_KASAN
|
|
|
|
MLG(KASAN_SHADOW_START, KASAN_SHADOW_END),
|
|
|
|
#endif
|
2016-02-16 13:52:40 +01:00
|
|
|
MLM(MODULES_VADDR, MODULES_END),
|
2014-07-16 17:42:43 +01:00
|
|
|
MLG(VMALLOC_START, VMALLOC_END),
|
2016-02-16 13:52:40 +01:00
|
|
|
MLK_ROUNDUP(__init_begin, __init_end),
|
BACKPORT: arm64: mm: fix location of _etext
As Kees Cook notes in the ARM counterpart of this patch [0]:
The _etext position is defined to be the end of the kernel text code,
and should not include any part of the data segments. This interferes
with things that might check memory ranges and expect executable code
up to _etext.
In particular, Kees is referring to the HARDENED_USERCOPY patch set [1],
which rejects attempts to call copy_to_user() on kernel ranges containing
executable code, but does allow access to the .rodata segment. Regardless
of whether one may or may not agree with the distinction, it makes sense
for _etext to have the same meaning across architectures.
So let's put _etext where it belongs, between .text and .rodata, and fix
up existing references to use __init_begin instead, which unlike _end_rodata
includes the exception and notes sections as well.
The _etext references in kaslr.c are left untouched, since its references
to [_stext, _etext) are meant to capture potential jump instruction targets,
and so disregarding .rodata is actually an improvement here.
[0] http://article.gmane.org/gmane.linux.kernel/2245084
[1] http://thread.gmane.org/gmane.linux.kernel.hardened.devel/2502
Reported-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 9fdc14c55cd6579d619ccd9d40982e0805e62b6d)
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-06-23 15:53:17 +02:00
|
|
|
MLK_ROUNDUP(_text, _etext),
|
|
|
|
MLK_ROUNDUP(__start_rodata, __init_begin),
|
2016-02-16 13:52:40 +01:00
|
|
|
MLK_ROUNDUP(_sdata, _edata),
|
2012-03-05 11:49:27 +00:00
|
|
|
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
arm64: vmemmap: use virtual projection of linear region
commit dfd55ad85e4a7fbaa82df12467515ac3c81e8a3e upstream.
Commit dd006da21646 ("arm64: mm: increase VA range of identity map") made
some changes to the memory mapping code to allow physical memory to reside
at an offset that exceeds the size of the virtual mapping.
However, since the size of the vmemmap area is proportional to the size of
the VA area, but it is populated relative to the physical space, we may
end up with the struct page array being mapped outside of the vmemmap
region. For instance, on my Seattle A0 box, I can see the following output
in the dmesg log.
vmemmap : 0xffffffbdc0000000 - 0xffffffbfc0000000 ( 8 GB maximum)
0xffffffbfc0000000 - 0xffffffbfd0000000 ( 256 MB actual)
We can fix this by deciding that the vmemmap region is not a projection of
the physical space, but of the virtual space above PAGE_OFFSET, i.e., the
linear region. This way, we are guaranteed that the vmemmap region is of
sufficient size, and we can even reduce the size by half.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2016-02-26 17:57:13 +01:00
|
|
|
MLG(VMEMMAP_START,
|
|
|
|
VMEMMAP_START + VMEMMAP_SIZE),
|
2016-01-29 11:59:03 +01:00
|
|
|
MLM((unsigned long)phys_to_page(memblock_start_of_DRAM()),
|
2012-03-05 11:49:27 +00:00
|
|
|
(unsigned long)virt_to_page(high_memory)),
|
|
|
|
#endif
|
2014-07-16 17:42:43 +01:00
|
|
|
MLK(FIXADDR_START, FIXADDR_TOP),
|
arm64: Fix overlapping VA allocations
PCI IO space was intended to be 16MiB, at 32MiB below MODULES_VADDR, but
commit d1e6dc91b532d3d3 ("arm64: Add architectural support for PCI")
extended this to cover the full 32MiB. The final 8KiB of this 32MiB is
also allocated for the fixmap, allowing for potential clashes between
the two.
This change was masked by assumptions in mem_init and the page table
dumping code, which assumed the I/O space to be 16MiB long through
seaparte hard-coded definitions.
This patch changes the definition of the PCI I/O space allocation to
live in asm/memory.h, along with the other VA space allocations. As the
fixmap allocation depends on the number of fixmap entries, this is moved
below the PCI I/O space allocation. Both the fixmap and PCI I/O space
are guarded with 2MB of padding. Sites assuming the I/O space was 16MiB
are moved over use new PCI_IO_{START,END} definitions, which will keep
in sync with the size of the IO space (now restored to 16MiB).
As a useful side effect, the use of the new PCI_IO_{START,END}
definitions prevents a build issue in the dumping code due to a (now
redundant) missing include of io.h for PCI_IOBASE.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
[catalin.marinas@arm.com: reorder FIXADDR and PCI_IO address_markers_idx enum]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2015-01-22 18:20:35 +00:00
|
|
|
MLM(PCI_IO_START, PCI_IO_END),
|
2016-01-29 11:59:03 +01:00
|
|
|
MLM(__phys_to_virt(memblock_start_of_DRAM()),
|
|
|
|
(unsigned long)high_memory));
|
2012-03-05 11:49:27 +00:00
|
|
|
|
|
|
|
#undef MLK
|
|
|
|
#undef MLM
|
|
|
|
#undef MLK_ROUNDUP
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check boundaries twice: Some fundamental inconsistencies can be
|
|
|
|
* detected at build time already.
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
BUILD_BUG_ON(TASK_SIZE_32 > TASK_SIZE_64);
|
|
|
|
#endif
|
|
|
|
BUILD_BUG_ON(TASK_SIZE_64 > MODULES_VADDR);
|
|
|
|
BUG_ON(TASK_SIZE_64 > MODULES_VADDR);
|
|
|
|
|
2013-07-03 15:03:49 -07:00
|
|
|
if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) {
|
2012-03-05 11:49:27 +00:00
|
|
|
extern int sysctl_overcommit_memory;
|
|
|
|
/*
|
|
|
|
* On a machine this small we won't get anywhere without
|
|
|
|
* overcommit, so turn it on by default.
|
|
|
|
*/
|
|
|
|
sysctl_overcommit_memory = OVERCOMMIT_ALWAYS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-09 15:38:33 -07:00
|
|
|
static inline void poison_init_mem(void *s, size_t count)
|
|
|
|
{
|
|
|
|
memset(s, 0, count);
|
|
|
|
}
|
|
|
|
|
2012-03-05 11:49:27 +00:00
|
|
|
void free_initmem(void)
|
|
|
|
{
|
2016-08-25 19:05:37 -07:00
|
|
|
free_initmem_default(0);
|
2016-02-16 13:52:40 +01:00
|
|
|
fixup_init();
|
2012-03-05 11:49:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
|
|
2015-07-27 03:32:53 +01:00
|
|
|
static int keep_initrd __initdata;
|
2012-03-05 11:49:27 +00:00
|
|
|
|
2015-07-27 03:32:53 +01:00
|
|
|
void __init free_initrd_mem(unsigned long start, unsigned long end)
|
2012-03-05 11:49:27 +00:00
|
|
|
{
|
2015-01-16 13:56:38 +00:00
|
|
|
if (!keep_initrd)
|
2013-07-03 15:02:54 -07:00
|
|
|
free_reserved_area((void *)start, (void *)end, 0, "initrd");
|
2012-03-05 11:49:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int __init keepinitrd_setup(char *__unused)
|
|
|
|
{
|
|
|
|
keep_initrd = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
__setup("keepinitrd", keepinitrd_setup);
|
|
|
|
#endif
|
2014-10-31 20:53:08 -07:00
|
|
|
|
|
|
|
#ifdef CONFIG_KERNEL_TEXT_RDONLY
|
|
|
|
void set_kernel_text_ro(void)
|
|
|
|
{
|
|
|
|
unsigned long start = PFN_ALIGN(_stext);
|
|
|
|
unsigned long end = PFN_ALIGN(_etext);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the kernel identity mapping for text RO.
|
|
|
|
*/
|
|
|
|
set_memory_ro(start, (end - start) >> PAGE_SHIFT);
|
|
|
|
}
|
|
|
|
#endif
|
2016-02-16 13:52:42 +01:00
|
|
|
/*
|
|
|
|
* Dump out memory limit information on panic.
|
|
|
|
*/
|
|
|
|
static int dump_mem_limit(struct notifier_block *self, unsigned long v, void *p)
|
|
|
|
{
|
|
|
|
if (memory_limit != (phys_addr_t)ULLONG_MAX) {
|
|
|
|
pr_emerg("Memory Limit: %llu MB\n", memory_limit >> 20);
|
|
|
|
} else {
|
|
|
|
pr_emerg("Memory Limit: none\n");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct notifier_block mem_limit_notifier = {
|
|
|
|
.notifier_call = dump_mem_limit,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init register_mem_limit_dumper(void)
|
|
|
|
{
|
|
|
|
atomic_notifier_chain_register(&panic_notifier_list,
|
|
|
|
&mem_limit_notifier);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
__initcall(register_mem_limit_dumper);
|
2017-04-28 14:09:53 +05:30
|
|
|
|
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
|
|
int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
|
|
|
|
{
|
|
|
|
pg_data_t *pgdat;
|
|
|
|
struct zone *zone;
|
|
|
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
|
|
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
arm64: Memory hotplug support for arm64 platform
This is a second and improved version of the patch previously released
in [3].
It builds on the work by Scott Branden [2] and, henceforth,
it needs to be applied on top of Scott's patches [2].
Comments are very welcome.
Changes from the original patchset and known issues:
- Compared to Scott's original patchset, this work adds the mapping of
the new hotplugged pages into the kernel page tables. This is done by
copying the old swapper_pg_dir over a new page, adding the new mappings,
and then switching to the newly built pg_dir (see `hotplug_paging` in
arch/arm64/mmu.c). There might be better ways to to this: suggestions
are more than welcome.
- The stub function for `arch_remove_memory` has been removed for now; we
are working in parallel on memory hot remove, and we plan to contribute
it as a separate patch.
- Corresponding Kconfig flags have been added;
- Note that this patch does not work when NUMA is enabled; in fact,
the function `memory_add_physaddr_to_nid` does not have an
implementation when the NUMA flag is on: this function is supposed to
return the nid the hotplugged memory should be associated with. However
it is not really clear to us yet what the semantics of this function
in the context of a NUMA system should be. A quick and dirty fix would
be to always attach to the first available NUMA node.
- In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the
nomap memory block flags to satisfy preconditions and postconditions of
`__add_pages` and postconditions of `arch_add_memory`. Compared to
memory hotplug implementation for other architectures, the "issue"
seems to be in the implemenation of `pfn_valid`. Suggestions on how
to cleanly avoid this hack are welcome.
This patchset can be tested by starting the kernel with the `mem=X` flag, where
X is less than the total available physical memory and has to be multiple of
MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU
capable to emulate physical hotplug on arm64 platform.
To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag
needs to be set to true. Then, after memory is physically hotplugged,
the standard two steps to make it available (as also documented in
Documentation/memory-hotplug.txt) are:
(1) Notify memory hot-add
echo '0xYY000000' > /sys/devices/system/memory/probe
where 0xYY000000 is the first physical address of the new memory section.
(2) Online new memory block(s)
echo online > /sys/devices/system/memory/memoryXXX/state
-- or --
echo online_movable > /sys/devices/system/memory/memoryXXX/state
where XXX corresponds to the ids of newly added blocks.
Onlining can optionally be automatic at hot-add notification by enabling
the global flag:
echo online > /sys/devices/system/memory/auto_online_blocks
or by setting the corresponding config flag in the kernel build.
Again, any comment is highly appreciated.
[1] https://lkml.org/lkml/2016/11/17/49
[2] https://lkml.org/lkml/2016/12/1/811
[3] https://lkml.org/lkml/2016/12/14/188
Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
[arunks@codeaurora.org: fix to pass checker test]
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-28 14:14:14 +05:30
|
|
|
unsigned long end_pfn = start_pfn + nr_pages;
|
|
|
|
unsigned long max_sparsemem_pfn = 1UL << (MAX_PHYSMEM_BITS-PAGE_SHIFT);
|
2017-04-28 14:09:53 +05:30
|
|
|
int ret;
|
|
|
|
|
arm64: Memory hotplug support for arm64 platform
This is a second and improved version of the patch previously released
in [3].
It builds on the work by Scott Branden [2] and, henceforth,
it needs to be applied on top of Scott's patches [2].
Comments are very welcome.
Changes from the original patchset and known issues:
- Compared to Scott's original patchset, this work adds the mapping of
the new hotplugged pages into the kernel page tables. This is done by
copying the old swapper_pg_dir over a new page, adding the new mappings,
and then switching to the newly built pg_dir (see `hotplug_paging` in
arch/arm64/mmu.c). There might be better ways to to this: suggestions
are more than welcome.
- The stub function for `arch_remove_memory` has been removed for now; we
are working in parallel on memory hot remove, and we plan to contribute
it as a separate patch.
- Corresponding Kconfig flags have been added;
- Note that this patch does not work when NUMA is enabled; in fact,
the function `memory_add_physaddr_to_nid` does not have an
implementation when the NUMA flag is on: this function is supposed to
return the nid the hotplugged memory should be associated with. However
it is not really clear to us yet what the semantics of this function
in the context of a NUMA system should be. A quick and dirty fix would
be to always attach to the first available NUMA node.
- In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the
nomap memory block flags to satisfy preconditions and postconditions of
`__add_pages` and postconditions of `arch_add_memory`. Compared to
memory hotplug implementation for other architectures, the "issue"
seems to be in the implemenation of `pfn_valid`. Suggestions on how
to cleanly avoid this hack are welcome.
This patchset can be tested by starting the kernel with the `mem=X` flag, where
X is less than the total available physical memory and has to be multiple of
MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU
capable to emulate physical hotplug on arm64 platform.
To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag
needs to be set to true. Then, after memory is physically hotplugged,
the standard two steps to make it available (as also documented in
Documentation/memory-hotplug.txt) are:
(1) Notify memory hot-add
echo '0xYY000000' > /sys/devices/system/memory/probe
where 0xYY000000 is the first physical address of the new memory section.
(2) Online new memory block(s)
echo online > /sys/devices/system/memory/memoryXXX/state
-- or --
echo online_movable > /sys/devices/system/memory/memoryXXX/state
where XXX corresponds to the ids of newly added blocks.
Onlining can optionally be automatic at hot-add notification by enabling
the global flag:
echo online > /sys/devices/system/memory/auto_online_blocks
or by setting the corresponding config flag in the kernel build.
Again, any comment is highly appreciated.
[1] https://lkml.org/lkml/2016/11/17/49
[2] https://lkml.org/lkml/2016/12/1/811
[3] https://lkml.org/lkml/2016/12/14/188
Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
[arunks@codeaurora.org: fix to pass checker test]
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-28 14:14:14 +05:30
|
|
|
if (end_pfn > max_sparsemem_pfn) {
|
|
|
|
pr_err("end_pfn too big");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
hotplug_paging(start, size);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Mark the first page in the range as unusable. This is needed
|
|
|
|
* because __add_section (within __add_pages) wants pfn_valid
|
|
|
|
* of it to be false, and in arm64 pfn falid is implemented by
|
|
|
|
* just checking at the nomap flag for existing blocks.
|
|
|
|
*
|
|
|
|
* A small trick here is that __add_section() requires only
|
|
|
|
* phys_start_pfn (that is the first pfn of a section) to be
|
|
|
|
* invalid. Regardless of whether it was assumed (by the function
|
|
|
|
* author) that all pfns within a section are either all valid
|
|
|
|
* or all invalid, it allows to avoid looping twice (once here,
|
|
|
|
* second when memblock_clear_nomap() is called) through all
|
|
|
|
* pfns of the section and modify only one pfn. Thanks to that,
|
|
|
|
* further, in __add_zone() only this very first pfn is skipped
|
|
|
|
* and corresponding page is not flagged reserved. Therefore it
|
|
|
|
* is enough to correct this setup only for it.
|
|
|
|
*
|
|
|
|
* When arch_add_memory() returns the walk_memory_range() function
|
|
|
|
* is called and passed with online_memory_block() callback,
|
|
|
|
* which execution finally reaches the memory_block_action()
|
|
|
|
* function, where also only the first pfn of a memory block is
|
|
|
|
* checked to be reserved. Above, it was first pfn of a section,
|
|
|
|
* here it is a block but
|
|
|
|
* (drivers/base/memory.c):
|
|
|
|
* sections_per_block = block_sz / MIN_MEMORY_BLOCK_SIZE;
|
|
|
|
* (include/linux/memory.h):
|
|
|
|
* #define MIN_MEMORY_BLOCK_SIZE (1UL << SECTION_SIZE_BITS)
|
|
|
|
* so we can consider block and section equivalently
|
|
|
|
*/
|
|
|
|
memblock_mark_nomap(start, 1<<PAGE_SHIFT);
|
|
|
|
|
2017-04-28 14:09:53 +05:30
|
|
|
pgdat = NODE_DATA(nid);
|
|
|
|
|
|
|
|
zone = pgdat->node_zones +
|
|
|
|
zone_for_memory(nid, start, size, ZONE_NORMAL, for_device);
|
|
|
|
ret = __add_pages(nid, zone, start_pfn, nr_pages);
|
|
|
|
|
arm64: Memory hotplug support for arm64 platform
This is a second and improved version of the patch previously released
in [3].
It builds on the work by Scott Branden [2] and, henceforth,
it needs to be applied on top of Scott's patches [2].
Comments are very welcome.
Changes from the original patchset and known issues:
- Compared to Scott's original patchset, this work adds the mapping of
the new hotplugged pages into the kernel page tables. This is done by
copying the old swapper_pg_dir over a new page, adding the new mappings,
and then switching to the newly built pg_dir (see `hotplug_paging` in
arch/arm64/mmu.c). There might be better ways to to this: suggestions
are more than welcome.
- The stub function for `arch_remove_memory` has been removed for now; we
are working in parallel on memory hot remove, and we plan to contribute
it as a separate patch.
- Corresponding Kconfig flags have been added;
- Note that this patch does not work when NUMA is enabled; in fact,
the function `memory_add_physaddr_to_nid` does not have an
implementation when the NUMA flag is on: this function is supposed to
return the nid the hotplugged memory should be associated with. However
it is not really clear to us yet what the semantics of this function
in the context of a NUMA system should be. A quick and dirty fix would
be to always attach to the first available NUMA node.
- In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the
nomap memory block flags to satisfy preconditions and postconditions of
`__add_pages` and postconditions of `arch_add_memory`. Compared to
memory hotplug implementation for other architectures, the "issue"
seems to be in the implemenation of `pfn_valid`. Suggestions on how
to cleanly avoid this hack are welcome.
This patchset can be tested by starting the kernel with the `mem=X` flag, where
X is less than the total available physical memory and has to be multiple of
MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU
capable to emulate physical hotplug on arm64 platform.
To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag
needs to be set to true. Then, after memory is physically hotplugged,
the standard two steps to make it available (as also documented in
Documentation/memory-hotplug.txt) are:
(1) Notify memory hot-add
echo '0xYY000000' > /sys/devices/system/memory/probe
where 0xYY000000 is the first physical address of the new memory section.
(2) Online new memory block(s)
echo online > /sys/devices/system/memory/memoryXXX/state
-- or --
echo online_movable > /sys/devices/system/memory/memoryXXX/state
where XXX corresponds to the ids of newly added blocks.
Onlining can optionally be automatic at hot-add notification by enabling
the global flag:
echo online > /sys/devices/system/memory/auto_online_blocks
or by setting the corresponding config flag in the kernel build.
Again, any comment is highly appreciated.
[1] https://lkml.org/lkml/2016/11/17/49
[2] https://lkml.org/lkml/2016/12/1/811
[3] https://lkml.org/lkml/2016/12/14/188
Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
[arunks@codeaurora.org: fix to pass checker test]
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-28 14:14:14 +05:30
|
|
|
/*
|
|
|
|
* Make the pages usable after they have been added.
|
|
|
|
* This will make pfn_valid return true
|
|
|
|
*/
|
|
|
|
memblock_clear_nomap(start, 1<<PAGE_SHIFT);
|
2017-04-28 14:09:53 +05:30
|
|
|
|
arm64: Memory hotplug support for arm64 platform
This is a second and improved version of the patch previously released
in [3].
It builds on the work by Scott Branden [2] and, henceforth,
it needs to be applied on top of Scott's patches [2].
Comments are very welcome.
Changes from the original patchset and known issues:
- Compared to Scott's original patchset, this work adds the mapping of
the new hotplugged pages into the kernel page tables. This is done by
copying the old swapper_pg_dir over a new page, adding the new mappings,
and then switching to the newly built pg_dir (see `hotplug_paging` in
arch/arm64/mmu.c). There might be better ways to to this: suggestions
are more than welcome.
- The stub function for `arch_remove_memory` has been removed for now; we
are working in parallel on memory hot remove, and we plan to contribute
it as a separate patch.
- Corresponding Kconfig flags have been added;
- Note that this patch does not work when NUMA is enabled; in fact,
the function `memory_add_physaddr_to_nid` does not have an
implementation when the NUMA flag is on: this function is supposed to
return the nid the hotplugged memory should be associated with. However
it is not really clear to us yet what the semantics of this function
in the context of a NUMA system should be. A quick and dirty fix would
be to always attach to the first available NUMA node.
- In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the
nomap memory block flags to satisfy preconditions and postconditions of
`__add_pages` and postconditions of `arch_add_memory`. Compared to
memory hotplug implementation for other architectures, the "issue"
seems to be in the implemenation of `pfn_valid`. Suggestions on how
to cleanly avoid this hack are welcome.
This patchset can be tested by starting the kernel with the `mem=X` flag, where
X is less than the total available physical memory and has to be multiple of
MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU
capable to emulate physical hotplug on arm64 platform.
To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag
needs to be set to true. Then, after memory is physically hotplugged,
the standard two steps to make it available (as also documented in
Documentation/memory-hotplug.txt) are:
(1) Notify memory hot-add
echo '0xYY000000' > /sys/devices/system/memory/probe
where 0xYY000000 is the first physical address of the new memory section.
(2) Online new memory block(s)
echo online > /sys/devices/system/memory/memoryXXX/state
-- or --
echo online_movable > /sys/devices/system/memory/memoryXXX/state
where XXX corresponds to the ids of newly added blocks.
Onlining can optionally be automatic at hot-add notification by enabling
the global flag:
echo online > /sys/devices/system/memory/auto_online_blocks
or by setting the corresponding config flag in the kernel build.
Again, any comment is highly appreciated.
[1] https://lkml.org/lkml/2016/11/17/49
[2] https://lkml.org/lkml/2016/12/1/811
[3] https://lkml.org/lkml/2016/12/14/188
Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
[arunks@codeaurora.org: fix to pass checker test]
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-28 14:14:14 +05:30
|
|
|
/*
|
|
|
|
* This is a hack to avoid having to mix arch specific code
|
|
|
|
* into arch independent code. SetPageReserved is supposed
|
|
|
|
* to be called by __add_zone (within __add_section, within
|
|
|
|
* __add_pages). However, when it is called there, it assumes that
|
|
|
|
* pfn_valid returns true. For the way pfn_valid is implemented
|
|
|
|
* in arm64 (a check on the nomap flag), the only way to make
|
|
|
|
* this evaluate true inside __add_zone is to clear the nomap
|
|
|
|
* flags of blocks in architecture independent code.
|
|
|
|
*
|
|
|
|
* To avoid this, we set the Reserved flag here after we cleared
|
|
|
|
* the nomap flag in the line above.
|
|
|
|
*/
|
|
|
|
SetPageReserved(pfn_to_page(start_pfn));
|
2017-04-28 14:09:53 +05:30
|
|
|
|
|
|
|
if (ret)
|
arm64: Memory hotplug support for arm64 platform
This is a second and improved version of the patch previously released
in [3].
It builds on the work by Scott Branden [2] and, henceforth,
it needs to be applied on top of Scott's patches [2].
Comments are very welcome.
Changes from the original patchset and known issues:
- Compared to Scott's original patchset, this work adds the mapping of
the new hotplugged pages into the kernel page tables. This is done by
copying the old swapper_pg_dir over a new page, adding the new mappings,
and then switching to the newly built pg_dir (see `hotplug_paging` in
arch/arm64/mmu.c). There might be better ways to to this: suggestions
are more than welcome.
- The stub function for `arch_remove_memory` has been removed for now; we
are working in parallel on memory hot remove, and we plan to contribute
it as a separate patch.
- Corresponding Kconfig flags have been added;
- Note that this patch does not work when NUMA is enabled; in fact,
the function `memory_add_physaddr_to_nid` does not have an
implementation when the NUMA flag is on: this function is supposed to
return the nid the hotplugged memory should be associated with. However
it is not really clear to us yet what the semantics of this function
in the context of a NUMA system should be. A quick and dirty fix would
be to always attach to the first available NUMA node.
- In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the
nomap memory block flags to satisfy preconditions and postconditions of
`__add_pages` and postconditions of `arch_add_memory`. Compared to
memory hotplug implementation for other architectures, the "issue"
seems to be in the implemenation of `pfn_valid`. Suggestions on how
to cleanly avoid this hack are welcome.
This patchset can be tested by starting the kernel with the `mem=X` flag, where
X is less than the total available physical memory and has to be multiple of
MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU
capable to emulate physical hotplug on arm64 platform.
To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag
needs to be set to true. Then, after memory is physically hotplugged,
the standard two steps to make it available (as also documented in
Documentation/memory-hotplug.txt) are:
(1) Notify memory hot-add
echo '0xYY000000' > /sys/devices/system/memory/probe
where 0xYY000000 is the first physical address of the new memory section.
(2) Online new memory block(s)
echo online > /sys/devices/system/memory/memoryXXX/state
-- or --
echo online_movable > /sys/devices/system/memory/memoryXXX/state
where XXX corresponds to the ids of newly added blocks.
Onlining can optionally be automatic at hot-add notification by enabling
the global flag:
echo online > /sys/devices/system/memory/auto_online_blocks
or by setting the corresponding config flag in the kernel build.
Again, any comment is highly appreciated.
[1] https://lkml.org/lkml/2016/11/17/49
[2] https://lkml.org/lkml/2016/12/1/811
[3] https://lkml.org/lkml/2016/12/14/188
Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296
Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com>
Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com>
Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25
Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
[arunks@codeaurora.org: fix to pass checker test]
Signed-off-by: Arun KS <arunks@codeaurora.org>
2017-04-28 14:14:14 +05:30
|
|
|
pr_warn("%s: Problem encountered in __add_pages() ret=%d\n",
|
2017-04-28 14:09:53 +05:30
|
|
|
__func__, ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-04-28 14:18:26 +05:30
|
|
|
#ifdef CONFIG_MEMORY_HOTREMOVE
|
|
|
|
static void kernel_physical_mapping_remove(unsigned long start,
|
|
|
|
unsigned long end)
|
|
|
|
{
|
|
|
|
start = (unsigned long)__va(start);
|
|
|
|
end = (unsigned long)__va(end);
|
|
|
|
|
|
|
|
remove_pagetable(start, end, true);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int arch_remove_memory(u64 start, u64 size)
|
|
|
|
{
|
|
|
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
|
|
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
|
|
|
struct page *page = pfn_to_page(start_pfn);
|
|
|
|
struct zone *zone;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
zone = page_zone(page);
|
|
|
|
ret = __remove_pages(zone, start_pfn, nr_pages);
|
|
|
|
WARN_ON_ONCE(ret);
|
|
|
|
|
|
|
|
kernel_physical_mapping_remove(start, start + size);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_MEMORY_HOTREMOVE */
|
2017-09-15 13:52:00 +05:30
|
|
|
static int arm64_online_page(struct page *page)
|
|
|
|
{
|
|
|
|
unsigned long target_pfn = page_to_pfn(page);
|
|
|
|
unsigned long limit = __phys_to_pfn(bootloader_memory_limit);
|
|
|
|
|
|
|
|
if (target_pfn >= limit)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
__online_page_set_limits(page);
|
|
|
|
__online_page_increment_counters(page);
|
|
|
|
__online_page_free(page);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init arm64_memory_hotplug_init(void)
|
|
|
|
{
|
|
|
|
set_online_page_callback(&arm64_online_page);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
subsys_initcall(arm64_memory_hotplug_init);
|
2017-04-28 14:18:26 +05:30
|
|
|
#endif /* CONFIG_MEMORY_HOTPLUG */
|