Compilation of pyverbs/dmabuf_alloc.c depends on a few DRM headers that are installed by either the kernel-header or the libdrm package. The installation is optional and the location is not unique.
Check the presence and location of the headers and, if the headers are missing, replace the dmabuf allocation routines wth stubs that return suitable error to allow the related tests to skip.
Signed-off-by: Jianxin Xiong jianxin.xiong@intel.com --- CMakeLists.txt | 17 +++++++++++++++++ pyverbs/CMakeLists.txt | 8 +++++++- pyverbs/dmabuf_alloc.c | 8 ++++---- pyverbs/dmabuf_alloc_stub.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 pyverbs/dmabuf_alloc_stub.c
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4113423..80fb747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -515,6 +515,20 @@ find_package(Systemd) include_directories(${SYSTEMD_INCLUDE_DIRS}) RDMA_DoFixup("${SYSTEMD_FOUND}" "systemd/sd-daemon.h")
+# drm headers + +# Check if the headers have been installed by kernel-headers +find_path(DRM_INCLUDE_DIRS "drm.h" PATH_SUFFIXES "drm") + +# Alternatively the headers could have been installed by libdrm +if (NOT DRM_INCLUDE_DIRS) + pkg_check_modules(DRM libdrm) +endif() + +if (DRM_INCLUDE_DIRS) + include_directories(${DRM_INCLUDE_DIRS}) +endif() + #------------------------- # Apply fixups
@@ -786,3 +800,6 @@ endif() if (NOT HAVE_TARGET_SSE) message(STATUS " attribute(target("sse")) does NOT work") endif() +if (NOT DRM_INCLUDE_DIRS) + message(STATUS " DMABUF NOT supported (disabling some tests)") +endif() diff --git a/pyverbs/CMakeLists.txt b/pyverbs/CMakeLists.txt index 6fd7625..dbd0ffe 100644 --- a/pyverbs/CMakeLists.txt +++ b/pyverbs/CMakeLists.txt @@ -6,6 +6,12 @@ publish_internal_headers("" dmabuf_alloc.h )
+if (DRM_INCLUDE_DIRS) + set(DMABUF_ALLOC dmabuf_alloc.c) +else() + set(DMABUF_ALLOC dmabuf_alloc_stub.c) +endif() + rdma_cython_module(pyverbs "" addr.pyx base.pyx @@ -14,7 +20,7 @@ rdma_cython_module(pyverbs "" cq.pyx device.pyx dmabuf.pyx - dmabuf_alloc.c + ${DMABUF_ALLOC} enums.pyx mem_alloc.pyx mr.pyx diff --git a/pyverbs/dmabuf_alloc.c b/pyverbs/dmabuf_alloc.c index 85ffb7a..9978a5b 100644 --- a/pyverbs/dmabuf_alloc.c +++ b/pyverbs/dmabuf_alloc.c @@ -9,12 +9,12 @@ #include <unistd.h> #include <string.h> #include <errno.h> -#include <drm/drm.h> -#include <drm/i915_drm.h> -#include <drm/amdgpu_drm.h> -#include <drm/radeon_drm.h> #include <fcntl.h> #include <sys/ioctl.h> +#include <drm.h> +#include <i915_drm.h> +#include <amdgpu_drm.h> +#include <radeon_drm.h> #include "dmabuf_alloc.h"
/* diff --git a/pyverbs/dmabuf_alloc_stub.c b/pyverbs/dmabuf_alloc_stub.c new file mode 100644 index 0000000..a73a5da --- /dev/null +++ b/pyverbs/dmabuf_alloc_stub.c @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB +/* + * Copyright 2021 Intel Corporation. All rights reserved. See COPYING file + */ + +#include <stdio.h> +#include <stdint.h> +#include <errno.h> +#include "dmabuf_alloc.h" + +struct dmabuf *dmabuf_alloc(uint64_t size, int gpu, int gtt) +{ + errno = EOPNOTSUPP; + return NULL; +} + +void dmabuf_free(struct dmabuf *dmabuf) +{ + errno = EOPNOTSUPP; +} + +int dmabuf_get_drm_fd(struct dmabuf *dmabuf) +{ + errno = EOPNOTSUPP; + return -1; +} + +int dmabuf_get_fd(struct dmabuf *dmabuf) +{ + errno = EOPNOTSUPP; + return -1; +} + +uint64_t dmabuf_get_offset(struct dmabuf *dmabuf) +{ + errno = EOPNOTSUPP; + return -1; +} +