Loading...
--- xnu/xnu-1228/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-792.18.15/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -114,11 +114,9 @@
mach_vm_address_t physicalMask)
{
kern_return_t kr;
- task_t mapTask = NULL;
- vm_map_t vmmap = NULL;
addr64_t lastIOAddr;
- IOAddressRange range;
- IOOptionBits iomdOptions = kIOMemoryTypeVirtual64;
+ vm_map_t vmmap = 0;
+ IOOptionBits iomdOptions = kIOMemoryAsReference | kIOMemoryTypeVirtual;
if (!capacity)
return false;
@@ -128,72 +126,100 @@
_physAddrs = 0;
_physSegCount = 0;
_buffer = 0;
- range.address = 0;
- range.length = 0;
- _ranges.v64 = ⦥
// Grab the direction and the Auto Prepare bits from the Buffer MD options
iomdOptions |= options & (kIOMemoryDirectionMask | kIOMemoryAutoPrepare);
- if ((options & (kIOMemorySharingTypeMask | kIOMapCacheMask)) && (alignment < page_size))
- alignment = page_size;
+ if ((options & kIOMemorySharingTypeMask) && (alignment < page_size))
+ alignment = page_size;
+
+ if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
+ return false;
if (physicalMask && (alignment <= 1))
alignment = ((physicalMask ^ PAGE_MASK) & PAGE_MASK) + 1;
- _alignment = alignment;
-
- if (((inTask != kernel_task) && !(options & kIOMemoryPageable)) ||
- (physicalMask && (options & kIOMapCacheMask)))
- return false;
-
if ((options & kIOMemoryPhysicallyContiguous) && !physicalMask)
physicalMask = 0xFFFFFFFF;
- // set flags for entry + object create
- vm_prot_t memEntryCacheMode = VM_PROT_READ | VM_PROT_WRITE;
-
- // set memory entry cache mode
- switch (options & kIOMapCacheMask)
- {
- case kIOMapInhibitCache:
- SET_MAP_MEM(MAP_MEM_IO, memEntryCacheMode);
- break;
-
- case kIOMapWriteThruCache:
- SET_MAP_MEM(MAP_MEM_WTHRU, memEntryCacheMode);
- break;
-
- case kIOMapWriteCombineCache:
- SET_MAP_MEM(MAP_MEM_WCOMB, memEntryCacheMode);
- break;
-
- case kIOMapCopybackCache:
- SET_MAP_MEM(MAP_MEM_COPYBACK, memEntryCacheMode);
- break;
-
- case kIOMapDefaultCache:
- default:
- SET_MAP_MEM(MAP_MEM_NOOP, memEntryCacheMode);
- break;
- }
-
+ _alignment = alignment;
if (options & kIOMemoryPageable)
{
- iomdOptions |= kIOMemoryBufferPageable;
-
- // must create the entry before any pages are allocated
+ iomdOptions |= kIOMemoryBufferPageable;
+
+ ipc_port_t sharedMem;
+ vm_size_t size = round_page_32(capacity);
+
+ // must create the entry before any pages are allocated
// set flags for entry + object create
- memEntryCacheMode |= MAP_MEM_NAMED_CREATE;
-
- if (options & kIOMemoryPurgeable)
- memEntryCacheMode |= MAP_MEM_PURGABLE;
+ vm_prot_t memEntryCacheMode = VM_PROT_READ | VM_PROT_WRITE
+ | MAP_MEM_NAMED_CREATE;
+
+ if (options & kIOMemoryPurgeable)
+ memEntryCacheMode |= MAP_MEM_PURGABLE;
+
+ // set memory entry cache mode
+ switch (options & kIOMapCacheMask)
+ {
+ case kIOMapInhibitCache:
+ SET_MAP_MEM(MAP_MEM_IO, memEntryCacheMode);
+ break;
+
+ case kIOMapWriteThruCache:
+ SET_MAP_MEM(MAP_MEM_WTHRU, memEntryCacheMode);
+ break;
+
+ case kIOMapWriteCombineCache:
+ SET_MAP_MEM(MAP_MEM_WCOMB, memEntryCacheMode);
+ break;
+
+ case kIOMapCopybackCache:
+ SET_MAP_MEM(MAP_MEM_COPYBACK, memEntryCacheMode);
+ break;
+
+ case kIOMapDefaultCache:
+ default:
+ SET_MAP_MEM(MAP_MEM_NOOP, memEntryCacheMode);
+ break;
+ }
+
+ kr = mach_make_memory_entry( vmmap,
+ &size, 0,
+ memEntryCacheMode, &sharedMem,
+ NULL );
+
+ if( (KERN_SUCCESS == kr) && (size != round_page_32(capacity))) {
+ ipc_port_release_send( sharedMem );
+ kr = kIOReturnVMError;
+ }
+ if( KERN_SUCCESS != kr)
+ return( false );
+
+ _memEntry = (void *) sharedMem;
+#if IOALLOCDEBUG
+ debug_iomallocpageable_size += size;
+#endif
+ if (NULL == inTask)
+ inTask = kernel_task;
+ else if (inTask == kernel_task)
+ {
+ vmmap = kernel_map;
+ }
+ else
+ {
+ if( !reserved) {
+ reserved = IONew( ExpansionData, 1 );
+ if( !reserved)
+ return( false );
+ }
+ vmmap = get_task_map(inTask);
+ vm_map_reference(vmmap);
+ reserved->map = vmmap;
+ }
}
else
{
- memEntryCacheMode |= MAP_MEM_NAMED_REUSE;
-
if (IOMapper::gSystem)
// assuming mapped space is 2G
lastIOAddr = (1UL << 31) - PAGE_SIZE;
@@ -203,21 +229,33 @@
if (physicalMask && (lastIOAddr != (lastIOAddr & physicalMask)))
{
mach_vm_address_t address;
- iomdOptions &= ~kIOMemoryTypeVirtual64;
- iomdOptions |= kIOMemoryTypePhysical64;
+ iomdOptions &= ~kIOMemoryTypeVirtual;
+ iomdOptions |= kIOMemoryTypePhysical;
address = IOMallocPhysical(capacity, physicalMask);
_buffer = (void *) address;
if (!_buffer)
return false;
- mapTask = inTask;
+ if (inTask == kernel_task)
+ {
+ vmmap = kernel_map;
+ }
+ else if (NULL != inTask)
+ {
+ if( !reserved) {
+ reserved = IONew( ExpansionData, 1 );
+ if( !reserved)
+ return( false );
+ }
+ vmmap = get_task_map(inTask);
+ vm_map_reference(vmmap);
+ reserved->map = vmmap;
+ }
inTask = 0;
}
else
{
- vmmap = kernel_map;
-
// Buffer shouldn't auto prepare they should be prepared explicitly
// But it never was enforced so what are you going to do?
iomdOptions |= kIOMemoryAutoPrepare;
@@ -234,52 +272,11 @@
}
}
- if( (kIOMemoryTypePhysical64 != (kIOMemoryTypeMask & iomdOptions))
- && (options & (kIOMemoryPageable | kIOMapCacheMask))) {
- ipc_port_t sharedMem;
- vm_size_t size = round_page_32(capacity);
-
- kr = mach_make_memory_entry(vmmap,
- &size, (vm_offset_t)_buffer,
- memEntryCacheMode, &sharedMem,
- NULL );
-
- if( (KERN_SUCCESS == kr) && (size != round_page_32(capacity))) {
- ipc_port_release_send( sharedMem );
- kr = kIOReturnVMError;
- }
- if( KERN_SUCCESS != kr)
- return( false );
-
- _memEntry = (void *) sharedMem;
-
- if( options & kIOMemoryPageable) {
-#if IOALLOCDEBUG
- debug_iomallocpageable_size += size;
-#endif
- mapTask = inTask;
- if (NULL == inTask)
- inTask = kernel_task;
- }
- else if (options & kIOMapCacheMask)
- {
- // Prefetch each page to put entries into the pmap
- volatile UInt8 * startAddr = (UInt8 *)_buffer;
- volatile UInt8 * endAddr = (UInt8 *)_buffer + capacity;
-
- while (startAddr < endAddr)
- {
- *startAddr;
- startAddr += page_size;
- }
- }
- }
-
- range.address = (mach_vm_address_t) _buffer;
- range.length = capacity;
-
- if (!super::initWithOptions(&range, 1, 0,
- inTask, iomdOptions, /* System mapper */ 0))
+ _singleRange.v.address = (vm_address_t) _buffer;
+ _singleRange.v.length = capacity;
+
+ if (!super::initWithOptions(&_singleRange.v, 1, 0,
+ inTask, iomdOptions, /* System mapper */ 0))
return false;
if (physicalMask && !IOMapper::gSystem)
@@ -309,7 +306,7 @@
if (lastIOAddr != (lastIOAddr & physicalMask))
{
- if (kIOMemoryTypePhysical64 != (_flags & kIOMemoryTypeMask))
+ if (kIOMemoryTypePhysical != (_flags & kIOMemoryTypeMask))
{
// flag a retry
_physSegCount = 1;
@@ -318,28 +315,21 @@
}
}
- if (mapTask)
- {
- if (!reserved) {
- reserved = IONew( ExpansionData, 1 );
- if( !reserved)
- return( false );
- }
- reserved->map = map(mapTask, 0, kIOMapAnywhere, 0, 0);
- if (!reserved->map)
+ if (vmmap)
+ {
+ kr = doMap(vmmap, (IOVirtualAddress *) &_buffer, kIOMapAnywhere, 0, capacity);
+ if (KERN_SUCCESS != kr)
{
_buffer = 0;
return( false );
}
- release(); // map took a retain on this
- mach_vm_address_t buffer = reserved->map->getAddress();
- _buffer = (void *) buffer;
- if (kIOMemoryTypeVirtual64 == (kIOMemoryTypeMask & iomdOptions))
- _ranges.v64->address = buffer;
+
+ if (kIOMemoryTypeVirtual & iomdOptions)
+ _singleRange.v.address = (vm_address_t) _buffer;
}
setLength(capacity);
-
+
return true;
}
@@ -500,16 +490,14 @@
IOOptionBits options = _options;
vm_size_t size = _capacity;
void * buffer = _buffer;
- IOVirtualAddress source = _ranges.v64->address;
- IOMemoryMap * map = 0;
+ IOVirtualAddress source = _singleRange.v.address;
+ vm_map_t vmmap = 0;
vm_offset_t alignment = _alignment;
if (reserved)
{
- map = reserved->map;
+ vmmap = reserved->map;
IODelete( reserved, ExpansionData, 1 );
- if (map)
- map->release();
}
/* super::free may unwire - deallocate buffer afterwards */
@@ -518,13 +506,25 @@
if (options & kIOMemoryPageable)
{
#if IOALLOCDEBUG
- debug_iomallocpageable_size -= round_page_32(size);
+ if (!buffer || vmmap)
+ debug_iomallocpageable_size -= round_page_32(size);
#endif
+ if (buffer)
+ {
+ if (vmmap)
+ vm_deallocate(vmmap, (vm_address_t) buffer, round_page_32(size));
+ else
+ IOFreePageable(buffer, size);
+ }
}
else if (buffer)
{
- if (kIOMemoryTypePhysical64 == (flags & kIOMemoryTypeMask))
+ if (kIOMemoryTypePhysical == (flags & kIOMemoryTypeMask))
+ {
+ if (vmmap)
+ vm_deallocate(vmmap, (vm_address_t) buffer, round_page_32(size));
IOFreePhysical((mach_vm_address_t) source, size);
+ }
else if (options & kIOMemoryPhysicallyContiguous)
IOKernelFreeContiguous((mach_vm_address_t) buffer, size);
else if (alignment > 1)
@@ -532,6 +532,8 @@
else
IOFree(buffer, size);
}
+ if (vmmap)
+ vm_map_deallocate(vmmap);
}
/*
@@ -559,7 +561,7 @@
assert(length <= _capacity);
_length = length;
- _ranges.v64->length = length;
+ _singleRange.v.length = length;
}
/*
@@ -591,10 +593,10 @@
offset = _length;
_length += actualBytesToCopy;
- _ranges.v64->length += actualBytesToCopy;
+ _singleRange.v.length += actualBytesToCopy;
if (_task == kernel_task)
- bcopy(/* from */ bytes, (void *)(_ranges.v64->address + offset),
+ bcopy(/* from */ bytes, (void *)(_singleRange.v.address + offset),
actualBytesToCopy);
else
writeBytes(offset, bytes, actualBytesToCopy);
@@ -609,10 +611,10 @@
*/
void * IOBufferMemoryDescriptor::getBytesNoCopy()
{
- if (kIOMemoryTypePhysical64 == (_flags & kIOMemoryTypeMask))
+ if (kIOMemoryTypePhysical == (_flags & kIOMemoryTypeMask))
return _buffer;
else
- return (void *)_ranges.v64->address;
+ return (void *)_singleRange.v.address;
}
@@ -625,10 +627,10 @@
IOBufferMemoryDescriptor::getBytesNoCopy(vm_size_t start, vm_size_t withLength)
{
IOVirtualAddress address;
- if (kIOMemoryTypePhysical64 == (_flags & kIOMemoryTypeMask))
+ if (kIOMemoryTypePhysical == (_flags & kIOMemoryTypeMask))
address = (IOVirtualAddress) _buffer;
else
- address = _ranges.v64->address;
+ address = _singleRange.v.address;
if (start < _length && (start + withLength) <= _length)
return (void *)(address + start);