From 68b55b3596178fde4b5ee98f037cb40ef7602f79 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Mon, 15 Sep 2025 00:31:48 -0400 Subject: os/amd64: Make MMU header standard per arch Lunos's virtual memory system is split into two parts, the machine dependent MMU layer and the machine independent layer. The MMU side exposes a standard bridge header that allows the MI layer to interface with the MD layer. Signed-off-by: Ian Moffett --- src/sys/arch/amd64/cpu/mmu.c | 2 +- src/sys/include/arch/amd64/mmu.h | 107 --------------------------------------- src/sys/include/vm/mmu.h | 107 +++++++++++++++++++++++++++++++++++++++ src/sys/vm/vm_init.c | 2 +- 4 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 src/sys/include/arch/amd64/mmu.h create mode 100644 src/sys/include/vm/mmu.h (limited to 'src/sys') diff --git a/src/sys/arch/amd64/cpu/mmu.c b/src/sys/arch/amd64/cpu/mmu.c index c08335e..3515bf4 100644 --- a/src/sys/arch/amd64/cpu/mmu.c +++ b/src/sys/arch/amd64/cpu/mmu.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/sys/include/arch/amd64/mmu.h b/src/sys/include/arch/amd64/mmu.h deleted file mode 100644 index 0edd0bc..0000000 --- a/src/sys/include/arch/amd64/mmu.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2025 Ian Marco Moffett and L5 engineers - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Description: Standard CPU MMU interface - * Author: Ian Marco Moffett - */ - -#ifndef _MACHINE_MMU_H_ -#define _MACHINE_MMU_H_ - -#include -#include -#include -#include - -/* - * Standard memory protection flags - */ -#define MMU_PROT_NONE 0x0 /* Nothing */ -#define MMU_PROT_READ PROT_READ /* Readable */ -#define MMU_PROT_WRITE PROT_WRITE /* Writable */ -#define MMU_PROT_EXEC PROT_EXEC /* Executable */ - -/* - * This will represent a virtual to - * physical address mapping. - * - * @va: Virtual address - * @pa: Physical address - */ -struct mmu_map { - vaddr_t va; - paddr_t pa; -}; - -/* - * Represents the current virtual address - * - * @cr3: The value of CR3 for this VAS - */ -struct vm_vas { - paddr_t cr3; -}; - -/* - * Global early kernel VAS structure used in the - * creation of new virtual address spaces. - */ -extern struct vm_vas g_kvas; - -/* - * Initialize arch-specific MMU state such as - * page tables, initial mappings and sanity checks. - * - * Returns zero on success, otherwise a less than zero - * value on failure. - */ -int mmu_init(void); - -/* - * Map a single virtual page into physical address - * space. - * - * @spec: Mapping specifier (virtual/physical address) - * @prot: Protection flags for the mapping (see MMU_PROT_*) - */ -int mmu_map_single(struct vm_vas *vas, struct mmu_map *spec, int prot); - -/* - * Get a pointer to the current virtual address - * space. - * - * @vasres_p: Resulting VAS is written here - * - * Returns zero on success, otherwise a less than zero - * value on failure. - */ -int mmu_this_vas(struct vm_vas *vasres_p); - -#endif /* !_MACHINE_MMU_H_ */ diff --git a/src/sys/include/vm/mmu.h b/src/sys/include/vm/mmu.h new file mode 100644 index 0000000..0edd0bc --- /dev/null +++ b/src/sys/include/vm/mmu.h @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and L5 engineers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Description: Standard CPU MMU interface + * Author: Ian Marco Moffett + */ + +#ifndef _MACHINE_MMU_H_ +#define _MACHINE_MMU_H_ + +#include +#include +#include +#include + +/* + * Standard memory protection flags + */ +#define MMU_PROT_NONE 0x0 /* Nothing */ +#define MMU_PROT_READ PROT_READ /* Readable */ +#define MMU_PROT_WRITE PROT_WRITE /* Writable */ +#define MMU_PROT_EXEC PROT_EXEC /* Executable */ + +/* + * This will represent a virtual to + * physical address mapping. + * + * @va: Virtual address + * @pa: Physical address + */ +struct mmu_map { + vaddr_t va; + paddr_t pa; +}; + +/* + * Represents the current virtual address + * + * @cr3: The value of CR3 for this VAS + */ +struct vm_vas { + paddr_t cr3; +}; + +/* + * Global early kernel VAS structure used in the + * creation of new virtual address spaces. + */ +extern struct vm_vas g_kvas; + +/* + * Initialize arch-specific MMU state such as + * page tables, initial mappings and sanity checks. + * + * Returns zero on success, otherwise a less than zero + * value on failure. + */ +int mmu_init(void); + +/* + * Map a single virtual page into physical address + * space. + * + * @spec: Mapping specifier (virtual/physical address) + * @prot: Protection flags for the mapping (see MMU_PROT_*) + */ +int mmu_map_single(struct vm_vas *vas, struct mmu_map *spec, int prot); + +/* + * Get a pointer to the current virtual address + * space. + * + * @vasres_p: Resulting VAS is written here + * + * Returns zero on success, otherwise a less than zero + * value on failure. + */ +int mmu_this_vas(struct vm_vas *vasres_p); + +#endif /* !_MACHINE_MMU_H_ */ diff --git a/src/sys/vm/vm_init.c b/src/sys/vm/vm_init.c index 1d1f733..2d0c507 100644 --- a/src/sys/vm/vm_init.c +++ b/src/sys/vm/vm_init.c @@ -31,8 +31,8 @@ #include #include #include +#include #include -#include /* standard */ /* os_kalloc.c */ -- cgit v1.2.3