On Thu, 4 Jun 2026 14:09:56 +0530 "Aneesh Kumar K.V (Arm)" <[email protected]> wrote:
> Check the return value when converting swiotlb pools between encrypted and > decrypted mappings. If the default pool cannot be decrypted after early > initialization, mark the pool fully used so it cannot satisfy future bounce > allocations. > > For late initialization, return the `set_memory_decrypted()` failure. For > restricted DMA pools, fail device initialization if the reserved pool > cannot be decrypted. > > This prevents swiotlb from using pools whose encryption attributes do not > match their metadata, and avoids returning pages with uncertain encryption > state back to the allocator. This works fine, but instead of effectively leaking the memory, we could return it to the buddy allocator and reset nslabs to zero as if SWIOTLB was not even initialized. OTOH I don't want to overthink this, because the system is probably not too useful after such a boot-time failure, so unless you _want_ to improve the error path, you can simply add: Reviewed-by: Petr Tesarik <[email protected]> Petr T > Tested-by: Michael Kelley <[email protected]> > Tested-by: Mostafa Saleh <[email protected]> > Signed-off-by: Aneesh Kumar K.V (Arm) <[email protected]> > --- > kernel/dma/swiotlb.c | 80 +++++++++++++++++++++++++++++++++++--------- > 1 file changed, 65 insertions(+), 15 deletions(-) > > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index 4c56f64602ea..14d834ca298b 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -248,6 +248,23 @@ static inline unsigned long nr_slots(u64 val) > return DIV_ROUND_UP(val, IO_TLB_SIZE); > } > > +static void swiotlb_mark_pool_used(struct io_tlb_pool *pool) > +{ > + unsigned long i; > + > + for (i = 0; i < pool->nareas; i++) { > + pool->areas[i].index = 0; > + pool->areas[i].used = pool->area_nslabs; > + } > + > + for (i = 0; i < pool->nslabs; i++) { > + pool->slots[i].list = 0; > + pool->slots[i].orig_addr = INVALID_PHYS_ADDR; > + pool->slots[i].alloc_size = 0; > + pool->slots[i].pad_slots = 0; > + } > +} > + > /* > * Early SWIOTLB allocation may be too early to allow an architecture to > * perform the desired operations. This function allows the architecture to > @@ -272,8 +289,16 @@ void __init swiotlb_update_mem_attributes(void) > return; > bytes = PAGE_ALIGN(mem->nslabs << IO_TLB_SHIFT); > > - if (io_tlb_default_mem.unencrypted) > - set_memory_decrypted((unsigned long)mem->vaddr, bytes >> > PAGE_SHIFT); > + if (io_tlb_default_mem.unencrypted) { > + int ret; > + > + ret = set_memory_decrypted((unsigned long)mem->vaddr, > + bytes >> PAGE_SHIFT); > + if (ret) { > + pr_warn("Failed to decrypt default memory pool, > disabling it\n"); > + swiotlb_mark_pool_used(mem); > + } > + } > } > > static void swiotlb_init_io_tlb_pool(struct io_tlb_pool *mem, phys_addr_t > start, > @@ -442,9 +467,10 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, > { > struct io_tlb_pool *mem = &io_tlb_default_mem.defpool; > unsigned long nslabs = ALIGN(size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE); > + unsigned int order, area_order, slot_order; > + bool leak_pages = false; > unsigned int nareas; > unsigned char *vstart = NULL; > - unsigned int order, area_order; > bool retried = false; > int rc = 0; > > @@ -504,6 +530,7 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, > (PAGE_SIZE << order) >> 20); > } > > + rc = -ENOMEM; > nareas = limit_nareas(default_nareas, nslabs); > area_order = get_order(array_size(sizeof(*mem->areas), nareas)); > mem->areas = (struct io_tlb_area *) > @@ -511,14 +538,20 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, > if (!mem->areas) > goto error_area; > > + slot_order = get_order(array_size(sizeof(*mem->slots), nslabs)); > mem->slots = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, > - get_order(array_size(sizeof(*mem->slots), nslabs))); > + slot_order); > if (!mem->slots) > goto error_slots; > > - if (io_tlb_default_mem.unencrypted) > - set_memory_decrypted((unsigned long)vstart, > - (nslabs << IO_TLB_SHIFT) >> PAGE_SHIFT); > + if (io_tlb_default_mem.unencrypted) { > + rc = set_memory_decrypted((unsigned long)vstart, > + (nslabs << IO_TLB_SHIFT) >> > PAGE_SHIFT); > + if (rc) { > + leak_pages = true; > + goto error_decrypt; > + } > + } > > swiotlb_init_io_tlb_pool(mem, virt_to_phys(vstart), nslabs, true, > nareas); > @@ -527,16 +560,20 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask, > swiotlb_print_info(); > return 0; > > +error_decrypt: > + free_pages((unsigned long)mem->slots, slot_order); > error_slots: > free_pages((unsigned long)mem->areas, area_order); > error_area: > - free_pages((unsigned long)vstart, order); > - return -ENOMEM; > + if (!leak_pages) > + free_pages((unsigned long)vstart, order); > + return rc; > } > > void __init swiotlb_exit(void) > { > struct io_tlb_pool *mem = &io_tlb_default_mem.defpool; > + bool leak_pages = false; > unsigned long tbl_vaddr; > size_t tbl_size, slots_size; > unsigned int area_order; > @@ -552,19 +589,23 @@ void __init swiotlb_exit(void) > tbl_size = PAGE_ALIGN(mem->end - mem->start); > slots_size = PAGE_ALIGN(array_size(sizeof(*mem->slots), mem->nslabs)); > > - if (io_tlb_default_mem.unencrypted) > - set_memory_encrypted(tbl_vaddr, tbl_size >> PAGE_SHIFT); > + if (io_tlb_default_mem.unencrypted) { > + if (set_memory_encrypted(tbl_vaddr, tbl_size >> PAGE_SHIFT)) > + leak_pages = true; > + } > > if (mem->late_alloc) { > area_order = get_order(array_size(sizeof(*mem->areas), > mem->nareas)); > free_pages((unsigned long)mem->areas, area_order); > - free_pages(tbl_vaddr, get_order(tbl_size)); > + if (!leak_pages) > + free_pages(tbl_vaddr, get_order(tbl_size)); > free_pages((unsigned long)mem->slots, get_order(slots_size)); > } else { > memblock_free(mem->areas, > array_size(sizeof(*mem->areas), mem->nareas)); > - memblock_phys_free(mem->start, tbl_size); > + if (!leak_pages) > + memblock_phys_free(mem->start, tbl_size); > memblock_free(mem->slots, slots_size); > } > > @@ -1938,9 +1979,18 @@ static int rmem_swiotlb_device_init(struct > reserved_mem *rmem, > * restricted mem pool is decrypted by default > */ > if (cc_platform_has(CC_ATTR_MEM_ENCRYPT)) { > + int ret; > + > mem->unencrypted = true; > - set_memory_decrypted((unsigned > long)phys_to_virt(rmem->base), > - rmem->size >> PAGE_SHIFT); > + ret = set_memory_decrypted((unsigned > long)phys_to_virt(rmem->base), > + rmem->size >> PAGE_SHIFT); > + if (ret) { > + dev_err(dev, "Failed to decrypt restricted DMA > pool\n"); > + kfree(pool->areas); > + kfree(pool->slots); > + kfree(mem); > + return ret; > + } > } else { > mem->unencrypted = false; > }
