Merge branch 'Xilinx:master' into 2023.1_test

Xilinx · Jun 27, 2023 · 4c85e8e · 4c85e8e
2 parents ca747dd + 2534930
commit 4c85e8e
Show file tree

Hide file tree

Showing 15 changed files with 840 additions and 655 deletions.
diff --git a/src/runtime_src/core/edge/user/shim.cpp b/src/runtime_src/core/edge/user/shim.cpp
@@ -296,6 +296,9 @@ xclAllocBO(size_t size, unsigned flags)
 {
   drm_zocl_create_bo info = { size, 0xffffffff, flags};
   int result = ioctl(mKernelFD, DRM_IOCTL_ZOCL_CREATE_BO, &info);
+
+  if (result)
+    throw std::bad_alloc();
 
   xclLog(XRT_DEBUG, "%s: size %ld, flags 0x%x", __func__, size, flags);
   xclLog(XRT_INFO, "%s: ioctl return %d, bo handle %d", __func__, result, info.handle);
@@ -311,6 +314,9 @@ xclAllocUserPtrBO(void *userptr, size_t size, unsigned flags)
   drm_zocl_userptr_bo info = {reinterpret_cast<uint64_t>(userptr), size, 0xffffffff, flags};
   int result = ioctl(mKernelFD, DRM_IOCTL_ZOCL_USERPTR_BO, &info);
 
+  if (result)
+    throw std::bad_alloc();
+
   xclLog(XRT_DEBUG, "%s: userptr %p size %ld, flags 0x%x", __func__, userptr, size, flags);
   xclLog(XRT_INFO, "%s: ioctl return %d, bo handle %d", __func__, result, info.handle);