jlaitine commented on code in PR #8026: URL: https://github.com/apache/nuttx/pull/8026#discussion_r1061375058
########## 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: done ########## 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: done cleanup in here -- 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
