hrev51072 adds 1 changeset to branch 'master'
old head: f17488662a661029abeba1594c92904f7670c406
new head: 99ccb18d974c974f5c609cc964eee59956f7efd1
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=99ccb18d974c+%5Ef17488662a66
----------------------------------------------------------------------------
99ccb18d974c: Kernel IOBuffer: Fixed potential memory leak.
* IOBuffer::FreeVirtualVecCookie() did not put the last physical page
back. This was only an issue in case GetNextVirtualVec() wasn't
iterated through the end, for example in case of an error.
* Fixed the condition when to put back a physical page; the current
solution will also work with the generic page mapper implementation.
* This fixes the low hanging fruits of Ingo's comment in #5777.
[ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51072
Commit: 99ccb18d974c974f5c609cc964eee59956f7efd1
URL: http://cgit.haiku-os.org/haiku/commit/?id=99ccb18d974c
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Thu Apr 6 21:31:48 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/5777
----------------------------------------------------------------------------
1 file changed, 31 insertions(+), 22 deletions(-)
src/system/kernel/device_manager/IORequest.cpp | 53 +++++++++++++---------
----------------------------------------------------------------------------
diff --git a/src/system/kernel/device_manager/IORequest.cpp
b/src/system/kernel/device_manager/IORequest.cpp
index f39f213..a6628db 100644
--- a/src/system/kernel/device_manager/IORequest.cpp
+++ b/src/system/kernel/device_manager/IORequest.cpp
@@ -1,6 +1,6 @@
/*
* Copyright 2008-2011, Ingo Weinhold, ingo_weinhold@xxxxxx.
- * Copyright 2008, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
+ * Copyright 2008-2017, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
* Distributed under the terms of the MIT License.
*/
@@ -38,6 +38,33 @@ enum {
};
+struct virtual_vec_cookie {
+ uint32 vec_index;
+ generic_size_t vec_offset;
+ area_id mapped_area;
+ void* physical_page_handle;
+ addr_t virtual_address;
+
+ virtual_vec_cookie()
+ :
+ vec_index(0),
+ vec_offset(0),
+ mapped_area(-1),
+ physical_page_handle(NULL),
+ virtual_address((addr_t)-1)
+ {
+ }
+
+ void PutPhysicalPageIfNeeded()
+ {
+ if (virtual_address != (addr_t)-1) {
+ vm_put_physical_page(virtual_address,
physical_page_handle);
+ virtual_address = (addr_t)-1;
+ }
+ }
+};
+
+
// #pragma mark -
@@ -57,15 +84,6 @@ IORequestChunk::~IORequestChunk()
// #pragma mark -
-struct virtual_vec_cookie {
- uint32 vec_index;
- generic_size_t vec_offset;
- area_id mapped_area;
- void* physical_page_handle;
- addr_t virtual_address;
-};
-
-
IOBuffer*
IOBuffer::Create(uint32 count, bool vip)
{
@@ -124,21 +142,11 @@ IOBuffer::GetNextVirtualVec(void*& _cookie, iovec& vector)
if (cookie == NULL)
return B_NO_MEMORY;
- cookie->vec_index = 0;
- cookie->vec_offset = 0;
- cookie->mapped_area = -1;
- cookie->physical_page_handle = NULL;
- cookie->virtual_address = 0;
_cookie = cookie;
}
// recycle a potential previously mapped page
- if (cookie->physical_page_handle != NULL) {
-// TODO: This check is invalid! The physical page mapper is not required to
-// return a non-NULL handle (the generic implementation does not)!
- vm_put_physical_page(cookie->virtual_address,
- cookie->physical_page_handle);
- }
+ cookie->PutPhysicalPageIfNeeded();
if (cookie->vec_index >= fVecCount)
return B_BAD_INDEX;
@@ -203,7 +211,8 @@ IOBuffer::FreeVirtualVecCookie(void* _cookie)
virtual_vec_cookie* cookie = (virtual_vec_cookie*)_cookie;
if (cookie->mapped_area >= 0)
delete_area(cookie->mapped_area);
-// TODO: A vm_get_physical_page() may still be unmatched!
+
+ cookie->PutPhysicalPageIfNeeded();
free_etc(cookie, fVIP ? HEAP_PRIORITY_VIP : 0);
}
