pussuw commented on code in PR #6069: URL: https://github.com/apache/incubator-nuttx/pull/6069#discussion_r859608227
########## arch/risc-v/include/arch.h: ########## @@ -70,6 +71,18 @@ #define STACK_ALIGNMENT 16 #define STACK_FRAME_SIZE __XSTR(STACK_ALIGNMENT) +/* Provide the maximum amount of page table levels per MMU type */ + +#ifdef CONFIG_ARCH_MMU_TYPE_SV39 +#define ARCH_PGT_MAX_LEVELS (3) Review Comment: Yes ########## arch/risc-v/src/common/riscv_addrenv.c: ########## @@ -0,0 +1,788 @@ +/**************************************************************************** + * arch/risc-v/src/common/riscv_addrenv.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Address Environment Interfaces + * + * Low-level interfaces used in binfmt/ to instantiate tasks with address + * environments. These interfaces all operate on type group_addrenv_t which + * is an abstract representation of a task group's address environment and + * must be defined in arch/arch.h if CONFIG_ARCH_ADDRENV is defined. + * + * up_addrenv_create - Create an address environment + * up_addrenv_destroy - Destroy an address environment. + * up_addrenv_vtext - Returns the virtual base address of the .text + * address environment + * up_addrenv_vdata - Returns the virtual base address of the .bss/.data + * address environment + * up_addrenv_heapsize - Returns the size of the initial heap allocation. + * up_addrenv_select - Instantiate an address environment + * up_addrenv_restore - Restore an address environment + * up_addrenv_clone - Copy an address environment from one location to + * another. + * + * Higher-level interfaces used by the tasking logic. These interfaces are + * used by the functions in sched/ and all operate on the thread which whose + * group been assigned an address environment by up_addrenv_clone(). + * + * up_addrenv_attach - Clone the address environment assigned to one TCB + * to another. This operation is done when a pthread + * is created that share's the same address + * environment. + * up_addrenv_detach - Release the threads reference to an address + * environment when a task/thread exits. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <assert.h> +#include <debug.h> + +#include <nuttx/addrenv.h> +#include <nuttx/arch.h> +#include <nuttx/irq.h> +#include <nuttx/pgalloc.h> + +#include <arch/barriers.h> + +#include "pgalloc.h" +#include "riscv_mmu.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Only CONFIG_BUILD_KERNEL is supported (i.e. tested) */ + +#ifndef CONFIG_BUILD_KERNEL +# error "This module is intended to be used with CONFIG_BUILD_KERNEL" +#endif + +/* Entries per PGT */ + +#define ENTRIES_PER_PGT (RV_MMU_PAGE_ENTRIES) + +/* Base address for address environment */ + +#define ADDRENV_VBASE (CONFIG_ARCH_DATA_VBASE) + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +extern uintptr_t g_kernel_mappings; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: map_spgtables + * + * Description: + * Map vaddr to the static page tables. + * + * Input Parameters: + * addrenv - Describes the address environment + * + ****************************************************************************/ + +static void map_spgtables(group_addrenv_t *addrenv, uintptr_t vaddr) +{ + int i; + uintptr_t prev; + + /* Start from L1, and connect until max level - 1 */ + + prev = riscv_pgvaddr(addrenv->spgtables[0]); + + /* Check if the mapping already exists */ + + if (mmu_ln_getentry(1, prev, vaddr) != 0) + { + return; + } + + /* No mapping yet, create it */ + + for (i = 0; i < (ARCH_SPGTS - 1); i++) + { + uintptr_t next = riscv_pgvaddr(addrenv->spgtables[i + 1]); + mmu_ln_setentry(i + 1, prev, next, vaddr, MMU_UPGT_FLAGS); + prev = next; + } +} + +/**************************************************************************** + * Name: create_spgtables + * + * Description: + * Create the static page tables. Allocate memory for them and connect them + * together. + * + * Input Parameters: + * addrenv - Describes the address environment + * + * Returned value: + * Amount of pages created on success; a negated errno value on failure + * + ****************************************************************************/ + +static int create_spgtables(group_addrenv_t *addrenv) +{ + int i; + uintptr_t paddr; + + for (i = 0; i < ARCH_SPGTS; i++) + { + paddr = mm_pgalloc(1); + if (!paddr) Review Comment: Yes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
