i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug #1413:

Browse Source 
* vm_soft_fault() no longer touches the page source cache in case fault_get_page() failed.
* fault_find_page() now unlocks and releases the cache if reading in a page failed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22016 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-08-20 14:27:11 +00:00
parent d0c290bf09
commit 9d22ffbe84
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+5 -4
View File
@@ -3610,7 +3610,6 @@ fault_find_page(vm_translation_map *map, vm_cache *topCache,
vm_store *store = cache->store; vm_store *store = cache->store;
if (store->ops->has_page != NULL if (store->ops->has_page != NULL
&& store->ops->has_page(store, cacheOffset)) { && store->ops->has_page(store, cacheOffset)) {
// insert a fresh page and mark it busy -- we're going to read it in // insert a fresh page and mark it busy -- we're going to read it in
page = vm_page_allocate_page(PAGE_STATE_FREE); page = vm_page_allocate_page(PAGE_STATE_FREE);
vm_cache_insert_page(cache, page, cacheOffset); vm_cache_insert_page(cache, page, cacheOffset);
@@ -3644,13 +3643,14 @@ fault_find_page(vm_translation_map *map, vm_cache *topCache,
vm_cache_remove_page(cache, page); vm_cache_remove_page(cache, page);
vm_page_set_state(page, PAGE_STATE_FREE); vm_page_set_state(page, PAGE_STATE_FREE);
mutex_unlock(&cache->lock);
vm_cache_release_ref(cache);
return status; return status;
} }
// mark the page unbusy again // mark the page unbusy again
page->state = PAGE_STATE_ACTIVE; page->state = PAGE_STATE_ACTIVE;
busyCondition.Unpublish(); busyCondition.Unpublish();
break; break;
} }
@@ -4036,12 +4036,13 @@ vm_soft_fault(addr_t originalAddress, bool isWrite, bool isUser)
newProtection &= ~(B_WRITE_AREA | B_KERNEL_WRITE_AREA); newProtection &= ~(B_WRITE_AREA | B_KERNEL_WRITE_AREA);
vm_map_page(area, page, address, newProtection); vm_map_page(area, page, address, newProtection);
mutex_unlock(&pageSource->lock);
vm_cache_release_ref(pageSource);
} }
atomic_add(&area->no_cache_change, -1); atomic_add(&area->no_cache_change, -1);
mutex_unlock(&pageSource->lock);
vm_cache_release_ref(pageSource);
if (copiedPageSource) if (copiedPageSource)
vm_cache_release_ref(copiedPageSource); vm_cache_release_ref(copiedPageSource);