浏览代码

drm/amdkfd: GFP_NOIO while holding locks taken in MMU notifier

When an MMU notifier runs in memory reclaim context, it can deadlock
trying to take locks that are already held in the thread causing the
memory reclaim. The solution is to avoid memory reclaim while holding
locks that are taken in MMU notifiers by using GFP_NOIO.

This commit fixes memory allocations done while holding the dqm->lock
which is needed in the MMU notifier (dqm->ops.evict_process_queues).

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Felix Kuehling 7 年之前
父节点
当前提交
d1853f42b6

+ 1 - 1
drivers/gpu/drm/amd/amdkfd/kfd_device.c

@@ -652,7 +652,7 @@ int kfd_gtt_sa_allocate(struct kfd_dev *kfd, unsigned int size,
 	if (size > kfd->gtt_sa_num_of_chunks * kfd->gtt_sa_chunk_size)
 	if (size > kfd->gtt_sa_num_of_chunks * kfd->gtt_sa_chunk_size)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
-	*mem_obj = kmalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);
+	*mem_obj = kmalloc(sizeof(struct kfd_mem_obj), GFP_NOIO);
 	if ((*mem_obj) == NULL)
 	if ((*mem_obj) == NULL)
 		return -ENOMEM;
 		return -ENOMEM;
 
 

+ 1 - 1
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c

@@ -412,7 +412,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,
 	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
 	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
 		return NULL;
 		return NULL;
 
 
-	mqd = kzalloc(sizeof(*mqd), GFP_KERNEL);
+	mqd = kzalloc(sizeof(*mqd), GFP_NOIO);
 	if (!mqd)
 	if (!mqd)
 		return NULL;
 		return NULL;
 
 

+ 1 - 1
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c

@@ -394,7 +394,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type,
 	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
 	if (WARN_ON(type >= KFD_MQD_TYPE_MAX))
 		return NULL;
 		return NULL;
 
 
-	mqd = kzalloc(sizeof(*mqd), GFP_KERNEL);
+	mqd = kzalloc(sizeof(*mqd), GFP_NOIO);
 	if (!mqd)
 	if (!mqd)
 		return NULL;
 		return NULL;