swiotlb regression fixe
Hi all,
attached are a bunch of fixes for regressions in the recent swiotlb refactoring. The first one was reported by Conor, and the other two are things I found by code inspections while trying to fix what he reported.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 1/3 swiotlb: don't panic when the swiotlb buffer can't be allocated
For historical reasons the switlb code paniced when the metadata could not be allocated, but just printed a warning when the actual main swiotlb buffer could not be allocated. Restore this somewhat unexpected behavior as changing it caused a boot failure on the Microchip RISC-V PolarFire SoC Icicle kit.
--- kernel/dma/swiotlb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/dma/swiotlb.c +4 -2
@@ -254,8 +254,10 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, tlb =memblock_alloc (bytes,PAGE_SIZE ); else tlb =memblock_alloc_low (bytes,PAGE_SIZE ); -if (!tlb) -panic ("%s: failed to allocate tlb structure\n" , __func__); +if (!tlb) { +pr_warn ("%s: failed to allocate tlb structure\n" , __func__); +return ; + }if (remap &&remap (tlb, nslabs) <0 ) {memblock_free (tlb,PAGE_ALIGN (bytes));
Signature · 6 lines
2.30.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 1/3] swiotlb: don't panic when the swiotlb buffer can't be allocated
Quoted 10 lines · Christoph Hellwig
For historical reasons the switlb code paniced when the metadata could not be allocated, but just printed a warning when the actual main swiotlb buffer could not be allocated. Restore this somewhat unexpected behavior as changing it caused a boot failure on the Microchip RISC-V PolarFire SoC Icicle kit.
Fixes 6424e31b1c05 ("swiotlb: remove swiotlb_init_with_tbl and swiotlb_init_late_with_tbl")Reported-by Conor Dooley <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Tested-by Conor Dooley <[email protected]>
Quoted 24 lines
--- kernel/dma/swiotlb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/dma/swiotlb.c +4
-2@@ -254,8 +254,10 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, tlb =memblock_alloc (bytes,PAGE_SIZE ); else tlb =memblock_alloc_low (bytes,PAGE_SIZE ); -if (!tlb) -panic ("%s: failed to allocate tlb structure\n" , __func__); +if (!tlb) { +pr_warn ("%s: failed to allocate tlb structure\n" , __func__); +return ; + }if (remap &&remap (tlb, nslabs) <0 ) {memblock_free (tlb,PAGE_ALIGN (bytes));Signature · 1 line
2.30.2
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 1/3] swiotlb: don't panic when the swiotlb buffer can't be allocated
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
For historical reasons the switlb code paniced when the metadata could not be allocated, but just printed a warning when the actual main swiotlb buffer could not be allocated. Restore this somewhat unexpected behavior as changing it caused a boot failure on the Microchip RISC-V PolarFire SoC Icicle kit.
Quoted 4 lines
Fixes 6424e31b1c05 ("swiotlb: remove swiotlb_init_with_tbl and swiotlb_init_late_with_tbl")Reported-by Conor Dooley <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Tested-by Conor Dooley <[email protected]>
FWIW:
Quoted 24 lines
--- kernel/dma/swiotlb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/dma/swiotlb.c +4
-3@@ -254,8 +254,10 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, tlb =memblock_alloc (bytes,PAGE_SIZE ); else tlb =memblock_alloc_low (bytes,PAGE_SIZE ); -if (!tlb) -panic ("%s: failed to allocate tlb structure\n" , __func__); +if (!tlb) { +pr_warn ("%s: failed to allocate tlb structure\n" , __func__); +return ; + }if (remap &&remap (tlb, nslabs) <0 ) {memblock_free (tlb,PAGE_ALIGN (bytes)); --2.30.2
PATCH 2/3 swiotlb: use the right nslabs value in swiotlb_init_remap
In reply to Christoph Hellwigdefault_nslabs should only be used to initialize nslabs, after that we need to use the local variable that can shrink when allocations or the remap don't succeed.
--- kernel/dma/swiotlb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/dma/swiotlb.c +4 -3
@@ -234,7 +234,7 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, {struct io_tlb_mem *mem = &io_tlb_default_mem;unsigned long nslabs = default_nslabs; -size_t alloc_size =PAGE_ALIGN (array_size (sizeof (*mem->slots), nslabs)); +size_t alloc_size;size_t bytes;void *tlb;
@@ -249,7 +249,7 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,* memory encryption. */ retry: - bytes =PAGE_ALIGN (default_nslabs <<IO_TLB_SHIFT ); + bytes =PAGE_ALIGN (nslabs <<IO_TLB_SHIFT );if (flags &SWIOTLB_ANY ) tlb =memblock_alloc (bytes,PAGE_SIZE );else
@@ -269,12 +269,13 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, goto retry; } + alloc_size =PAGE_ALIGN (array_size (sizeof (*mem->slots), nslabs)); mem->slots =memblock_alloc (alloc_size,PAGE_SIZE );if (!mem->slots)panic ("%s: Failed to allocate %zu bytes align=0x%lx\n" , __func__, alloc_size,PAGE_SIZE ); -swiotlb_init_io_tlb_mem (mem,__pa (tlb), default_nslabs, false); +swiotlb_init_io_tlb_mem (mem,__pa (tlb), nslabs, false); mem->force_bounce = flags &SWIOTLB_FORCE ;if (flags &SWIOTLB_VERBOSE )
Signature · 6 lines
2.30.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 2/3] swiotlb: use the right nslabs value in swiotlb_init_remap
Quoted 6 lines · Christoph Hellwig
default_nslabsshould only be used to initialize nslabs, after that we need to use the local variable that can shrink when allocations or the remap don't succeed.Fixes 6424e31b1c05 ("swiotlb: remove swiotlb_init_with_tbl and swiotlb_init_late_with_tbl")Signed-off-by Christoph Hellwig <[email protected]>
Quoted 44 lines
--- kernel/dma/swiotlb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)kernel/dma/swiotlb.c +4
-3@@ -234,7 +234,7 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, {struct io_tlb_mem *mem = &io_tlb_default_mem;unsigned long nslabs = default_nslabs; -size_t alloc_size =PAGE_ALIGN (array_size (sizeof (*mem->slots), nslabs)); +size_t alloc_size;size_t bytes;void *tlb;@@ -249,7 +249,7 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,* memory encryption. */ retry: - bytes =PAGE_ALIGN (default_nslabs <<IO_TLB_SHIFT ); + bytes =PAGE_ALIGN (nslabs <<IO_TLB_SHIFT );if (flags &SWIOTLB_ANY ) tlb =memblock_alloc (bytes,PAGE_SIZE );else @@ -269,12 +269,13 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, goto retry; } + alloc_size =PAGE_ALIGN (array_size (sizeof (*mem->slots), nslabs)); mem->slots =memblock_alloc (alloc_size,PAGE_SIZE );if (!mem->slots)panic ("%s: Failed to allocate %zu bytes align=0x%lx\n" , __func__, alloc_size,PAGE_SIZE ); -swiotlb_init_io_tlb_mem (mem,__pa (tlb), default_nslabs, false); +swiotlb_init_io_tlb_mem (mem,__pa (tlb), nslabs, false); mem->force_bounce = flags &SWIOTLB_FORCE ;if (flags &SWIOTLB_VERBOSE )Signature · 1 line
2.30.2
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 3/3 swiotlb: use the right nslabs-derived sizes in swiotlb_init_late
In reply to Christoph Hellwignslabs can shrink when allocations or the remap don't succeed, so make sure to use it for all sizing. For that remove the bytes value that can get stale and replace it with local calculations and a boolean to indicate if the originally requested size could not be allocated.
--- kernel/dma/swiotlb.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
kernel/dma/swiotlb.c +11 -8
@@ -297,9 +297,9 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, {struct io_tlb_mem *mem = &io_tlb_default_mem;unsigned long nslabs =ALIGN (size >>IO_TLB_SHIFT ,IO_TLB_SEGSIZE ); -unsigned long bytes;unsigned char *vstart =NULL ;unsigned int order; +bool retried = false;int rc =0 ;if (swiotlb_force_disable)
@@ -308,7 +308,6 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, retry: order =get_order (nslabs <<IO_TLB_SHIFT ); nslabs =SLABS_PER_PAGE << order; - bytes = nslabs <<IO_TLB_SHIFT ;while ((SLABS_PER_PAGE << order) >IO_TLB_MIN_SLABS ) { vstart = (void *)__get_free_pages(gfp_mask | __GFP_NOWARN,
@@ -316,16 +315,13 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,if (vstart)break ; order--; + nslabs =SLABS_PER_PAGE << order; + retried = true; }if (!vstart)return -ENOMEM ; -if (order !=get_order (bytes)) { -pr_warn ("only able to allocate %ld MB\n" , - (PAGE_SIZE << order) >>20 ); - nslabs =SLABS_PER_PAGE << order; - }if (remap) rc =remap (vstart, nslabs);if (rc) {
@@ -334,9 +330,15 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, nslabs =ALIGN (nslabs >>1 ,IO_TLB_SEGSIZE );if (nslabs <IO_TLB_MIN_SLABS )return rc; + retried = true; goto retry; } +if (retried) { +pr_warn ("only able to allocate %ld MB\n" , + (PAGE_SIZE << order) >>20 ); + } + mem->slots = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO,get_order (array_size (sizeof (*mem->slots), nslabs)));if (!mem->slots) {
@@ -344,7 +346,8 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,return -ENOMEM ; } -set_memory_decrypted ((unsigned long )vstart, bytes >>PAGE_SHIFT ); +set_memory_decrypted ((unsigned long )vstart, + (nslabs <<IO_TLB_SHIFT ) >>PAGE_SHIFT );swiotlb_init_io_tlb_mem (mem,virt_to_phys (vstart), nslabs, true);swiotlb_print_info ();
Signature · 6 lines
2.30.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 3/3] swiotlb: use the right nslabs-derived sizes in swiotlb_init_late
Quoted 7 lines · Christoph Hellwig
nslabs can shrink when allocations or the remap don't succeed, so make sure to use it for all sizing. For that remove the bytes value that can get stale and replace it with local calculations and a boolean to indicate if the originally requested size could not be allocated.
Fixes 6424e31b1c05 ("swiotlb: remove swiotlb_init_with_tbl and swiotlb_init_late_with_tbl")Signed-off-by Christoph Hellwig <[email protected]>
Quoted 75 lines
--- kernel/dma/swiotlb.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)kernel/dma/swiotlb.c +11
-8@@ -297,9 +297,9 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, {struct io_tlb_mem *mem = &io_tlb_default_mem;unsigned long nslabs =ALIGN (size >>IO_TLB_SHIFT ,IO_TLB_SEGSIZE ); -unsigned long bytes;unsigned char *vstart =NULL ;unsigned int order; +bool retried = false;int rc =0 ;if (swiotlb_force_disable)@@ -308,7 +308,6 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, retry: order =get_order (nslabs <<IO_TLB_SHIFT ); nslabs =SLABS_PER_PAGE << order; - bytes = nslabs <<IO_TLB_SHIFT ;while ((SLABS_PER_PAGE << order) >IO_TLB_MIN_SLABS ) { vstart = (void *)__get_free_pages(gfp_mask | __GFP_NOWARN,@@ -316,16 +315,13 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,if (vstart)break ; order--; + nslabs =SLABS_PER_PAGE << order; + retried = true; }if (!vstart)return -ENOMEM ; -if (order !=get_order (bytes)) { -pr_warn ("only able to allocate %ld MB\n" , - (PAGE_SIZE << order) >>20 ); - nslabs =SLABS_PER_PAGE << order; - }if (remap) rc =remap (vstart, nslabs);if (rc) {@@ -334,9 +330,15 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, nslabs =ALIGN (nslabs >>1 ,IO_TLB_SEGSIZE );if (nslabs <IO_TLB_MIN_SLABS )return rc; + retried = true; goto retry; } +if (retried) { +pr_warn ("only able to allocate %ld MB\n" , + (PAGE_SIZE << order) >>20 ); + } + mem->slots = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO,get_order (array_size (sizeof (*mem->slots), nslabs)));if (!mem->slots) {@@ -344,7 +346,8 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,return -ENOMEM ; } -set_memory_decrypted ((unsigned long )vstart, bytes >>PAGE_SHIFT ); +set_memory_decrypted ((unsigned long )vstart, + (nslabs <<IO_TLB_SHIFT ) >>PAGE_SHIFT );swiotlb_init_io_tlb_mem (mem,virt_to_phys (vstart), nslabs, true);swiotlb_print_info ();Signature · 1 line
2.30.2
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu