From c6a23a88ee53147bc1308212a1a4bf294436aa09 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Tue, 19 Jul 2022 21:47:30 -0400 Subject: [PATCH] libhsakmt: Remove CMA implementation The CMA feature is deprecated and about to be removed from the DKMS branch. It was never supported upstream. Leave dummy functions in place for now. Signed-off-by: Felix Kuehling Change-Id: I9e51403d753cb91630553aff4f19e931af509740 [ROCm/ROCR-Runtime commit: 9b2b81e555519ffc65e9317b628518ed53b8e993] --- projects/rocr-runtime/src/memory.c | 65 ++---------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/projects/rocr-runtime/src/memory.c b/projects/rocr-runtime/src/memory.c index 5eae74a92c..7f8e45b6e0 100644 --- a/projects/rocr-runtime/src/memory.c +++ b/projects/rocr-runtime/src/memory.c @@ -386,16 +386,6 @@ error: return ret; } -static uint64_t convertHsaToKfdRange(HsaMemoryRange *HsaRange) -{ - if (sizeof(struct kfd_memory_range) != - sizeof(HsaMemoryRange)) { - pr_err("Struct size mismatch in thunk. Cannot cast Hsa Range to KFD IOCTL range\n"); - return 0; - } - return (uint64_t) HsaRange; -} - HSAKMT_STATUS HSAKMTAPI hsaKmtProcessVMRead(HSAuint32 Pid, HsaMemoryRange *LocalMemoryArray, HSAuint64 LocalMemoryArrayCount, @@ -403,31 +393,9 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtProcessVMRead(HSAuint32 Pid, HSAuint64 RemoteMemoryArrayCount, HSAuint64 *SizeCopied) { - int ret = HSAKMT_STATUS_SUCCESS; - struct kfd_ioctl_cross_memory_copy_args args = {0}; + pr_err("[%s] Deprecated\n", __func__); - pr_debug("[%s]\n", __func__); - - if (!LocalMemoryArray || !RemoteMemoryArray || - LocalMemoryArrayCount == 0 || RemoteMemoryArrayCount == 0) - return HSAKMT_STATUS_ERROR; - - args.flags = 0; - KFD_SET_CROSS_MEMORY_READ(args.flags); - args.pid = Pid; - args.src_mem_range_array = convertHsaToKfdRange(RemoteMemoryArray); - args.src_mem_array_size = RemoteMemoryArrayCount; - args.dst_mem_range_array = convertHsaToKfdRange(LocalMemoryArray); - args.dst_mem_array_size = LocalMemoryArrayCount; - args.bytes_copied = 0; - - if (kmtIoctl(kfd_fd, AMDKFD_IOC_CROSS_MEMORY_COPY, &args)) - ret = HSAKMT_STATUS_ERROR; - - if (SizeCopied) - *SizeCopied = args.bytes_copied; - - return ret; + return HSAKMT_STATUS_NOT_IMPLEMENTED; } HSAKMT_STATUS HSAKMTAPI hsaKmtProcessVMWrite(HSAuint32 Pid, @@ -437,34 +405,9 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtProcessVMWrite(HSAuint32 Pid, HSAuint64 RemoteMemoryArrayCount, HSAuint64 *SizeCopied) { - int ret = HSAKMT_STATUS_SUCCESS; - struct kfd_ioctl_cross_memory_copy_args args = {0}; + pr_err("[%s] Deprecated\n", __func__); - pr_debug("[%s]\n", __func__); - - if (SizeCopied) - *SizeCopied = 0; - - if (!LocalMemoryArray || !RemoteMemoryArray || - LocalMemoryArrayCount == 0 || RemoteMemoryArrayCount == 0) - return HSAKMT_STATUS_ERROR; - - args.flags = 0; - KFD_SET_CROSS_MEMORY_WRITE(args.flags); - args.pid = Pid; - args.src_mem_range_array = convertHsaToKfdRange(LocalMemoryArray); - args.src_mem_array_size = LocalMemoryArrayCount; - args.dst_mem_range_array = convertHsaToKfdRange(RemoteMemoryArray); - args.dst_mem_array_size = RemoteMemoryArrayCount; - args.bytes_copied = 0; - - if (kmtIoctl(kfd_fd, AMDKFD_IOC_CROSS_MEMORY_COPY, &args)) - ret = HSAKMT_STATUS_ERROR; - - if (SizeCopied) - *SizeCopied = args.bytes_copied; - - return ret; + return HSAKMT_STATUS_NOT_IMPLEMENTED; }