Skip to content

Commit a3ecd97

Browse files
committed
drm/etnaviv: switch devcoredump allocations to GFP_NOWAIT
The etnaviv devcoredump is created in the GPU reset path, which must make forward progress to avoid stalling memory reclaim on unsignalled dma fences. The currently used __GFP_NORETRY does not prohibit sleeping on direct reclaim, breaking the forward progress guarantee. Switch to GFP_NOWAIT, which allows background reclaim to be triggered, but avoids any stalls waiting for direct reclaim. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1 parent a233df7 commit a3ecd97

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/gpu/drm/etnaviv/etnaviv_dump.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit)
159159
file_size += sizeof(*iter.hdr) * n_obj;
160160

161161
/* Allocate the file in vmalloc memory, it's likely to be big */
162-
iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN |
163-
__GFP_NORETRY);
162+
iter.start = __vmalloc(file_size, GFP_NOWAIT);
164163
if (!iter.start) {
165164
mutex_unlock(&submit->mmu_context->lock);
166165
dev_warn(gpu->dev, "failed to allocate devcoredump file\n");
@@ -230,5 +229,5 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit)
230229

231230
etnaviv_core_dump_header(&iter, ETDUMP_BUF_END, iter.data);
232231

233-
dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_KERNEL);
232+
dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_NOWAIT);
234233
}

0 commit comments

Comments
 (0)