History

drm/nouveau: Fixup gk20a instobj hierarchy

Commit 12c9b05da918 ("drm/nouveau/imem: support allocations not preserved across suspend") uses container_of() to cast from struct nvkm_memory to struct nvkm_instobj, assuming that all instance objects are derived from struct nvkm_instobj. For the gk20a family that's not the case and they are derived from struct nvkm_memory instead. This causes some subtle data corruption (nvkm_instobj.preserve ends up mapping to gk20a_instobj.vaddr) that causes a NULL pointer dereference in gk20a_instobj_acquire_iommu() (and possibly elsewhere) and also prevents suspend/resume from working. Fix this by making struct gk20a_instobj derive from struct nvkm_instobj instead.

Thierry Reding committed 2 years ago

Commit 46dec611 parent f8678a31 file · +9 −9Browse files

Unified · Split

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c+9−9
@@ -49,14 +49,14 @@ · 48 unmodified lines
49#include <subdev/mmu.h>49#include <subdev/mmu.h>
50 50
51struct gk20a_instobj {51struct gk20a_instobj {
52 struct nvkm_memory memory;52 struct nvkm_instobj base;
53 struct nvkm_mm_node *mn;53 struct nvkm_mm_node *mn;
54 struct gk20a_instmem *imem;54 struct gk20a_instmem *imem;
55 55
56 /* CPU mapping */56 /* CPU mapping */
57 u32 *vaddr;57 u32 *vaddr;
58};58};
59#define gk20a_instobj(p) container_of((p), struct gk20a_instobj, memory)59#define gk20a_instobj(p) container_of((p), struct gk20a_instobj, base.memory)
60 60
61/*61/*
62 * Used for objects allocated using the DMA API62 * Used for objects allocated using the DMA API
@@ -148,7 +148,7 @@ gk20a_instobj_iommu_recycle_vaddr(struct gk20a_instobj_iommu *obj) · 85 unmodified lines
148 list_del(&obj->vaddr_node);148 list_del(&obj->vaddr_node);
149 vunmap(obj->base.vaddr);149 vunmap(obj->base.vaddr);
150 obj->base.vaddr = NULL;150 obj->base.vaddr = NULL;
151 imem->vaddr_use -= nvkm_memory_size(&obj->base.memory);151 imem->vaddr_use -= nvkm_memory_size(&obj->base.base.memory);
152 nvkm_debug(&imem->base.subdev, "vaddr used: %x/%x\n", imem->vaddr_use,152 nvkm_debug(&imem->base.subdev, "vaddr used: %x/%x\n", imem->vaddr_use,
153 imem->vaddr_max);153 imem->vaddr_max);
154}154}
@@ -283,7 +283,7 @@ gk20a_instobj_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm, · 128 unmodified lines
283{283{
284 struct gk20a_instobj *node = gk20a_instobj(memory);284 struct gk20a_instobj *node = gk20a_instobj(memory);
285 struct nvkm_vmm_map map = {285 struct nvkm_vmm_map map = {
286 .memory = &node->memory,286 .memory = &node->base.memory,
287 .offset = offset,287 .offset = offset,
288 .mem = node->mn,288 .mem = node->mn,
289 };289 };
@@ -391,8 +391,8 @@ gk20a_instobj_ctor_dma(struct gk20a_instmem *imem, u32 npages, u32 align, · 101 unmodified lines
391 return -ENOMEM;391 return -ENOMEM;
392 *_node = &node->base;392 *_node = &node->base;
393 393
394 nvkm_memory_ctor(&gk20a_instobj_func_dma, &node->base.memory);394 nvkm_memory_ctor(&gk20a_instobj_func_dma, &node->base.base.memory);
395 node->base.memory.ptrs = &gk20a_instobj_ptrs;395 node->base.base.memory.ptrs = &gk20a_instobj_ptrs;
396 396
397 node->base.vaddr = dma_alloc_attrs(dev, npages << PAGE_SHIFT,397 node->base.vaddr = dma_alloc_attrs(dev, npages << PAGE_SHIFT,
398 &node->handle, GFP_KERNEL,398 &node->handle, GFP_KERNEL,
@@ -438,8 +438,8 @@ gk20a_instobj_ctor_iommu(struct gk20a_instmem *imem, u32 npages, u32 align, · 39 unmodified lines
438 *_node = &node->base;438 *_node = &node->base;
439 node->dma_addrs = (void *)(node->pages + npages);439 node->dma_addrs = (void *)(node->pages + npages);
440 440
441 nvkm_memory_ctor(&gk20a_instobj_func_iommu, &node->base.memory);441 nvkm_memory_ctor(&gk20a_instobj_func_iommu, &node->base.base.memory);
442 node->base.memory.ptrs = &gk20a_instobj_ptrs;442 node->base.base.memory.ptrs = &gk20a_instobj_ptrs;
443 443
444 /* Allocate backing memory */444 /* Allocate backing memory */
445 for (i = 0; i < npages; i++) {445 for (i = 0; i < npages; i++) {
@@ -533,7 +533,7 @@ gk20a_instobj_new(struct nvkm_instmem *base, u32 size, u32 align, bool zero, · 87 unmodified lines
533 else533 else
534 ret = gk20a_instobj_ctor_dma(imem, size >> PAGE_SHIFT,534 ret = gk20a_instobj_ctor_dma(imem, size >> PAGE_SHIFT,
535 align, &node);535 align, &node);
536 *pmemory = node ? &node->memory : NULL;536 *pmemory = node ? &node->base.memory : NULL;
537 if (ret)537 if (ret)
538 return ret;538 return ret;
539 539

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t