Skip to contentSkip to conversation

drm/amdkfd: sparse: Fix warning in reading SDMA counters

PATCH Superseded Mukul Joshi 2 participants 2 messages Aug 17, 2020

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdkfd: sparse: Fix warning in reading SDMA counters

Add __user annotation to fix related sparse warning while reading SDMA counters from userland.

---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +5 -3
index e0e60b0d0669..a6a4bbf99d9b 100644
@@ -157,19 +157,21 @@ int read_sdma_queue_counter(uint64_t q_rptr, uint64_t *val)
 {
 	int ret;
 	uint64_t tmp = 0;
+	uint64_t __user *sdma_rptr;
 
 	if (!val)
 		return -EINVAL;
 	/*
 	 * SDMA activity counter is stored at queue's RPTR + 0x8 location.
 	 */
-	if (!access_ok((const void __user *)(q_rptr +
-					sizeof(uint64_t)), sizeof(uint64_t))) {
+	sdma_rptr = (uint64_t *)(q_rptr + sizeof(uint64_t));
+
+	if (!access_ok((const void __user *)sdma_rptr, sizeof(uint64_t))) {
 		pr_err("Can't access sdma queue activity counter\n");
 		return -EFAULT;
 	}
 
-	ret = get_user(tmp, (uint64_t *)(q_rptr + sizeof(uint64_t)));
+	ret = get_user(tmp, sdma_rptr);
 	if (!ret) {
 		*val = tmp;
 	}
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer
#1 lore raw

Am 2020-08-17 um 4:45 p.m. schrieb Mukul Joshi:

Quoted 14 lines

Add __user annotation to fix related sparse warning while reading SDMA counters from userland.

---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -0
index e0e60b0d0669..a6a4bbf99d9b 100644

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c int read_sdma_queue_counter(uint64_t q_rptr, uint64_t *val) · line 160

Quoted 4 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -0
@@ -157,19 +157,21 @@ int read_sdma_queue_counter(uint64_t q_rptr, uint64_t *val)
 {
 	int ret;
 	uint64_t tmp = 0;
+	uint64_t __user *sdma_rptr;

This name is misleading. You never point this to the actual rptr. Call this sdma_usage_cntr or something similar.

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c int read_sdma_queue_counter(uint64_t q_rptr, uint64_t *val) · line 167

Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -2
 	if (!val)
 		return -EINVAL;
 	/*
 	 * SDMA activity counter is stored at queue's RPTR + 0x8 location.
 	 */
-	if (!access_ok((const void __user *)(q_rptr +
-					sizeof(uint64_t)), sizeof(uint64_t))) {
+	sdma_rptr = (uint64_t *)(q_rptr + sizeof(uint64_t));

Should this cast to (uint64_t __user *)? A more elegant way to get the offset would be:

    sdma_usage_cntr = (uint64_t __user *)q_rptr + 1;

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c int read_sdma_queue_counter(uint64_t q_rptr, uint64_t *val) · line 169

Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -0
+
+	if (!access_ok((const void __user *)sdma_rptr, sizeof(uint64_t))) {

Is the explicit cast really needed here? And as far as I can tell get_user already checks access_ok. So this check is probably redundant.

Regards,
  Felix

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c int read_sdma_queue_counter(uint64_t q_rptr, uint64_t *val) · line 177

Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
 		pr_err("Can't access sdma queue activity counter\n");
 		return -EFAULT;
 	}
 
-	ret = get_user(tmp, (uint64_t *)(q_rptr + sizeof(uint64_t)));
+	ret = get_user(tmp, sdma_rptr);
 	if (!ret) {
 		*val = tmp;
 	}

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx