sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-04-17 17:29:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed find_vma_byrange completely. It was buggy and useless.

Browse Source
This commit is contained in:
Bahadir Balban
2008-11-07 16:12:44 +02:00
parent f87f3cd5d2
commit 40ccc642f9
2 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tasks/mm0/include/vm_area.h
View File

@@ -183,23 +183,8 @@ struct vm_area {
unsigned long file_offset; /* File offset in pfns */ unsigned long file_offset; /* File offset in pfns */
}; };
/* Finds 'a' vma that is in this range. Only useful for munmap() */ int vma_intersect(unsigned long pfn_start, unsigned long pfn_end,
static inline struct vm_area * struct vm_area *vma);
find_vma_byrange(unsigned long pfn_start,
unsigned long pfn_end, struct list_head *vm_area_list)
{
struct vm_area *vma;
list_for_each_entry(vma, vm_area_list, list) {
if ((pfn_start >= vma->pfn_start) && (pfn_start < vma->pfn_end))
return vma;
if ((pfn_end >= vma->pfn_start) && (pfn_end < vma->pfn_end))
return vma;
}
return 0;
}
/* /*
* Finds the vma that has the given address. * Finds the vma that has the given address.
* TODO: In the future a lot of use cases may need to traverse each vma * TODO: In the future a lot of use cases may need to traverse each vma

28
tasks/mm0/src/munmap.c
View File

@@ -129,21 +129,24 @@ int do_munmap(struct tcb *task, void *vaddr, unsigned long npages)
{ {
const unsigned long munmap_start = __pfn(vaddr); const unsigned long munmap_start = __pfn(vaddr);
const unsigned long munmap_end = munmap_start + npages; const unsigned long munmap_end = munmap_start + npages;
struct vm_area *vma; struct vm_area *vma, *n;
int err; int err;
/* Find a vma that overlaps with this address range */ list_for_each_entry_safe(vma, n, &task->vm_area_head->list, list) {
while ((vma = find_vma_byrange(munmap_start, munmap_end, /* Check for intersection */
&task->vm_area_head->list))) { if (vma_intersect(munmap_start, munmap_end, vma)) {
/*
* Flush pages if vma is writable,
* dirty and file-backed.
*/
if ((err = vma_flush_pages(vma)) < 0)
return err;
/* Flush pages if vma is writable, dirty and file-backed. */ /* Unmap the vma accordingly. This may delete the vma */
if ((err = vma_flush_pages(vma)) < 0) if ((err = vma_unmap(vma, task, munmap_start,
return err; munmap_end)) < 0)
return err;
/* Unmap the vma accordingly. Note, this may delete the vma */ }
if ((err = vma_unmap(vma, task, munmap_start,
munmap_end)) < 0)
return err;
} }
/* Unmap those pages from the task address space */ /* Unmap those pages from the task address space */
@@ -152,7 +155,6 @@ int do_munmap(struct tcb *task, void *vaddr, unsigned long npages)
return 0; return 0;
} }
int sys_munmap(struct tcb *task, void *start, unsigned long length) int sys_munmap(struct tcb *task, void *start, unsigned long length)
{ {
/* Must be aligned on a page boundary */ /* Must be aligned on a page boundary */