xiaoxiang781216 commented on code in PR #8026: URL: https://github.com/apache/nuttx/pull/8026#discussion_r1064023523
########## mm/map/mm_map.c: ########## @@ -0,0 +1,325 @@ +/**************************************************************************** + * 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/mm/map.h> +#include <stdbool.h> +#include <stddef.h> +#include <nuttx/sched.h> +#include <nuttx/kmalloc.h> +#include <assert.h> + +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static bool in_range(FAR const void *start, size_t length, + FAR const void *range_start, size_t range_length) +{ + char *u_start = (char *)start; Review Comment: add FAR for all pointer ########## include/nuttx/mm/map.h: ########## @@ -73,11 +73,155 @@ struct mm_map_entry_s struct mm_map_s { sq_queue_t mm_map_sq; - mutex_t mm_map_mutex; + rmutex_t mm_map_mutex; }; /**************************************************************************** * Public Function Prototypes ****************************************************************************/ -#endif /* __INCLUDE_NUTTX_MM_MM_MAP_H */ +/**************************************************************************** + * Name: mm_map_lock + * + * Description: + * Get exclusive access to task_group's mm_map + * + * Input Parameters: + * mm - Pointer to the mm_map_s + * + * Returned Value: + * OK on success + * A negated errno value on failure + * + ****************************************************************************/ + +int mm_map_lock(FAR struct task_group_s *group); + +/**************************************************************************** + * Name: mm_map_unlock + * + * Description: + * Relinquish exclusive access to task_group's mm_map + * + * Input Parameters: + * mm - Pointer to the mm_map_s + * + * Returned Value: + * None + * + ****************************************************************************/ + +void mm_map_unlock(FAR struct task_group_s *group); + +/**************************************************************************** + * 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 successfully + * -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 + * + * 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_remove + * + * Description: + * Removes a virtual memory area from the list of mappings + * Sets the given pointer argument to NULL after successful removal + * + * 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 successfully + * -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_remove(FAR struct task_group_s *group, + FAR struct mm_map_entry_s **map); Review Comment: let's unify the term: mm_map_entry_s->entry ########## include/nuttx/sched.h: ########## @@ -506,6 +506,10 @@ struct task_group_s struct group_shm_s tg_shm; /* Task shared memory logic */ #endif + + /* Virtual memory mapping info ********************************************/ + + FAR struct mm_map_s tg_mm_map; /* Task mmappings */ Review Comment: remove FAR and include nuttx/mm/map.h in this file, and remove the same inclusion from group_create.c and group_leave.c ########## mm/map/mm_map.c: ########## @@ -0,0 +1,325 @@ +/**************************************************************************** + * 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/mm/map.h> +#include <stdbool.h> +#include <stddef.h> +#include <nuttx/sched.h> +#include <nuttx/kmalloc.h> +#include <assert.h> + +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static bool in_range(FAR const void *start, size_t length, + FAR const void *range_start, size_t range_length) +{ + char *u_start = (char *)start; + char *u_end = u_start + length; + char *r_start = (char *)range_start; + char *r_end = r_start + range_length; + + return (u_start >= r_start && u_start < r_end && /* start is in range */ + u_end >= r_start && u_end <= r_end); /* end is in range */ +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mm_map_lock + * + * Description: + * Get exclusive access to task_group's mm_map + * + ****************************************************************************/ + +int mm_map_lock(FAR struct task_group_s *group) +{ + return nxrmutex_lock(&group->tg_mm_map.mm_map_mutex); +} + +/**************************************************************************** + * Name: mm_map_unlock + * + * Description: + * Relinquish exclusive access to task_group's mm_map + * + ****************************************************************************/ + +void mm_map_unlock(FAR struct task_group_s *group) +{ + DEBUGVERIFY(nxrmutex_unlock(&group->tg_mm_map.mm_map_mutex)); +} + +/**************************************************************************** + * 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) +{ + sq_init(&mm->mm_map_sq); + nxrmutex_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; Review Comment: please consistent the parameter name: mm_map_entry_s map v.s. entry ########## mm/map/mm_map.c: ########## @@ -0,0 +1,327 @@ +/**************************************************************************** + * 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/mm/map.h> +#include <stdbool.h> +#include <stddef.h> +#include <nuttx/sched.h> +#include <nuttx/kmalloc.h> +#include <assert.h> + +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static bool in_range(FAR const void *start, size_t length, + FAR const void *range_start, size_t range_length) +{ + char *u_start = (char *)start; + char *u_end = u_start + length; + char *r_start = (char *)range_start; + char *r_end = r_start + range_length; + + return (u_start >= r_start && u_start < r_end && /* start is in range */ + u_end >= r_start && u_end <= r_end); /* end is in range */ +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mm_map_lock + * + * Description: + * Get exclusive access to task_group's mm_map + * + ****************************************************************************/ + +int mm_map_lock(void) +{ + return nxrmutex_lock(&nxsched_self()->group->tg_mm_map.mm_map_mutex); +} + +/**************************************************************************** + * Name: mm_map_unlock + * + * Description: + * Relinquish exclusive access to task_group's mm_map + * + ****************************************************************************/ + +void mm_map_unlock(void) +{ + DEBUGVERIFY( + nxrmutex_unlock(&nxsched_self()->group->tg_mm_map.mm_map_mutex) + ); +} + +/**************************************************************************** + * 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) Review Comment: > Initializing and destroying the map is correct I think. Only the mm_map_s structure is passed, which is the one to initialize (in task group creation) and destroyed (in task group destruction, process exit) > Here is three choices: 1. Get info from the current task 2. Pass task_group_s as first argument 3. Pass mm_map_s as first argument Please don't mix the usage as much as you can, any exception need have a very good reason. > The only question is that how you pass the info about task exit case to driver's unmap (from the mm_map_destroy). You can either have the logic in every driver, conditionally calling mm_map_remove only in normal case(not during group destruction) OR forwarding this info to mm_map_remove. > > If passing group for this purpose feels wrong, we can > > * pass mm_map_s instead (NULL or current one) > * a boolean flag > * we can conditionally call the mm_map_remove from drivers only when the context is known (not during process exit). > > We can even re-think the driver's munmap "group" argument. That was given only because it is a good indication to the driver that the context is not valid when the group is null. ########## mm/map/mm_map.c: ########## @@ -0,0 +1,325 @@ +/**************************************************************************** + * 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/mm/map.h> +#include <stdbool.h> +#include <stddef.h> +#include <nuttx/sched.h> +#include <nuttx/kmalloc.h> +#include <assert.h> + +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static bool in_range(FAR const void *start, size_t length, + FAR const void *range_start, size_t range_length) +{ + char *u_start = (char *)start; + char *u_end = u_start + length; + char *r_start = (char *)range_start; + char *r_end = r_start + range_length; + + return (u_start >= r_start && u_start < r_end && /* start is in range */ + u_end >= r_start && u_end <= r_end); /* end is in range */ +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mm_map_lock + * + * Description: + * Get exclusive access to task_group's mm_map + * + ****************************************************************************/ + +int mm_map_lock(FAR struct task_group_s *group) +{ + return nxrmutex_lock(&group->tg_mm_map.mm_map_mutex); +} + +/**************************************************************************** + * Name: mm_map_unlock + * + * Description: + * Relinquish exclusive access to task_group's mm_map + * + ****************************************************************************/ + +void mm_map_unlock(FAR struct task_group_s *group) +{ + DEBUGVERIFY(nxrmutex_unlock(&group->tg_mm_map.mm_map_mutex)); +} + +/**************************************************************************** + * 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) +{ + sq_init(&mm->mm_map_sq); + nxrmutex_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 + */ + + /* Unmap the whole region */ + + if (!map->munmap || + map->munmap(NULL, map, map->vaddr, map->length) < 0) + { + /* The driver doesn't support unmap, or unmap failed. Just free + * the entry. + * A call to drivers munmap failing here would be a bug in the + * driver. The driver should be able to unmap at least the full + * area, which it has mapped + */ + + kmm_free(map); + } + } + + nxrmutex_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; + int ret; + + if (!entry) + { + return -EINVAL; + } + + /* Copy the provided mapping and add to the list */ + + map = kmm_malloc(sizeof(struct mm_map_entry_s)); + if (!map) + { + return -EINVAL; + } + + *map = *entry; + + ret = mm_map_lock(group); + if (ret < 0) + { + kmm_free(map); + return ret; + } + + sq_addfirst((sq_entry_t *)map, &mm->mm_map_sq); + + mm_map_unlock(group); + + 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 (mm_map_lock(group) == 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)); + } + + mm_map_unlock(group); + } + + return map; +} + +/**************************************************************************** + * Name: mm_map_find + * + * Description: + * Find the first mapping containing the range from the task group's list + * + ****************************************************************************/ + +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 (mm_map_lock(group) == OK) + { + map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq); + + while (map && !in_range(vaddr, length, map->vaddr, map->length)) + { + map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)map)); + } + + mm_map_unlock(group); + } + + return map; +} + +/**************************************************************************** + * Name: mm_map_remove + * + * Description: + * Remove a mapping from the task group's list + * + ****************************************************************************/ + +int mm_map_remove(FAR struct task_group_s *group, + FAR struct mm_map_entry_s **map) Review Comment: please make your naming consistence with each other. ########## fs/mmap/fs_rammap.c: ########## @@ -81,15 +149,14 @@ struct fs_allmaps_s g_rammaps = * ****************************************************************************/ -int rammap(FAR struct file *filep, size_t length, - off_t offset, bool kernel, FAR void **mapped) +int rammap(FAR struct file *filep, FAR struct mm_map_entry_s *map_entry, Review Comment: let's unify the term, either entry or map_entry, not both in the code base. ########## include/nuttx/mm/map.h: ########## @@ -84,34 +84,34 @@ struct mm_map_s * Name: mm_map_lock * * Description: - * Get exclusive access to task_group's mm_map + * Get exclusive access current task_group's mm_map * * Input Parameters: - * mm - Pointer to the mm_map_s + * None * * Returned Value: * OK on success * A negated errno value on failure * ****************************************************************************/ -int mm_map_lock(FAR struct task_group_s *group); +int mm_map_lock(void); Review Comment: please move to the second patch ########## mm/map/mm_map.c: ########## @@ -0,0 +1,326 @@ +/**************************************************************************** + * 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/mm/map.h> +#include <stdbool.h> +#include <stddef.h> +#include <nuttx/sched.h> +#include <nuttx/kmalloc.h> +#include <assert.h> + +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static bool in_range(FAR const void *start, size_t length, + FAR const void *range_start, size_t range_length) +{ + char *u_start = (char *)start; + char *u_end = u_start + length; + char *r_start = (char *)range_start; + char *r_end = r_start + range_length; + + return (u_start >= r_start && u_start < r_end && /* start is in range */ + u_end >= r_start && u_end <= r_end); /* end is in range */ +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mm_map_lock + * + * Description: + * Get exclusive access to task_group's mm_map + * + ****************************************************************************/ + +int mm_map_lock(void) +{ + return nxrmutex_lock(&nxsched_self()->group->tg_mm_map.mm_map_mutex); +} + +/**************************************************************************** + * Name: mm_map_unlock + * + * Description: + * Relinquish exclusive access to task_group's mm_map + * + ****************************************************************************/ + +void mm_map_unlock(void) +{ + DEBUGVERIFY( + nxrmutex_unlock(&nxsched_self()->group->tg_mm_map.mm_map_mutex) + ); +} + +/**************************************************************************** + * 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) +{ + sq_init(&mm->mm_map_sq); + nxrmutex_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 + */ + + /* Unmap the whole region */ + + if (!map->munmap || + map->munmap(NULL, map, map->vaddr, map->length) < 0) + { + /* The driver doesn't support unmap, or unmap failed. Just free + * the entry. + * A call to drivers munmap failing here would be a bug in the + * driver. The driver should be able to unmap at least the full + * area, which it has mapped + */ + + kmm_free(map); + } + } + + nxrmutex_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; + int ret; + + if (!entry) + { + return -EINVAL; + } + + /* Copy the provided mapping and add to the list */ + + map = kmm_malloc(sizeof(struct mm_map_entry_s)); + if (!map) + { + return -EINVAL; + } + + *map = *entry; + + ret = nxrmutex_lock(&mm->mm_map_mutex); + if (ret < 0) + { + kmm_free(map); + return ret; + } + + sq_addfirst((sq_entry_t *)map, &mm->mm_map_sq); + + nxrmutex_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 (nxrmutex_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)); + } + + nxrmutex_unlock(&mm->mm_map_mutex); + } + + return map; +} + +/**************************************************************************** + * Name: mm_map_find + * + * Description: + * Find the first mapping containing the range from the task group's list + * + ****************************************************************************/ + +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 (nxrmutex_lock(&mm->mm_map_mutex) == OK) + { + map = (struct mm_map_entry_s *)sq_peek(&mm->mm_map_sq); + + while (map && !in_range(vaddr, length, map->vaddr, map->length)) + { + map = (struct mm_map_entry_s *)sq_next(((sq_entry_t *)map)); + } + + nxrmutex_unlock(&mm->mm_map_mutex); + } + + return map; +} + +/**************************************************************************** + * Name: mm_map_remove + * + * Description: + * Remove a mapping from the task group's list + * + ****************************************************************************/ + +int mm_map_remove(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 + */ + Review Comment: I don't see why you need pass map as pointer of pointer to mm_map_entry_s. ########## fs/mmap/fs_rammap.h: ########## @@ -53,29 +35,28 @@ * - There are not access privileges. */ -struct fs_rammap_s -{ - struct fs_rammap_s *flink; /* Implements a singly linked list */ - FAR void *addr; /* Start of allocated memory */ - size_t length; /* Length of region */ - off_t offset; /* File offset */ -}; +#ifndef __FS_MMAP_FS_RAMMAP_H Review Comment: why not keep the file guard in the origin place? ########## mm/map/mm_map.c: ########## @@ -0,0 +1,327 @@ +/**************************************************************************** + * 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/mm/map.h> +#include <stdbool.h> +#include <stddef.h> +#include <nuttx/sched.h> +#include <nuttx/kmalloc.h> +#include <assert.h> + +#if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static bool in_range(FAR const void *start, size_t length, + FAR const void *range_start, size_t range_length) +{ + char *u_start = (char *)start; + char *u_end = u_start + length; + char *r_start = (char *)range_start; + char *r_end = r_start + range_length; + + return (u_start >= r_start && u_start < r_end && /* start is in range */ + u_end >= r_start && u_end <= r_end); /* end is in range */ +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mm_map_lock + * + * Description: + * Get exclusive access to task_group's mm_map + * + ****************************************************************************/ + +int mm_map_lock(void) +{ + return nxrmutex_lock(&nxsched_self()->group->tg_mm_map.mm_map_mutex); +} + +/**************************************************************************** + * Name: mm_map_unlock + * + * Description: + * Relinquish exclusive access to task_group's mm_map + * + ****************************************************************************/ + +void mm_map_unlock(void) +{ + DEBUGVERIFY( + nxrmutex_unlock(&nxsched_self()->group->tg_mm_map.mm_map_mutex) + ); +} + +/**************************************************************************** + * 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) +{ + sq_init(&mm->mm_map_sq); + nxrmutex_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) Review Comment: Please keep the function consistent with each other, it's strange that some function use mm_map_s *, other use task_group_s *. ########## fs/mmap/fs_anonmap.c: ########## @@ -0,0 +1,96 @@ +/**************************************************************************** + * fs/mmap/fs_anonmap.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/kmalloc.h> +#include <debug.h> + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: unmap_anonymous + ****************************************************************************/ + +static int unmap_anonymous(FAR struct task_group_s *group, + FAR struct mm_map_entry_s *map, + FAR void *start, + size_t length) +{ + int ret; + + /* De-allocate memory. + * NB: This is incomplete anounymous mapping implementation + * see file_mmap_ below + */ + + if (start == map->vaddr && length == map->length) + { + /* map->priv marks allocation from kernel heap */ + + if (map->priv.i) + { + kmm_free(start); + } + else + { + kumm_free(start); + } + + ret = mm_map_remove(group, &map); + } + else + { + ret = -EINVAL; + ferr("ERROR: Unknown map type\n"); + } + + return ret; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +int map_anonymous(FAR struct mm_map_entry_s *map, bool kernel) +{ + /* REVISIT: Should reside outside of the heap. That is really the + * only purpose of MAP_ANONYMOUS: To get non-heap memory. In KERNEL + * build, this could be accomplished using pgalloc(), provided that + * you had logic in place to assign a virtual address to the mapping. + */ + + map->vaddr = kernel ? kmm_zalloc(map->length) : kumm_zalloc(map->length); + if (map->vaddr == NULL) + { + ferr("ERROR: kumm_alloc() failed, enable DEBUG_MM for info!\n"); + return -ENOMEM; + } + + map->munmap = unmap_anonymous; + map->priv.i = kernel; + + return mm_map_add(map); Review Comment: should we free the resource if mm_map_add fail -- 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-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
