Skip to contentSkip to conversation

drm/amdkfd: Add upper bound check for num_of_nodes

PATCH In review Alysa Liu 2 participants 2 messages Apr 1

Subsystems (3)
lore
Share & tools
lore

Alysa Liu

author
#0 lore raw

PATCH v4 1/1 drm/amdkfd: Add upper bound check for num_of_nodes

drm/amdkfd: Add upper bound check for num_of_nodes in kfd_ioctl_get_process_apertures_new.

---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c  |  3 +++
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h     |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 11 +++++++++++
 3 files changed, 15 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +3 -0
index 1db565442c48..5435419a7bd9 100644
@@ -776,6 +776,9 @@ static int kfd_ioctl_get_process_apertures_new(struct file *filp,
 		goto out_unlock;
 	}
 
+	if (args->num_of_nodes > kfd_topology_get_num_devices())
+		return -EINVAL;
+
 	/* Fill in process-aperture information for all available
 	 * nodes, but not more than args->num_of_nodes as that is
 	 * the amount of memory allocated by user
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -0
index e7a8f3e17872..af7b687d729c 100644
@@ -1191,6 +1191,7 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev,
 	return NULL;
 }
 int kfd_topology_enum_kfd_devices(uint8_t idx, struct kfd_node **kdev);
+uint32_t kfd_topology_get_num_devices(void);
 int kfd_numa_node_to_apic_id(int numa_node_id);
 uint32_t kfd_gpu_node_num(void);
 
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +11 -0
index 1ccd4514d3ee..4dc9f9aa3a2e 100644
@@ -2297,6 +2297,17 @@ int kfd_topology_remove_device(struct kfd_node *gpu)
 	return res;
 }
 
+uint32_t kfd_topology_get_num_devices(void)
+{
+	uint32_t num_devices;
+
+	down_read(&topology_lock);
+	num_devices = sys_props.num_devices;
+	up_read(&topology_lock);
+
+	return num_devices;
+}
+
 /* kfd_topology_enum_kfd_devices - Enumerate through all devices in KFD
  *	topology. If GPU device is found @idx, then valid kfd_dev pointer is
  *	returned through @kdev
Signature · 1 line
2.34.1
Reviewed-by on v4 1/1
#1 lore raw

[AMD Official Use Only - AMD Internal Distribution Only]

________________________________
From: Liu, Alysa <[email protected]>
Sent: Wednesday, April 1, 2026 10:05 AM
To: [email protected] <[email protected]>
Cc: Kasiviswanathan, Harish <[email protected]>; Liu, Alysa <[email protected]>
Subject: [PATCH v4] drm/amdkfd: Add upper bound check for num_of_nodes

drm/amdkfd: Add upper bound check for num_of_nodes in kfd_ioctl_get_process_apertures_new.

---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c  |  3 +++
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h     |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 11 +++++++++++
 3 files changed, 15 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +3 -0
index 1db565442c48..5435419a7bd9 100644
@@ -776,6 +776,9 @@ static int kfd_ioctl_get_process_apertures_new(struct file *filp,
                 goto out_unlock;
         }
 
+       if (args->num_of_nodes > kfd_topology_get_num_devices())
+               return -EINVAL;
+
         /* Fill in process-aperture information for all available
          * nodes, but not more than args->num_of_nodes as that is
          * the amount of memory allocated by user
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -0
index e7a8f3e17872..af7b687d729c 100644
@@ -1191,6 +1191,7 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev,
         return NULL;
 }
 int kfd_topology_enum_kfd_devices(uint8_t idx, struct kfd_node **kdev);
+uint32_t kfd_topology_get_num_devices(void);
 int kfd_numa_node_to_apic_id(int numa_node_id);
 uint32_t kfd_gpu_node_num(void);
 
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +11 -0
index 1ccd4514d3ee..4dc9f9aa3a2e 100644
@@ -2297,6 +2297,17 @@ int kfd_topology_remove_device(struct kfd_node *gpu)
         return res;
 }
 
+uint32_t kfd_topology_get_num_devices(void)
+{
+       uint32_t num_devices;
+
+       down_read(&topology_lock);
+       num_devices = sys_props.num_devices;
+       up_read(&topology_lock);
+
+       return num_devices;
+}
+
 /* kfd_topology_enum_kfd_devices - Enumerate through all devices in KFD
  *     topology. If GPU device is found @idx, then valid kfd_dev pointer is
  *     returned through @kdev

--
2.34.1