diff options
| author | Yu Zhao <yuzhao@google.com> | 2022-08-31 00:38:18 -0600 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-09-07 10:38:16 +0200 |
| commit | 81c12e922b97b94f64e84aa9bfe5a9d1fca2dc25 (patch) | |
| tree | 794b4db9fb7f3355300d27146f3b20d05bc15b36 /kernel/dma | |
| parent | 0066f1b0e27556381402db3ff31f85d2a2265858 (diff) | |
| download | linux-stable-81c12e922b97b94f64e84aa9bfe5a9d1fca2dc25.tar.gz linux-stable-81c12e922b97b94f64e84aa9bfe5a9d1fca2dc25.tar.bz2 linux-stable-81c12e922b97b94f64e84aa9bfe5a9d1fca2dc25.zip | |
Revert "swiotlb: panic if nslabs is too small"
This reverts commit 0bf28fc40d89b1a3e00d1b79473bad4e9ca20ad1.
Reasons:
1. new panic()s shouldn't be added [1].
2. It does no "cleanup" but breaks MIPS [2].
v2: properly solved the conflict [3] with
commit 20347fca71a38 ("swiotlb: split up the global swiotlb lock")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
[1] https://lore.kernel.org/r/CAHk-=wit-DmhMfQErY29JSPjFgebx_Ld+pnerc4J2Ag990WwAA@mail.gmail.com/
[2] https://lore.kernel.org/r/20220820012031.1285979-1-yuzhao@google.com/
[3] https://lore.kernel.org/r/202208310701.LKr1WDCh-lkp@intel.com/
Fixes: 0bf28fc40d89b ("swiotlb: panic if nslabs is too small")
Signed-off-by: Yu Zhao <yuzhao@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/swiotlb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index c5a9190b218f..dd8863987e0c 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -326,9 +326,6 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, swiotlb_adjust_nareas(num_possible_cpus()); nslabs = default_nslabs; - if (nslabs < IO_TLB_MIN_SLABS) - panic("%s: nslabs = %lu too small\n", __func__, nslabs); - /* * By default allocate the bounce buffer memory from low memory, but * allow to pick a location everywhere for hypervisors with guest @@ -341,8 +338,7 @@ retry: else tlb = memblock_alloc_low(bytes, PAGE_SIZE); if (!tlb) { - pr_warn("%s: Failed to allocate %zu bytes tlb structure\n", - __func__, bytes); + pr_warn("%s: failed to allocate tlb structure\n", __func__); return; } |