drm/amdkfd: Add gws number to kfd topology node properties
Subsystems (3)
PATCH 1/7 drm/amdkfd: Add gws number to kfd topology node properties
Add amdgpu_amdkfd interface to get num_gws and add num_gws to /sys/class/kfd/kfd/topology/nodes/x/properties. Only report num_gws if MEC FW support GWS barriers. Currently it is determined by a module parameter which will be replaced with MEC FW version check when firmware is ready.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 ++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 +++++ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +++++ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + 6 files changed, 29 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +7 -0
@@ -544,6 +544,13 @@ uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr(struct kgd_dev *kgd)return adev->rmmio_remap.bus_addr; } +uint32_t amdgpu_amdkfd_get_num_gws (struct kgd_dev *kgd) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)kgd; + +return adev->gds.gws_size; +} +int amdgpu_amdkfd_submit_ib (struct kgd_dev *kgd,enum kgd_engine_type engine,uint32_t vmid,uint64_t gpu_addr,uint32_t *ib_cmd,uint32_t ib_len)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
@@ -169,6 +169,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd,uint64_t amdgpu_amdkfd_get_vram_usage (struct kgd_dev *kgd);uint64_t amdgpu_amdkfd_get_hive_id (struct kgd_dev *kgd);uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr (struct kgd_dev *kgd); +uint32_t amdgpu_amdkfd_get_num_gws (struct kgd_dev *kgd);uint8_t amdgpu_amdkfd_get_xgmi_hops_count (struct kgd_dev *dst,struct kgd_dev *src);#define read_user_wptr (mmptr, wptr, dst) \
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +10 -0
@@ -666,6 +666,16 @@ MODULE_PARM_DESC(noretry,int halt_if_hws_hang;module_param (halt_if_hws_hang, int,0644 );MODULE_PARM_DESC (halt_if_hws_hang,"Halt if HWS hang is detected (0 = off (default), 1 = on)" ); + +/** +* DOC: hws_gws_support(bool) +* Whether HWS support gws barriers. Default value: false (not supported) +* This will be replaced with a MEC firmware version check once firmware +* is ready +*/ +bool hws_gws_support; +module_param (hws_gws_support, bool,0444 ); +MODULE_PARM_DESC (hws_gws_support,"MEC FW support gws barriers (false = not supported (Default), true = supported)" );#endif /**
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +5 -0
@@ -160,6 +160,11 @@ extern int noretry;*/ extern int halt_if_hws_hang; +/* +* Whether MEC FW support GWS barriers +*/ +extern bool hws_gws_support; +enum cache_policy { cache_policy_coherent, cache_policy_noncoherent
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +5 -0
@@ -454,6 +454,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->node_props.lds_size_in_kb);sysfs_show_32bit_prop (buffer,"gds_size_in_kb" , dev->node_props.gds_size_in_kb); +sysfs_show_32bit_prop (buffer,"num_gws" , + dev->node_props.num_gws);sysfs_show_32bit_prop (buffer,"wave_front_size" , dev->node_props.wave_front_size); sysfs_show_32bit_prop(buffer, "array_count",
@@ -1290,6 +1292,9 @@ int kfd_topology_add_device(struct kfd_dev *gpu) dev->node_props.num_sdma_engines = gpu->device_info->num_sdma_engines; dev->node_props.num_sdma_xgmi_engines = gpu->device_info->num_xgmi_sdma_engines; + dev->node_props.num_gws = (hws_gws_support && + dev->gpu->dqm->sched_policy !=KFD_SCHED_POLICY_NO_HWS ) ? +amdgpu_amdkfd_get_num_gws (dev->gpu->kgd) :0 ;kfd_fill_mem_clk_max_info (dev);kfd_fill_iolink_non_crat_info (dev);
drivers/gpu/drm/amd/amdkfd/kfd_topology.h +1 -0
@@ -65,6 +65,7 @@ struct kfd_node_properties {uint32_t max_waves_per_simd;uint32_t lds_size_in_kb;uint32_t gds_size_in_kb; +uint32_t num_gws;uint32_t wave_front_size;uint32_t array_count;uint32_t simd_arrays_per_engine;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1558636843-9867-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
PATCH 2/7 drm/amdgpu: Add interface to alloc gws from amdgpu
Add amdgpu_amdkfd interface to alloc and free gws
from amdgpu
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 34 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 ++ 2 files changed, 36 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +34 -0
@@ -339,6 +339,40 @@ void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)amdgpu_bo_unref (&(bo)); } +int amdgpu_amdkfd_alloc_gws (struct kgd_dev *kgd,size_t size, +void **mem_obj) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)kgd; +struct amdgpu_bo *bo =NULL ; +struct amdgpu_bo_param bp; +int r; + +memset (&bp,0 ,sizeof (bp)); + bp.size = size; + bp.byte_align =1 ; + bp.domain =AMDGPU_GEM_DOMAIN_GWS ; + bp.flags =AMDGPU_GEM_CREATE_NO_CPU_ACCESS ; + bp.type = ttm_bo_type_device; + bp.resv =NULL ; + + r =amdgpu_bo_create (adev, &bp, &bo); +if (r) { +dev_err (adev->dev, +"failed to allocate gws BO for amdkfd (%d)\n" , r); +return r; + } + + *mem_obj = bo; +return 0 ; +} + +void amdgpu_amdkfd_free_gws (struct kgd_dev *kgd,void *mem_obj) +{ +struct amdgpu_bo *bo = (struct amdgpu_bo *)mem_obj; + +amdgpu_bo_unref (&bo); +} +uint32_t amdgpu_amdkfd_get_fw_version (struct kgd_dev *kgd,enum kgd_engine_type type) {
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -0
@@ -153,6 +153,8 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size, void **mem_obj, uint64_t *gpu_addr, void **cpu_ptr, bool mqd_gfx9);void amdgpu_amdkfd_free_gtt_mem (struct kgd_dev *kgd,void *mem_obj); +int amdgpu_amdkfd_alloc_gws (struct kgd_dev *kgd,size_t size,void **mem_obj); +void amdgpu_amdkfd_free_gws (struct kgd_dev *kgd,void *mem_obj);uint32_t amdgpu_amdkfd_get_fw_version (struct kgd_dev *kgd,enum kgd_engine_type type); void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/7 drm/amdkfd: Allocate gws on device initialization
In reply to a message not in the archiveOn device initialization, KFD allocates all (64) gws which is shared by all KFD processes.
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 14 +++++++++++++- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +13 -1
@@ -553,6 +553,13 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, }else kfd->max_proc_per_quantum = hws_max_conc_proc; +/* Allocate global GWS that is shared by all KFD processes */ +if (hws_gws_support &&amdgpu_amdkfd_alloc_gws (kfd->kgd, +amdgpu_amdkfd_get_num_gws (kfd->kgd), &kfd->gws)) { +dev_err (kfd_device,"Could not allocate %d gws\n" , +amdgpu_amdkfd_get_num_gws (kfd->kgd)); + goto out; + }/* calculate max size of mqds needed for queues */ size = max_num_of_queues_per_device * kfd->device_info->mqd_size_aligned;
@@ -576,7 +583,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, &kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr, false)) {dev_err (kfd_device,"Could not allocate %d bytes\n" , size); - goto out; + goto alloc_gtt_mem_failure; }dev_info (kfd_device,"Allocated %d bytes on gart\n" , size);
@@ -646,6 +653,9 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,kfd_gtt_sa_fini (kfd); kfd_gtt_sa_init_error:amdgpu_amdkfd_free_gtt_mem (kfd->kgd, kfd->gtt_mem); +alloc_gtt_mem_failure: +if (hws_gws_support) +amdgpu_amdkfd_free_gws (kfd->kgd, kfd->gws);dev_err (kfd_device,"device %x:%x NOT added due to errors\n" , kfd->pdev->vendor, kfd->pdev->device);
@@ -663,6 +673,8 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd)kfd_doorbell_fini (kfd);kfd_gtt_sa_fini (kfd);amdgpu_amdkfd_free_gtt_mem (kfd->kgd, kfd->gtt_mem); +if (hws_gws_support) +amdgpu_amdkfd_free_gws (kfd->kgd, kfd->gws); }kfree (kfd);
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +3 -0
@@ -288,6 +288,9 @@ struct kfd_dev {/* Compute Profile ref. count */ atomic_t compute_profile; + +/* Global GWS resource shared b/t processes*/ +void *gws; };enum kfd_mempool {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/7 drm/amdgpu: Add function to add/remove gws to kfd process
In reply to a message not in the archiveGWS bo is shared between all kfd processes. Add function to add gws to kfd process's bo list so gws can be evicted from and restored for process.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 103 +++++++++++++++++++++-- 2 files changed, 100 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -0
@@ -155,6 +155,8 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size,void amdgpu_amdkfd_free_gtt_mem (struct kgd_dev *kgd,void *mem_obj);int amdgpu_amdkfd_alloc_gws (struct kgd_dev *kgd,size_t size,void **mem_obj);void amdgpu_amdkfd_free_gws (struct kgd_dev *kgd,void *mem_obj); +int amdgpu_amdkfd_add_gws_to_process (void *info,void *gws,struct kgd_mem **mem); +int amdgpu_amdkfd_remove_gws_from_process (void *info,void *mem);uint32_t amdgpu_amdkfd_get_fw_version (struct kgd_dev *kgd,enum kgd_engine_type type); void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +98 -5
125 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 drm/amdkfd: Add function to set queue gws
In reply to a message not in the archiveAdd functions in process queue manager to set queue gws. Also set process's number of gws used. Currently only one queue in process can use and use all gws.
--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 56 ++++++++++++++++++++++ 2 files changed, 62 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +6 -0
@@ -454,6 +454,9 @@ struct queue_properties {* * @device: The kfd device that created this queue. * +* @gws: Pointing to gws kgd_mem if this is a gws control queue; NULL +* otherwise. +* * This structure represents user mode compute queues. * It contains all the necessary data to handle such queues. *
@@ -475,6 +478,7 @@ struct queue {struct kfd_process *process;struct kfd_dev *device; +void *gws; };/*
@@ -868,6 +872,8 @@ int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid, struct queue_properties *p);int pqm_set_cu_mask (struct process_queue_manager *pqm,unsigned int qid,struct queue_properties *p); +int pqm_set_gws (struct process_queue_manager *pqm,unsigned int qid, +void *gws);struct kernel_queue *pqm_get_kernel_queue (struct process_queue_manager *pqm,unsigned int qid); int pqm_get_wave_state(struct process_queue_manager *pqm,
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +56 -0
74 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1558636843-9867-5-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 5/7] drm/amdkfd: Add function to set queue gws
Quoted 61 lines · Oak
Add functions in process queue manager to set queue gws. Also set process's number of gws used. Currently only one queue in process can use and use all gws.
Change-Id I03e480c8692db3eabfc3a188cce8904d5d962ab7Signed-off-by Oak Zeng <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 56 ++++++++++++++++++++++ 2 files changed, 62 insertions(+)drivers/gpu/drm/amd/amdkfd/kfd_priv.h +6
-0@@ -454,6 +454,9 @@ struct queue_properties {* * @device: The kfd device that created this queue. * +* @gws: Pointing to gws kgd_mem if this is a gws control queue; NULL +* otherwise. +* * This structure represents user mode compute queues. * It contains all the necessary data to handle such queues. * @@ -475,6 +478,7 @@ struct queue {struct kfd_process *process;struct kfd_dev *device; +void *gws; };/* @@ -868,6 +872,8 @@ int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid, struct queue_properties *p);int pqm_set_cu_mask (struct process_queue_manager *pqm,unsigned int qid,struct queue_properties *p); +int pqm_set_gws (struct process_queue_manager *pqm,unsigned int qid, +void *gws);struct kernel_queue *pqm_get_kernel_queue (struct process_queue_manager *pqm,unsigned int qid); int pqm_get_wave_state(struct process_queue_manager *pqm,drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +3
-0@@ -26,6 +26,7 @@#include "kfd_device_queue_manager.h" #include "kfd_priv.h" #include "kfd_kernel_queue.h" +#include "amdgpu_amdkfd.h" static inline struct process_queue_node *get_queue_by_qid (struct process_queue_manager *pqm,unsigned int qid)@@ -74,6 +75,54 @@ void kfd_process_dequeue_from_device(struct kfd_process_device *pdd) pdd->already_dequeued = true; } +int pqm_set_gws (struct process_queue_manager *pqm,unsigned int qid, +void *gws)
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c void kfd_process_dequeue_from_device(struct kfd_process_device *pdd) · line 89
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +10
-0+{ +struct kfd_dev *dev =NULL ; +struct process_queue_node *pqn; +struct kfd_process_device *pdd; +struct kgd_mem *mem; +int ret; + +/* Don't allow unset gws */ +if (!gws) +return -EINVAL ;
I wonder if it would be useful to allow this (e.g. if kfd_ioctl_alloc_queue_gws is called with args->num_gws == 0). Otherwise the only way to release GWS resources is to destroy the queue.
Quoted 13 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +13
-0+ + pqn =get_queue_by_qid (pqm, qid); +if (!pqn) { +pr_err ("Queue id does not match any known queue\n" ); +return -EINVAL ; + } + +if (pqn->q) + dev = pqn->q->device; +if (WARN_ON (!dev)) +return -ENODEV ; + + pdd =kfd_get_process_device_data (dev, pqm->process);
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c void kfd_process_dequeue_from_device(struct kfd_process_device *pdd) · line 112
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +10
-0+if (!pdd) { +pr_err ("Process device data doesn't exist\n" ); +return -EINVAL ; + } + +/* Only allow one queue per process can have GWS assigned */ +list_for_each_entry (pqn, &pqm->queues, process_queue_list) { +if (pqn->q && pqn->q->gws) +return -EINVAL ; + }
It would be easier and more efficient to just check that pdd->qpd.num_gws is 0.
Regards,
Felix
Quoted 20 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +13
-0+ + ret =amdgpu_amdkfd_add_gws_to_process (pdd->process->kgd_process_info, + gws, &mem); +if (unlikely (ret)) +return ret; + + pqn->q->gws = mem; + pdd->qpd.num_gws =amdgpu_amdkfd_get_num_gws (dev->kgd); + +return pqn->q->device->dqm->ops.update_queue (pqn->q->device->dqm, + pqn->q); +} +void kfd_process_dequeue_from_all_devices (struct kfd_process *p) {struct kfd_process_device *pdd;@@ -330,6 +379,13 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid)if (retval != -ETIME ) goto err_destroy_queue; }
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid) · line 391
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +7
-0+ +if (pqn->q->gws) { +amdgpu_amdkfd_remove_gws_from_process (pqm->process->kgd_process_info, + pqn->q->gws); + pdd->qpd.num_gws =0 ; + } +kfree (pqn->q->properties.cu_mask); pqn->q->properties.cu_mask =NULL ;uninit_queue (pqn->q);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/7 drm/amdkfd: New IOCTL to allocate queue GWS
In reply to a message not in the archiveAdd a new kfd ioctl to allocate queue GWS. Queue
GWS is released on queue destroy.
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 30 ++++++++++++++++++++++++++++++ include/uapi/linux/kfd_ioctl.h | 20 +++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +30 -0
@@ -1559,6 +1559,34 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep,return err; } +static int kfd_ioctl_alloc_queue_gws (struct file *filep, +struct kfd_process *p,void *data) +{ +int retval; +struct kfd_ioctl_alloc_queue_gws_args *args = data; +struct kfd_dev *dev =NULL ; + +if (args->num_gws ==0 ) +return -EINVAL ; + +if (!hws_gws_support || + dev->dqm->sched_policy ==KFD_SCHED_POLICY_NO_HWS ) +return -EINVAL ; + + dev =kfd_device_by_id (args->gpu_id); +if (!dev) { +pr_debug ("Could not find gpu id 0x%x\n" , args->gpu_id); +return -EINVAL ; + } + +mutex_lock (&p->mutex); + retval =pqm_set_gws (&p->pqm, args->queue_id, dev->gws); +mutex_unlock (&p->mutex); + + args->first_gws =0 ; +return retval; +} +static int kfd_ioctl_get_dmabuf_info (struct file *filep,struct kfd_process *p,void *data) {
@@ -1761,6 +1789,8 @@ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = {AMDKFD_IOCTL_DEF (AMDKFD_IOC_IMPORT_DMABUF , kfd_ioctl_import_dmabuf,0 ), +AMDKFD_IOCTL_DEF (AMDKFD_IOC_ALLOC_QUEUE_GWS , + kfd_ioctl_alloc_queue_gws, 0), };#define AMDKFD_CORE_IOCTL_COUNT ARRAY_SIZE(amdkfd_ioctls)
include/uapi/linux/kfd_ioctl.h +19 -1
@@ -410,6 +410,21 @@ struct kfd_ioctl_unmap_memory_from_gpu_args {__u32 n_success;/* to/from KFD */ }; +/* Allocate GWS for specific queue +* +* @gpu_id: device identifier +* @queue_id: queue's id that GWS is allocated for +* @num_gws: how many GWS to allocate +* @first_gws: index of the first GWS allocated. +* only support contiguous GWS allocation +*/ +struct kfd_ioctl_alloc_queue_gws_args { +__u32 gpu_id;/* to KFD */ +__u32 queue_id;/* to KFD */ +__u32 num_gws;/* to KFD */ +__u32 first_gws;/* from KFD */ +}; +struct kfd_ioctl_get_dmabuf_info_args {__u64 size;/* from KFD */ __u64 metadata_ptr;/* to KFD */
@@ -529,7 +544,10 @@ enum kfd_mmio_remap {#define AMDKFD_IOC_IMPORT_DMABUF \ AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args) +#define AMDKFD_IOC_ALLOC_QUEUE_GWS \ + AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args) +#define AMDKFD_COMMAND_START 0x01 -#define AMDKFD_COMMAND_END 0x1E +#define AMDKFD_COMMAND_END 0x1F#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1558636843-9867-6-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 6/7] drm/amdkfd: New IOCTL to allocate queue GWS
Quoted 17 lines · Oak
Add a new kfd ioctl to allocate queue GWS. Queue
GWS is released on queue destroy.Change-Id I60153c26a577992ad873e4292e759e5c3d5bbd15Signed-off-by Oak Zeng <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 30 ++++++++++++++++++++++++++++++ include/uapi/linux/kfd_ioctl.h | 20 +++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +0
-0@@ -1559,6 +1559,34 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep,return err; }
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep, · line 1570
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +9
-0+static int kfd_ioctl_alloc_queue_gws (struct file *filep, +struct kfd_process *p,void *data) +{ +int retval; +struct kfd_ioctl_alloc_queue_gws_args *args = data; +struct kfd_dev *dev =NULL ; + +if (args->num_gws ==0 ) +return -EINVAL ;
This could be useful to allow releasing GWS resources without having to destroy the queue. See also my comment in patch 5.
Other than that this looks good to me.
Regards,
Felix
Quoted 59 lines
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +21
-0+ +if (!hws_gws_support || + dev->dqm->sched_policy ==KFD_SCHED_POLICY_NO_HWS ) +return -EINVAL ; + + dev =kfd_device_by_id (args->gpu_id); +if (!dev) { +pr_debug ("Could not find gpu id 0x%x\n" , args->gpu_id); +return -EINVAL ; + } + +mutex_lock (&p->mutex); + retval =pqm_set_gws (&p->pqm, args->queue_id, dev->gws); +mutex_unlock (&p->mutex); + + args->first_gws =0 ; +return retval; +} +static int kfd_ioctl_get_dmabuf_info (struct file *filep,struct kfd_process *p,void *data) {@@ -1761,6 +1789,8 @@ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = {AMDKFD_IOCTL_DEF (AMDKFD_IOC_IMPORT_DMABUF , kfd_ioctl_import_dmabuf,0 ), +AMDKFD_IOCTL_DEF (AMDKFD_IOC_ALLOC_QUEUE_GWS , + kfd_ioctl_alloc_queue_gws, 0), };#define AMDKFD_CORE_IOCTL_COUNT ARRAY_SIZE(amdkfd_ioctls)include/uapi/linux/kfd_ioctl.h +15
-0@@ -410,6 +410,21 @@ struct kfd_ioctl_unmap_memory_from_gpu_args {__u32 n_success;/* to/from KFD */ }; +/* Allocate GWS for specific queue +* +* @gpu_id: device identifier +* @queue_id: queue's id that GWS is allocated for +* @num_gws: how many GWS to allocate +* @first_gws: index of the first GWS allocated. +* only support contiguous GWS allocation +*/ +struct kfd_ioctl_alloc_queue_gws_args { +__u32 gpu_id;/* to KFD */ +__u32 queue_id;/* to KFD */ +__u32 num_gws;/* to KFD */ +__u32 first_gws;/* from KFD */ +}; +struct kfd_ioctl_get_dmabuf_info_args {__u64 size;/* from KFD */ __u64 metadata_ptr;/* to KFD */ @@ -529,7 +544,10 @@ enum kfd_mmio_remap {#define AMDKFD_IOC_IMPORT_DMABUF \
include/uapi/linux/kfd_ioctl.h enum kfd_mmio_remap { · line 553
Quoted 10 lines
include/uapi/linux/kfd_ioctl.h +4
-1AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args) +#define AMDKFD_IOC_ALLOC_QUEUE_GWS \ + AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args) +#define AMDKFD_COMMAND_START 0x01 -#define AMDKFD_COMMAND_END 0x1E +#define AMDKFD_COMMAND_END 0x1F#endif
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/7 drm/amdkfd: PM4 packets change to support GWS
In reply to a message not in the archiveAdd a field in map_queues packet to indicate whether this is a gws control queue. Only one queue per process can be gws control queue. Change num_gws field in map_process packet to 7 bits
--- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c +1 -0
@@ -159,6 +159,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer, packet->bitfields2.engine_sel = engine_sel__mes_map_queues__compute_vi; + packet->bitfields2.gws_control_queue = q->gws ?1 :0 ; packet->bitfields2.queue_type = queue_type__mes_map_queues__normal_compute_vi;
drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h +4 -3
@@ -176,8 +176,7 @@ struct pm4_mes_map_process {union {struct { -uint32_t num_gws:6 ; -uint32_t reserved7:1 ; +uint32_t num_gws:7 ;uint32_t sdma_enable:1 ;uint32_t num_oac:4 ;uint32_t reserved8:4 ;
@@ -272,7 +271,9 @@ struct pm4_mes_map_queues {struct {uint32_t reserved1:4 ;enum mes_map_queues_queue_sel_enum queue_sel:2 ; -uint32_t reserved2:15 ; +uint32_t reserved5:6 ; +uint32_t gws_control_queue:1 ; +uint32_t reserved2:8 ;enum mes_map_queues_queue_type_enum queue_type:3 ;uint32_t reserved3:2 ;enum mes_map_queues_engine_sel_enum engine_sel:3 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx