mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-27 19:29:37 +00:00
Code Issues Releases Wiki Activity

drm/amdkfd: Calculate CPU VCRAT size dynamically (v2)

Browse source 
Instead of guessing at a sufficient size for the CPU VCRAT, base the
size on the number of online NUMA nodes.

v2: fix warning

Signed-off-by: Kent Russell <kent.russell@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kent Russell 2020-09-18 07:42:57 -04:00 committed by Alex Deucher
parent c7651b7358
commit b7b6c38529
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/gpu/drm/amd/amdkfd/kfd_crat.c
View file

@ -809,11 +809,10 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)
/* Memory required to create Virtual CRAT. /* Memory required to create Virtual CRAT.
* Since there is no easy way to predict the amount of memory required, the * Since there is no easy way to predict the amount of memory required, the
* following amount are allocated for CPU and GPU Virtual CRAT. This is * following amount is allocated for GPU Virtual CRAT. This is
* expected to cover all known conditions. But to be safe additional check * expected to cover all known conditions. But to be safe additional check
* is put in the code to ensure we don't overwrite. * is put in the code to ensure we don't overwrite.
*/ */
#define VCRAT_SIZE_FOR_CPU (2 * PAGE_SIZE)
#define VCRAT_SIZE_FOR_GPU (4 * PAGE_SIZE) #define VCRAT_SIZE_FOR_GPU (4 * PAGE_SIZE)
/* kfd_fill_cu_for_cpu - Fill in Compute info for the given CPU NUMA node /* kfd_fill_cu_for_cpu - Fill in Compute info for the given CPU NUMA node
@ -964,7 +963,7 @@ static int kfd_create_vcrat_image_cpu(void *pcrat_image, size_t *size)
#endif #endif
int ret = 0; int ret = 0;
if (!pcrat_image || avail_size < VCRAT_SIZE_FOR_CPU) if (!pcrat_image)
return -EINVAL; return -EINVAL;
/* Fill in CRAT Header. /* Fill in CRAT Header.
@ -1364,24 +1363,31 @@ int kfd_create_crat_image_virtual(void **crat_image, size_t *size,
uint32_t proximity_domain) uint32_t proximity_domain)
{ {
void *pcrat_image = NULL; void *pcrat_image = NULL;
int ret = 0; int ret = 0, num_nodes;
size_t dyn_size;
if (!crat_image) if (!crat_image)
return -EINVAL; return -EINVAL;
*crat_image = NULL; *crat_image = NULL;
/* Allocate one VCRAT_SIZE_FOR_CPU for CPU virtual CRAT image and /* Allocate the CPU Virtual CRAT size based on the number of online
* VCRAT_SIZE_FOR_GPU for GPU virtual CRAT image. This should cover * nodes. Allocate VCRAT_SIZE_FOR_GPU for GPU virtual CRAT image.
* all the current conditions. A check is put not to overwrite beyond * This should cover all the current conditions. A check is put not
* allocated size * to overwrite beyond allocated size for GPUs
*/ */
switch (flags) { switch (flags) {
case COMPUTE_UNIT_CPU: case COMPUTE_UNIT_CPU:
pcrat_image = kmalloc(VCRAT_SIZE_FOR_CPU, GFP_KERNEL); num_nodes = num_online_nodes();
dyn_size = sizeof(struct crat_header) +
num_nodes * (sizeof(struct crat_subtype_computeunit) +
sizeof(struct crat_subtype_memory) +
(num_nodes - 1) * sizeof(struct crat_subtype_iolink));
pcrat_image = kmalloc(dyn_size, GFP_KERNEL);
if (!pcrat_image) if (!pcrat_image)
return -ENOMEM; return -ENOMEM;
*size = VCRAT_SIZE_FOR_CPU; *size = dyn_size;
pr_debug("CRAT size is %ld", dyn_size);
ret = kfd_create_vcrat_image_cpu(pcrat_image, size); ret = kfd_create_vcrat_image_cpu(pcrat_image, size);
break; break;
case COMPUTE_UNIT_GPU: case COMPUTE_UNIT_GPU: