1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From b1dbbbdaef3806740df0b00b5375f9ed7205094e Mon Sep 17 00:00:00 2001
From: Felix Kuehling <Felix.Kuehling@amd.com>
Date: Thu, 1 Sep 2016 21:11:39 -0400
Subject: [PATCH 1182/4131] drm/amd: Simplify SDMA HQD loading in kernel
threads
Use the use_mm function to temporarily access a user process context
while running in a kernel thread. This avoids the need to lock the
mmap_sem, which fixes a circular locking problem observed with user
pointers while running without the HW scheduler.
Change-Id: I4e74f3b021277e09df55dddf81ae5e070032b599
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 9 +--------
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 ----
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 69b08a9..a47d7f1 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -738,16 +738,9 @@ int kgd2kfd_resume_mm(struct kfd_dev *kfd, struct mm_struct *mm)
r = -ENODEV;
pdd = kfd_get_process_device_data(kfd, p);
- if (pdd) {
- if (kfd->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
- down_read(&mm->mmap_sem);
-
+ if (pdd)
r = process_restore_queues(kfd->dqm, &pdd->qpd);
- if (kfd->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
- up_read(&mm->mmap_sem);
- }
-
kfd_unref_process(p);
return r;
}
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 53fef02..d77c1ad 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -408,8 +408,6 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q)
BUG_ON(!dqm || !q || !q->mqd);
- if (dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
- down_read(¤t->mm->mmap_sem);
mutex_lock(&dqm->lock);
pdd = kfd_get_process_device_data(q->device, q->process);
@@ -465,8 +463,6 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q)
out_unlock:
mutex_unlock(&dqm->lock);
- if (dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
- up_read(¤t->mm->mmap_sem);
return retval;
}
--
2.7.4
|
