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

vm_page_allocate_page_run: fix for aligned page allocations

Browse Source 
* don't enforce a zero boundary or a zero alignment
* when going to the next range, takes alignment into account.
  It could previously just be enforced again through alignment and loop infinite.
* it should help with some FreeBSD based drivers
This commit is contained in:
Jérôme Duval
2012-11-06 00:41:08 +01:00
parent 3704c0f8b1
commit f5a14b17df
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm_page.cpp
+7 -4
View File
@@ -3862,13 +3862,13 @@ vm_page_allocate_page_run(uint32 flags, page_num_t length,
page_num_t offsetStart = start + sPhysicalPageOffset; page_num_t offsetStart = start + sPhysicalPageOffset;
// enforce alignment // enforce alignment
if ((offsetStart & alignmentMask) != 0) { if (alignmentMask != 0 && (offsetStart & alignmentMask) != 0) {
offsetStart = ((offsetStart + alignmentMask) & ~alignmentMask) offsetStart = ((offsetStart + alignmentMask) & ~alignmentMask)
- sPhysicalPageOffset; - sPhysicalPageOffset;
} }
// enforce boundary // enforce boundary
if (offsetStart << boundaryShift if (boundaryShift != 0 && offsetStart << boundaryShift
!= (offsetStart + length - 1) << boundaryShift) { != (offsetStart + length - 1) << boundaryShift) {
offsetStart = (offsetStart + length - 1) << boundaryShift offsetStart = (offsetStart + length - 1) << boundaryShift
>> boundaryShift; >> boundaryShift;
@@ -3887,7 +3887,10 @@ vm_page_allocate_page_run(uint32 flags, page_num_t length,
} }
dprintf("vm_page_allocate_page_run(): Failed to allocate run of " dprintf("vm_page_allocate_page_run(): Failed to allocate run of "
"length %" B_PRIuPHYSADDR " in second iteration!", length); "length %" B_PRIuPHYSADDR " (%" B_PRIuPHYSADDR " %"
B_PRIuPHYSADDR ") in second iteration (align: %" B_PRIuPHYSADDR
" boundary: %" B_PRIuPHYSADDR ") !", length, requestedStart,
end, restrictions->alignment, restrictions->boundary);
freeClearQueueLocker.Unlock(); freeClearQueueLocker.Unlock();
vm_page_unreserve_pages(&reservation); vm_page_unreserve_pages(&reservation);
@@ -3916,7 +3919,7 @@ vm_page_allocate_page_run(uint32 flags, page_num_t length,
freeClearQueueLocker.Lock(); freeClearQueueLocker.Lock();
} }
start += i + 1; start += max_c(i, alignmentMask) + 1;
} }
} }