Skip to contentSkip to conversation

drm/amdkfd: Restore SDMA queues with engine_id

PATCH Superseded David Yat Sin 1 participant 2 messages Jul 22, 2025

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/amdkfd: Restore SDMA queues with engine_id

Add support for checkpoint/restore for SDMA queues of type KFD_QUEUE_TYPE_SDMA_BY_ENG_ID.

---
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h                  | 1 +
 drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 8 ++++++++
 2 files changed, 9 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -0
index 67694bcd9464..837da09b5bec 100644
@@ -1261,6 +1261,7 @@ struct kfd_criu_queue_priv_data {
 	uint32_t doorbell_id;
 	uint32_t gws;
 	uint32_t sdma_id;
+	uint32_t sdma_engine_id;
 	uint32_t eop_ring_buffer_size;
 	uint32_t ctx_save_restore_area_size;
 	uint32_t ctl_stack_size;
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +8 -0
index c643e0ccec52..b64bc47748f1 100644
@@ -846,6 +846,14 @@ static int criu_checkpoint_queue(struct kfd_process_device *pdd,
 
 	q_data->sdma_id = q->sdma_id;
 
+	if ((q->properties.type == KFD_QUEUE_TYPE_SDMA ||
+		 q->properties.type == KFD_QUEUE_TYPE_SDMA_XGMI)
+		&& q->properties.sdma_engine_id) {
+		q_data->type = KFD_QUEUE_TYPE_SDMA_BY_ENG_ID;
+	}
+
+	q_data->sdma_engine_id = q->properties.sdma_engine_id;
+
 	q_data->eop_ring_buffer_address =
 		q->properties.eop_ring_buffer_address;
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 drm/amdkfd: Fix checkpoint-restore on multi-xcc

GPUs with multi-xcc have multiple MQDs per queue. This patch saves and restores all the MQDs within the partition.

---
 .../drm/amd/amdkfd/kfd_device_queue_manager.c |  2 +-
 .../gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c   | 61 ++++++++++++++++---
 .../amd/amdkfd/kfd_process_queue_manager.c    | 21 +++++--
 3 files changed, 68 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
index 2d91027e2a74..6c5c7c1bf5ed 100644
@@ -2725,7 +2725,7 @@ static void get_queue_checkpoint_info(struct device_queue_manager *dqm,
 
 	dqm_lock(dqm);
 	mqd_mgr = dqm->mqd_mgrs[mqd_type];
-	*mqd_size = mqd_mgr->mqd_size;
+	*mqd_size = mqd_mgr->mqd_size * NUM_XCC(mqd_mgr->dev->xcc_mask);
 	*ctl_stack_size = 0;
 
 	if (q->properties.type == KFD_QUEUE_TYPE_COMPUTE && mqd_mgr->get_checkpoint_info)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +51 -10

100 lines not on this page · raw message

drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +16 -5
index b64bc47748f1..bae200035ff4 100644
@@ -922,7 +922,10 @@ static int criu_checkpoint_queues_device(struct kfd_process_device *pdd,
 
 		q_data = (struct kfd_criu_queue_priv_data *)q_private_data;
 
-		/* data stored in this order: priv_data, mqd, ctl_stack */
+		/*
+		 * data stored in this order:
+		 * priv_data, mqd[xcc0], mqd[xcc1],..., ctl_stack[xcc0], ctl_stack[xcc1]...
+		 */
 		q_data->mqd_size = mqd_size;
 		q_data->ctl_stack_size = ctl_stack_size;
 
@@ -971,7 +974,7 @@ int kfd_criu_checkpoint_queues(struct kfd_process *p,
 }
 
 static void set_queue_properties_from_criu(struct queue_properties *qp,
-					  struct kfd_criu_queue_priv_data *q_data)
+					  struct kfd_criu_queue_priv_data *q_data, uint32_t num_xcc)
 {
 	qp->is_interop = false;
 	qp->queue_percent = q_data->q_percent;
@@ -980,11 +983,16 @@ static void set_queue_properties_from_criu(struct queue_properties *qp,
 	qp->queue_size = q_data->q_size;
 	qp->read_ptr = (uint32_t *) q_data->read_ptr_addr;
 	qp->write_ptr = (uint32_t *) q_data->write_ptr_addr;
+	qp->sdma_engine_id = q_data->sdma_engine_id;
 	qp->eop_ring_buffer_address = q_data->eop_ring_buffer_address;
 	qp->eop_ring_buffer_size = q_data->eop_ring_buffer_size;
 	qp->ctx_save_restore_area_address = q_data->ctx_save_restore_area_address;
 	qp->ctx_save_restore_area_size = q_data->ctx_save_restore_area_size;
-	qp->ctl_stack_size = q_data->ctl_stack_size;
+	if (q_data->type == KFD_QUEUE_TYPE_COMPUTE)
+		qp->ctl_stack_size = q_data->ctl_stack_size / num_xcc;
+	else
+		qp->ctl_stack_size = q_data->ctl_stack_size;
+
 	qp->type = q_data->type;
 	qp->format = q_data->format;
 }
@@ -1044,12 +1052,15 @@ int kfd_criu_restore_queue(struct kfd_process *p,
 		goto exit;
 	}
 
-	/* data stored in this order: mqd, ctl_stack */
+	/*
+	 * data stored in this order:
+	 * mqd[xcc0], mqd[xcc1],..., ctl_stack[xcc0], ctl_stack[xcc1]...
+	 */
 	mqd = q_extra_data;
 	ctl_stack = mqd + q_data->mqd_size;
 
 	memset(&qp, 0, sizeof(qp));
-	set_queue_properties_from_criu(&qp, q_data);
+	set_queue_properties_from_criu(&qp, q_data, NUM_XCC(pdd->dev->adev->gfx.xcc_mask));
 
 	print_queue_properties(&qp);
 
Signature · 1 line
2.34.1