arch/risc-v: Add riscv_addrenv_pgmap

This is the counterpart for the kernel mapping functionality, i.e. it
implements the up_addrenv_xx functions needed by kmm_map

arch/risc-v/src/common/Make.defs

@@ -102,5 +102,5 @@ endif
 
 ifeq ($(CONFIG_ARCH_ADDRENV),y)
 CMN_CSRCS += riscv_addrenv.c riscv_pgalloc.c riscv_addrenv_perms.c
-CMN_CSRCS += riscv_addrenv_utils.c riscv_addrenv_shm.c
+CMN_CSRCS += riscv_addrenv_utils.c riscv_addrenv_shm.c riscv_addrenv_pgmap.c
 endif

arch/risc-v/src/common/riscv_addrenv_pgmap.c

@@ -0,0 +1,239 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_addrenv_pgmap.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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <nuttx/arch.h>
+#include <nuttx/addrenv.h>
+#include <nuttx/irq.h>
+#include <nuttx/pgalloc.h>
+#include <nuttx/sched.h>
+
+#include <arch/barriers.h>
+
+#include <sys/mman.h>
+
+#include "pgalloc.h"
+#include "riscv_mmu.h"
+
+#ifdef CONFIG_BUILD_KERNEL
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_addrenv_find_page
+ *
+ * Description:
+ *   Find physical page mapped to user virtual address from the address
+ *   environment page directory.
+ *
+ * Input Parameters:
+ *   addrenv - The user address environment.
+ *   vaddr   - The user virtual address
+ *
+ * Returned Value:
+ *   Page physical address on success; NULL on failure.
+ *
+ ****************************************************************************/
+
+uintptr_t up_addrenv_find_page(FAR arch_addrenv_t *addrenv, uintptr_t vaddr)
+{
+  uintptr_t pgdir;
+  uintptr_t lnvaddr;
+  uintptr_t paddr;
+  uint32_t  ptlevel;
+
+  /* If vaddr is not user space, get out */
+
+  if (!riscv_uservaddr(vaddr))
+    {
+      return 0;
+    }
+
+  /* Get the kernel addressable virtual address of the page directory root */
+
+  pgdir = riscv_pgvaddr(mmu_satp_to_paddr(addrenv->satp));
+  if (!pgdir)
+    {
+      return 0;
+    }
+
+  /* Make table walk to find the page */
+
+  for (ptlevel = 1, lnvaddr = pgdir; ptlevel < RV_MMU_PT_LEVELS; ptlevel++)
+    {
+      paddr = mmu_pte_to_paddr(mmu_ln_getentry(ptlevel, lnvaddr, vaddr));
+      lnvaddr = riscv_pgvaddr(paddr);
+      if (!lnvaddr)
+        {
+          return 0;
+        }
+    }
+
+  /* Got it, now convert it to physical page */
+
+  paddr = mmu_ln_getentry(ptlevel, lnvaddr, vaddr);
+  paddr = mmu_pte_to_paddr(paddr);
+
+  return paddr;
+}
+
+/****************************************************************************
+ * Name: up_addrenv_page_vaddr
+ *
+ * Description:
+ *   Find the kernel virtual address associated with physical page.
+ *
+ * Input Parameters:
+ *   page - The page physical address.
+ *
+ * Returned Value:
+ *   Page kernel virtual address on success; NULL on failure.
+ *
+ ****************************************************************************/
+
+uintptr_t up_addrenv_page_vaddr(uintptr_t page)
+{
+  return riscv_pgvaddr(page);
+}
+
+/****************************************************************************
+ * Name: up_addrenv_user_vaddr
+ *
+ * Description:
+ *   Check if a virtual address is in user virtual address space.
+ *
+ * Input Parameters:
+ *   vaddr - The virtual address.
+ *
+ * Returned Value:
+ *   True if it is; false if it's not
+ *
+ ****************************************************************************/
+
+bool up_addrenv_user_vaddr(uintptr_t vaddr)
+{
+  return riscv_uservaddr(vaddr);
+}
+
+#ifdef CONFIG_MM_KMAP
+
+/****************************************************************************
+ * Name: up_addrenv_kmap_pages
+ *
+ * Description:
+ *   Map physical pages into a continuous virtual memory block.
+ *
+ * Input Parameters:
+ *   pages - A pointer to the first element in a array of physical address,
+ *     each corresponding to one page of memory.
+ *   npages - The number of pages in the list of physical pages to be mapped.
+ *   vaddr - The virtual address corresponding to the beginning of the
+ *     (continuous) virtual address region.
+ *   prot - Access right flags.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_kmap_pages(void **pages, unsigned int npages, uintptr_t vaddr,
+                          int prot)
+{
+  struct tcb_s          *tcb     = nxsched_self();
+  struct arch_addrenv_s *addrenv = &tcb->addrenv_own->addrenv;
+  int mask                       = 0;
+
+  /* Sanity checks */
+
+  DEBUGASSERT(tcb && tcb->addrenv_own);
+  DEBUGASSERT(pages != NULL && npages > 0);
+  DEBUGASSERT(vaddr >= CONFIG_ARCH_KMAP_VBASE && vaddr < ARCH_KMAP_VEND);
+  DEBUGASSERT(MM_ISALIGNED(vaddr));
+
+  /* Convert access right flags to MMU flags */
+
+  if (prot & PROT_READ)
+    {
+      mask |= PTE_R;
+    }
+
+  if (prot & PROT_WRITE)
+    {
+      mask |= PTE_W;
+    }
+
+  if (prot & PROT_EXEC)
+    {
+      mask |= PTE_X;
+    }
+
+  /* This is a kernel (global) mapping */
+
+  mask |= PTE_G;
+
+  /* Let riscv_map_pages do the work */
+
+  return riscv_map_pages(addrenv, (uintptr_t *)pages, npages, vaddr, mask);
+}
+
+/****************************************************************************
+ * Name: riscv_unmap_pages
+ *
+ * Description:
+ *   Unmap a previously mapped virtual memory region.
+ *
+ * Input Parameters:
+ *   vaddr - The virtual address corresponding to the beginning of the
+ *     (continuous) virtual address region.
+ *   npages - The number of pages to be unmapped
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int up_addrenv_kunmap_pages(uintptr_t vaddr, unsigned int npages)
+{
+  struct tcb_s          *tcb     = nxsched_self();
+  struct arch_addrenv_s *addrenv = &tcb->addrenv_own->addrenv;
+
+  /* Sanity checks */
+
+  DEBUGASSERT(tcb && tcb->addrenv_own);
+  DEBUGASSERT(npages > 0);
+  DEBUGASSERT(vaddr >= CONFIG_ARCH_KMAP_VBASE && vaddr < ARCH_KMAP_VEND);
+  DEBUGASSERT(MM_ISALIGNED(vaddr));
+
+  /* Let riscv_unmap_pages do the work */
+
+  return riscv_unmap_pages(addrenv, vaddr, npages);
+}
+
+#endif /* CONFIG_MM_KMAP */
+#endif /* CONFIG_BUILD_KERNEL */