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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
From ad658ca6f651b6edaadcb3c651a29009e96daf03 Mon Sep 17 00:00:00 2001
From: Oak Zeng <Oak.Zeng@amd.com>
Date: Mon, 22 Jan 2018 16:23:06 -0500
Subject: [PATCH 3309/4131] drm/amdkfd: Unsupport NULL device array on GPU map
Previously, zero-sized device id array is supported
on mapping memory to GPU. Unsupport this and now Thunk
or application is required to pass a none-zero-sized
arrary on mapping memory to GPU.
Change-Id: I6f6f1c524b46e253e10252fda77bd159ecbc3743
Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 150 ++++++++++++++-----------------
1 file changed, 68 insertions(+), 82 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 7fd26ec..59ab2e4 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1291,25 +1291,27 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep,
if (!dev)
return -EINVAL;
- if (args->device_ids_array_size > 0 &&
- (args->device_ids_array_size < sizeof(uint32_t))) {
+ if (args->device_ids_array_size == 0) {
+ pr_debug("Device ID array size is 0\n");
+ return -EINVAL;
+ }
+
+ if (args->device_ids_array_size % sizeof(uint32_t)) {
pr_debug("Node IDs array size %u\n",
args->device_ids_array_size);
return -EFAULT;
}
- if (args->device_ids_array_size > 0) {
- devices_arr = kmalloc(args->device_ids_array_size, GFP_KERNEL);
- if (!devices_arr)
- return -ENOMEM;
+ devices_arr = kmalloc(args->device_ids_array_size, GFP_KERNEL);
+ if (!devices_arr)
+ return -ENOMEM;
- err = copy_from_user(devices_arr,
- (void __user *)args->device_ids_array_ptr,
- args->device_ids_array_size);
- if (err != 0) {
- err = -EFAULT;
- goto copy_from_user_failed;
- }
+ err = copy_from_user(devices_arr,
+ (void __user *)args->device_ids_array_ptr,
+ args->device_ids_array_size);
+ if (err != 0) {
+ err = -EFAULT;
+ goto copy_from_user_failed;
}
mutex_lock(&p->mutex);
@@ -1327,35 +1329,26 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep,
goto get_mem_obj_from_handle_failed;
}
- if (args->device_ids_array_size > 0) {
- num_dev = args->device_ids_array_size / sizeof(uint32_t);
- for (i = 0 ; i < num_dev; i++) {
- peer = kfd_device_by_id(devices_arr[i]);
- if (!peer) {
- pr_debug("Getting device by id failed for 0x%x\n",
- devices_arr[i]);
- err = -EFAULT;
- goto get_mem_obj_from_handle_failed;
- }
+ num_dev = args->device_ids_array_size / sizeof(uint32_t);
+ for (i = 0 ; i < num_dev; i++) {
+ peer = kfd_device_by_id(devices_arr[i]);
+ if (!peer) {
+ pr_debug("Getting device by id failed for 0x%x\n",
+ devices_arr[i]);
+ err = -EFAULT;
+ goto get_mem_obj_from_handle_failed;
+ }
- peer_pdd = kfd_bind_process_to_device(peer, p);
- if (!peer_pdd) {
- err = -EFAULT;
- goto get_mem_obj_from_handle_failed;
- }
- err = peer->kfd2kgd->map_memory_to_gpu(
- peer->kgd, (struct kgd_mem *)mem, peer_pdd->vm);
- if (err != 0) {
- pr_err("Failed to map to gpu %d, num_dev=%d\n",
- i, num_dev);
- goto map_memory_to_gpu_failed;
- }
+ peer_pdd = kfd_bind_process_to_device(peer, p);
+ if (!peer_pdd) {
+ err = -EFAULT;
+ goto get_mem_obj_from_handle_failed;
}
- } else {
- err = dev->kfd2kgd->map_memory_to_gpu(
- dev->kgd, (struct kgd_mem *)mem, pdd->vm);
+ err = peer->kfd2kgd->map_memory_to_gpu(
+ peer->kgd, (struct kgd_mem *)mem, peer_pdd->vm);
if (err != 0) {
- pr_err("Failed to map\n");
+ pr_err("Failed to map to gpu %d, num_dev=%d\n",
+ i, num_dev);
goto map_memory_to_gpu_failed;
}
}
@@ -1369,19 +1362,14 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep,
}
/* Flush TLBs after waiting for the page table updates to complete */
- if (args->device_ids_array_size > 0) {
- for (i = 0; i < num_dev; i++) {
- peer = kfd_device_by_id(devices_arr[i]);
- if (WARN_ON_ONCE(!peer))
- continue;
- kfd_flush_tlb(peer, p);
- }
- } else {
- kfd_flush_tlb(dev, p);
+ for (i = 0; i < num_dev; i++) {
+ peer = kfd_device_by_id(devices_arr[i]);
+ if (WARN_ON_ONCE(!peer))
+ continue;
+ kfd_flush_tlb(peer, p);
}
- if (args->device_ids_array_size > 0 && devices_arr)
- kfree(devices_arr);
+ kfree(devices_arr);
return err;
@@ -1391,8 +1379,7 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep,
mutex_unlock(&p->mutex);
copy_from_user_failed:
sync_memory_failed:
- if (args->device_ids_array_size > 0 && devices_arr)
- kfree(devices_arr);
+ kfree(devices_arr);
return err;
}
@@ -1427,25 +1414,27 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep,
if (!dev)
return -EINVAL;
- if (args->device_ids_array_size > 0 &&
- (args->device_ids_array_size < sizeof(uint32_t))) {
+ if (args->device_ids_array_size == 0) {
+ pr_debug("Device ID array size is 0\n");
+ return -EINVAL;
+ }
+
+ if (args->device_ids_array_size % sizeof(uint32_t)) {
pr_debug("Node IDs array size %u\n",
args->device_ids_array_size);
return -EFAULT;
}
- if (args->device_ids_array_size > 0) {
- devices_arr = kmalloc(args->device_ids_array_size, GFP_KERNEL);
- if (!devices_arr)
- return -ENOMEM;
+ devices_arr = kmalloc(args->device_ids_array_size, GFP_KERNEL);
+ if (!devices_arr)
+ return -ENOMEM;
- err = copy_from_user(devices_arr,
- (void __user *)args->device_ids_array_ptr,
- args->device_ids_array_size);
- if (err != 0) {
- err = -EFAULT;
- goto copy_from_user_failed;
- }
+ err = copy_from_user(devices_arr,
+ (void __user *)args->device_ids_array_ptr,
+ args->device_ids_array_size);
+ if (err != 0) {
+ err = -EFAULT;
+ goto copy_from_user_failed;
}
mutex_lock(&p->mutex);
@@ -1464,25 +1453,22 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep,
goto get_mem_obj_from_handle_failed;
}
- if (args->device_ids_array_size > 0) {
- num_dev = args->device_ids_array_size / sizeof(uint32_t);
- for (i = 0 ; i < num_dev; i++) {
- peer = kfd_device_by_id(devices_arr[i]);
- if (!peer) {
- err = -EFAULT;
- goto get_mem_obj_from_handle_failed;
- }
+ num_dev = args->device_ids_array_size / sizeof(uint32_t);
+ for (i = 0 ; i < num_dev; i++) {
+ peer = kfd_device_by_id(devices_arr[i]);
+ if (!peer) {
+ err = -EFAULT;
+ goto get_mem_obj_from_handle_failed;
+ }
- peer_pdd = kfd_get_process_device_data(peer, p);
- if (!peer_pdd) {
- err = -EFAULT;
- goto get_mem_obj_from_handle_failed;
- }
- kfd_unmap_memory_from_gpu(mem, peer_pdd);
+ peer_pdd = kfd_get_process_device_data(peer, p);
+ if (!peer_pdd) {
+ err = -EFAULT;
+ goto get_mem_obj_from_handle_failed;
}
- kfree(devices_arr);
- } else
- kfd_unmap_memory_from_gpu(mem, pdd);
+ kfd_unmap_memory_from_gpu(mem, peer_pdd);
+ }
+ kfree(devices_arr);
mutex_unlock(&p->mutex);
--
2.7.4
|
