On 4/29/21 1:28 AM, Christoph Hellwig wrote: > If the user already specified a swiotlb size on the command line, > swiotlb_adjust_size shoul not overwrite it. > > Fixes: 2cbc2776efe4 ("swiotlb: remove swiotlb_nr_tbl") > Reported-by: Tom Lendacky <thomas.lenda...@amd.com>
Thanks, Christoph! Tested-by: Tom Lendacky <thomas.lenda...@amd.com> > Signed-off-by: Christoph Hellwig <h...@lst.de> > --- > kernel/dma/swiotlb.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index 8635a57f88e9..8ca7d505d61c 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -118,6 +118,8 @@ void __init swiotlb_adjust_size(unsigned long size) > * architectures such as those supporting memory encryption to > * adjust/expand SWIOTLB size for their use. > */ > + if (default_nslabs != IO_TLB_DEFAULT_SIZE >> IO_TLB_SHIFT) > + return; > size = ALIGN(size, IO_TLB_SIZE); > default_nslabs = ALIGN(size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE); > pr_info("SWIOTLB bounce buffer size adjusted to %luMB", size >> 20); > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu