Skip to content

Commit 6c2825e

Browse files
pchelkin91roxanan1996
authored andcommitted
dma-mapping: benchmark: handle NUMA_NO_NODE correctly
BugLink: https://bugs.launchpad.net/bugs/2072617 [ Upstream commit e64746e74f717961250a155e14c156616fcd981f ] cpumask_of_node() can be called for NUMA_NO_NODE inside do_map_benchmark() resulting in the following sanitizer report: UBSAN: array-index-out-of-bounds in ./arch/x86/include/asm/topology.h:72:28 index -1 is out of range for type 'cpumask [64][1]' CPU: 1 PID: 990 Comm: dma_map_benchma Not tainted 6.9.0-rc6 #29 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Call Trace: <TASK> dump_stack_lvl (lib/dump_stack.c:117) ubsan_epilogue (lib/ubsan.c:232) __ubsan_handle_out_of_bounds (lib/ubsan.c:429) cpumask_of_node (arch/x86/include/asm/topology.h:72) [inline] do_map_benchmark (kernel/dma/map_benchmark.c:104) map_benchmark_ioctl (kernel/dma/map_benchmark.c:246) full_proxy_unlocked_ioctl (fs/debugfs/file.c:333) __x64_sys_ioctl (fs/ioctl.c:890) do_syscall_64 (arch/x86/entry/common.c:83) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) Use cpumask_of_node() in place when binding a kernel thread to a cpuset of a particular node. Note that the provided node id is checked inside map_benchmark_ioctl(). It's just a NUMA_NO_NODE case which is not handled properly later. Found by Linux Verification Center (linuxtesting.org). Fixes: 65789da ("dma-mapping: add benchmark support for streaming DMA APIs") Signed-off-by: Fedor Pchelkin <[email protected]> Acked-by: Barry Song <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Portia Stephens <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent cddbc2c commit 6c2825e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

kernel/dma/map_benchmark.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ static int do_map_benchmark(struct map_benchmark_data *map)
124124
struct task_struct **tsk;
125125
int threads = map->bparam.threads;
126126
int node = map->bparam.node;
127-
const cpumask_t *cpu_mask = cpumask_of_node(node);
128127
u64 loops;
129128
int ret = 0;
130129
int i;
@@ -145,7 +144,7 @@ static int do_map_benchmark(struct map_benchmark_data *map)
145144
}
146145

147146
if (node != NUMA_NO_NODE)
148-
kthread_bind_mask(tsk[i], cpu_mask);
147+
kthread_bind_mask(tsk[i], cpumask_of_node(node));
149148
}
150149

151150
/* clear the old value in the previous benchmark */

0 commit comments

Comments
 (0)