Loading...
--- xnu/xnu-3248.50.21/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-1504.9.37/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -35,24 +35,8 @@
#include <IOKit/IOMapper.h>
#include <IOKit/IOBufferMemoryDescriptor.h>
#include <libkern/OSDebug.h>
-#include <mach/mach_vm.h>
#include "IOKitKernelInternal.h"
-
-#ifdef IOALLOCDEBUG
-#include <libkern/c++/OSCPPDebug.h>
-#endif
-#include <IOKit/IOStatisticsPrivate.h>
-
-#if IOKITSTATS
-#define IOStatisticsAlloc(type, size) \
-do { \
- IOStatistics::countAlloc(type, size); \
-} while (0)
-#else
-#define IOStatisticsAlloc(type, size)
-#endif /* IOKITSTATS */
-
__BEGIN_DECLS
void ipc_port_release_send(ipc_port_t port);
@@ -64,9 +48,8 @@
enum
{
- kInternalFlagPhysical = 0x00000001,
- kInternalFlagPageSized = 0x00000002,
- kInternalFlagPageAllocated = 0x00000004
+ kInternalFlagPhysical = 0x00000001,
+ kInternalFlagPageSized = 0x00000002
};
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -74,23 +57,6 @@
#define super IOGeneralMemoryDescriptor
OSDefineMetaClassAndStructors(IOBufferMemoryDescriptor,
IOGeneralMemoryDescriptor);
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-static uintptr_t IOBMDPageProc(iopa_t * a)
-{
- kern_return_t kr;
- vm_address_t vmaddr = 0;
- int options = 0; // KMA_LOMEM;
-
- kr = kernel_memory_allocate(kernel_map, &vmaddr,
- page_size, 0, options, VM_KERN_MEMORY_IOKIT);
-
- if (KERN_SUCCESS != kr) vmaddr = 0;
- else bzero((void *) vmaddr, page_size);
-
- return ((uintptr_t) vmaddr);
-}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -113,15 +79,14 @@
mach_vm_address_t alignment,
mach_vm_address_t physicalMask)
{
- task_t mapTask = NULL;
- vm_map_t vmmap = NULL;
- mach_vm_address_t highestMask = 0;
- IOOptionBits iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
- IODMAMapSpecification mapSpec;
- bool mapped = false;
- bool needZero;
-
- if (!capacity) return false;
+ kern_return_t kr;
+ task_t mapTask = NULL;
+ vm_map_t vmmap = NULL;
+ mach_vm_address_t highestMask = 0;
+ IOOptionBits iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
+
+ if (!capacity)
+ return false;
_options = options;
_capacity = capacity;
@@ -134,18 +99,19 @@
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);
- if (!(kIOMemoryMapperNone & options))
- {
- IOMapper::checkForSystemMapper();
- mapped = (0 != IOMapper::gSystem);
- }
- needZero = (mapped || (0 != (kIOMemorySharingTypeMask & options)));
+#if 0
+ // workarounds-
+ if ((options & kIOMemoryPhysicallyContiguous) || ((capacity == 0x1000) && (inTask == kernel_task))
+ && !physicalMask)
+ {
+ highestMask = physicalMask = 0xFFFFF000;
+ }
+ //-
+#endif
if (physicalMask && (alignment <= 1))
{
@@ -167,32 +133,52 @@
_alignment = alignment;
- if ((capacity + alignment) < _capacity) return (false);
-
if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
return false;
- bzero(&mapSpec, sizeof(mapSpec));
- mapSpec.alignment = _alignment;
- mapSpec.numAddressBits = 64;
- if (highestMask && mapped)
- {
- if (highestMask <= 0xFFFFFFFF)
- mapSpec.numAddressBits = (32 - __builtin_clz((unsigned int) highestMask));
- else
- mapSpec.numAddressBits = (64 - __builtin_clz((unsigned int) (highestMask >> 32)));
- highestMask = 0;
- }
-
- // set memory entry cache mode, pageable, purgeable
- iomdOptions |= ((options & kIOMapCacheMask) >> kIOMapCacheShift) << kIOMemoryBufferCacheShift;
+ // 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;
+ }
+
if (options & kIOMemoryPageable)
{
iomdOptions |= kIOMemoryBufferPageable;
- if (options & kIOMemoryPurgeable) iomdOptions |= kIOMemoryBufferPurgeable;
+
+ // 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;
}
else
{
+ memEntryCacheMode |= MAP_MEM_NAMED_REUSE;
vmmap = kernel_map;
// Buffer shouldn't auto prepare they should be prepared explicitly
@@ -201,19 +187,7 @@
/* Allocate a wired-down buffer inside kernel space. */
- bool contig = (0 != (options & kIOMemoryHostPhysicallyContiguous));
-
- if (!contig && (0 != (options & kIOMemoryPhysicallyContiguous)))
- {
- contig |= (!mapped);
- contig |= (0 != (kIOMemoryMapperNone & options));
-#if 0
- // treat kIOMemoryPhysicallyContiguous as kIOMemoryHostPhysicallyContiguous for now
- contig |= true;
-#endif
- }
-
- if (contig || highestMask || (alignment > page_size))
+ if ((options & kIOMemoryPhysicallyContiguous) || highestMask || (alignment > page_size))
{
_internalFlags |= kInternalFlagPhysical;
if (highestMask)
@@ -221,22 +195,8 @@
_internalFlags |= kInternalFlagPageSized;
capacity = round_page(capacity);
}
- _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(
- capacity, highestMask, alignment, contig);
- }
- else if (needZero
- && ((capacity + alignment) <= (page_size - gIOPageAllocChunkBytes)))
- {
- _internalFlags |= kInternalFlagPageAllocated;
- needZero = false;
- _buffer = (void *) iopa_alloc(&gIOBMDPageAllocator, &IOBMDPageProc, capacity, alignment);
- if (_buffer)
- {
- IOStatisticsAlloc(kIOStatisticsMallocAligned, capacity);
-#if IOALLOCDEBUG
- OSAddAtomic(capacity, &debug_iomalloc_size);
-#endif
- }
+ _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(capacity, highestMask, alignment,
+ (0 != (options & kIOMemoryPhysicallyContiguous)));
}
else if (alignment > 1)
{
@@ -246,22 +206,34 @@
{
_buffer = IOMalloc(capacity);
}
+
if (!_buffer)
{
return false;
}
- if (needZero) bzero(_buffer, capacity);
}
if( (options & (kIOMemoryPageable | kIOMapCacheMask))) {
+ ipc_port_t sharedMem;
vm_size_t size = round_page(capacity);
- // initWithOptions will create memory entry
- iomdOptions |= kIOMemoryPersistent;
+ kr = mach_make_memory_entry(vmmap,
+ &size, (vm_offset_t)_buffer,
+ memEntryCacheMode, &sharedMem,
+ NULL );
+
+ if( (KERN_SUCCESS == kr) && (size != round_page(capacity))) {
+ ipc_port_release_send( sharedMem );
+ kr = kIOReturnVMError;
+ }
+ if( KERN_SUCCESS != kr)
+ return( false );
+
+ _memEntry = (void *) sharedMem;
if( options & kIOMemoryPageable) {
#if IOALLOCDEBUG
- OSAddAtomicLong(size, &debug_iomallocpageable_size);
+ debug_iomallocpageable_size += size;
#endif
mapTask = inTask;
if (NULL == inTask)
@@ -275,10 +247,9 @@
while (startAddr < endAddr)
{
- UInt8 dummyVar = *startAddr;
- (void) dummyVar;
+ *startAddr;
startAddr += page_size;
- }
+ }
}
}
@@ -287,11 +258,6 @@
if (!super::initWithOptions(_ranges.v64, 1, 0,
inTask, iomdOptions, /* System mapper */ 0))
- return false;
-
- // give any system mapper the allocation params
- if (kIOReturnSuccess != dmaCommandOperation(kIOMDAddDMAMapSpec,
- &mapSpec, sizeof(mapSpec)))
return false;
if (mapTask)
@@ -302,7 +268,7 @@
return( false );
}
reserved->map = createMappingInTask(mapTask, 0,
- kIOMapAnywhere | (options & kIOMapPrefault) | (options & kIOMapCacheMask), 0, 0);
+ kIOMapAnywhere | (options & kIOMapCacheMask), 0, 0);
if (!reserved->map)
{
_buffer = 0;
@@ -494,38 +460,21 @@
if (options & kIOMemoryPageable)
{
#if IOALLOCDEBUG
- OSAddAtomicLong(-(round_page(size)), &debug_iomallocpageable_size);
+ debug_iomallocpageable_size -= round_page(size);
#endif
}
else if (buffer)
{
- if (kInternalFlagPageSized & internalFlags) size = round_page(size);
-
- if (kInternalFlagPhysical & internalFlags)
+ if (internalFlags & kInternalFlagPhysical)
{
+ if (kInternalFlagPageSized & internalFlags)
+ size = round_page(size);
IOKernelFreePhysical((mach_vm_address_t) buffer, size);
- }
- else if (kInternalFlagPageAllocated & internalFlags)
- {
- uintptr_t page;
- page = iopa_free(&gIOBMDPageAllocator, (uintptr_t) buffer, size);
- if (page)
- {
- kmem_free(kernel_map, page, page_size);
- }
-#if IOALLOCDEBUG
- OSAddAtomic(-size, &debug_iomalloc_size);
-#endif
- IOStatisticsAlloc(kIOStatisticsFreeAligned, size);
- }
+ }
else if (alignment > 1)
- {
IOFreeAligned(buffer, size);
- }
else
- {
IOFree(buffer, size);
- }
}
if (range && (kIOMemoryAsReference & flags))
IODelete(range, IOAddressRange, 1);
@@ -554,7 +503,6 @@
void IOBufferMemoryDescriptor::setLength(vm_size_t length)
{
assert(length <= _capacity);
- if (length > _capacity) return;
_length = length;
_ranges.v64->length = length;