Skip to content

Commit

Permalink
arm64: mm: Separate out vmemmap
Browse files Browse the repository at this point in the history
vmemmap is a preprocessor definition that depends on a variable,
memstart_addr. In a later patch we will need to expand the size of
the VMEMMAP region and optionally modify vmemmap depending upon
whether or not hardware support is available for 52-bit virtual
addresses.

This patch changes vmemmap to be a variable. As the old definition
depended on a variable load, this should not affect performance
noticeably.

Signed-off-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
  • Loading branch information
Steve Capper authored and Will Deacon committed Aug 9, 2019
1 parent c812026 commit c8b6d2c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm64/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
#define VMALLOC_START (MODULES_END)
#define VMALLOC_END (- PUD_SIZE - VMEMMAP_SIZE - SZ_64K)

#define vmemmap ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT))

#define FIRST_USER_ADDRESS 0UL

#ifndef __ASSEMBLY__
Expand All @@ -35,6 +33,8 @@
#include <linux/mm_types.h>
#include <linux/sched.h>

extern struct page *vmemmap;

extern void __pte_error(const char *file, int line, unsigned long val);
extern void __pmd_error(const char *file, int line, unsigned long val);
extern void __pud_error(const char *file, int line, unsigned long val);
Expand Down
5 changes: 5 additions & 0 deletions arch/arm64/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ EXPORT_SYMBOL(memstart_addr);
s64 physvirt_offset __ro_after_init;
EXPORT_SYMBOL(physvirt_offset);

struct page *vmemmap __ro_after_init;
EXPORT_SYMBOL(vmemmap);

phys_addr_t arm64_dma_phys_limit __ro_after_init;

#ifdef CONFIG_KEXEC_CORE
Expand Down Expand Up @@ -320,6 +323,8 @@ void __init arm64_memblock_init(void)

physvirt_offset = PHYS_OFFSET - PAGE_OFFSET;

vmemmap = ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT));

/*
* 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
Expand Down

0 comments on commit c8b6d2c

Please sign in to comment.