[PATCH] swiotlb: Check nslabs after initialization in the swiotlb_init_remap()
From: Tianyu Lan
Date: Wed Jul 13 2022 - 04:26:49 EST
From: Tianyu Lan <tiala@xxxxxxxxxxxxx>
The check of nslabs less than IO_TLB_MIN_SLABS should be later than
initialization. Fix it.
Signed-off-by: Tianyu Lan <tiala@xxxxxxxxxxxxx>
---
kernel/dma/swiotlb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 0ffb23c0e0e8..c39483bf067d 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -308,9 +308,6 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
if (swiotlb_force_disable)
return;
- if (nslabs < IO_TLB_MIN_SLABS)
- panic("%s: nslabs = %lu too small\n", __func__, nslabs);
-
/*
* default_nslabs maybe changed when adjust area number.
* So allocate bounce buffer after adjusting area number.
@@ -320,6 +317,9 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
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
--
2.25.1