Loading...
--- xnu/xnu-1456.1.26/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -25,16 +25,12 @@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
-
-#define _IOMEMORYDESCRIPTOR_INTERNAL_
-
#include <IOKit/assert.h>
#include <IOKit/system.h>
#include <IOKit/IOLib.h>
#include <IOKit/IOMapper.h>
#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <libkern/OSDebug.h>
#include "IOKitKernelInternal.h"
#include "IOCopyMapper.h"
@@ -43,14 +39,10 @@
void ipc_port_release_send(ipc_port_t port);
#include <vm/pmap.h>
+vm_map_t IOPageableMapForAddress( vm_address_t address );
__END_DECLS
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-enum
-{
- kInternalFlagRealloc = 0x00000001,
-};
volatile ppnum_t gIOHighestAllocatedPage;
@@ -60,9 +52,50 @@
OSDefineMetaClassAndStructors(IOBufferMemoryDescriptor,
IOGeneralMemoryDescriptor);
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef __LP64__
+bool IOBufferMemoryDescriptor::initWithAddress(
+ void * /* address */ ,
+ IOByteCount /* withLength */ ,
+ IODirection /* withDirection */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithAddress(
+ vm_address_t /* address */ ,
+ IOByteCount /* withLength */ ,
+ IODirection /* withDirection */ ,
+ task_t /* withTask */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithPhysicalAddress(
+ IOPhysicalAddress /* address */ ,
+ IOByteCount /* withLength */ ,
+ IODirection /* withDirection */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithPhysicalRanges(
+ IOPhysicalRange * /* ranges */ ,
+ UInt32 /* withCount */ ,
+ IODirection /* withDirection */ ,
+ bool /* asReference */ )
+{
+ return false;
+}
+
+bool IOBufferMemoryDescriptor::initWithRanges(
+ IOVirtualRange * /* ranges */ ,
+ UInt32 /* withCount */ ,
+ IODirection /* withDirection */ ,
+ task_t /* withTask */ ,
+ bool /* asReference */ )
+{
+ return false;
+}
+
bool IOBufferMemoryDescriptor::initWithOptions(
IOOptionBits options,
vm_size_t capacity,
@@ -72,7 +105,6 @@
mach_vm_address_t physicalMask = 0;
return (initWithPhysicalMask(inTask, options, capacity, alignment, physicalMask));
}
-#endif /* !__LP64__ */
bool IOBufferMemoryDescriptor::initWithPhysicalMask(
task_t inTask,
@@ -85,47 +117,34 @@
task_t mapTask = NULL;
vm_map_t vmmap = NULL;
addr64_t lastIOAddr;
- mach_vm_address_t highestMask = 0;
- bool usePhys;
- IOOptionBits iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
+ IOAddressRange range;
+ IOOptionBits iomdOptions = kIOMemoryTypeVirtual64;
if (!capacity)
return false;
- _options = options;
- _capacity = capacity;
- _internalFlags = 0;
- _internalReserved = 0;
- _buffer = 0;
-
- _ranges.v64 = IONew(IOAddressRange, 1);
- if (!_ranges.v64)
- return (false);
- _ranges.v64->address = 0;
- _ranges.v64->length = 0;
-
- // Grab IOMD bits from the Buffer MD options
- iomdOptions |= (options & kIOBufferDescriptorMemoryFlags);
-
- if (physicalMask && (alignment <= 1))
- {
- alignment = ((physicalMask ^ (-1ULL)) & (physicalMask - 1));
- highestMask = (physicalMask | alignment);
- alignment++;
- }
+ _options = options;
+ _capacity = capacity;
+ _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 (alignment >= page_size)
- capacity = round_page(capacity);
-
- if (alignment > page_size)
- options |= kIOMemoryPhysicallyContiguous;
+ if (physicalMask && (alignment <= 1))
+ alignment = ((physicalMask ^ PAGE_MASK) & PAGE_MASK) + 1;
_alignment = alignment;
- if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
+ if (((inTask != kernel_task) && !(options & kIOMemoryPageable)) ||
+ (physicalMask && (options & kIOMapCacheMask)))
return false;
if ((options & kIOMemoryPhysicallyContiguous) && !physicalMask)
@@ -181,21 +200,13 @@
else
lastIOAddr = ptoa_64(gIOHighestAllocatedPage);
- usePhys = (highestMask && (lastIOAddr != (lastIOAddr & highestMask))
- && (alignment <= page_size));
-
- if (!usePhys && (options & kIOMemoryPhysicallyContiguous))
- {
- _buffer = (void *) IOKernelAllocateContiguous(capacity, highestMask, alignment);
- usePhys = (NULL == _buffer);
- }
- if (usePhys)
+ if (physicalMask && (lastIOAddr != (lastIOAddr & physicalMask)))
{
mach_vm_address_t address;
iomdOptions &= ~kIOMemoryTypeVirtual64;
iomdOptions |= kIOMemoryTypePhysical64;
- address = IOMallocPhysical(capacity, highestMask);
+ address = IOMallocPhysical(capacity, physicalMask);
_buffer = (void *) address;
if (!_buffer)
return false;
@@ -213,17 +224,11 @@
/* Allocate a wired-down buffer inside kernel space. */
if (options & kIOMemoryPhysicallyContiguous)
- {
- // attempted allocate already
- }
+ _buffer = (void *) IOKernelAllocateContiguous(capacity, alignment);
else if (alignment > 1)
- {
_buffer = IOMallocAligned(capacity, alignment);
- }
else
- {
_buffer = IOMalloc(capacity);
- }
if (!_buffer)
return false;
}
@@ -232,14 +237,14 @@
if( (kIOMemoryTypePhysical64 != (kIOMemoryTypeMask & iomdOptions))
&& (options & (kIOMemoryPageable | kIOMapCacheMask))) {
ipc_port_t sharedMem;
- vm_size_t size = round_page(capacity);
+ 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(capacity))) {
+ if( (KERN_SUCCESS == kr) && (size != round_page_32(capacity))) {
ipc_port_release_send( sharedMem );
kr = kIOReturnVMError;
}
@@ -270,14 +275,14 @@
}
}
- _ranges.v64->address = (mach_vm_address_t) _buffer;;
- _ranges.v64->length = _capacity;
-
- if (!super::initWithOptions(_ranges.v64, 1, 0,
+ range.address = (mach_vm_address_t) _buffer;
+ range.length = capacity;
+
+ if (!super::initWithOptions(&range, 1, 0,
inTask, iomdOptions, /* System mapper */ 0))
return false;
- if (highestMask && !IOMapper::gSystem)
+ if (physicalMask && !IOMapper::gSystem)
{
IOMDDMACharacteristics mdSummary;
@@ -302,12 +307,12 @@
else
lastIOAddr = ptoa_64(gIOLastPage);
- if (lastIOAddr != (lastIOAddr & highestMask))
+ if (lastIOAddr != (lastIOAddr & physicalMask))
{
if (kIOMemoryTypePhysical64 != (_flags & kIOMemoryTypeMask))
{
// flag a retry
- _internalFlags |= kInternalFlagRealloc;
+ _physSegCount = 1;
}
return false;
}
@@ -320,23 +325,20 @@
if( !reserved)
return( false );
}
- reserved->map = createMappingInTask(mapTask, 0,
- kIOMapAnywhere | (options & kIOMapCacheMask), 0, 0);
+ reserved->map = map(mapTask, 0, kIOMapAnywhere, 0, 0);
if (!reserved->map)
{
_buffer = 0;
return( false );
}
release(); // map took a retain on this
- reserved->map->retain();
- removeMapping(reserved->map);
mach_vm_address_t buffer = reserved->map->getAddress();
_buffer = (void *) buffer;
if (kIOMemoryTypeVirtual64 == (kIOMemoryTypeMask & iomdOptions))
_ranges.v64->address = buffer;
}
- setLength(_capacity);
+ setLength(capacity);
return true;
}
@@ -349,14 +351,14 @@
{
IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(inTask, options, capacity, alignment, 0)) {
- bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
+ if (me && !me->initWithOptions(options, capacity, alignment, inTask)) {
+ bool retry = me->_physSegCount;
me->release();
me = 0;
if (retry)
{
me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(inTask, options, capacity, alignment, 0))
+ if (me && !me->initWithOptions(options, capacity, alignment, inTask))
{
me->release();
me = 0;
@@ -376,7 +378,7 @@
if (me && !me->initWithPhysicalMask(inTask, options, capacity, 1, physicalMask))
{
- bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
+ bool retry = me->_physSegCount;
me->release();
me = 0;
if (retry)
@@ -392,38 +394,20 @@
return me;
}
-#ifndef __LP64__
bool IOBufferMemoryDescriptor::initWithOptions(
IOOptionBits options,
vm_size_t capacity,
vm_offset_t alignment)
{
- return (initWithPhysicalMask(kernel_task, options, capacity, alignment, (mach_vm_address_t)0));
-}
-#endif /* !__LP64__ */
+ return( initWithOptions(options, capacity, alignment, kernel_task) );
+}
IOBufferMemoryDescriptor * IOBufferMemoryDescriptor::withOptions(
IOOptionBits options,
vm_size_t capacity,
vm_offset_t alignment)
{
- IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
-
- if (me && !me->initWithPhysicalMask(kernel_task, options, capacity, alignment, 0)) {
- bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
- me->release();
- me = 0;
- if (retry)
- {
- me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(kernel_task, options, capacity, alignment, 0))
- {
- me->release();
- me = 0;
- }
- }
- }
- return me;
+ return(IOBufferMemoryDescriptor::inTaskWithOptions(kernel_task, options, capacity, alignment));
}
@@ -444,7 +428,6 @@
inCapacity, inContiguous ? inCapacity : 1 ));
}
-#ifndef __LP64__
/*
* initWithBytes:
*
@@ -456,9 +439,10 @@
IODirection inDirection,
bool inContiguous)
{
- if (!initWithPhysicalMask(kernel_task, inDirection | kIOMemoryUnshared
- | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
- inLength, inLength, (mach_vm_address_t)0))
+ if (!initWithOptions(
+ inDirection | kIOMemoryUnshared
+ | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
+ inLength, inLength ))
return false;
// start out with no data
@@ -469,7 +453,6 @@
return true;
}
-#endif /* !__LP64__ */
/*
* withBytes:
@@ -485,39 +468,21 @@
{
IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(
- kernel_task, inDirection | kIOMemoryUnshared
- | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
- inLength, inLength, 0 ))
- {
- bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
+ if (me && !me->initWithBytes(inBytes, inLength, inDirection, inContiguous))
+ {
+ bool retry = me->_physSegCount;
me->release();
me = 0;
if (retry)
{
me = new IOBufferMemoryDescriptor;
- if (me && !me->initWithPhysicalMask(
- kernel_task, inDirection | kIOMemoryUnshared
- | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
- inLength, inLength, 0 ))
+ if (me && !me->initWithBytes(inBytes, inLength, inDirection, inContiguous))
{
me->release();
me = 0;
}
}
- }
-
- if (me)
- {
- // start out with no data
- me->setLength(0);
-
- if (!me->appendBytes(inBytes, inLength))
- {
- me->release();
- me = 0;
- }
}
return me;
}
@@ -535,13 +500,9 @@
IOOptionBits options = _options;
vm_size_t size = _capacity;
void * buffer = _buffer;
+ IOVirtualAddress source = _ranges.v64->address;
IOMemoryMap * map = 0;
- IOAddressRange * range = _ranges.v64;
- mach_vm_address_t source = range ? range->address : 0;
vm_offset_t alignment = _alignment;
-
- if (alignment >= page_size)
- size = round_page(size);
if (reserved)
{
@@ -557,13 +518,13 @@
if (options & kIOMemoryPageable)
{
#if IOALLOCDEBUG
- debug_iomallocpageable_size -= round_page(size);
+ debug_iomallocpageable_size -= round_page_32(size);
#endif
}
else if (buffer)
{
if (kIOMemoryTypePhysical64 == (flags & kIOMemoryTypeMask))
- IOFreePhysical(source, size);
+ IOFreePhysical((mach_vm_address_t) source, size);
else if (options & kIOMemoryPhysicallyContiguous)
IOKernelFreeContiguous((mach_vm_address_t) buffer, size);
else if (alignment > 1)
@@ -571,8 +532,6 @@
else
IOFree(buffer, size);
}
- if (range && (kIOMemoryAsReference & flags))
- IODelete(range, IOAddressRange, 1);
}
/*
@@ -612,10 +571,7 @@
*/
void IOBufferMemoryDescriptor::setDirection(IODirection direction)
{
- _flags = (_flags & ~kIOMemoryDirectionMask) | direction;
-#ifndef __LP64__
- _direction = (IODirection) (_flags & kIOMemoryDirectionMask);
-#endif /* !__LP64__ */
+ _direction = direction;
}
/*
@@ -679,9 +635,8 @@
return 0;
}
-#ifndef __LP64__
-void * IOBufferMemoryDescriptor::getVirtualSegment(IOByteCount offset,
- IOByteCount * lengthOfSegment)
+/* DEPRECATED */ void * IOBufferMemoryDescriptor::getVirtualSegment(IOByteCount offset,
+/* DEPRECATED */ IOByteCount * lengthOfSegment)
{
void * bytes = getBytesNoCopy(offset, 0);
@@ -690,15 +645,9 @@
return bytes;
}
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 0);
-OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 1);
-#else /* !__LP64__ */
+
OSMetaClassDefineReservedUsed(IOBufferMemoryDescriptor, 0);
OSMetaClassDefineReservedUsed(IOBufferMemoryDescriptor, 1);
-#endif /* !__LP64__ */
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 2);
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 3);
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 4);