drm/amdkfd: Consolidate duplicated bo alloc flags
Subsystems (3)
PATCH 1/1 drm/amdkfd: Consolidate duplicated bo alloc flags
ALLOC_MEM_FLAGS_* used are the same as the KFD_IOC_ALLOC_MEM_FLAGS_*, but they are interweavedly used in kernel driver, resulting in bad readability. For example, KFD_IOC_ALLOC_MEM_FLAGS_COHERENT is not referenced in kernel, and it functions implicitly in kernel through ALLOC_MEM_FLAGS_COHERENT, causing unnecessary confusion.
Replace all occurrences of ALLOC_MEM_FLAGS_* with
KFD_IOC_ALLOC_MEM_FLAGS_* to solve the problem.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 ++-- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 29 ++++++++++--------- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +++++---- .../gpu/drm/amd/include/kgd_kfd_interface.h | 21 -------------- 4 files changed, 27 insertions(+), 42 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4 -2
@@ -29,6 +29,7 @@#include <linux/module.h> #include <linux/dma-buf.h> #include "amdgpu_xgmi.h" +#include <uapi/linux/kfd_ioctl.h> static const unsigned int compute_vmid_bitmap =0xFF00 ;
@@ -501,10 +502,11 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, metadata_size, &metadata_flags);if (flags) { *flags = (bo->preferred_domains &AMDGPU_GEM_DOMAIN_VRAM ) ? -ALLOC_MEM_FLAGS_VRAM :ALLOC_MEM_FLAGS_GTT ; +KFD_IOC_ALLOC_MEM_FLAGS_VRAM + :KFD_IOC_ALLOC_MEM_FLAGS_GTT ;if (bo->flags &AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ) - *flags |=ALLOC_MEM_FLAGS_PUBLIC ; + *flags |=KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC ; } out_put:
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +16 -13
@@ -29,6 +29,7 @@#include "amdgpu_vm.h" #include "amdgpu_amdkfd.h" #include "amdgpu_dma_buf.h" +#include <uapi/linux/kfd_ioctl.h> /* BO flag to indicate a KFD userptr BO */ #define AMDGPU_AMDKFD_USERPTR_BO (1ULL << 63)
@@ -400,18 +401,18 @@ static int vm_update_pds(struct amdgpu_vm *vm, struct amdgpu_sync *sync)static uint64_t get_pte_flags (struct amdgpu_device *adev,struct kgd_mem *mem) {struct amdgpu_device *bo_adev =amdgpu_ttm_adev (mem->bo->tbo.bdev); -bool coherent = mem->alloc_flags &ALLOC_MEM_FLAGS_COHERENT ; +bool coherent = mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_COHERENT ;uint32_t mapping_flags; mapping_flags =AMDGPU_VM_PAGE_READABLE ; -if (mem->alloc_flags &ALLOC_MEM_FLAGS_WRITABLE ) +if (mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE ) mapping_flags |=AMDGPU_VM_PAGE_WRITEABLE ; -if (mem->alloc_flags &ALLOC_MEM_FLAGS_EXECUTABLE ) +if (mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ) mapping_flags |=AMDGPU_VM_PAGE_EXECUTABLE ;switch (adev->asic_type) {case CHIP_ARCTURUS : -if (mem->alloc_flags &ALLOC_MEM_FLAGS_VRAM ) { +if (mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_VRAM ) {if (bo_adev == adev) mapping_flags |= coherent ?AMDGPU_VM_MTYPE_CC :AMDGPU_VM_MTYPE_RW ;
@@ -1160,24 +1161,24 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(/* * Check on which domain to allocate BO */ -if (flags &ALLOC_MEM_FLAGS_VRAM ) { +if (flags &KFD_IOC_ALLOC_MEM_FLAGS_VRAM ) { domain = alloc_domain =AMDGPU_GEM_DOMAIN_VRAM ; alloc_flags =AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE ; - alloc_flags |= (flags &ALLOC_MEM_FLAGS_PUBLIC ) ? + alloc_flags |= (flags &KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC ) ?AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED :AMDGPU_GEM_CREATE_NO_CPU_ACCESS ; - }else if (flags &ALLOC_MEM_FLAGS_GTT ) { + }else if (flags &KFD_IOC_ALLOC_MEM_FLAGS_GTT ) { domain = alloc_domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_flags =0 ; - }else if (flags &ALLOC_MEM_FLAGS_USERPTR ) { + }else if (flags &KFD_IOC_ALLOC_MEM_FLAGS_USERPTR ) { domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_domain =AMDGPU_GEM_DOMAIN_CPU ; alloc_flags =0 ;if (!offset || !*offset)return -EINVAL ; user_addr =untagged_addr (*offset); - }else if (flags & (ALLOC_MEM_FLAGS_DOORBELL | -ALLOC_MEM_FLAGS_MMIO_REMAP )) { + }else if (flags & (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | +KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) { domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_domain =AMDGPU_GEM_DOMAIN_CPU ; bo_type = ttm_bo_type_sg;
@@ -1198,7 +1199,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( }INIT_LIST_HEAD (&(*mem)->bo_va_list);mutex_init (&(*mem)->lock); - (*mem)->aql_queue = !!(flags &ALLOC_MEM_FLAGS_AQL_QUEUE_MEM ); + (*mem)->aql_queue = !!(flags &KFD_IOC_ALLOC_MEM_FLAGS_AQL_QUEUE_MEM );/* Workaround for AQL queue wraparound bug. Map the same * memory twice. That means we only actually allocate half
@@ -1680,10 +1681,12 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd,INIT_LIST_HEAD (&(*mem)->bo_va_list);mutex_init (&(*mem)->lock); + (*mem)->alloc_flags = ((bo->preferred_domains &AMDGPU_GEM_DOMAIN_VRAM ) ? -ALLOC_MEM_FLAGS_VRAM :ALLOC_MEM_FLAGS_GTT ) | -ALLOC_MEM_FLAGS_WRITABLE |ALLOC_MEM_FLAGS_EXECUTABLE ; +KFD_IOC_ALLOC_MEM_FLAGS_VRAM :KFD_IOC_ALLOC_MEM_FLAGS_GTT ) + |KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE + |KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ; (*mem)->bo =amdgpu_bo_ref (bo); (*mem)->va = va;
drivers/gpu/drm/amd/amdkfd/kfd_process.c +7 -6
@@ -327,10 +327,10 @@ static int kfd_process_alloc_gpuvm(struct kfd_process_device *pdd,static int kfd_process_device_reserve_ib_mem (struct kfd_process_device *pdd) {struct qcm_process_device *qpd = &pdd->qpd; -uint32_t flags =ALLOC_MEM_FLAGS_GTT | -ALLOC_MEM_FLAGS_NO_SUBSTITUTE | -ALLOC_MEM_FLAGS_WRITABLE | -ALLOC_MEM_FLAGS_EXECUTABLE ; +uint32_t flags =KFD_IOC_ALLOC_MEM_FLAGS_GTT | +KFD_IOC_ALLOC_MEM_FLAGS_NO_SUBSTITUTE | +KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE | +KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ;void *kaddr;int ret;
@@ -692,8 +692,9 @@ static int kfd_process_device_init_cwsr_dgpu(struct kfd_process_device *pdd) {struct kfd_dev *dev = pdd->dev;struct qcm_process_device *qpd = &pdd->qpd; -uint32_t flags =ALLOC_MEM_FLAGS_GTT | -ALLOC_MEM_FLAGS_NO_SUBSTITUTE |ALLOC_MEM_FLAGS_EXECUTABLE ; +uint32_t flags =KFD_IOC_ALLOC_MEM_FLAGS_GTT + |KFD_IOC_ALLOC_MEM_FLAGS_NO_SUBSTITUTE + |KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ;void *kaddr;int ret;
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0 -21
@@ -167,27 +167,6 @@ struct tile_config {#define KFD_MAX_NUM_OF_QUEUES_PER_DEVICE_DEFAULT 4096 -/* -* Allocation flag domains -* NOTE: This must match the corresponding definitions in kfd_ioctl.h. -*/ -#define ALLOC_MEM_FLAGS_VRAM (1 << 0) -#define ALLOC_MEM_FLAGS_GTT (1 << 1) -#define ALLOC_MEM_FLAGS_USERPTR (1 << 2) -#define ALLOC_MEM_FLAGS_DOORBELL (1 << 3) -#define ALLOC_MEM_FLAGS_MMIO_REMAP (1 << 4) - -/* -* Allocation flags attributes/access options. -* NOTE: This must match the corresponding definitions in kfd_ioctl.h. -*/ -#define ALLOC_MEM_FLAGS_WRITABLE (1 << 31) -#define ALLOC_MEM_FLAGS_EXECUTABLE (1 << 30) -#define ALLOC_MEM_FLAGS_PUBLIC (1 << 29) -#define ALLOC_MEM_FLAGS_NO_SUBSTITUTE (1 << 28)/* TODO */ -#define ALLOC_MEM_FLAGS_AQL_QUEUE_MEM (1 << 27) -#define ALLOC_MEM_FLAGS_COHERENT (1 << 26)/* For GFXv9 or later */ -/** * struct kfd2kgd_calls *
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 11 lines · Yong Zhao
ALLOC_MEM_FLAGS_* used are the same as the KFD_IOC_ALLOC_MEM_FLAGS_*, but they are interweavedly used in kernel driver, resulting in bad readability. For example,
KFD_IOC_ALLOC_MEM_FLAGS_COHERENTis not referenced in kernel, and it functions implicitly in kernel throughALLOC_MEM_FLAGS_COHERENT, causing unnecessary confusion.Replace all occurrences of ALLOC_MEM_FLAGS_* with
KFD_IOC_ALLOC_MEM_FLAGS_* to solve the problem.Change-Id Iced6ed3698167296c97b14e7e4569883859d619cSigned-off-by Yong Zhao <[email protected]>
Quoted 176 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 ++-- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 29 ++++++++++--------- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 13 +++++---- .../gpu/drm/amd/include/kgd_kfd_interface.h | 21 -------------- 4 files changed, 27 insertions(+), 42 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +4
-2@@ -29,6 +29,7 @@#include <linux/module.h> #include <linux/dma-buf.h> #include "amdgpu_xgmi.h" +#include <uapi/linux/kfd_ioctl.h> static const unsigned int compute_vmid_bitmap =0xFF00 ;@@ -501,10 +502,11 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, metadata_size, &metadata_flags);if (flags) { *flags = (bo->preferred_domains &AMDGPU_GEM_DOMAIN_VRAM ) ? -ALLOC_MEM_FLAGS_VRAM :ALLOC_MEM_FLAGS_GTT ; +KFD_IOC_ALLOC_MEM_FLAGS_VRAM + :KFD_IOC_ALLOC_MEM_FLAGS_GTT ;if (bo->flags &AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ) - *flags |=ALLOC_MEM_FLAGS_PUBLIC ; + *flags |=KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC ; } out_put:drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +16
-13@@ -29,6 +29,7 @@#include "amdgpu_vm.h" #include "amdgpu_amdkfd.h" #include "amdgpu_dma_buf.h" +#include <uapi/linux/kfd_ioctl.h> /* BO flag to indicate a KFD userptr BO */ #define AMDGPU_AMDKFD_USERPTR_BO (1ULL << 63)@@ -400,18 +401,18 @@ static int vm_update_pds(struct amdgpu_vm *vm, struct amdgpu_sync *sync)static uint64_t get_pte_flags (struct amdgpu_device *adev,struct kgd_mem *mem) {struct amdgpu_device *bo_adev =amdgpu_ttm_adev (mem->bo->tbo.bdev); -bool coherent = mem->alloc_flags &ALLOC_MEM_FLAGS_COHERENT ; +bool coherent = mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_COHERENT ;uint32_t mapping_flags; mapping_flags =AMDGPU_VM_PAGE_READABLE ; -if (mem->alloc_flags &ALLOC_MEM_FLAGS_WRITABLE ) +if (mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE ) mapping_flags |=AMDGPU_VM_PAGE_WRITEABLE ; -if (mem->alloc_flags &ALLOC_MEM_FLAGS_EXECUTABLE ) +if (mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ) mapping_flags |=AMDGPU_VM_PAGE_EXECUTABLE ;switch (adev->asic_type) {case CHIP_ARCTURUS : -if (mem->alloc_flags &ALLOC_MEM_FLAGS_VRAM ) { +if (mem->alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_VRAM ) {if (bo_adev == adev) mapping_flags |= coherent ?AMDGPU_VM_MTYPE_CC :AMDGPU_VM_MTYPE_RW ;@@ -1160,24 +1161,24 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(/* * Check on which domain to allocate BO */ -if (flags &ALLOC_MEM_FLAGS_VRAM ) { +if (flags &KFD_IOC_ALLOC_MEM_FLAGS_VRAM ) { domain = alloc_domain =AMDGPU_GEM_DOMAIN_VRAM ; alloc_flags =AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE ; - alloc_flags |= (flags &ALLOC_MEM_FLAGS_PUBLIC ) ? + alloc_flags |= (flags &KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC ) ?AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED :AMDGPU_GEM_CREATE_NO_CPU_ACCESS ; - }else if (flags &ALLOC_MEM_FLAGS_GTT ) { + }else if (flags &KFD_IOC_ALLOC_MEM_FLAGS_GTT ) { domain = alloc_domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_flags =0 ; - }else if (flags &ALLOC_MEM_FLAGS_USERPTR ) { + }else if (flags &KFD_IOC_ALLOC_MEM_FLAGS_USERPTR ) { domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_domain =AMDGPU_GEM_DOMAIN_CPU ; alloc_flags =0 ;if (!offset || !*offset)return -EINVAL ; user_addr =untagged_addr (*offset); - }else if (flags & (ALLOC_MEM_FLAGS_DOORBELL | -ALLOC_MEM_FLAGS_MMIO_REMAP )) { + }else if (flags & (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL | +KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP )) { domain =AMDGPU_GEM_DOMAIN_GTT ; alloc_domain =AMDGPU_GEM_DOMAIN_CPU ; bo_type = ttm_bo_type_sg;@@ -1198,7 +1199,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( }INIT_LIST_HEAD (&(*mem)->bo_va_list);mutex_init (&(*mem)->lock); - (*mem)->aql_queue = !!(flags &ALLOC_MEM_FLAGS_AQL_QUEUE_MEM ); + (*mem)->aql_queue = !!(flags &KFD_IOC_ALLOC_MEM_FLAGS_AQL_QUEUE_MEM );/* Workaround for AQL queue wraparound bug. Map the same * memory twice. That means we only actually allocate half @@ -1680,10 +1681,12 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd,INIT_LIST_HEAD (&(*mem)->bo_va_list);mutex_init (&(*mem)->lock); + (*mem)->alloc_flags = ((bo->preferred_domains &AMDGPU_GEM_DOMAIN_VRAM ) ? -ALLOC_MEM_FLAGS_VRAM :ALLOC_MEM_FLAGS_GTT ) | -ALLOC_MEM_FLAGS_WRITABLE |ALLOC_MEM_FLAGS_EXECUTABLE ; +KFD_IOC_ALLOC_MEM_FLAGS_VRAM :KFD_IOC_ALLOC_MEM_FLAGS_GTT ) + |KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE + |KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ; (*mem)->bo =amdgpu_bo_ref (bo); (*mem)->va = va;drivers/gpu/drm/amd/amdkfd/kfd_process.c +7
-6@@ -327,10 +327,10 @@ static int kfd_process_alloc_gpuvm(struct kfd_process_device *pdd,static int kfd_process_device_reserve_ib_mem (struct kfd_process_device *pdd) {struct qcm_process_device *qpd = &pdd->qpd; -uint32_t flags =ALLOC_MEM_FLAGS_GTT | -ALLOC_MEM_FLAGS_NO_SUBSTITUTE | -ALLOC_MEM_FLAGS_WRITABLE | -ALLOC_MEM_FLAGS_EXECUTABLE ; +uint32_t flags =KFD_IOC_ALLOC_MEM_FLAGS_GTT | +KFD_IOC_ALLOC_MEM_FLAGS_NO_SUBSTITUTE | +KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE | +KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ;void *kaddr;int ret;@@ -692,8 +692,9 @@ static int kfd_process_device_init_cwsr_dgpu(struct kfd_process_device *pdd) {struct kfd_dev *dev = pdd->dev;struct qcm_process_device *qpd = &pdd->qpd; -uint32_t flags =ALLOC_MEM_FLAGS_GTT | -ALLOC_MEM_FLAGS_NO_SUBSTITUTE |ALLOC_MEM_FLAGS_EXECUTABLE ; +uint32_t flags =KFD_IOC_ALLOC_MEM_FLAGS_GTT + |KFD_IOC_ALLOC_MEM_FLAGS_NO_SUBSTITUTE + |KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ;void *kaddr;int ret;drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0
-14@@ -167,27 +167,6 @@ struct tile_config {#define KFD_MAX_NUM_OF_QUEUES_PER_DEVICE_DEFAULT 4096 -/* -* Allocation flag domains -* NOTE: This must match the corresponding definitions in kfd_ioctl.h. -*/ -#define ALLOC_MEM_FLAGS_VRAM (1 << 0) -#define ALLOC_MEM_FLAGS_GTT (1 << 1) -#define ALLOC_MEM_FLAGS_USERPTR (1 << 2) -#define ALLOC_MEM_FLAGS_DOORBELL (1 << 3) -#define ALLOC_MEM_FLAGS_MMIO_REMAP (1 << 4) - -/* -* Allocation flags attributes/access options. -* NOTE: This must match the corresponding definitions in kfd_ioctl.h. -*/
drivers/gpu/drm/amd/include/kgd_kfd_interface.h struct tile_config { · line 172
Quoted 10 lines
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +0
-7-#define ALLOC_MEM_FLAGS_WRITABLE (1 << 31) -#define ALLOC_MEM_FLAGS_EXECUTABLE (1 << 30) -#define ALLOC_MEM_FLAGS_PUBLIC (1 << 29) -#define ALLOC_MEM_FLAGS_NO_SUBSTITUTE (1 << 28)/* TODO */ -#define ALLOC_MEM_FLAGS_AQL_QUEUE_MEM (1 << 27) -#define ALLOC_MEM_FLAGS_COHERENT (1 << 26)/* For GFXv9 or later */ -/** * struct kfd2kgd_calls *
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx