Re: [PATCH v3 1/3] riscv: Move kernel mapping to vmalloc zone

From: Alex Ghiti
Date: Thu May 28 2020 - 09:07:45 EST

Next message: Mark Brown: "Re: [PATCH v8 00/13] add ecspi ERR009165 for i.mx6/7 soc family"
Previous message: Thomas Bogendoerfer: "Re: [PATCH] MIPS: Loongson64: Remove not used pci.c"
In reply to: Alex Ghiti: "Re: [PATCH v3 1/3] riscv: Move kernel mapping to vmalloc zone"
Next in thread: kbuild test robot: "Re: [PATCH v3 1/3] riscv: Move kernel mapping to vmalloc zone"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Zong,

Le 5/27/20 Ã 3:29 AM, Alex Ghiti a ÃcritÂ:

Le 5/27/20 Ã 2:05 AM, Zong Li a ÃcritÂ:

On Wed, May 27, 2020 at 1:06 AM Alex Ghiti <alex@xxxxxxxx> wrote:

Hi Zong,

Le 5/26/20 Ã 5:43 AM, Zong Li a Ãcrit :

On Sun, May 24, 2020 at 4:54 PM Alexandre Ghiti <alex@xxxxxxxx> wrote:

This is a preparatory patch for relocatable kernel.

The kernel used to be linked at PAGE_OFFSET address and used to be loaded
physically at the beginning of the main memory. Therefore, we could use
the linear mapping for the kernel mapping.

But the relocated kernel base address will be different from PAGE_OFFSET
and since in the linear mapping, two different virtual addresses cannot
point to the same physical address, the kernel mapping needs to lie outside
the linear mapping.

In addition, because modules and BPF must be close to the kernel (inside
+-2GB window), the kernel is placed at the end of the vmalloc zone minus
2GB, which leaves room for modules and BPF. The kernel could not be
placed at the beginning of the vmalloc zone since other vmalloc
allocations from the kernel could get all the +-2GB window around the
kernel which would prevent new modules and BPF programs to be loaded.

Signed-off-by: Alexandre Ghiti <alex@xxxxxxxx>
---
ÂÂ arch/riscv/boot/loader.lds.SÂÂÂÂ |Â 3 +-
ÂÂ arch/riscv/include/asm/page.hÂÂÂ | 10 +++++-
ÂÂ arch/riscv/include/asm/pgtable.h | 37 +++++++++++++-------
ÂÂ arch/riscv/kernel/head.SÂÂÂÂÂÂÂÂ |Â 3 +-
ÂÂ arch/riscv/kernel/module.cÂÂÂÂÂÂ |Â 4 +--
ÂÂ arch/riscv/kernel/vmlinux.lds.SÂ |Â 3 +-
ÂÂ arch/riscv/mm/init.cÂÂÂÂÂÂÂÂÂÂÂÂ | 58 +++++++++++++++++++++++++-------
ÂÂ arch/riscv/mm/physaddr.cÂÂÂÂÂÂÂÂ |Â 2 +-
ÂÂ 8 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/arch/riscv/boot/loader.lds.S b/arch/riscv/boot/loader.lds.S
index 47a5003c2e28..62d94696a19c 100644
--- a/arch/riscv/boot/loader.lds.S
+++ b/arch/riscv/boot/loader.lds.S
@@ -1,13 +1,14 @@
ÂÂ /* SPDX-License-Identifier: GPL-2.0 */

ÂÂ #include <asm/page.h>
+#include <asm/pgtable.h>

ÂÂ OUTPUT_ARCH(riscv)
ÂÂ ENTRY(_start)

ÂÂ SECTIONS
ÂÂ {
-ÂÂÂÂÂÂ . = PAGE_OFFSET;
+ÂÂÂÂÂÂ . = KERNEL_LINK_ADDR;

ÂÂÂÂÂÂÂÂÂ .payload : {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ *(.payload)
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
index 2d50f76efe48..48bb09b6a9b7 100644
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@ -90,18 +90,26 @@ typedef struct page *pgtable_t;

ÂÂ #ifdef CONFIG_MMU
ÂÂ extern unsigned long va_pa_offset;
+extern unsigned long va_kernel_pa_offset;
ÂÂ extern unsigned long pfn_base;
ÂÂ #define ARCH_PFN_OFFSETÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ (pfn_base)
ÂÂ #else
ÂÂ #define va_pa_offsetÂÂÂÂÂÂÂÂÂÂ 0
+#define va_kernel_pa_offsetÂÂÂ 0
ÂÂ #define ARCH_PFN_OFFSETÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ (PAGE_OFFSET >> PAGE_SHIFT)
ÂÂ #endif /* CONFIG_MMU */

ÂÂ extern unsigned long max_low_pfn;
ÂÂ extern unsigned long min_low_pfn;
+extern unsigned long kernel_virt_addr;

ÂÂ #define __pa_to_va_nodebug(x)Â ((void *)((unsigned long) (x) + va_pa_offset))
-#define __va_to_pa_nodebug(x)Â ((unsigned long)(x) - va_pa_offset)
+#define linear_mapping_va_to_pa(x)ÂÂÂÂ ((unsigned long)(x) - va_pa_offset)
+#define kernel_mapping_va_to_pa(x)ÂÂÂÂ \
+ÂÂÂÂÂÂ ((unsigned long)(x) - va_kernel_pa_offset)
+#define __va_to_pa_nodebug(x)ÂÂÂÂÂÂÂÂÂ \
+ÂÂÂÂÂÂ (((x) >= PAGE_OFFSET) ?ÂÂÂÂÂÂÂÂ \
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ linear_mapping_va_to_pa(x) : kernel_mapping_va_to_pa(x))

ÂÂ #ifdef CONFIG_DEBUG_VIRTUAL
ÂÂ extern phys_addr_t __virt_to_phys(unsigned long x);
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 35b60035b6b0..25213cfaf680 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -11,23 +11,29 @@

ÂÂ #include <asm/pgtable-bits.h>

-#ifndef __ASSEMBLY__
-
-/* Page Upper Directory not used in RISC-V */
-#include <asm-generic/pgtable-nopud.h>
-#include <asm/page.h>
-#include <asm/tlbflush.h>
-#include <linux/mm_types.h>
-
-#ifdef CONFIG_MMU
+#ifndef CONFIG_MMU
+#define KERNEL_VIRT_ADDRÂÂÂÂÂÂ PAGE_OFFSET
+#define KERNEL_LINK_ADDRÂÂÂÂÂÂ PAGE_OFFSET
+#else
+/*
+ * Leave 2GB for modules and BPF that must lie within a 2GB range around
+ * the kernel.
+ */
+#define KERNEL_VIRT_ADDRÂÂÂÂÂÂ (VMALLOC_END - SZ_2G + 1)
+#define KERNEL_LINK_ADDRÂÂÂÂÂÂ KERNEL_VIRT_ADDR

ÂÂ #define VMALLOC_SIZEÂÂÂÂ (KERN_VIRT_SIZE >> 1)
ÂÂ #define VMALLOC_ENDÂÂÂÂÂ (PAGE_OFFSET - 1)
ÂÂ #define VMALLOC_STARTÂÂÂ (PAGE_OFFSET - VMALLOC_SIZE)

ÂÂ #define BPF_JIT_REGION_SIZEÂÂÂ (SZ_128M)
-#define BPF_JIT_REGION_STARTÂÂ (PAGE_OFFSET - BPF_JIT_REGION_SIZE)
-#define BPF_JIT_REGION_ENDÂÂÂÂ (VMALLOC_END)
+#define BPF_JIT_REGION_STARTÂÂ (kernel_virt_addr)
+#define BPF_JIT_REGION_ENDÂÂÂÂ (kernel_virt_addr + BPF_JIT_REGION_SIZE)
It seems to have a potential risk here, the region of bpf is
overlapping with kernel mapping, so if kernel size is bigger than
128MB, bpf region would be occupied and run out by kernel mapping.

Is there the risk as I mentioned?

Sorry I forgot to answer this one: I was confident that 128MB was large enough for kernel
and BPF. But I see no reason to leave this risk so I'll change kernel_virt_addr for _end so
BPF will have its 128MB reserved.

Thanks !

Alex

+
+#ifdef CONFIG_64BIT
+#define VMALLOC_MODULE_STARTÂÂ BPF_JIT_REGION_END
+#define VMALLOC_MODULE_ENDÂÂÂÂ VMALLOC_END
+#endif

Although kernel_virt_addr is a fixed address now, I think it could be
changed for the purpose of relocatable or KASLR, so if
kernel_virt_addr is moved to far from VMALLOC_END than 2G, the region
of module would be too big.

Yes you're right, that's wrong to allow modules to lie outside
the 2G window, thanks for noticing.

In addition, the region of module could be
+-2G around the kernel, so we don't be limited in one direction as
before. It seems to me that the region of the module could be decided
at runtime, for example, VMALLOC_MODULE_START is "&_end - 2G" and
VMLLOC_MODULE_END is "&_start + 2G".

I had tried that, but as we need to make sure BPF region is different
from the module's
that makes the macro definitions really cumbersome. I'll give a try
again anyway. And
I tried to use _end and _start here but it failed, I have to debug this.

I gave more thought about that and it is actually not possible to use the 2GB
before and after the kernel: modules can call exported functions from each other,
so we need to make sure that the "distance" between 2 modules is at most 2GB.
And I assume BPF comes with the same restrictions with respect to modules so the
kernel + BPF + modules must live in the same 2GB region.

I'll come with a v4 quickly,

Thanks,

Alex

ÂÂ I'm not sure whether the size of
region of bpf has to be 128MB for some particular reason, if not,
maybe the region of bpf could be the same with module to avoid being
run out by module.

On the contrary, BPF region must not be the same as module's since in
that case,
modules could take all the space and make BPF fail.

ok, I got it. Thanks for the explaining.

Thanks for your review Zong,

Alex

ÂÂ /*
ÂÂÂ * Roughly size the vmemmap space to be large enough to fit enough
@@ -57,9 +63,16 @@
ÂÂ #define FIXADDR_SIZEÂÂÂÂ PGDIR_SIZE
ÂÂ #endif
ÂÂ #define FIXADDR_STARTÂÂÂ (FIXADDR_TOP - FIXADDR_SIZE)
-
ÂÂ #endif

+#ifndef __ASSEMBLY__
+
+/* Page Upper Directory not used in RISC-V */
+#include <asm-generic/pgtable-nopud.h>
+#include <asm/page.h>
+#include <asm/tlbflush.h>
+#include <linux/mm_types.h>
+
ÂÂ #ifdef CONFIG_64BIT
ÂÂ #include <asm/pgtable-64.h>
ÂÂ #else
diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index 98a406474e7d..8f5bb7731327 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -49,7 +49,8 @@ ENTRY(_start)
ÂÂ #ifdef CONFIG_MMU
ÂÂ relocate:
ÂÂÂÂÂÂÂÂÂ /* Relocate return address */
-ÂÂÂÂÂÂ li a1, PAGE_OFFSET
+ÂÂÂÂÂÂ la a1, kernel_virt_addr
+ÂÂÂÂÂÂ REG_L a1, 0(a1)
ÂÂÂÂÂÂÂÂÂ la a2, _start
ÂÂÂÂÂÂÂÂÂ sub a1, a1, a2
ÂÂÂÂÂÂÂÂÂ add ra, ra, a1
diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index 8bbe5dbe1341..1a8fbe05accf 100644
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -392,12 +392,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
ÂÂ }

ÂÂ #if defined(CONFIG_MMU) && defined(CONFIG_64BIT)
-#define VMALLOC_MODULE_START \
-ÂÂÂÂÂÂÂ max(PFN_ALIGN((unsigned long)&_end - SZ_2G), VMALLOC_START)
ÂÂ void *module_alloc(unsigned long size)
ÂÂ {
ÂÂÂÂÂÂÂÂÂ return __vmalloc_node_range(size, 1, VMALLOC_MODULE_START,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ VMALLOC_END, GFP_KERNEL,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ VMALLOC_MODULE_END, GFP_KERNEL,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
__builtin_return_address(0));
ÂÂ }
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S
index 0339b6bbe11a..a9abde62909f 100644
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@@ -4,7 +4,8 @@
ÂÂÂ * Copyright (C) 2017 SiFive
ÂÂÂ */

-#define LOAD_OFFSET PAGE_OFFSET
+#include <asm/pgtable.h>
+#define LOAD_OFFSET KERNEL_LINK_ADDR
ÂÂ #include <asm/vmlinux.lds.h>
ÂÂ #include <asm/page.h>
ÂÂ #include <asm/cache.h>
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 27a334106708..17f108baec4f 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -22,6 +22,9 @@

ÂÂ #include "../kernel/head.h"

+unsigned long kernel_virt_addr = KERNEL_VIRT_ADDR;
+EXPORT_SYMBOL(kernel_virt_addr);
+
ÂÂ unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
__page_aligned_bss;
ÂÂ EXPORT_SYMBOL(empty_zero_page);
@@ -178,8 +181,12 @@ void __init setup_bootmem(void)
ÂÂ }

ÂÂ #ifdef CONFIG_MMU
+/* Offset between linear mapping virtual address and kernel load address */
ÂÂ unsigned long va_pa_offset;
ÂÂ EXPORT_SYMBOL(va_pa_offset);
+/* Offset between kernel mapping virtual address and kernel load address */
+unsigned long va_kernel_pa_offset;
+EXPORT_SYMBOL(va_kernel_pa_offset);
ÂÂ unsigned long pfn_base;
ÂÂ EXPORT_SYMBOL(pfn_base);

@@ -271,7 +278,7 @@ static phys_addr_t __init alloc_pmd(uintptr_t va)
ÂÂÂÂÂÂÂÂÂ if (mmu_enabled)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);

-ÂÂÂÂÂÂ pmd_num = (va - PAGE_OFFSET) >> PGDIR_SHIFT;
+ÂÂÂÂÂÂ pmd_num = (va - kernel_virt_addr) >> PGDIR_SHIFT;
ÂÂÂÂÂÂÂÂÂ BUG_ON(pmd_num >= NUM_EARLY_PMDS);
ÂÂÂÂÂÂÂÂÂ return (uintptr_t)&early_pmd[pmd_num * PTRS_PER_PMD];
ÂÂ }
@@ -372,14 +379,30 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
ÂÂ #error "setup_vm() is called from head.S before relocate so it should not use absolute addressing."
ÂÂ #endif

+static uintptr_t load_pa, load_sz;
+
+void create_kernel_page_table(pgd_t *pgdir, uintptr_t map_size)
+{
+ÂÂÂÂÂÂ uintptr_t va, end_va;
+
+ÂÂÂÂÂÂ end_va = kernel_virt_addr + load_sz;
+ÂÂÂÂÂÂ for (va = kernel_virt_addr; va < end_va; va += map_size)
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ create_pgd_mapping(pgdir, va,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ load_pa + (va - kernel_virt_addr),
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ map_size, PAGE_KERNEL_EXEC);
+}
+
ÂÂ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
ÂÂ {
ÂÂÂÂÂÂÂÂÂ uintptr_t va, end_va;
-ÂÂÂÂÂÂ uintptr_t load_pa = (uintptr_t)(&_start);
-ÂÂÂÂÂÂ uintptr_t load_sz = (uintptr_t)(&_end) - load_pa;
ÂÂÂÂÂÂÂÂÂ uintptr_t map_size = best_map_size(load_pa, MAX_EARLY_MAPPING_SIZE);

+ÂÂÂÂÂÂ load_pa = (uintptr_t)(&_start);
+ÂÂÂÂÂÂ load_sz = (uintptr_t)(&_end) - load_pa;
+
ÂÂÂÂÂÂÂÂÂ va_pa_offset = PAGE_OFFSET - load_pa;
+ÂÂÂÂÂÂ va_kernel_pa_offset = kernel_virt_addr - load_pa;
+
ÂÂÂÂÂÂÂÂÂ pfn_base = PFN_DOWN(load_pa);

ÂÂÂÂÂÂÂÂÂ /*
@@ -402,26 +425,22 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
ÂÂÂÂÂÂÂÂÂ create_pmd_mapping(fixmap_pmd, FIXADDR_START,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ (uintptr_t)fixmap_pte, PMD_SIZE, PAGE_TABLE);
ÂÂÂÂÂÂÂÂÂ /* Setup trampoline PGD and PMD */
-ÂÂÂÂÂÂ create_pgd_mapping(trampoline_pg_dir, PAGE_OFFSET,
+ÂÂÂÂÂÂ create_pgd_mapping(trampoline_pg_dir, kernel_virt_addr,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ (uintptr_t)trampoline_pmd, PGDIR_SIZE, PAGE_TABLE);
-ÂÂÂÂÂÂ create_pmd_mapping(trampoline_pmd, PAGE_OFFSET,
+ÂÂÂÂÂÂ create_pmd_mapping(trampoline_pmd, kernel_virt_addr,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ load_pa, PMD_SIZE, PAGE_KERNEL_EXEC);
ÂÂ #else
ÂÂÂÂÂÂÂÂÂ /* Setup trampoline PGD */
-ÂÂÂÂÂÂ create_pgd_mapping(trampoline_pg_dir, PAGE_OFFSET,
+ÂÂÂÂÂÂ create_pgd_mapping(trampoline_pg_dir, kernel_virt_addr,
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ load_pa, PGDIR_SIZE, PAGE_KERNEL_EXEC);
ÂÂ #endif

ÂÂÂÂÂÂÂÂÂ /*
-ÂÂÂÂÂÂÂ * Setup early PGD covering entire kernel which will allows
+ÂÂÂÂÂÂÂ * Setup early PGD covering entire kernel which will allow
ÂÂÂÂÂÂÂÂÂÂ * us to reach paging_init(). We map all memory banks later
ÂÂÂÂÂÂÂÂÂÂ * in setup_vm_final() below.
ÂÂÂÂÂÂÂÂÂÂ */
-ÂÂÂÂÂÂ end_va = PAGE_OFFSET + load_sz;
-ÂÂÂÂÂÂ for (va = PAGE_OFFSET; va < end_va; va += map_size)
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ create_pgd_mapping(early_pg_dir, va,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ load_pa + (va - PAGE_OFFSET),
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ map_size, PAGE_KERNEL_EXEC);
+ÂÂÂÂÂÂ create_kernel_page_table(early_pg_dir, map_size);

ÂÂÂÂÂÂÂÂÂ /* Create fixed mapping for early FDT parsing */
ÂÂÂÂÂÂÂÂÂ end_va = __fix_to_virt(FIX_FDT) + FIX_FDT_SIZE;
@@ -441,6 +460,7 @@ static void __init setup_vm_final(void)
ÂÂÂÂÂÂÂÂÂ uintptr_t va, map_size;
ÂÂÂÂÂÂÂÂÂ phys_addr_t pa, start, end;
ÂÂÂÂÂÂÂÂÂ struct memblock_region *reg;
+ÂÂÂÂÂÂ static struct vm_struct vm_kernel = { 0 };

ÂÂÂÂÂÂÂÂÂ /* Set mmu_enabled flag */
ÂÂÂÂÂÂÂÂÂ mmu_enabled = true;
@@ -467,10 +487,22 @@ static void __init setup_vm_final(void)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ for (pa = start; pa < end; pa += map_size) {
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ va = (uintptr_t)__va(pa);
create_pgd_mapping(swapper_pg_dir, va, pa,
-ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ map_size, PAGE_KERNEL_EXEC);
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ map_size, PAGE_KERNEL);
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ }
ÂÂÂÂÂÂÂÂÂ }

+ÂÂÂÂÂÂ /* Map the kernel */
+ÂÂÂÂÂÂ create_kernel_page_table(swapper_pg_dir, PMD_SIZE);
+
+ÂÂÂÂÂÂ /* Reserve the vmalloc area occupied by the kernel */
+ÂÂÂÂÂÂ vm_kernel.addr = (void *)kernel_virt_addr;
+ÂÂÂÂÂÂ vm_kernel.phys_addr = load_pa;
+ÂÂÂÂÂÂ vm_kernel.size = (load_sz + PMD_SIZE) & ~(PMD_SIZE - 1);
+ÂÂÂÂÂÂ vm_kernel.flags = VM_MAP | VM_NO_GUARD;
+ÂÂÂÂÂÂ vm_kernel.caller = __builtin_return_address(0);
+
+ÂÂÂÂÂÂ vm_area_add_early(&vm_kernel);
+
ÂÂÂÂÂÂÂÂÂ /* Clear fixmap PTE and PMD mappings */
ÂÂÂÂÂÂÂÂÂ clear_fixmap(FIX_PTE);
ÂÂÂÂÂÂÂÂÂ clear_fixmap(FIX_PMD);
diff --git a/arch/riscv/mm/physaddr.c b/arch/riscv/mm/physaddr.c
index e8e4dcd39fed..35703d5ef5fd 100644
--- a/arch/riscv/mm/physaddr.c
+++ b/arch/riscv/mm/physaddr.c
@@ -23,7 +23,7 @@ EXPORT_SYMBOL(__virt_to_phys);

ÂÂ phys_addr_t __phys_addr_symbol(unsigned long x)
ÂÂ {
-ÂÂÂÂÂÂ unsigned long kernel_start = (unsigned long)PAGE_OFFSET;
+ÂÂÂÂÂÂ unsigned long kernel_start = (unsigned long)kernel_virt_addr;
ÂÂÂÂÂÂÂÂÂ unsigned long kernel_end = (unsigned long)_end;

ÂÂÂÂÂÂÂÂÂ /*
--
2.20.1

Next message: Mark Brown: "Re: [PATCH v8 00/13] add ecspi ERR009165 for i.mx6/7 soc family"
Previous message: Thomas Bogendoerfer: "Re: [PATCH] MIPS: Loongson64: Remove not used pci.c"
In reply to: Alex Ghiti: "Re: [PATCH v3 1/3] riscv: Move kernel mapping to vmalloc zone"
Next in thread: kbuild test robot: "Re: [PATCH v3 1/3] riscv: Move kernel mapping to vmalloc zone"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]