You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2023/01/03 17:27:09 UTC
[GitHub] [nuttx] xiaoxiang781216 commented on a diff in pull request #8026: Add mm map
xiaoxiang781216 commented on code in PR #8026:
URL: https://github.com/apache/nuttx/pull/8026#discussion_r1060776537
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
Review Comment:
don't need
##########
include/nuttx/mm/map.h:
##########
@@ -43,7 +49,11 @@ struct mm_map_entry_s
off_t offset;
int prot;
int flags;
- FAR void *priv;
+ union
+ {
+ FAR void *p;
+ int i;
Review Comment:
why need add i field? we can always assign an integer to pointer:
priv = (FAR void *)(uinptr_t)i;
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
+ sq_init(&mm->mm_map_sq);
+ nxmutex_init(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * De-allocates a task group specific mm_map stucture and the mm_map_mutex
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm)
+{
+ FAR struct mm_map_entry_s *map;
+
+ while ((map = (FAR struct mm_map_entry_s *)sq_remfirst(&mm->mm_map_sq)))
+ {
+ /* Pass null as group argument to indicate that actual MMU mappings
+ * must not be touched. The process is being deleted and we don't
+ * know in which context we are. Only kernel memory allocations
+ * need to be freed by drivers
+ */
+
+ if (map->munmap)
+ {
+ /* Unmap the whole region */
+
+ if (map->munmap(NULL, map, (void *)map->vaddr, map->length) < 0)
Review Comment:
why need cast to (void *)?
##########
include/nuttx/mm/map.h:
##########
@@ -80,4 +80,137 @@ struct mm_map_s
* Public Function Prototypes
****************************************************************************/
-#endif /* __INCLUDE_NUTTX_MM_MM_MAP_H */
+#ifdef CONFIG_MM_MAP
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Initialization function, called only by group_initialize
+ *
+ * Input Parameters:
+ * mm - Pointer to the mm_map structure to be initialized
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm);
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * Uninitialization function, called only by group_release
+ *
+ * Input Parameters:
+ * mm - Pointer to the mm_map structure to be initialized
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm);
+
+/****************************************************************************
+ * Name: mm_map_add
+ *
+ * Description:
+ * Adds a virtual memory area into the list of mappings
+ *
+ * Input Parameters:
+ * entry - A pointer to mm_map_entry_s, mapping info to be added
+ *
+ * Returned Value:
+ * OK Added succesfully
+ * -EINVAL: Invalid attempt to get the semaphore
+ * -EINTR: The wait was interrupted by the receipt of a signal.
+ * -ENOMEM: Out of memory
+ *
+ ****************************************************************************/
+
+int mm_map_add(FAR struct mm_map_entry_s *entry);
+
+/****************************************************************************
+ * Name: mm_map_next
+ *
+ * Description:
+ * Returns the next mapping in the list, following the argument.
+ * Can be used to iterate through all the mappings. Returns the first
+ * mapping when the argument "entry" is NULL.
+ *
+ * Input Parameters:
+ * entry - Pointer to a single mapping in this task group or NULL to get
+ * the first one
+ *
+ * Returned Value:
+ * Pointer to the next mapping
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_next(
+ FAR const struct mm_map_entry_s *entry);
+
+/****************************************************************************
+ * Name: mm_map_find_contains
+ *
+ * Description:
+ * Find the first mapping containing an address from the task
+ * group's list
+ *
+ * Input Parameters:
+ * vaddr - Address within the mapped area
+ *
+ * Returned Value:
+ * Pointer to the mapping, NULL if not found
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find_contains(FAR const void *vaddr);
+
+/****************************************************************************
+ * Name: mm_map_find
+ *
+ * Description:
+ * Find the first mapping matching address and length
+ *
+ * Input Parameters:
+ * vaddr - Start address of the mapped area
+ * length - Length of the mapping
+ *
+ * Returned Value:
+ * Pointer to the mapping, NULL if not found
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find(FAR const void *vaddr,
+ size_t length);
+
+/****************************************************************************
+ * Name: mm_map_rm
+ *
+ * Description:
+ * Removes a virtual memory area from the list of mappings
+ * Sets the given pointer argument to a value which can be used to continue
+ * iteration (previous or NULL)
+ *
+ * Input Parameters:
+ * group - Pointer to current task_group_s. NULL in process exit case
+ * map - Pointer to a pointer to the mapping to be removed
+ *
+ * Returned Value:
+ * OK: Removed succesfully
+ * -EINVAL: Invalid attempt to get the semaphore
+ * -EINTR: The wait was interrupted by the receipt of a signal.
+ * -ENOENT: Memory area not found
+ *
+ ****************************************************************************/
+
+int mm_map_rm(FAR struct task_group_s *group,
Review Comment:
mm_map_remove
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
+ sq_init(&mm->mm_map_sq);
+ nxmutex_init(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * De-allocates a task group specific mm_map stucture and the mm_map_mutex
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm)
+{
+ FAR struct mm_map_entry_s *map;
+
+ while ((map = (FAR struct mm_map_entry_s *)sq_remfirst(&mm->mm_map_sq)))
+ {
+ /* Pass null as group argument to indicate that actual MMU mappings
+ * must not be touched. The process is being deleted and we don't
+ * know in which context we are. Only kernel memory allocations
+ * need to be freed by drivers
+ */
+
+ if (map->munmap)
+ {
+ /* Unmap the whole region */
+
+ if (map->munmap(NULL, map, (void *)map->vaddr, map->length) < 0)
+ {
+ /* This is a bug. A driver provides munmap, but can't munmap
+ * the region. Just delete the map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+ else
+ {
+ /* Mappping has been added, but there is no unmap. Just delete the
+ * map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+
+ nxmutex_destroy(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_add
+ *
+ * Description:
+ * Add a mapping to task group's mm_map list
+ *
+ ****************************************************************************/
+
+int mm_map_add(FAR struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = kmm_zalloc(sizeof(struct mm_map_entry_s));
+ int ret;
+
+ if (!entry)
+ {
+ return -EINVAL;
+ }
+
+ if (!map)
+ {
+ return -ENOMEM;
+ }
+
+ /* Copy the provided mapping and add to the list */
+
+ *map = *entry;
Review Comment:
why not?
1. kmm_malloc entry in the first place
2. or kmm_malloc here and return
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
+ sq_init(&mm->mm_map_sq);
+ nxmutex_init(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * De-allocates a task group specific mm_map stucture and the mm_map_mutex
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm)
+{
+ FAR struct mm_map_entry_s *map;
+
+ while ((map = (FAR struct mm_map_entry_s *)sq_remfirst(&mm->mm_map_sq)))
+ {
+ /* Pass null as group argument to indicate that actual MMU mappings
+ * must not be touched. The process is being deleted and we don't
+ * know in which context we are. Only kernel memory allocations
+ * need to be freed by drivers
+ */
+
+ if (map->munmap)
+ {
+ /* Unmap the whole region */
+
+ if (map->munmap(NULL, map, (void *)map->vaddr, map->length) < 0)
+ {
+ /* This is a bug. A driver provides munmap, but can't munmap
+ * the region. Just delete the map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+ else
+ {
+ /* Mappping has been added, but there is no unmap. Just delete the
+ * map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+
+ nxmutex_destroy(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_add
+ *
+ * Description:
+ * Add a mapping to task group's mm_map list
+ *
+ ****************************************************************************/
+
+int mm_map_add(FAR struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = kmm_zalloc(sizeof(struct mm_map_entry_s));
+ int ret;
+
+ if (!entry)
+ {
+ return -EINVAL;
+ }
+
+ if (!map)
+ {
+ return -ENOMEM;
+ }
+
+ /* Copy the provided mapping and add to the list */
+
+ *map = *entry;
+
+ ret = nxmutex_lock(&mm->mm_map_mutex);
+ if (ret < 0)
+ {
+ kmm_free(map);
+ return ret;
+ }
+
+ sq_addfirst((sq_entry_t *)map, &mm->mm_map_sq);
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: mm_map_next
+ *
+ * Description:
+ * Returns the next mapping in the list.
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_next(
+ FAR const struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ if (entry == NULL)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+ }
+ else
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)entry));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
Review Comment:
the lock doesn't fix any race condition, it's always unsafe to hold an entry without lock
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
+ sq_init(&mm->mm_map_sq);
+ nxmutex_init(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * De-allocates a task group specific mm_map stucture and the mm_map_mutex
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm)
+{
+ FAR struct mm_map_entry_s *map;
+
+ while ((map = (FAR struct mm_map_entry_s *)sq_remfirst(&mm->mm_map_sq)))
+ {
+ /* Pass null as group argument to indicate that actual MMU mappings
+ * must not be touched. The process is being deleted and we don't
+ * know in which context we are. Only kernel memory allocations
+ * need to be freed by drivers
+ */
+
+ if (map->munmap)
+ {
+ /* Unmap the whole region */
+
+ if (map->munmap(NULL, map, (void *)map->vaddr, map->length) < 0)
+ {
+ /* This is a bug. A driver provides munmap, but can't munmap
+ * the region. Just delete the map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+ else
+ {
+ /* Mappping has been added, but there is no unmap. Just delete the
+ * map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+
+ nxmutex_destroy(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_add
+ *
+ * Description:
+ * Add a mapping to task group's mm_map list
+ *
+ ****************************************************************************/
+
+int mm_map_add(FAR struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = kmm_zalloc(sizeof(struct mm_map_entry_s));
+ int ret;
+
+ if (!entry)
+ {
+ return -EINVAL;
+ }
+
+ if (!map)
+ {
+ return -ENOMEM;
+ }
+
+ /* Copy the provided mapping and add to the list */
+
+ *map = *entry;
+
+ ret = nxmutex_lock(&mm->mm_map_mutex);
+ if (ret < 0)
+ {
+ kmm_free(map);
+ return ret;
+ }
+
+ sq_addfirst((sq_entry_t *)map, &mm->mm_map_sq);
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: mm_map_next
+ *
+ * Description:
+ * Returns the next mapping in the list.
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_next(
+ FAR const struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ if (entry == NULL)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+ }
+ else
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)entry));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
+}
+
+/****************************************************************************
+ * Name: mm_map_find_contains
+ *
+ * Description:
+ * Find the first mapping containing an address from the task group's list
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find_contains(FAR const void *vaddr)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+
+ while (map && !vaddr_in_area(vaddr, map->vaddr, map->length))
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)map));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
+}
+
+/****************************************************************************
+ * Name: mm_map_find
+ *
+ * Description:
+ * Find the first mapping matching address and length
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find(FAR const void *vaddr,
+ size_t length)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+
+ while (map && vaddr != map->vaddr && length != map->length)
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)map));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
+}
+
+/****************************************************************************
+ * Name: mm_map_rm
+ *
+ * Description:
+ * Remove a mapping from the task group's list
+ *
+ ****************************************************************************/
+
+int mm_map_rm(FAR struct task_group_s *group,
+ FAR struct mm_map_entry_s **map)
+{
+ FAR struct mm_map_entry_s *prev;
+ FAR struct mm_map_entry_s *r = NULL;
+ FAR struct mm_map_s *mm;
+
+ if (!group)
+ {
+ /* We end up in here only through mm_map_destroy. The address
+ * environment is being destroyed and the group is not valid.
+ * just delete the entry
+ */
+
+ goto free_mem;
+ }
+
+ mm = &group->tg_mm_map;
+
+ int ret = nxmutex_lock(&mm->mm_map_mutex);
+ if (ret < 0)
+ {
+ return ret;
+ }
+
+ prev = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+
+ /* Check if the list was empty */
+
+ if (!prev)
+ {
+ nxmutex_unlock(&mm->mm_map_mutex);
+ return -ENOENT;
+ }
+
+ /* Check if removing the first item */
+
+ if (*map == prev)
+ {
+ sq_remfirst(&mm->mm_map_sq);
+ *map = NULL;
+ r = prev;
+ }
+ else
+ {
+ /* Loop through the remaining items to find the one to be removed */
+
+ while ((r = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)prev))))
Review Comment:
why not use dq_entry to avoid the loop
##########
fs/mmap/fs_munmap.c:
##########
@@ -158,7 +160,38 @@ static int file_munmap_(FAR void *start, size_t length, bool kernel)
nxmutex_unlock(&g_rammaps.lock);
return ret;
#else
+
+#ifdef CONFIG_MM_MAP
Review Comment:
let's remove g_rammaps and reuse tg_mm_map, to avoid the code duplication
##########
mm/Kconfig:
##########
@@ -257,4 +257,8 @@ config MM_PANIC_ON_FAILURE
default n
depends on DEBUG_MM
+config MM_MAP
Review Comment:
the basic map code need always exist, otherwise many drivers willn't work
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
Review Comment:
remove the header files which are already included in mm/map.h
##########
include/nuttx/mm/map.h:
##########
@@ -80,4 +80,137 @@ struct mm_map_s
* Public Function Prototypes
****************************************************************************/
-#endif /* __INCLUDE_NUTTX_MM_MM_MAP_H */
+#ifdef CONFIG_MM_MAP
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Initialization function, called only by group_initialize
+ *
+ * Input Parameters:
+ * mm - Pointer to the mm_map structure to be initialized
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm);
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * Uninitialization function, called only by group_release
+ *
+ * Input Parameters:
+ * mm - Pointer to the mm_map structure to be initialized
+ *
+ * Returned Value:
+ * None
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm);
+
+/****************************************************************************
+ * Name: mm_map_add
+ *
+ * Description:
+ * Adds a virtual memory area into the list of mappings
+ *
+ * Input Parameters:
+ * entry - A pointer to mm_map_entry_s, mapping info to be added
+ *
+ * Returned Value:
+ * OK Added succesfully
+ * -EINVAL: Invalid attempt to get the semaphore
+ * -EINTR: The wait was interrupted by the receipt of a signal.
+ * -ENOMEM: Out of memory
+ *
+ ****************************************************************************/
+
+int mm_map_add(FAR struct mm_map_entry_s *entry);
+
+/****************************************************************************
+ * Name: mm_map_next
+ *
+ * Description:
+ * Returns the next mapping in the list, following the argument.
+ * Can be used to iterate through all the mappings. Returns the first
+ * mapping when the argument "entry" is NULL.
+ *
+ * Input Parameters:
+ * entry - Pointer to a single mapping in this task group or NULL to get
+ * the first one
+ *
+ * Returned Value:
+ * Pointer to the next mapping
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_next(
+ FAR const struct mm_map_entry_s *entry);
+
+/****************************************************************************
+ * Name: mm_map_find_contains
+ *
+ * Description:
+ * Find the first mapping containing an address from the task
+ * group's list
+ *
+ * Input Parameters:
+ * vaddr - Address within the mapped area
+ *
+ * Returned Value:
+ * Pointer to the mapping, NULL if not found
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find_contains(FAR const void *vaddr);
Review Comment:
why not only define mm_map_find?
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
+ sq_init(&mm->mm_map_sq);
+ nxmutex_init(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * De-allocates a task group specific mm_map stucture and the mm_map_mutex
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm)
+{
+ FAR struct mm_map_entry_s *map;
+
+ while ((map = (FAR struct mm_map_entry_s *)sq_remfirst(&mm->mm_map_sq)))
+ {
+ /* Pass null as group argument to indicate that actual MMU mappings
+ * must not be touched. The process is being deleted and we don't
+ * know in which context we are. Only kernel memory allocations
+ * need to be freed by drivers
+ */
+
+ if (map->munmap)
+ {
+ /* Unmap the whole region */
+
+ if (map->munmap(NULL, map, (void *)map->vaddr, map->length) < 0)
+ {
+ /* This is a bug. A driver provides munmap, but can't munmap
+ * the region. Just delete the map entry.
+ */
+
+ kmm_free(map);
Review Comment:
let's merge if/else block into one
##########
mm/map/mm_map.c:
##########
@@ -0,0 +1,337 @@
+/****************************************************************************
+ * mm/map/mm_map.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 <stdbool.h>
+#include <stddef.h>
+#include <nuttx/queue.h>
+#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
+#include <nuttx/mm/map.h>
+#include <nuttx/kmalloc.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__)
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static bool vaddr_in_area(FAR const void *addr, FAR const void *start,
+ size_t length)
+{
+ uintptr_t u_addr = (uintptr_t)addr;
+ uintptr_t u_start = (uintptr_t)start;
+ return (u_addr >= u_start) && (u_addr < u_start + length);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: mm_map_initialize
+ *
+ * Description:
+ * Allocates a task group specific mm_map stucture. Called when the group
+ * is initialized
+ *
+ ****************************************************************************/
+
+void mm_map_initialize(FAR struct mm_map_s *mm)
+{
+ memset(mm, 0, sizeof(struct mm_map_s));
+ sq_init(&mm->mm_map_sq);
+ nxmutex_init(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_destroy
+ *
+ * Description:
+ * De-allocates a task group specific mm_map stucture and the mm_map_mutex
+ *
+ ****************************************************************************/
+
+void mm_map_destroy(FAR struct mm_map_s *mm)
+{
+ FAR struct mm_map_entry_s *map;
+
+ while ((map = (FAR struct mm_map_entry_s *)sq_remfirst(&mm->mm_map_sq)))
+ {
+ /* Pass null as group argument to indicate that actual MMU mappings
+ * must not be touched. The process is being deleted and we don't
+ * know in which context we are. Only kernel memory allocations
+ * need to be freed by drivers
+ */
+
+ if (map->munmap)
+ {
+ /* Unmap the whole region */
+
+ if (map->munmap(NULL, map, (void *)map->vaddr, map->length) < 0)
+ {
+ /* This is a bug. A driver provides munmap, but can't munmap
+ * the region. Just delete the map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+ else
+ {
+ /* Mappping has been added, but there is no unmap. Just delete the
+ * map entry.
+ */
+
+ kmm_free(map);
+ }
+ }
+
+ nxmutex_destroy(&mm->mm_map_mutex);
+}
+
+/****************************************************************************
+ * Name: mm_map_add
+ *
+ * Description:
+ * Add a mapping to task group's mm_map list
+ *
+ ****************************************************************************/
+
+int mm_map_add(FAR struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = kmm_zalloc(sizeof(struct mm_map_entry_s));
+ int ret;
+
+ if (!entry)
+ {
+ return -EINVAL;
+ }
+
+ if (!map)
+ {
+ return -ENOMEM;
+ }
+
+ /* Copy the provided mapping and add to the list */
+
+ *map = *entry;
+
+ ret = nxmutex_lock(&mm->mm_map_mutex);
+ if (ret < 0)
+ {
+ kmm_free(map);
+ return ret;
+ }
+
+ sq_addfirst((sq_entry_t *)map, &mm->mm_map_sq);
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: mm_map_next
+ *
+ * Description:
+ * Returns the next mapping in the list.
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_next(
+ FAR const struct mm_map_entry_s *entry)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ if (entry == NULL)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+ }
+ else
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)entry));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
+}
+
+/****************************************************************************
+ * Name: mm_map_find_contains
+ *
+ * Description:
+ * Find the first mapping containing an address from the task group's list
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find_contains(FAR const void *vaddr)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+
+ while (map && !vaddr_in_area(vaddr, map->vaddr, map->length))
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)map));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
+}
+
+/****************************************************************************
+ * Name: mm_map_find
+ *
+ * Description:
+ * Find the first mapping matching address and length
+ *
+ ****************************************************************************/
+
+FAR struct mm_map_entry_s *mm_map_find(FAR const void *vaddr,
+ size_t length)
+{
+ FAR struct tcb_s *tcb = nxsched_self();
+ FAR struct task_group_s *group = tcb->group;
+ FAR struct mm_map_s *mm = &group->tg_mm_map;
+ FAR struct mm_map_entry_s *map = NULL;
+
+ if (nxmutex_lock(&mm->mm_map_mutex) == OK)
+ {
+ map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq);
+
+ while (map && vaddr != map->vaddr && length != map->length)
+ {
+ map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)map));
+ }
+
+ nxmutex_unlock(&mm->mm_map_mutex);
+ }
+
+ return map;
Review Comment:
ditto, if you want to avoid the race condition, you have to hold the lock until you don't touch map.
--
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: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org