diff options
| author |  Philip Yang <Philip.Yang@amd.com>
| 2023-01-09 18:08:17 -0500 |
|---|---|---|
| committer |  Alex Deucher <alexander.deucher@amd.com>
| 2023-01-11 16:41:03 -0500 |
| commit | 0c2dece8fb541ab07b68c3312a1065fa9c927a81 (patch) | |
| tree | 9bc33df388da24fb65dc94cd9c3f9197d487f1bb /drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | |
| parent | drm/amdkfd: Cleanup vm process info if init vm failed (diff) | |
| download | linux-0c2dece8fb541ab07b68c3312a1065fa9c927a81.tar.gz linux-0c2dece8fb541ab07b68c3312a1065fa9c927a81.tar.bz2 linux-0c2dece8fb541ab07b68c3312a1065fa9c927a81.zip | |
drm/amdkfd: Page aligned memory reserve size
Use page aligned size to reserve memory usage because page aligned TTM
BO size is used to unreserve memory usage, otherwise no page aligned
size causes memory usage accounting unbalanced.
Change vram_used definition type to int64_t to be able to trigger
WARN_ONCE(adev && adev->kfd.vram_used < 0, "..."), to help debug the
accounting issue with warning and backtrace.
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdkfd/kfd_chardev.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 6d291aa6386b..f79b8e964140 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1127,8 +1127,13 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep, } /* Update the VRAM usage count */ - if (flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) - WRITE_ONCE(pdd->vram_usage, pdd->vram_usage + args->size); + if (flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) { + uint64_t size = args->size; + + if (flags & KFD_IOC_ALLOC_MEM_FLAGS_AQL_QUEUE_MEM) + size >>= 1; + WRITE_ONCE(pdd->vram_usage, pdd->vram_usage + PAGE_ALIGN(size)); + } mutex_unlock(&p->mutex); |