Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more robust validation of inputs. 

- prevent USM device pointers on transfer calls
- prevent pointers that do not hold enough storage to service transfer.

Change-Id: I678808c034f708e9d0ae477d632788aae7f70452
Signed-off-by: Michal Mrozek <michal.mrozek@intel.com>
This commit is contained in:
Michal Mrozek 2020-01-22 15:59:11 +01:00 committed by sys_ocldev
parent 915a6fa14f
commit ac4041d906
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/command_queue/enqueue_write_buffer.h
View File

@ -70,6 +70,13 @@ cl_int CommandQueueHw<GfxFamily>::enqueueWriteBuffer(
if (!mapAllocation && this->getContext().getSVMAllocsManager()) { if (!mapAllocation && this->getContext().getSVMAllocsManager()) {
auto svmEntry = this->getContext().getSVMAllocsManager()->getSVMAlloc(ptr); auto svmEntry = this->getContext().getSVMAllocsManager()->getSVMAlloc(ptr);
if (svmEntry) { if (svmEntry) {
if (svmEntry->memoryType == DEVICE_UNIFIED_MEMORY) {
return CL_INVALID_OPERATION;
}
if ((svmEntry->gpuAllocation->getGpuAddress() + svmEntry->size) < (castToUint64(ptr) + size)) {
return CL_INVALID_OPERATION;
}
mapAllocation = svmEntry->cpuAllocation ? svmEntry->cpuAllocation : svmEntry->gpuAllocation; mapAllocation = svmEntry->cpuAllocation ? svmEntry->cpuAllocation : svmEntry->gpuAllocation;
} }
} }

52
unit_tests/memory_manager/unified_memory_manager_tests.cpp
View File

@ -614,6 +614,58 @@ TEST(UnfiedSharedMemoryTransferCalls, givenHostUSMllocationWhenPointerIsUsedAsWr
ASSERT_EQ(CL_SUCCESS, status); ASSERT_EQ(CL_SUCCESS, status);
clReleaseCommandQueue(commandQueue); clReleaseCommandQueue(commandQueue);
} }
TEST(UnfiedSharedMemoryTransferCalls, givenDeviceUsmAllocationWhenItIsPassedToWriteBufferAsSourceThenErrorIsReturned) {
MockContext mockContext;
cl_context clContext = &mockContext;
auto status = CL_SUCCESS;
cl_device_id clDevice = mockContext.getDevice(0u);
auto deviceMemory = clDeviceMemAllocINTEL(clContext, clDevice, nullptr, 4096u, 0u, &status);
ASSERT_EQ(CL_SUCCESS, status);
auto buffer = clCreateBuffer(clContext, CL_MEM_READ_WRITE, 4096u, nullptr, &status);
ASSERT_EQ(CL_SUCCESS, status);
auto commandQueue = clCreateCommandQueue(clContext, clDevice, 0u, &status);
ASSERT_EQ(CL_SUCCESS, status);
status = clEnqueueWriteBuffer(commandQueue, buffer, false, 0u, 4096u, deviceMemory, 0u, nullptr, nullptr);
EXPECT_EQ(CL_INVALID_OPERATION, status);
status = clReleaseMemObject(buffer);
ASSERT_EQ(CL_SUCCESS, status);
status = clMemFreeINTEL(clContext, deviceMemory);
ASSERT_EQ(CL_SUCCESS, status);
clReleaseCommandQueue(commandQueue);
}
TEST(UnfiedSharedMemoryTransferCalls, givenHostAllocationThatIsSmallerThenWriteBufferTranfserSizeWhenTransferCallIsEmittedThenErrorIsReturned) {
MockContext mockContext;
cl_context clContext = &mockContext;
auto status = CL_SUCCESS;
auto hostMemory = clHostMemAllocINTEL(clContext, nullptr, 4u, 0u, &status);
ASSERT_EQ(CL_SUCCESS, status);
auto buffer = clCreateBuffer(clContext, CL_MEM_READ_WRITE, 4096u, nullptr, &status);
ASSERT_EQ(CL_SUCCESS, status);
cl_device_id clDevice = mockContext.getDevice(0u);
auto commandQueue = clCreateCommandQueue(clContext, clDevice, 0u, &status);
ASSERT_EQ(CL_SUCCESS, status);
status = clEnqueueWriteBuffer(commandQueue, buffer, false, 0u, 4096u, hostMemory, 0u, nullptr, nullptr);
EXPECT_EQ(CL_INVALID_OPERATION, status);
status = clReleaseMemObject(buffer);
ASSERT_EQ(CL_SUCCESS, status);
status = clMemFreeINTEL(clContext, hostMemory);
ASSERT_EQ(CL_SUCCESS, status);
clReleaseCommandQueue(commandQueue);
}
TEST(UnfiedSharedMemoryTransferCalls, givenSharedUSMllocationWithoutLocalMemoryWhenPointerIsUsedAsWriteBufferSourceThenUSMAllocationIsReused) { TEST(UnfiedSharedMemoryTransferCalls, givenSharedUSMllocationWithoutLocalMemoryWhenPointerIsUsedAsWriteBufferSourceThenUSMAllocationIsReused) {
DebugManagerStateRestore restore; DebugManagerStateRestore restore;