github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/gpuvm: convert WARN() to drm_WARN() variants

Browse Source 
Use drm_WARN() and drm_WARN_ON() variants to indicate drivers the
context the failing VM resides in.

Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231108001259.15123-2-dakr@redhat.com
This commit is contained in:
Danilo Krummrich 2023-11-08 01:12:31 +01:00
parent 7add80126b
commit 546ca4d35d
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/drm_gpuvm.c
View File

@ -614,12 +614,12 @@ static int __drm_gpuva_insert(struct drm_gpuvm *gpuvm,
static void __drm_gpuva_remove(struct drm_gpuva *va); static void __drm_gpuva_remove(struct drm_gpuva *va);
static bool static bool
drm_gpuvm_check_overflow(u64 addr, u64 range) drm_gpuvm_check_overflow(struct drm_gpuvm *gpuvm, u64 addr, u64 range)
{ {
u64 end; u64 end;
return WARN(check_add_overflow(addr, range, &end), return drm_WARN(gpuvm->drm, check_add_overflow(addr, range, &end),
"GPUVA address limited to %zu bytes.\n", sizeof(end)); "GPUVA address limited to %zu bytes.\n", sizeof(end));
} }
static bool static bool
@ -647,7 +647,7 @@ static bool
drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm, drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm,
u64 addr, u64 range) u64 addr, u64 range)
{ {
return !drm_gpuvm_check_overflow(addr, range) && return !drm_gpuvm_check_overflow(gpuvm, addr, range) &&
drm_gpuvm_in_mm_range(gpuvm, addr, range) && drm_gpuvm_in_mm_range(gpuvm, addr, range) &&
!drm_gpuvm_in_kernel_node(gpuvm, addr, range); !drm_gpuvm_in_kernel_node(gpuvm, addr, range);
} }
@ -656,6 +656,7 @@ drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm,
* drm_gpuvm_init() - initialize a &drm_gpuvm * drm_gpuvm_init() - initialize a &drm_gpuvm
* @gpuvm: pointer to the &drm_gpuvm to initialize * @gpuvm: pointer to the &drm_gpuvm to initialize
* @name: the name of the GPU VA space * @name: the name of the GPU VA space
* @drm: the &drm_device this VM resides in
* @start_offset: the start offset of the GPU VA space * @start_offset: the start offset of the GPU VA space
* @range: the size of the GPU VA space * @range: the size of the GPU VA space
* @reserve_offset: the start of the kernel reserved GPU VA area * @reserve_offset: the start of the kernel reserved GPU VA area
@ -668,8 +669,8 @@ drm_gpuvm_range_valid(struct drm_gpuvm *gpuvm,
* &name is expected to be managed by the surrounding driver structures. * &name is expected to be managed by the surrounding driver structures.
*/ */
void void
drm_gpuvm_init(struct drm_gpuvm *gpuvm, drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,
const char *name, struct drm_device *drm,
u64 start_offset, u64 range, u64 start_offset, u64 range,
u64 reserve_offset, u64 reserve_range, u64 reserve_offset, u64 reserve_range,
const struct drm_gpuvm_ops *ops) const struct drm_gpuvm_ops *ops)
@ -677,20 +678,20 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm,
gpuvm->rb.tree = RB_ROOT_CACHED; gpuvm->rb.tree = RB_ROOT_CACHED;
INIT_LIST_HEAD(&gpuvm->rb.list); INIT_LIST_HEAD(&gpuvm->rb.list);
drm_gpuvm_check_overflow(start_offset, range); gpuvm->name = name ? name : "unknown";
gpuvm->ops = ops;
gpuvm->drm = drm;
drm_gpuvm_check_overflow(gpuvm, start_offset, range);
gpuvm->mm_start = start_offset; gpuvm->mm_start = start_offset;
gpuvm->mm_range = range; gpuvm->mm_range = range;
gpuvm->name = name ? name : "unknown";
gpuvm->ops = ops;
memset(&gpuvm->kernel_alloc_node, 0, sizeof(struct drm_gpuva)); memset(&gpuvm->kernel_alloc_node, 0, sizeof(struct drm_gpuva));
if (reserve_range) { if (reserve_range) {
gpuvm->kernel_alloc_node.va.addr = reserve_offset; gpuvm->kernel_alloc_node.va.addr = reserve_offset;
gpuvm->kernel_alloc_node.va.range = reserve_range; gpuvm->kernel_alloc_node.va.range = reserve_range;
if (likely(!drm_gpuvm_check_overflow(reserve_offset, if (likely(!drm_gpuvm_check_overflow(gpuvm, reserve_offset,
reserve_range))) reserve_range)))
__drm_gpuva_insert(gpuvm, &gpuvm->kernel_alloc_node); __drm_gpuva_insert(gpuvm, &gpuvm->kernel_alloc_node);
} }
@ -712,8 +713,8 @@ drm_gpuvm_destroy(struct drm_gpuvm *gpuvm)
if (gpuvm->kernel_alloc_node.va.range) if (gpuvm->kernel_alloc_node.va.range)
__drm_gpuva_remove(&gpuvm->kernel_alloc_node); __drm_gpuva_remove(&gpuvm->kernel_alloc_node);
WARN(!RB_EMPTY_ROOT(&gpuvm->rb.tree.rb_root), drm_WARN(gpuvm->drm, !RB_EMPTY_ROOT(&gpuvm->rb.tree.rb_root),
"GPUVA tree is not empty, potentially leaking memory."); "GPUVA tree is not empty, potentially leaking memory.\n");
} }
EXPORT_SYMBOL_GPL(drm_gpuvm_destroy); EXPORT_SYMBOL_GPL(drm_gpuvm_destroy);
@ -795,7 +796,8 @@ drm_gpuva_remove(struct drm_gpuva *va)
struct drm_gpuvm *gpuvm = va->vm; struct drm_gpuvm *gpuvm = va->vm;
if (unlikely(va == &gpuvm->kernel_alloc_node)) { if (unlikely(va == &gpuvm->kernel_alloc_node)) {
WARN(1, "Can't destroy kernel reserved node.\n"); drm_WARN(gpuvm->drm, 1,
"Can't destroy kernel reserved node.\n");
return; return;
} }

3
drivers/gpu/drm/nouveau/nouveau_uvmm.c
View File

@ -1808,6 +1808,7 @@ int
nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli,
u64 kernel_managed_addr, u64 kernel_managed_size) u64 kernel_managed_addr, u64 kernel_managed_size)
{ {
struct drm_device *drm = cli->drm->dev;
int ret; int ret;
u64 kernel_managed_end = kernel_managed_addr + kernel_managed_size; u64 kernel_managed_end = kernel_managed_addr + kernel_managed_size;
@ -1836,7 +1837,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli,
uvmm->kernel_managed_addr = kernel_managed_addr; uvmm->kernel_managed_addr = kernel_managed_addr;
uvmm->kernel_managed_size = kernel_managed_size; uvmm->kernel_managed_size = kernel_managed_size;
drm_gpuvm_init(&uvmm->base, cli->name, drm_gpuvm_init(&uvmm->base, cli->name, drm,
NOUVEAU_VA_SPACE_START, NOUVEAU_VA_SPACE_START,
NOUVEAU_VA_SPACE_END, NOUVEAU_VA_SPACE_END,
kernel_managed_addr, kernel_managed_size, kernel_managed_addr, kernel_managed_size,

7
include/drm/drm_gpuvm.h
View File

@ -29,6 +29,7 @@
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/types.h> #include <linux/types.h>
#include <drm/drm_device.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
struct drm_gpuvm; struct drm_gpuvm;
@ -201,6 +202,11 @@ struct drm_gpuvm {
*/ */
const char *name; const char *name;
/**
* @drm: the &drm_device this VM lives in
*/
struct drm_device *drm;
/** /**
* @mm_start: start of the VA space * @mm_start: start of the VA space
*/ */
@ -241,6 +247,7 @@ struct drm_gpuvm {
}; };
void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name,
struct drm_device *drm,
u64 start_offset, u64 range, u64 start_offset, u64 range,
u64 reserve_offset, u64 reserve_range, u64 reserve_offset, u64 reserve_range,
const struct drm_gpuvm_ops *ops); const struct drm_gpuvm_ops *ops);