drm/amdkfd: Add function to set queue gws
Subsystems (3)
PATCH 5/8 drm/amdkfd: Add function to set queue gws
Add functions in process queue manager to set/get 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 | 50 ++++++++++++++++++++++ 2 files changed, 56 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 +50 -0
62 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): 1557773393-13707-1-git-send-email-Oak.Zeng-5C7GfCeVMHo@public.gmane.org
PATCH 6/8 drm/amdgpu: Add function to add/remove gws to kfd process
GWS 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 7/8 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 | 39 ++++++++++++++++++++++ .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 6 ++++ include/uapi/linux/kfd_ioctl.h | 20 ++++++++++- 3 files changed, 64 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +39 -0
@@ -1559,6 +1559,43 @@ 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 ; +struct kgd_mem *mem; + +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 ; + } + + retval =amdgpu_amdkfd_add_gws_to_process (p->kgd_process_info, + dev->gws, &mem); +if (unlikely (retval)) +return retval; + +mutex_lock (&p->mutex); + retval =pqm_set_gws (&p->pqm, args->queue_id, mem); +mutex_unlock (&p->mutex); + +if (unlikely (retval)) +amdgpu_amdkfd_remove_gws_from_process (p->kgd_process_info, mem); + + args->first_gws =0 ; +return retval; +} +static int kfd_ioctl_get_dmabuf_info (struct file *filep,struct kfd_process *p,void *data) {
@@ -1761,6 +1798,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)
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +6 -0
@@ -363,6 +363,12 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid)return -1 ; } +if (pqm_get_gws (pqm, qid)) { +amdgpu_amdkfd_remove_gws_from_process (pqm->process->kgd_process_info, +pqm_get_gws (pqm, qid)); +pqm_set_gws (pqm, qid,NULL ); + } +if (pqn->kq) {/* destroy kernel queue (DIQ) */ dqm = pqn->kq->dev->dqm;
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(0x22, struct kfd_ioctl_alloc_queue_gws_args) +#define AMDKFD_COMMAND_START 0x01 -#define AMDKFD_COMMAND_END 0x1E +#define AMDKFD_COMMAND_END 0x23#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx