Skip to content

Commit e9696d2

Browse files
Stefano Stabellinikonradwilk
authored andcommitted
swiotlb: fix "x86: Don't panic if can not alloc buffer for swiotlb"
kernel/dma/swiotlb.c:swiotlb_init gets called first and tries to allocate a buffer for the swiotlb. It does so by calling memblock_alloc_low(PAGE_ALIGN(bytes), PAGE_SIZE); If the allocation must fail, no_iotlb_memory is set. Later during initialization swiotlb-xen comes in (drivers/xen/swiotlb-xen.c:xen_swiotlb_init) and given that io_tlb_start is != 0, it thinks the memory is ready to use when actually it is not. When the swiotlb is actually needed, swiotlb_tbl_map_single gets called and since no_iotlb_memory is set the kernel panics. Instead, if swiotlb-xen.c:xen_swiotlb_init knew the swiotlb hadn't been initialized, it would do the initialization itself, which might still succeed. Fix the panic by setting io_tlb_start to 0 on swiotlb initialization failure, and also by setting no_iotlb_memory to false on swiotlb initialization success. Fixes: ac2cbab ("x86: Don't panic if can not alloc buffer for swiotlb") Reported-by: Elliott Mitchell <ehem+xen@m5p.com> Tested-by: Elliott Mitchell <ehem+xen@m5p.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: stable@vger.kernel.org Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
1 parent 3650b22 commit e9696d2

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

kernel/dma/swiotlb.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
229229
io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;
230230
}
231231
io_tlb_index = 0;
232+
no_iotlb_memory = false;
232233

233234
if (verbose)
234235
swiotlb_print_info();
@@ -260,9 +261,11 @@ swiotlb_init(int verbose)
260261
if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose))
261262
return;
262263

263-
if (io_tlb_start)
264+
if (io_tlb_start) {
264265
memblock_free_early(io_tlb_start,
265266
PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
267+
io_tlb_start = 0;
268+
}
266269
pr_warn("Cannot allocate buffer");
267270
no_iotlb_memory = true;
268271
}
@@ -360,6 +363,7 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
360363
io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;
361364
}
362365
io_tlb_index = 0;
366+
no_iotlb_memory = false;
363367

364368
swiotlb_print_info();
365369

0 commit comments

Comments
 (0)