Loading...
--- xnu/xnu-12377.101.15/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-4903.270.47/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -25,7 +25,6 @@
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
-#define IOKIT_ENABLE_SHARED_PTR
#define _IOMEMORYDESCRIPTOR_INTERNAL_
@@ -37,8 +36,6 @@
#include <IOKit/IOBufferMemoryDescriptor.h>
#include <libkern/OSDebug.h>
#include <mach/mach_vm.h>
-
-#include <vm/vm_kern_xnu.h>
#include "IOKitKernelInternal.h"
@@ -61,7 +58,6 @@
void ipc_port_release_send(ipc_port_t port);
#include <vm/pmap.h>
-KALLOC_HEAP_DEFINE(KHEAP_IOBMD_CONTROL, "IOBMD_control", KHEAP_ID_KT_VAR);
__END_DECLS
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -70,46 +66,35 @@
kInternalFlagPhysical = 0x00000001,
kInternalFlagPageSized = 0x00000002,
kInternalFlagPageAllocated = 0x00000004,
- kInternalFlagInit = 0x00000008,
- kInternalFlagHasPointers = 0x00000010,
- kInternalFlagGuardPages = 0x00000020,
- /**
- * Should the IOBMD behave as if it has no kernel mapping for the
- * underlying buffer? Note that this does not necessarily imply the
- * existence (or non-existence) of a kernel mapping.
- */
- kInternalFlagAsIfUnmapped = 0x00000040,
+ kInternalFlagInit = 0x00000008
};
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#define super IOGeneralMemoryDescriptor
-OSDefineMetaClassAndStructorsWithZone(IOBufferMemoryDescriptor,
- IOGeneralMemoryDescriptor, ZC_ZFREE_CLEARMEM);
+OSDefineMetaClassAndStructors(IOBufferMemoryDescriptor,
+ IOGeneralMemoryDescriptor);
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#if defined(__x86_64__)
static uintptr_t
-IOBMDPageProc(kalloc_heap_t kheap, iopa_t * a)
+IOBMDPageProc(iopa_t * a)
{
kern_return_t kr;
vm_address_t vmaddr = 0;
- kma_flags_t kma_flags = KMA_ZERO;
-
- if (kheap == KHEAP_DATA_SHARED) {
- kma_flags = (kma_flags_t) (kma_flags | KMA_DATA_SHARED);
- }
- kr = kmem_alloc(kernel_map, &vmaddr, page_size,
- kma_flags, VM_KERN_MEMORY_IOKIT);
+ 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;
}
-#endif /* defined(__x86_64__) */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -126,60 +111,6 @@
}
#endif /* !__LP64__ */
-OSSharedPtr<IOBufferMemoryDescriptor>
-IOBufferMemoryDescriptor::withCopy(
- task_t inTask,
- IOOptionBits options,
- vm_map_t sourceMap,
- mach_vm_address_t source,
- mach_vm_size_t size)
-{
- OSSharedPtr<IOBufferMemoryDescriptor> inst;
- kern_return_t err;
- vm_map_copy_t copy;
- vm_map_address_t address;
-
- copy = NULL;
- do {
- err = kIOReturnNoMemory;
- inst = OSMakeShared<IOBufferMemoryDescriptor>();
- if (!inst) {
- break;
- }
- inst->_ranges.v64 = IOMallocType(IOAddressRange);
-
- err = vm_map_copyin(sourceMap, source, size,
- false /* src_destroy */, ©);
- if (KERN_SUCCESS != err) {
- break;
- }
-
- err = vm_map_copyout(get_task_map(inTask), &address, copy);
- if (KERN_SUCCESS != err) {
- break;
- }
- copy = NULL;
-
- inst->_ranges.v64->address = address;
- inst->_ranges.v64->length = size;
-
- if (!inst->initWithPhysicalMask(inTask, options, size, page_size, 0)) {
- err = kIOReturnError;
- }
- } while (false);
-
- if (KERN_SUCCESS == err) {
- return inst;
- }
-
- if (copy) {
- vm_map_copy_discard(copy);
- }
-
- return nullptr;
-}
-
-
bool
IOBufferMemoryDescriptor::initWithPhysicalMask(
task_t inTask,
@@ -189,51 +120,29 @@
mach_vm_address_t physicalMask)
{
task_t mapTask = NULL;
- kalloc_heap_t kheap = KHEAP_DATA_SHARED;
+ vm_map_t vmmap = NULL;
mach_vm_address_t highestMask = 0;
IOOptionBits iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
IODMAMapSpecification mapSpec;
bool mapped = false;
- bool withCopy = false;
- bool mappedOrShared = false;
- bool noSoftLimit = false;
+ bool needZero;
if (!capacity) {
return false;
}
- /*
- * The IOKit constructor requests the allocator for zeroed memory
- * so the members of the class do not need to be explicitly zeroed.
- */
_options = options;
_capacity = capacity;
-
+ _internalFlags = 0;
+ _internalReserved = 0;
+ _buffer = 0;
+
+ _ranges.v64 = IONew(IOAddressRange, 1);
if (!_ranges.v64) {
- _ranges.v64 = IOMallocType(IOAddressRange);
- _ranges.v64->address = 0;
- _ranges.v64->length = 0;
- } else {
- if (!_ranges.v64->address) {
- return false;
- }
- if (!(kIOMemoryPageable & options)) {
- return false;
- }
- if (!inTask) {
- return false;
- }
- _buffer = (void *) _ranges.v64->address;
- withCopy = true;
- }
-
- /*
- * Set kalloc_heap to KHEAP_IOBMD_CONTROL if allocation contains pointers
- */
- if (kInternalFlagHasPointers & _internalFlags) {
- kheap = KHEAP_IOBMD_CONTROL;
- }
-
+ return false;
+ }
+ _ranges.v64->address = 0;
+ _ranges.v64->length = 0;
// make sure super::free doesn't dealloc _ranges before super::init
_flags = kIOMemoryAsReference;
@@ -242,8 +151,9 @@
if (!(kIOMemoryMapperNone & options)) {
IOMapper::checkForSystemMapper();
- mapped = (NULL != IOMapper::gSystem);
- }
+ mapped = (0 != IOMapper::gSystem);
+ }
+ needZero = (mapped || (0 != (kIOMemorySharingTypeMask & options)));
if (physicalMask && (alignment <= 1)) {
alignment = ((physicalMask ^ (-1ULL)) & (physicalMask - 1));
@@ -259,9 +169,7 @@
}
if (alignment >= page_size) {
- if (round_page_overflow(capacity, &capacity)) {
- return false;
- }
+ capacity = round_page(capacity);
}
if (alignment > page_size) {
@@ -274,19 +182,8 @@
return false;
}
- if (inTask) {
- if ((inTask != kernel_task) && !(options & kIOMemoryPageable)) {
- // Cannot create non-pageable memory in user tasks
- return false;
- }
- } else {
- // Not passing a task implies the memory should not be mapped (or, at
- // least, should behave as if it were not mapped)
- _internalFlags |= kInternalFlagAsIfUnmapped;
-
- // Disable the soft-limit since the mapping, if any, will not escape the
- // IOBMD.
- noSoftLimit = true;
+ if ((inTask != kernel_task) && !(options & kIOMemoryPageable)) {
+ return false;
}
bzero(&mapSpec, sizeof(mapSpec));
@@ -294,9 +191,9 @@
mapSpec.numAddressBits = 64;
if (highestMask && mapped) {
if (highestMask <= 0xFFFFFFFF) {
- mapSpec.numAddressBits = (uint8_t)(32 - __builtin_clz((unsigned int) highestMask));
+ mapSpec.numAddressBits = (32 - __builtin_clz((unsigned int) highestMask));
} else {
- mapSpec.numAddressBits = (uint8_t)(64 - __builtin_clz((unsigned int) (highestMask >> 32)));
+ mapSpec.numAddressBits = (64 - __builtin_clz((unsigned int) (highestMask >> 32)));
}
highestMask = 0;
}
@@ -304,15 +201,13 @@
// set memory entry cache mode, pageable, purgeable
iomdOptions |= ((options & kIOMapCacheMask) >> kIOMapCacheShift) << kIOMemoryBufferCacheShift;
if (options & kIOMemoryPageable) {
- if (_internalFlags & kInternalFlagGuardPages) {
- printf("IOBMD: Unsupported use of guard pages with pageable memory.\n");
- return false;
- }
iomdOptions |= kIOMemoryBufferPageable;
if (options & kIOMemoryPurgeable) {
iomdOptions |= kIOMemoryBufferPurgeable;
}
} 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;
@@ -330,101 +225,51 @@
#endif
}
- mappedOrShared = (mapped || (0 != (kIOMemorySharingTypeMask & options)));
if (contig || highestMask || (alignment > page_size)) {
- if (_internalFlags & kInternalFlagGuardPages) {
- printf("IOBMD: Unsupported use of guard pages with physical mask or contiguous memory.\n");
- return false;
- }
_internalFlags |= kInternalFlagPhysical;
if (highestMask) {
_internalFlags |= kInternalFlagPageSized;
- if (round_page_overflow(capacity, &capacity)) {
- return false;
- }
+ capacity = round_page(capacity);
}
- _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(kheap,
- capacity, highestMask, alignment, contig, noSoftLimit);
- } else if (_internalFlags & kInternalFlagGuardPages) {
- vm_offset_t address = 0;
- kern_return_t kr;
- uintptr_t alignMask;
- kma_flags_t kma_flags = (kma_flags_t) (KMA_GUARD_FIRST |
- KMA_GUARD_LAST | KMA_ZERO);
-
- if (((uint32_t) alignment) != alignment) {
- return false;
- }
- if (kheap == KHEAP_DATA_SHARED) {
- kma_flags = (kma_flags_t) (kma_flags | KMA_DATA_SHARED);
- }
-
- if (noSoftLimit) {
- kma_flags = (kma_flags_t)(kma_flags | KMA_NOSOFTLIMIT);
- }
-
- alignMask = (1UL << log2up((uint32_t) alignment)) - 1;
- kr = kernel_memory_allocate(kernel_map, &address,
- capacity + page_size * 2, alignMask, kma_flags,
- IOMemoryTag(kernel_map));
- if (kr != KERN_SUCCESS || address == 0) {
- return false;
- }
-#if IOALLOCDEBUG
- OSAddAtomicLong(capacity, &debug_iomalloc_size);
-#endif
- IOStatisticsAlloc(kIOStatisticsMallocAligned, capacity);
- _buffer = (void *)(address + page_size);
-#if defined(__x86_64__)
- } else if (mappedOrShared
- && (capacity + alignment) <= (page_size - gIOPageAllocChunkBytes)) {
+ _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(
+ capacity, highestMask, alignment, contig);
+ } else if (needZero
+ && ((capacity + alignment) <= (page_size - gIOPageAllocChunkBytes))) {
_internalFlags |= kInternalFlagPageAllocated;
- _buffer = (void *) iopa_alloc(&gIOBMDPageAllocator,
- &IOBMDPageProc, kheap, capacity, alignment);
+ needZero = false;
+ _buffer = (void *) iopa_alloc(&gIOBMDPageAllocator, &IOBMDPageProc, capacity, alignment);
if (_buffer) {
- bzero(_buffer, capacity);
IOStatisticsAlloc(kIOStatisticsMallocAligned, capacity);
#if IOALLOCDEBUG
- OSAddAtomicLong(capacity, &debug_iomalloc_size);
+ OSAddAtomic(capacity, &debug_iomalloc_size);
#endif
}
-#endif /* defined(__x86_64__) */
+ } else if (alignment > 1) {
+ _buffer = IOMallocAligned(capacity, alignment);
} else {
- zalloc_flags_t zflags = Z_ZERO_VM_TAG_BT_BIT;
- if (noSoftLimit) {
- zflags = (zalloc_flags_t)(zflags | Z_NOSOFTLIMIT);
- }
-
- /* BEGIN IGNORE CODESTYLE */
- __typed_allocators_ignore_push
- if (alignment > 1) {
- _buffer = IOMallocAligned_internal(kheap, capacity, alignment,
- zflags);
- } else {
- _buffer = IOMalloc_internal(kheap, capacity, zflags);
- }
- __typed_allocators_ignore_pop
- /* END IGNORE CODESTYLE */
+ _buffer = IOMalloc(capacity);
}
if (!_buffer) {
return false;
}
+ if (needZero) {
+ bzero(_buffer, capacity);
+ }
}
if ((options & (kIOMemoryPageable | kIOMapCacheMask))) {
vm_size_t size = round_page(capacity);
// initWithOptions will create memory entry
- if (!withCopy) {
- iomdOptions |= kIOMemoryPersistent;
- }
+ iomdOptions |= kIOMemoryPersistent;
if (options & kIOMemoryPageable) {
#if IOALLOCDEBUG
OSAddAtomicLong(size, &debug_iomallocpageable_size);
#endif
- if (!withCopy) {
- mapTask = inTask;
+ mapTask = inTask;
+ if (NULL == inTask) {
+ inTask = kernel_task;
}
} else if (options & kIOMapCacheMask) {
// Prefetch each page to put entries into the pmap
@@ -439,16 +284,11 @@
}
}
- _ranges.v64->address = (mach_vm_address_t) _buffer;
+ _ranges.v64->address = (mach_vm_address_t) _buffer;;
_ranges.v64->length = _capacity;
- if (!super::initWithOptions(
- /* buffers */ _ranges.v64, /* count */ 1, /* offset */ 0,
- // Since we handle all "unmapped" behavior internally and our superclass
- // requires a task, default all unbound IOBMDs to the kernel task.
- /* task */ inTask ?: kernel_task,
- /* options */ iomdOptions,
- /* System mapper */ NULL)) {
+ if (!super::initWithOptions(_ranges.v64, 1, 0,
+ inTask, iomdOptions, /* System mapper */ 0)) {
return false;
}
@@ -467,15 +307,15 @@
if (mapTask) {
if (!reserved) {
- reserved = IOMallocType(ExpansionData);
+ reserved = IONew( ExpansionData, 1 );
if (!reserved) {
return false;
}
}
reserved->map = createMappingInTask(mapTask, 0,
- kIOMapAnywhere | (options & kIOMapPrefault) | (options & kIOMapCacheMask), 0, 0).detach();
+ kIOMapAnywhere | (options & kIOMapPrefault) | (options & kIOMapCacheMask), 0, 0);
if (!reserved->map) {
- _buffer = NULL;
+ _buffer = 0;
return false;
}
release(); // map took a retain on this
@@ -493,98 +333,34 @@
return true;
}
-bool
-IOBufferMemoryDescriptor::initControlWithPhysicalMask(
- task_t inTask,
- IOOptionBits options,
- mach_vm_size_t capacity,
- mach_vm_address_t alignment,
- mach_vm_address_t physicalMask)
-{
- _internalFlags = kInternalFlagHasPointers;
- return initWithPhysicalMask(inTask, options, capacity, alignment,
- physicalMask);
-}
-
-bool
-IOBufferMemoryDescriptor::initWithGuardPages(
- task_t inTask,
- IOOptionBits options,
- mach_vm_size_t capacity)
-{
- mach_vm_size_t roundedCapacity;
-
- _internalFlags = kInternalFlagGuardPages;
-
- if (round_page_overflow(capacity, &roundedCapacity)) {
- return false;
- }
-
- return initWithPhysicalMask(inTask, options, roundedCapacity, page_size,
- (mach_vm_address_t)0);
-}
-
-OSSharedPtr<IOBufferMemoryDescriptor>
+IOBufferMemoryDescriptor *
IOBufferMemoryDescriptor::inTaskWithOptions(
task_t inTask,
IOOptionBits options,
vm_size_t capacity,
vm_offset_t alignment)
{
- OSSharedPtr<IOBufferMemoryDescriptor> me = OSMakeShared<IOBufferMemoryDescriptor>();
+ IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
if (me && !me->initWithPhysicalMask(inTask, options, capacity, alignment, 0)) {
- me.reset();
+ me->release();
+ me = 0;
}
return me;
}
-OSSharedPtr<IOBufferMemoryDescriptor>
-IOBufferMemoryDescriptor::inTaskWithOptions(
- task_t inTask,
- IOOptionBits options,
- vm_size_t capacity,
- vm_offset_t alignment,
- uint32_t kernTag,
- uint32_t userTag)
-{
- OSSharedPtr<IOBufferMemoryDescriptor> me = OSMakeShared<IOBufferMemoryDescriptor>();
-
- if (me) {
- me->setVMTags(kernTag, userTag);
-
- if (!me->initWithPhysicalMask(inTask, options, capacity, alignment, 0)) {
- me.reset();
- }
- }
- return me;
-}
-
-OSSharedPtr<IOBufferMemoryDescriptor>
+IOBufferMemoryDescriptor *
IOBufferMemoryDescriptor::inTaskWithPhysicalMask(
task_t inTask,
IOOptionBits options,
mach_vm_size_t capacity,
mach_vm_address_t physicalMask)
{
- OSSharedPtr<IOBufferMemoryDescriptor> me = OSMakeShared<IOBufferMemoryDescriptor>();
+ IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
if (me && !me->initWithPhysicalMask(inTask, options, capacity, 1, physicalMask)) {
- me.reset();
- }
- return me;
-}
-
-OSSharedPtr<IOBufferMemoryDescriptor>
-IOBufferMemoryDescriptor::inTaskWithGuardPages(
- task_t inTask,
- IOOptionBits options,
- mach_vm_size_t capacity)
-{
- OSSharedPtr<IOBufferMemoryDescriptor> me = OSMakeShared<IOBufferMemoryDescriptor>();
-
- if (me && !me->initWithGuardPages(inTask, options, capacity)) {
- me.reset();
+ me->release();
+ me = 0;
}
return me;
}
@@ -600,16 +376,17 @@
}
#endif /* !__LP64__ */
-OSSharedPtr<IOBufferMemoryDescriptor>
+IOBufferMemoryDescriptor *
IOBufferMemoryDescriptor::withOptions(
IOOptionBits options,
vm_size_t capacity,
vm_offset_t alignment)
{
- OSSharedPtr<IOBufferMemoryDescriptor> me = OSMakeShared<IOBufferMemoryDescriptor>();
+ IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
if (me && !me->initWithPhysicalMask(kernel_task, options, capacity, alignment, 0)) {
- me.reset();
+ me->release();
+ me = 0;
}
return me;
}
@@ -621,7 +398,7 @@
* Returns a new IOBufferMemoryDescriptor with a buffer large enough to
* hold capacity bytes. The descriptor's length is initially set to the capacity.
*/
-OSSharedPtr<IOBufferMemoryDescriptor>
+IOBufferMemoryDescriptor *
IOBufferMemoryDescriptor::withCapacity(vm_size_t inCapacity,
IODirection inDirection,
bool inContiguous)
@@ -668,21 +445,20 @@
* Returns a new IOBufferMemoryDescriptor preloaded with bytes (copied).
* The descriptor's length and capacity are set to the input buffer's size.
*/
-OSSharedPtr<IOBufferMemoryDescriptor>
+IOBufferMemoryDescriptor *
IOBufferMemoryDescriptor::withBytes(const void * inBytes,
vm_size_t inLength,
IODirection inDirection,
bool inContiguous)
{
- OSSharedPtr<IOBufferMemoryDescriptor> me = OSMakeShared<IOBufferMemoryDescriptor>();
- mach_vm_address_t alignment;
-
- alignment = (inLength <= page_size) ? inLength : page_size;
+ IOBufferMemoryDescriptor *me = new IOBufferMemoryDescriptor;
+
if (me && !me->initWithPhysicalMask(
kernel_task, inDirection | kIOMemoryUnshared
| (inContiguous ? kIOMemoryPhysicallyContiguous : 0),
- inLength, alignment, 0 )) {
- me.reset();
+ inLength, inLength, 0 )) {
+ me->release();
+ me = 0;
}
if (me) {
@@ -690,7 +466,8 @@
me->setLength(0);
if (!me->appendBytes(inBytes, inLength)) {
- me.reset();
+ me->release();
+ me = 0;
}
}
return me;
@@ -711,21 +488,17 @@
IOOptionBits options = _options;
vm_size_t size = _capacity;
void * buffer = _buffer;
- IOMemoryMap * map = NULL;
+ IOMemoryMap * map = 0;
IOAddressRange * range = _ranges.v64;
vm_offset_t alignment = _alignment;
- kalloc_heap_t kheap = KHEAP_DATA_SHARED;
- vm_size_t rsize;
if (alignment >= page_size) {
- if (!round_page_overflow(size, &rsize)) {
- size = rsize;
- }
+ size = round_page(size);
}
if (reserved) {
map = reserved->map;
- IOFreeType(reserved, ExpansionData);
+ IODelete( reserved, ExpansionData, 1 );
if (map) {
map->release();
}
@@ -733,13 +506,7 @@
if ((options & kIOMemoryPageable)
|| (kInternalFlagPageSized & internalFlags)) {
- if (!round_page_overflow(size, &rsize)) {
- size = rsize;
- }
- }
-
- if (internalFlags & kInternalFlagHasPointers) {
- kheap = KHEAP_IOBMD_CONTROL;
+ size = round_page(size);
}
#if IOTRACKING
@@ -759,42 +526,25 @@
#endif
} else if (buffer) {
if (kInternalFlagPhysical & internalFlags) {
- IOKernelFreePhysical(kheap, (mach_vm_address_t) buffer, size);
+ IOKernelFreePhysical((mach_vm_address_t) buffer, size);
} else if (kInternalFlagPageAllocated & internalFlags) {
-#if defined(__x86_64__)
uintptr_t page;
page = iopa_free(&gIOBMDPageAllocator, (uintptr_t) buffer, size);
if (page) {
kmem_free(kernel_map, page, page_size);
}
#if IOALLOCDEBUG
- OSAddAtomicLong(-size, &debug_iomalloc_size);
-#endif
- IOStatisticsAlloc(kIOStatisticsFreeAligned, size);
-#else /* !defined(__x86_64__) */
- /* should be unreachable */
- panic("Attempting to free IOBMD with page allocated flag");
-#endif /* defined(__x86_64__) */
- } else if (kInternalFlagGuardPages & internalFlags) {
- vm_offset_t allocation = (vm_offset_t)buffer - page_size;
- kmem_free(kernel_map, allocation, size + page_size * 2,
- (kmf_flags_t)(KMF_GUARD_FIRST | KMF_GUARD_LAST));
-#if IOALLOCDEBUG
- OSAddAtomicLong(-size, &debug_iomalloc_size);
+ OSAddAtomic(-size, &debug_iomalloc_size);
#endif
IOStatisticsAlloc(kIOStatisticsFreeAligned, size);
} else if (alignment > 1) {
- /* BEGIN IGNORE CODESTYLE */
- __typed_allocators_ignore_push
- IOFreeAligned_internal(kheap, buffer, size);
+ IOFreeAligned(buffer, size);
} else {
- IOFree_internal(kheap, buffer, size);
- __typed_allocators_ignore_pop
- /* END IGNORE CODESTYLE */
+ IOFree(buffer, size);
}
}
if (range && (kIOMemoryAsReference & flags)) {
- IOFreeType(range, IOAddressRange);
+ IODelete(range, IOAddressRange, 1);
}
}
@@ -857,7 +607,7 @@
bool
IOBufferMemoryDescriptor::appendBytes(const void * bytes, vm_size_t withLength)
{
- vm_size_t actualBytesToCopy = IOMin(withLength, _capacity - _length);
+ vm_size_t actualBytesToCopy = min(withLength, _capacity - _length);
IOByteCount offset;
assert(_length <= _capacity);
@@ -884,10 +634,6 @@
void *
IOBufferMemoryDescriptor::getBytesNoCopy()
{
- if (__improbable(_internalFlags & kInternalFlagAsIfUnmapped)) {
- return NULL;
- }
-
if (kIOMemoryTypePhysical64 == (_flags & kIOMemoryTypeMask)) {
return _buffer;
} else {
@@ -906,12 +652,8 @@
{
IOVirtualAddress address;
- if (__improbable(_internalFlags & kInternalFlagAsIfUnmapped)) {
- return NULL;
- }
-
if ((start + withLength) < start) {
- return NULL;
+ return 0;
}
if (kIOMemoryTypePhysical64 == (_flags & kIOMemoryTypeMask)) {
@@ -923,7 +665,7 @@
if (start < _length && (start + withLength) <= _length) {
return (void *)(address + start);
}
- return NULL;
+ return 0;
}
#ifndef __LP64__
@@ -945,8 +687,8 @@
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 0);
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 1);
#else /* !__LP64__ */
-OSMetaClassDefineReservedUsedX86(IOBufferMemoryDescriptor, 0);
-OSMetaClassDefineReservedUsedX86(IOBufferMemoryDescriptor, 1);
+OSMetaClassDefineReservedUsed(IOBufferMemoryDescriptor, 0);
+OSMetaClassDefineReservedUsed(IOBufferMemoryDescriptor, 1);
#endif /* !__LP64__ */
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 2);
OSMetaClassDefineReservedUnused(IOBufferMemoryDescriptor, 3);