Skip to content

Commit

Permalink
Merge tag 'dma-mapping-5.11-1' of git://git.infradead.org/users/hch/d…
Browse files Browse the repository at this point in the history
…ma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a kernel crash in the new dma-mapping benchmark test (Barry Song)"

* tag 'dma-mapping-5.11-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: benchmark: fix kernel crash when dma_map_single fails
  • Loading branch information
Linus Torvalds committed Feb 2, 2021
2 parents 2e02677 + d17405d commit 7d36ccd
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion kernel/dma/map_benchmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,10 @@ static int do_map_benchmark(struct map_benchmark_data *map)
atomic64_set(&map->sum_sq_unmap, 0);
atomic64_set(&map->loops, 0);

for (i = 0; i < threads; i++)
for (i = 0; i < threads; i++) {
get_task_struct(tsk[i]);
wake_up_process(tsk[i]);
}

msleep_interruptible(map->bparam.seconds * 1000);

Expand Down Expand Up @@ -183,6 +185,8 @@ static int do_map_benchmark(struct map_benchmark_data *map)
}

out:
for (i = 0; i < threads; i++)
put_task_struct(tsk[i]);
put_device(map->dev);
kfree(tsk);
return ret;
Expand Down

0 comments on commit 7d36ccd

Please sign in to comment.