drm/amdkfd: Fix GWS queue count
Subsystems (3)
PATCH v2 1/2 drm/amdkfd: Fix GWS queue count
dqm->gws_queue_count and pdd->qpd.mapped_gws_queue needs to be updated each time the queue gets evicted.
--- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 83 +++++++++---------- 1 file changed, 37 insertions(+), 46 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +37 -46
@@ -130,19 +130,33 @@ void program_sh_mem_settings(struct device_queue_manager *dqm, }static void increment_queue_count (struct device_queue_manager *dqm, -enum kfd_queue_type type) +struct qcm_process_device *qpd, +struct queue *q) { dqm->active_queue_count++; -if (type ==KFD_QUEUE_TYPE_COMPUTE || type ==KFD_QUEUE_TYPE_DIQ ) +if (q->properties.type ==KFD_QUEUE_TYPE_COMPUTE || + q->properties.type ==KFD_QUEUE_TYPE_DIQ ) dqm->active_cp_queue_count++; + +if (q->properties.is_gws) { + dqm->gws_queue_count++; + qpd->mapped_gws_queue = true; + } }static void decrement_queue_count (struct device_queue_manager *dqm, -enum kfd_queue_type type) +struct qcm_process_device *qpd, +struct queue *q) { dqm->active_queue_count--; -if (type ==KFD_QUEUE_TYPE_COMPUTE || type ==KFD_QUEUE_TYPE_DIQ ) +if (q->properties.type ==KFD_QUEUE_TYPE_COMPUTE || + q->properties.type ==KFD_QUEUE_TYPE_DIQ ) dqm->active_cp_queue_count--; + +if (q->properties.is_gws) { + dqm->gws_queue_count--; + qpd->mapped_gws_queue = false; + } }/*
@@ -412,7 +426,7 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm,list_add (&q->list, &qpd->queues_list); qpd->queue_count++;if (q->properties.is_active) -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, qpd, q);/* * Unconditionally increment this counter, regardless of the queue's
@@ -601,13 +615,8 @@ static int destroy_queue_nocpsch_locked(struct device_queue_manager *dqm,deallocate_vmid (dqm, qpd, q); } qpd->queue_count--; -if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } - } +if (q->properties.is_active) +decrement_queue_count (dqm, qpd, q);return retval; }
@@ -700,12 +709,11 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q,* dqm->active_queue_count to determine whether a new runlist must be * uploaded. */ -if (q->properties.is_active && !prev_active) -increment_queue_count (dqm, q->properties.type); -else if (!q->properties.is_active && prev_active) -decrement_queue_count (dqm, q->properties.type); - -if (q->gws && !q->properties.is_gws) { +if (q->properties.is_active && !prev_active) { +increment_queue_count (dqm, &pdd->qpd, q); + }else if (!q->properties.is_active && prev_active) { +decrement_queue_count (dqm, &pdd->qpd, q); + }else if (q->gws && !q->properties.is_gws) {if (q->properties.is_active) { dqm->gws_queue_count++; pdd->qpd.mapped_gws_queue = true;
@@ -767,11 +775,7 @@ static int evict_process_queues_nocpsch(struct device_queue_manager *dqm, mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( q->properties.type)]; q->properties.is_active = false; -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } +decrement_queue_count (dqm, qpd, q);if (WARN_ONCE (!dqm->sched_running,"Evict when stopped\n" ))continue ;
@@ -817,7 +821,7 @@ static int evict_process_queues_cpsch(struct device_queue_manager *dqm,continue ; q->properties.is_active = false; -decrement_queue_count (dqm, q->properties.type); +decrement_queue_count (dqm, qpd, q); } pdd->last_evict_timestamp =get_jiffies_64 (); retval = execute_queues_cpsch(dqm,
@@ -888,11 +892,7 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( q->properties.type)]; q->properties.is_active = true; -increment_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count++; - qpd->mapped_gws_queue = true; - } +increment_queue_count (dqm, qpd, q);if (WARN_ONCE (!dqm->sched_running,"Restore when stopped\n" ))continue ;
@@ -950,7 +950,7 @@ static int restore_process_queues_cpsch(struct device_queue_manager *dqm,continue ; q->properties.is_active = true; -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, &pdd->qpd, q); } retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );
@@ -1378,7 +1378,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm, dqm->total_queue_count);list_add (&kq->list, &qpd->priv_queue_list); -increment_queue_count (dqm, kq->queue->properties.type); +increment_queue_count (dqm, qpd, kq->queue); qpd->is_debug = true;execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );dqm_unlock (dqm);
@@ -1392,7 +1392,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm, {dqm_lock (dqm);list_del (&kq->list); -decrement_queue_count (dqm, kq->queue->properties.type); +decrement_queue_count (dqm, qpd, kq->queue); qpd->is_debug = false;execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES ,0 );/*
@@ -1467,7 +1467,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, qpd->queue_count++;if (q->properties.is_active) { -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, qpd, q);execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );
@@ -1683,15 +1683,11 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,list_del (&q->list); qpd->queue_count--;if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); +decrement_queue_count (dqm, qpd, q); retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );if (retval == -ETIME ) qpd->reset_wavefronts = true; -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } }/*
@@ -1932,7 +1928,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,/* Clean all kernel queues */ list_for_each_entry_safe (kq, kq_next, &qpd->priv_queue_list, list) {list_del (&kq->list); -decrement_queue_count (dqm, kq->queue->properties.type); +decrement_queue_count (dqm, qpd, kq->queue); qpd->is_debug = false; dqm->total_queue_count--; filter =KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES ;
@@ -1945,13 +1941,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,else if (q->properties.type ==KFD_QUEUE_TYPE_SDMA_XGMI )deallocate_sdma_queue (dqm, q); -if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } - } +if (q->properties.is_active) +decrement_queue_count (dqm, qpd, q); dqm->total_queue_count--; }
Signature · 1 line
2.30.2
PATCH v2 2/2 drm/amdkfd: CRIU add support for GWS queues
Adding support to checkpoint/restore GWS(Global Wave Sync) queues.
--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -1
@@ -1102,7 +1102,7 @@ struct kfd_criu_queue_priv_data {uint32_t priority;uint32_t q_percent;uint32_t doorbell_id; -uint32_t is_gws; +uint32_t gws;uint32_t sdma_id;uint32_t eop_ring_buffer_size;uint32_t ctx_save_restore_area_size;
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +7 -3
@@ -636,6 +636,8 @@ static int criu_checkpoint_queue(struct kfd_process_device *pdd, q_data->ctx_save_restore_area_size = q->properties.ctx_save_restore_area_size; + q_data->gws = !!q->gws; + ret =pqm_checkpoint_mqd (&pdd->process->pqm, q->properties.queue_id, mqd, ctl_stack);if (ret) {pr_err ("Failed checkpoint queue_mqd (%d)\n" , ret);
@@ -743,7 +745,6 @@ static void set_queue_properties_from_criu(struct queue_properties *qp, struct kfd_criu_queue_priv_data *q_data) { qp->is_interop = false; - qp->is_gws = q_data->is_gws; qp->queue_percent = q_data->q_percent; qp->priority = q_data->priority; qp->queue_address = q_data->q_address;
@@ -826,12 +827,15 @@ int kfd_criu_restore_queue(struct kfd_process *p, NULL);if (ret) {pr_err ("Failed to create new queue err:%d\n" , ret); - ret = -EINVAL ; + goto exit; } +if (q_data->gws) + ret =pqm_set_gws (&p->pqm, q_data->q_id, pdd->dev->gws); + exit:if (ret) -pr_err ("Failed to create queue (%d)\n" , ret); +pr_err ("Failed to restore queue (%d)\n" , ret);else pr_debug ("Queue id %d was restored successfully\n" , queue_id);
Signature · 1 line
2.30.2
Re: [PATCH v2 2/2] drm/amdkfd: CRIU add support for GWS queues
Dear David,
Thank you for your patch.
Am 18.04.22 um 18:44 schrieb David Yat Sin:
In the commit message summary, you could reorder some words:
Add CRIU support for GWS queues
Quoted 1 line
Adding support to checkpoint/restore GWS(Global Wave Sync) queues.
s/Adding/Add/
Please add a space before the (.
How can this be tested?
Quoted 11 lines
Signed-off-by David Yat Sin <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-0
drivers/gpu/drm/amd/amdkfd/kfd_priv.h struct kfd_criu_queue_priv_data { · line 1105
Quoted 5 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1
-1@@ -1102,7 +1102,7 @@ struct kfd_criu_queue_priv_data {uint32_t priority;uint32_t q_percent;uint32_t doorbell_id; -uint32_t is_gws; +uint32_t gws;
Why is the new name better?
Quoted 29 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-0uint32_t sdma_id;uint32_t eop_ring_buffer_size;uint32_t ctx_save_restore_area_size;drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +2
-2@@ -636,6 +636,8 @@ static int criu_checkpoint_queue(struct kfd_process_device *pdd, q_data->ctx_save_restore_area_size = q->properties.ctx_save_restore_area_size; + q_data->gws = !!q->gws; + ret =pqm_checkpoint_mqd (&pdd->process->pqm, q->properties.queue_id, mqd, ctl_stack);if (ret) {pr_err ("Failed checkpoint queue_mqd (%d)\n" , ret);@@ -743,7 +745,6 @@ static void set_queue_properties_from_criu(struct queue_properties *qp, struct kfd_criu_queue_priv_data *q_data) { qp->is_interop = false; - qp->is_gws = q_data->is_gws; qp->queue_percent = q_data->q_percent; qp->priority = q_data->priority; qp->queue_address = q_data->q_address;@@ -826,12 +827,15 @@ int kfd_criu_restore_queue(struct kfd_process *p, NULL);if (ret) {pr_err ("Failed to create new queue err:%d\n" , ret); - ret = -EINVAL ;
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c int kfd_criu_restore_queue(struct kfd_process *p, · line 838
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +5
-1+ goto exit; } +if (q_data->gws) + ret =pqm_set_gws (&p->pqm, q_data->q_id, pdd->dev->gws); + exit:if (ret) -pr_err ("Failed to create queue (%d)\n" , ret); +pr_err ("Failed to restore queue (%d)\n" , ret);
Maybe separate this out, so it can be applied to stable series.
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c int kfd_criu_restore_queue(struct kfd_process *p, · line 841
Quoted 3 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-0else pr_debug ("Queue id %d was restored successfully\n" , queue_id);
Kind regards,
Paul
RE: [PATCH v2 2/2] drm/amdkfd: CRIU add support for GWS queues
Quoted 19 lines
-----Original Message-----
From: Paul Menzel <[email protected]>
Sent: Monday, April 18, 2022 4:23 PM
To: Yat Sin, David <[email protected]>
Cc: [email protected]; Kuehling, Felix <[email protected]>
Subject: Re: [PATCH v2 2/2] drm/amdkfd: CRIU add support for GWS queuesDear David,
Thank you for your patch.
Am 18.04.22 um 18:44 schrieb David Yat Sin:
In the commit message summary, you could reorder some words:
Quoted 7 lines
Add CRIU support for GWS queues
Quoted 1 line
Adding support to checkpoint/restore GWS(Global Wave Sync) queues.
s/Adding/Add/
Please add a space before the (.
ACK
Quoted 2 lines
How can this be tested?
We have some internal tests that can we be used to specifically test this feature.
Quoted 8 lines
Quoted 5 lines
Signed-off-by David Yat Sin <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10+++++++---
Quoted 2 lines
2 files changed, 8 insertions(+), 4 deletions(-)
Quoted 13 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h struct kfd_criu_queue_priv_data { · line 1105
Quoted 11 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1
-1@@ -1102,7 +1102,7 @@ struct kfd_criu_queue_priv_data {uint32_t priority;uint32_t q_percent;uint32_t doorbell_id; -uint32_t is_gws; +uint32_t gws;Why is the new name better?
The old variable (is_gws) was obtained from the queue_properties structure during checkpoint and is only used temporarily during queue creation, so this variable cannot be used to determine whether a queue as gws enabled. The new variable (gws) is obtained from the queue structure. The name is changed to better reflect this.
Quoted 59 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static int criu_checkpoint_queue(struct
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-0uint32_t sdma_id;uint32_t eop_ring_buffer_size; uint32_t ctx_save_restore_area_size; diff --git
a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.cb/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.cindex6eca9509f2e3..4f58e671d39b100644drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-0@@ -636,6 +636,8 @@ static int criu_checkpoint_queue(struct
kfd_process_device*pdd,Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +2
-0q_data->ctx_save_restore_area_size = q->properties.ctx_save_restore_area_size; + q_data->gws = !!q->gws; + ret =pqm_checkpoint_mqd (&pdd->process->pqm, q- properties.queue_id, mqd, ctl_stack);if (ret) {
pr_err("Failed checkpoint queue_mqd (%d)\n", ret); @@ -743,7
Quoted 1 line
+745,6 @@ static void set_queue_properties_from_criu(struct
queue_properties*qp,Quoted 1 line
struct
kfd_criu_queue_priv_data
*q_data)drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static void set_queue_properties_from_criu(struct queue_properties *qp,
Quoted 6 lines
{ qp->is_interop = false;drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-1- qp->is_gws = q_data->is_gws; qp->queue_percent = q_data->q_percent; qp->priority = q_data->priority; qp->queue_address = q_data->q_address; @@ -826,12 +827,15 @@int
Quoted 5 lines
kfd_criu_restore_queue(struct
kfd_process*p,
NULL);
if (ret) {
pr_err("Failed to create new queue err:%d\n", ret);drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-1- ret = -EINVAL ;drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c int kfd_criu_restore_queue(struct kfd_process *p, · line 838
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +5
-1+ goto exit; } +if (q_data->gws) + ret =pqm_set_gws (&p->pqm, q_data->q_id, pdd->dev->gws); + exit:if (ret) -pr_err ("Failed to create queue (%d)\n" , ret); +pr_err ("Failed to restore queue (%d)\n" , ret);Maybe separate this out, so it can be applied to stable series.
Quoted 2 lines
else
pr_debug("Queue id %d was restored successfully\n",
queue_id);Quoted 1 line
Kind regards,
Paul
Re: [PATCH v2 2/2] drm/amdkfd: CRIU add support for GWS queues
Dear David,
Thank you for sending out v3 of these patches.
Am 19.04.22 um 02:04 schrieb Yat Sin, David:
Quoted 5 lines
Quoted 5 lines
-----Original Message-----
From: Paul Menzel <[email protected]>
Sent: Monday, April 18, 2022 4:23 PM
[…]
Quoted 9 lines
Quoted 9 lines
Am 18.04.22 um 18:44 schrieb David Yat Sin:
In the commit message summary, you could reorder some words:
Add CRIU support for GWS queues
Quoted 1 line
Adding support to checkpoint/restore GWS(Global Wave Sync) queues.
s/Adding/Add/
Did you miss the two comments above?
Quoted 5 lines
Quoted 1 line
Please add a space before the (.
ACK
Quoted 2 lines
How can this be tested?
We have some internal tests that can we be used to specifically test this feature.
Nice. Are you going to publish these in the future?
Quoted 19 lines
Quoted 6 lines
Quoted 6 lines
Signed-off-by David Yat Sin <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)Quoted 13 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h struct kfd_criu_queue_priv_data { · line 1105
Quoted 11 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1
-1@@ -1102,7 +1102,7 @@ struct kfd_criu_queue_priv_data {uint32_t priority;uint32_t q_percent;uint32_t doorbell_id; -uint32_t is_gws; +uint32_t gws;Why is the new name better?
Quoted 5 lines
The old variable (
is_gws) was obtained from thequeue_propertiesstructure during checkpoint and is only used temporarily during queue creation, so this variable cannot be used to determine whether a queue as gws enabled. The new variable (gws) is obtained from the queue structure. The name is changed to better reflect this.
Further down you seem to use it like a boolean though. So a name reflecting that would be nice.
Quoted 34 lines
Quoted 34 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static int criu_checkpoint_queue(struct
Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-0uint32_t sdma_id;uint32_t eop_ring_buffer_size; uint32_t ctx_save_restore_area_size; diff --git
a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.cb/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.cindex6eca9509f2e3..4f58e671d39b100644drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-0@@ -636,6 +636,8 @@ static int criu_checkpoint_queue(struct
kfd_process_device*pdd,Quoted 6 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +2
-0q_data->ctx_save_restore_area_size = q->properties.ctx_save_restore_area_size; + q_data->gws = !!q->gws; + ret =pqm_checkpoint_mqd (&pdd->process->pqm, q-> properties.queue_id, mqd, ctl_stack);drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static int criu_checkpoint_queue(struct
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +1
-1if (ret) { pr_err("Failed checkpoint queue_mqd (%d)\n", ret); @@ -743,7 +745,6 @@ static void set_queue_properties_from_criu(struct queue_properties *qp,struct kfd_criu_queue_priv_data *q_data) { qp->is_interop = false; - qp->is_gws = q_data->is_gws; qp->queue_percent = q_data->q_percent; qp->priority = q_data->priority; qp->queue_address = q_data->q_address; @@ -826,12 +827,15 @@int kfd_criu_restore_queue(struct
kfd_process*p,Quoted 7 lines
NULL); if (ret) { pr_err("Failed to create new queue err:%d\n", ret);drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +1
-1- ret = -EINVAL ; + goto exit; }
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c int kfd_criu_restore_queue(struct kfd_process *p, · line 838
Quoted 7 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +4
-1+if (q_data->gws) + ret =pqm_set_gws (&p->pqm, q_data->q_id, pdd->dev->gws); + exit:if (ret) -pr_err ("Failed to create queue (%d)\n" , ret); +pr_err ("Failed to restore queue (%d)\n" , ret);Maybe separate this out, so it can be applied to stable series.
Did you miss this comment?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
else pr_debug("Queue id %d was restored successfully\n", queue_id);
Kind regards,
Paul
RE: [PATCH v2 2/2] drm/amdkfd: CRIU add support for GWS queues
Quoted 28 lines
-----Original Message-----
From: Paul Menzel <[email protected]>
Sent: Tuesday, April 19, 2022 2:54 AM
To: Yat Sin, David <[email protected]>
Cc: Kuehling, Felix <[email protected]>; amd- [email protected]
Subject: Re: [PATCH v2 2/2] drm/amdkfd: CRIU add support for GWS queuesDear David,
Thank you for sending out v3 of these patches.
Am 19.04.22 um 02:04 schrieb Yat Sin, David:
Quoted 5 lines
Quoted 5 lines
-----Original Message-----
From: Paul Menzel <[email protected]>
Sent: Monday, April 18, 2022 4:23 PM[…]
Quoted 4 lines
Quoted 4 lines
Am 18.04.22 um 18:44 schrieb David Yat Sin:
In the commit message summary, you could reorder some words:
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Add CRIU support for GWS queues
Quoted 1 line
Adding support to checkpoint/restore GWS(Global Wave Sync) queues.
s/Adding/Add/
Did you miss the two comments above?
ACK
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
Please add a space before the (.
ACK
Quoted 2 lines
How can this be tested?
We have some internal tests that can we be used to specifically test this
feature.
Nice. Are you going to publish these in the future?
I think some of these tests depend on other frameworks, so it might not be straight forward to do this.
Quoted 21 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Signed-off-by David Yat Sin <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10+++++++---
Quoted 15 lines
Quoted 15 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h struct kfd_criu_queue_priv_data { · line 1105
Quoted 13 lines
2 files changed, 8 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1
-1@@ -1102,7 +1102,7 @@ struct kfd_criu_queue_priv_data {uint32_t priority;uint32_t q_percent;uint32_t doorbell_id; -uint32_t is_gws; +uint32_t gws;Why is the new name better?
Quoted 8 lines
Quoted 5 lines
The old variable (
is_gws) was obtained from thequeue_propertiesstructure during checkpoint and is only used temporarily during queue creation, so this variable cannot be used to determine whether a queue as gws enabled. The new variable (gws) is obtained from the queue structure. The name is changed to better reflect this.Further down you seem to use it like a boolean though. So a name reflecting that would be nice.
To me this is ok. I would rather have the variable name match its source.
Quoted 49 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static int criu_checkpoint_queue(struct
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-0uint32_t sdma_id;uint32_t eop_ring_buffer_size; uint32_t ctx_save_restore_area_size; diff --git
a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.cb/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.cindex6eca9509f2e3..4f58e671d39b100644drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-0@@ -636,6 +636,8 @@ static int criu_checkpoint_queue(struct
kfd_process_device*pdd,Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static int criu_checkpoint_queue(struct kfd_process_device *pdd,
Quoted 6 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +2
-0q_data->ctx_save_restore_area_size = q->properties.ctx_save_restore_area_size; + q_data->gws = !!q->gws; + ret = pqm_checkpoint_mqd(&pdd->process->pqm, q->properties.queue_id, mqd,
ctl_stack);Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static int criu_checkpoint_queue(struct · line 643
Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-0if (ret) { pr_err("Failed checkpoint queue_mqd (%d)\n", ret); @@ -743,7
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
+745,6 @@ static void set_queue_properties_from_criu(struct +queue_properties *qp,
structkfd_criu_queue_priv_data
*q_data)Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c static void set_queue_properties_from_criu(struct queue_properties *qp,
Quoted 6 lines
{ qp->is_interop = false;drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +0
-1- qp->is_gws = q_data->is_gws; qp->queue_percent = q_data->q_percent; qp->priority = q_data->priority; qp->queue_address = q_data->q_address; @@ -826,12 +827,15 @@int kfd_criu_restore_queue(struct
kfd_process*p,Quoted 7 lines
NULL); if (ret) { pr_err("Failed to create new queue err:%d\n", ret);drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +1
-1- ret = -EINVAL ; + goto exit; }Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c int kfd_criu_restore_queue(struct kfd_process *p, · line 838
Quoted 7 lines
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +4
-1+if (q_data->gws) + ret =pqm_set_gws (&p->pqm, q_data->q_id, pdd->dev->gws); + exit:if (ret) -pr_err ("Failed to create queue (%d)\n" , ret); +pr_err ("Failed to restore queue (%d)\n" , ret);Maybe separate this out, so it can be applied to stable series.
Quoted 1 line
Did you miss this comment?
What do you mean by stable series?
Quoted 10 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
else
pr_debug("Queue id %d was restored successfully\n",
queue_id);Quoted 1 line
Quoted 1 line
Quoted 1 line
Kind regards,
Paul
Am 2022-04-18 um 12:44 schrieb David Yat Sin:
Quoted 4 lines
dqm->gws_queue_countandpdd->qpd.mapped_gws_queueneeds to be updated each time the queue gets evicted.Signed-off-by David Yat Sin <[email protected]>
The series is
Quoted 202 lines
--- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 83 +++++++++---------- 1 file changed, 37 insertions(+), 46 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +37
-46@@ -130,19 +130,33 @@ void program_sh_mem_settings(struct device_queue_manager *dqm, }static void increment_queue_count (struct device_queue_manager *dqm, -enum kfd_queue_type type) +struct qcm_process_device *qpd, +struct queue *q) { dqm->active_queue_count++; -if (type ==KFD_QUEUE_TYPE_COMPUTE || type ==KFD_QUEUE_TYPE_DIQ ) +if (q->properties.type ==KFD_QUEUE_TYPE_COMPUTE || + q->properties.type ==KFD_QUEUE_TYPE_DIQ ) dqm->active_cp_queue_count++; + +if (q->properties.is_gws) { + dqm->gws_queue_count++; + qpd->mapped_gws_queue = true; + } }static void decrement_queue_count (struct device_queue_manager *dqm, -enum kfd_queue_type type) +struct qcm_process_device *qpd, +struct queue *q) { dqm->active_queue_count--; -if (type ==KFD_QUEUE_TYPE_COMPUTE || type ==KFD_QUEUE_TYPE_DIQ ) +if (q->properties.type ==KFD_QUEUE_TYPE_COMPUTE || + q->properties.type ==KFD_QUEUE_TYPE_DIQ ) dqm->active_cp_queue_count--; + +if (q->properties.is_gws) { + dqm->gws_queue_count--; + qpd->mapped_gws_queue = false; + } }/* @@ -412,7 +426,7 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm,list_add (&q->list, &qpd->queues_list); qpd->queue_count++;if (q->properties.is_active) -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, qpd, q);/* * Unconditionally increment this counter, regardless of the queue's @@ -601,13 +615,8 @@ static int destroy_queue_nocpsch_locked(struct device_queue_manager *dqm,deallocate_vmid (dqm, qpd, q); } qpd->queue_count--; -if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } - } +if (q->properties.is_active) +decrement_queue_count (dqm, qpd, q);return retval; }@@ -700,12 +709,11 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q,* dqm->active_queue_count to determine whether a new runlist must be * uploaded. */ -if (q->properties.is_active && !prev_active) -increment_queue_count (dqm, q->properties.type); -else if (!q->properties.is_active && prev_active) -decrement_queue_count (dqm, q->properties.type); - -if (q->gws && !q->properties.is_gws) { +if (q->properties.is_active && !prev_active) { +increment_queue_count (dqm, &pdd->qpd, q); + }else if (!q->properties.is_active && prev_active) { +decrement_queue_count (dqm, &pdd->qpd, q); + }else if (q->gws && !q->properties.is_gws) {if (q->properties.is_active) { dqm->gws_queue_count++; pdd->qpd.mapped_gws_queue = true;@@ -767,11 +775,7 @@ static int evict_process_queues_nocpsch(struct device_queue_manager *dqm, mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( q->properties.type)]; q->properties.is_active = false; -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } +decrement_queue_count (dqm, qpd, q);if (WARN_ONCE (!dqm->sched_running,"Evict when stopped\n" ))continue ;@@ -817,7 +821,7 @@ static int evict_process_queues_cpsch(struct device_queue_manager *dqm,continue ; q->properties.is_active = false; -decrement_queue_count (dqm, q->properties.type); +decrement_queue_count (dqm, qpd, q); } pdd->last_evict_timestamp =get_jiffies_64 (); retval = execute_queues_cpsch(dqm,@@ -888,11 +892,7 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( q->properties.type)]; q->properties.is_active = true; -increment_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count++; - qpd->mapped_gws_queue = true; - } +increment_queue_count (dqm, qpd, q);if (WARN_ONCE (!dqm->sched_running,"Restore when stopped\n" ))continue ;@@ -950,7 +950,7 @@ static int restore_process_queues_cpsch(struct device_queue_manager *dqm,continue ; q->properties.is_active = true; -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, &pdd->qpd, q); } retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );@@ -1378,7 +1378,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm, dqm->total_queue_count);list_add (&kq->list, &qpd->priv_queue_list); -increment_queue_count (dqm, kq->queue->properties.type); +increment_queue_count (dqm, qpd, kq->queue); qpd->is_debug = true;execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );dqm_unlock (dqm);@@ -1392,7 +1392,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm, {dqm_lock (dqm);list_del (&kq->list); -decrement_queue_count (dqm, kq->queue->properties.type); +decrement_queue_count (dqm, qpd, kq->queue); qpd->is_debug = false;execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES ,0 );/* @@ -1467,7 +1467,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, qpd->queue_count++;if (q->properties.is_active) { -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, qpd, q);execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );@@ -1683,15 +1683,11 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,list_del (&q->list); qpd->queue_count--;if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); +decrement_queue_count (dqm, qpd, q); retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );if (retval == -ETIME ) qpd->reset_wavefronts = true; -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } }/* @@ -1932,7 +1928,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,/* Clean all kernel queues */ list_for_each_entry_safe (kq, kq_next, &qpd->priv_queue_list, list) {list_del (&kq->list); -decrement_queue_count (dqm, kq->queue->properties.type); +decrement_queue_count (dqm, qpd, kq->queue); qpd->is_debug = false; dqm->total_queue_count--; filter =KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES ;@@ -1945,13 +1941,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,else if (q->properties.type ==KFD_QUEUE_TYPE_SDMA_XGMI )deallocate_sdma_queue (dqm, q); -if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } - } +if (q->properties.is_active) +decrement_queue_count (dqm, qpd, q); dqm->total_queue_count--; }
Dear David,
Thank you for your patch.
Am 18.04.22 um 18:44 schrieb David Yat Sin:
Quoted 1 line
dqm->gws_queue_countandpdd->qpd.mapped_gws_queueneeds to be updated
s/needs/need/
Quoted 1 line
each time the queue gets evicted.
Why?
Do you only change the case, when an element of the queue gets evicted?
Next time, a short note about the implementation would be nic.e
No Fixes tag?
Kind regards,
Paul
Quoted 203 lines
Signed-off-by David Yat Sin <[email protected]>--- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 83 +++++++++---------- 1 file changed, 37 insertions(+), 46 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +37
-46@@ -130,19 +130,33 @@ void program_sh_mem_settings(struct device_queue_manager *dqm, }static void increment_queue_count (struct device_queue_manager *dqm, -enum kfd_queue_type type) +struct qcm_process_device *qpd, +struct queue *q) { dqm->active_queue_count++; -if (type ==KFD_QUEUE_TYPE_COMPUTE || type ==KFD_QUEUE_TYPE_DIQ ) +if (q->properties.type ==KFD_QUEUE_TYPE_COMPUTE || + q->properties.type ==KFD_QUEUE_TYPE_DIQ ) dqm->active_cp_queue_count++; + +if (q->properties.is_gws) { + dqm->gws_queue_count++; + qpd->mapped_gws_queue = true; + } }static void decrement_queue_count (struct device_queue_manager *dqm, -enum kfd_queue_type type) +struct qcm_process_device *qpd, +struct queue *q) { dqm->active_queue_count--; -if (type ==KFD_QUEUE_TYPE_COMPUTE || type ==KFD_QUEUE_TYPE_DIQ ) +if (q->properties.type ==KFD_QUEUE_TYPE_COMPUTE || + q->properties.type ==KFD_QUEUE_TYPE_DIQ ) dqm->active_cp_queue_count--; + +if (q->properties.is_gws) { + dqm->gws_queue_count--; + qpd->mapped_gws_queue = false; + } }/* @@ -412,7 +426,7 @@ static int create_queue_nocpsch(struct device_queue_manager *dqm,list_add (&q->list, &qpd->queues_list); qpd->queue_count++;if (q->properties.is_active) -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, qpd, q);/* * Unconditionally increment this counter, regardless of the queue's @@ -601,13 +615,8 @@ static int destroy_queue_nocpsch_locked(struct device_queue_manager *dqm,deallocate_vmid (dqm, qpd, q); } qpd->queue_count--; -if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } - } +if (q->properties.is_active) +decrement_queue_count (dqm, qpd, q);return retval; }@@ -700,12 +709,11 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q,* dqm->active_queue_count to determine whether a new runlist must be * uploaded. */ -if (q->properties.is_active && !prev_active) -increment_queue_count (dqm, q->properties.type); -else if (!q->properties.is_active && prev_active) -decrement_queue_count (dqm, q->properties.type); - -if (q->gws && !q->properties.is_gws) { +if (q->properties.is_active && !prev_active) { +increment_queue_count (dqm, &pdd->qpd, q); + }else if (!q->properties.is_active && prev_active) { +decrement_queue_count (dqm, &pdd->qpd, q); + }else if (q->gws && !q->properties.is_gws) {if (q->properties.is_active) { dqm->gws_queue_count++; pdd->qpd.mapped_gws_queue = true;@@ -767,11 +775,7 @@ static int evict_process_queues_nocpsch(struct device_queue_manager *dqm, mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( q->properties.type)]; q->properties.is_active = false; -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } +decrement_queue_count (dqm, qpd, q);if (WARN_ONCE (!dqm->sched_running,"Evict when stopped\n" ))continue ;@@ -817,7 +821,7 @@ static int evict_process_queues_cpsch(struct device_queue_manager *dqm,continue ; q->properties.is_active = false; -decrement_queue_count (dqm, q->properties.type); +decrement_queue_count (dqm, qpd, q); } pdd->last_evict_timestamp =get_jiffies_64 (); retval = execute_queues_cpsch(dqm,@@ -888,11 +892,7 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type ( q->properties.type)]; q->properties.is_active = true; -increment_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count++; - qpd->mapped_gws_queue = true; - } +increment_queue_count (dqm, qpd, q);if (WARN_ONCE (!dqm->sched_running,"Restore when stopped\n" ))continue ;@@ -950,7 +950,7 @@ static int restore_process_queues_cpsch(struct device_queue_manager *dqm,continue ; q->properties.is_active = true; -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, &pdd->qpd, q); } retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );@@ -1378,7 +1378,7 @@ static int create_kernel_queue_cpsch(struct device_queue_manager *dqm, dqm->total_queue_count);list_add (&kq->list, &qpd->priv_queue_list); -increment_queue_count (dqm, kq->queue->properties.type); +increment_queue_count (dqm, qpd, kq->queue); qpd->is_debug = true;execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );dqm_unlock (dqm);@@ -1392,7 +1392,7 @@ static void destroy_kernel_queue_cpsch(struct device_queue_manager *dqm, {dqm_lock (dqm);list_del (&kq->list); -decrement_queue_count (dqm, kq->queue->properties.type); +decrement_queue_count (dqm, qpd, kq->queue); qpd->is_debug = false;execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES ,0 );/* @@ -1467,7 +1467,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, qpd->queue_count++;if (q->properties.is_active) { -increment_queue_count (dqm, q->properties.type); +increment_queue_count (dqm, qpd, q);execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );@@ -1683,15 +1683,11 @@ static int destroy_queue_cpsch(struct device_queue_manager *dqm,list_del (&q->list); qpd->queue_count--;if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); +decrement_queue_count (dqm, qpd, q); retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 );if (retval == -ETIME ) qpd->reset_wavefronts = true; -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } }/* @@ -1932,7 +1928,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,/* Clean all kernel queues */ list_for_each_entry_safe (kq, kq_next, &qpd->priv_queue_list, list) {list_del (&kq->list); -decrement_queue_count (dqm, kq->queue->properties.type); +decrement_queue_count (dqm, qpd, kq->queue); qpd->is_debug = false; dqm->total_queue_count--; filter =KFD_UNMAP_QUEUES_FILTER_ALL_QUEUES ;@@ -1945,13 +1941,8 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,else if (q->properties.type ==KFD_QUEUE_TYPE_SDMA_XGMI )deallocate_sdma_queue (dqm, q); -if (q->properties.is_active) { -decrement_queue_count (dqm, q->properties.type); -if (q->properties.is_gws) { - dqm->gws_queue_count--; - qpd->mapped_gws_queue = false; - } - } +if (q->properties.is_active) +decrement_queue_count (dqm, qpd, q); dqm->total_queue_count--; }