Loading...
--- xnu/xnu-2050.9.2/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-1504.7.4/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -37,6 +37,7 @@
#include <libkern/OSDebug.h>
#include "IOKitKernelInternal.h"
+#include "IOCopyMapper.h"
__BEGIN_DECLS
void ipc_port_release_send(ipc_port_t port);
@@ -48,9 +49,10 @@
enum
{
- kInternalFlagPhysical = 0x00000001,
- kInternalFlagPageSized = 0x00000002
+ kInternalFlagRealloc = 0x00000001,
};
+
+volatile ppnum_t gIOHighestAllocatedPage;
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -82,7 +84,9 @@
kern_return_t kr;
task_t mapTask = NULL;
vm_map_t vmmap = NULL;
+ addr64_t lastIOAddr;
mach_vm_address_t highestMask = 0;
+ bool usePhys;
IOOptionBits iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
if (!capacity)
@@ -99,8 +103,6 @@
return (false);
_ranges.v64->address = 0;
_ranges.v64->length = 0;
- // make sure super::free doesn't dealloc _ranges before super::init
- _flags = kIOMemoryAsReference;
// Grab IOMD bits from the Buffer MD options
iomdOptions |= (options & kIOBufferDescriptorMemoryFlags);
@@ -110,11 +112,9 @@
alignment = ((physicalMask ^ (-1ULL)) & (physicalMask - 1));
highestMask = (physicalMask | alignment);
alignment++;
- if (alignment < page_size)
- alignment = page_size;
- }
-
- if ((options & (kIOMemorySharingTypeMask | kIOMapCacheMask | kIOMemoryClearEncrypt)) && (alignment < page_size))
+ }
+
+ if ((options & (kIOMemorySharingTypeMask | kIOMapCacheMask)) && (alignment < page_size))
alignment = page_size;
if (alignment >= page_size)
@@ -127,6 +127,9 @@
if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
return false;
+
+ if ((options & kIOMemoryPhysicallyContiguous) && !physicalMask)
+ physicalMask = 0xFFFFFFFF;
// set flags for entry + object create
vm_prot_t memEntryCacheMode = VM_PROT_READ | VM_PROT_WRITE;
@@ -148,10 +151,6 @@
case kIOMapCopybackCache:
SET_MAP_MEM(MAP_MEM_COPYBACK, memEntryCacheMode);
- break;
-
- case kIOMapCopybackInnerCache:
- SET_MAP_MEM(MAP_MEM_INNERWBACK, memEntryCacheMode);
break;
case kIOMapDefaultCache:
@@ -175,41 +174,63 @@
else
{
memEntryCacheMode |= MAP_MEM_NAMED_REUSE;
- 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;
-
- /* Allocate a wired-down buffer inside kernel space. */
-
- if ((options & kIOMemoryPhysicallyContiguous) || highestMask || (alignment > page_size))
- {
- _internalFlags |= kInternalFlagPhysical;
- if (highestMask)
- {
- _internalFlags |= kInternalFlagPageSized;
- capacity = round_page(capacity);
- }
- _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(capacity, highestMask, alignment,
- (0 != (options & kIOMemoryPhysicallyContiguous)));
- }
- else if (alignment > 1)
- {
- _buffer = IOMallocAligned(capacity, alignment);
- }
+
+ if (IOMapper::gSystem)
+ // assuming mapped space is 2G
+ lastIOAddr = (1UL << 31) - PAGE_SIZE;
else
- {
- _buffer = IOMalloc(capacity);
- }
-
- if (!_buffer)
- {
- return false;
- }
- }
-
- if( (options & (kIOMemoryPageable | kIOMapCacheMask))) {
+ 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)
+ {
+ mach_vm_address_t address;
+ iomdOptions &= ~kIOMemoryTypeVirtual64;
+ iomdOptions |= kIOMemoryTypePhysical64;
+
+ address = IOMallocPhysical(capacity, highestMask);
+ _buffer = (void *) address;
+ if (!_buffer)
+ return false;
+
+ mapTask = inTask;
+ 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;
+
+ /* Allocate a wired-down buffer inside kernel space. */
+ if (options & kIOMemoryPhysicallyContiguous)
+ {
+ // attempted allocate already
+ }
+ else if (alignment > 1)
+ {
+ _buffer = IOMallocAligned(capacity, alignment);
+ }
+ else
+ {
+ _buffer = IOMalloc(capacity);
+ }
+ if (!_buffer)
+ return false;
+ }
+ }
+
+ if( (kIOMemoryTypePhysical64 != (kIOMemoryTypeMask & iomdOptions))
+ && (options & (kIOMemoryPageable | kIOMapCacheMask))) {
ipc_port_t sharedMem;
vm_size_t size = round_page(capacity);
@@ -256,6 +277,42 @@
inTask, iomdOptions, /* System mapper */ 0))
return false;
+ if (highestMask && !IOMapper::gSystem)
+ {
+ IOMDDMACharacteristics mdSummary;
+
+ bzero(&mdSummary, sizeof(mdSummary));
+ IOReturn rtn = dmaCommandOperation(
+ kIOMDGetCharacteristics,
+ &mdSummary, sizeof(mdSummary));
+ if (rtn)
+ return false;
+
+ if (mdSummary.fHighestPage)
+ {
+ ppnum_t highest;
+ while (mdSummary.fHighestPage > (highest = gIOHighestAllocatedPage))
+ {
+ if (OSCompareAndSwap(highest, mdSummary.fHighestPage,
+ (UInt32 *) &gIOHighestAllocatedPage))
+ break;
+ }
+ lastIOAddr = ptoa_64(mdSummary.fHighestPage);
+ }
+ else
+ lastIOAddr = ptoa_64(gIOLastPage);
+
+ if (lastIOAddr != (lastIOAddr & highestMask))
+ {
+ if (kIOMemoryTypePhysical64 != (_flags & kIOMemoryTypeMask))
+ {
+ // flag a retry
+ _internalFlags |= kInternalFlagRealloc;
+ }
+ return false;
+ }
+ }
+
if (mapTask)
{
if (!reserved) {
@@ -293,8 +350,18 @@
IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
if (me && !me->initWithPhysicalMask(inTask, options, capacity, alignment, 0)) {
+ bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
me->release();
me = 0;
+ if (retry)
+ {
+ me = new IOBufferMemoryDescriptor;
+ if (me && !me->initWithPhysicalMask(inTask, options, capacity, alignment, 0))
+ {
+ me->release();
+ me = 0;
+ }
+ }
}
return me;
}
@@ -309,8 +376,18 @@
if (me && !me->initWithPhysicalMask(inTask, options, capacity, 1, physicalMask))
{
+ bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
me->release();
me = 0;
+ if (retry)
+ {
+ me = new IOBufferMemoryDescriptor;
+ if (me && !me->initWithPhysicalMask(inTask, options, capacity, 1, physicalMask))
+ {
+ me->release();
+ me = 0;
+ }
+ }
}
return me;
}
@@ -333,8 +410,18 @@
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;
}
@@ -403,8 +490,22 @@
| (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
inLength, inLength, 0 ))
{
+ bool retry = (0 != (kInternalFlagRealloc & me->_internalFlags));
me->release();
me = 0;
+ if (retry)
+ {
+ me = new IOBufferMemoryDescriptor;
+ if (me && !me->initWithPhysicalMask(
+ kernel_task, inDirection | kIOMemoryUnshared
+ | (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
+ inLength, inLength, 0 ))
+ {
+ me->release();
+ me = 0;
+ }
+ }
+
}
if (me)
@@ -430,13 +531,13 @@
{
// Cache all of the relevant information on the stack for use
// after we call super::free()!
- IOOptionBits flags = _flags;
- IOOptionBits internalFlags = _internalFlags;
+ IOOptionBits flags = _flags;
IOOptionBits options = _options;
vm_size_t size = _capacity;
void * buffer = _buffer;
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)
@@ -461,12 +562,10 @@
}
else if (buffer)
{
- if (internalFlags & kInternalFlagPhysical)
- {
- if (kInternalFlagPageSized & internalFlags)
- size = round_page(size);
- IOKernelFreePhysical((mach_vm_address_t) buffer, size);
- }
+ if (kIOMemoryTypePhysical64 == (flags & kIOMemoryTypeMask))
+ IOFreePhysical(source, size);
+ else if (options & kIOMemoryPhysicallyContiguous)
+ IOKernelFreeContiguous((mach_vm_address_t) buffer, size);
else if (alignment > 1)
IOFreeAligned(buffer, size);
else