swiotlb: bail out of swiotlb_init_late() if swiotlb is already allocated

If swiotlb is allocated, immediately return 0, so callers do not have to
check io_tlb_default_mem.nslabs explicitly.

Signed-off-by: Petr Tesarik <petr.tesarik.ext@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index 3d826c0b5feecb6c488758412780fa1c114a288a..882cd70c7a2f24a501a22e19ec27245a50ec4684 100644 (file)
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -125,12 +125,10 @@ static int __init xen_mm_init(void)
                return 0;
 
        /* we can work with the default swiotlb */
-       if (!io_tlb_default_mem.nslabs) {
-               rc = swiotlb_init_late(swiotlb_size_or_default(),
-                                      xen_swiotlb_gfp(), NULL);
-               if (rc < 0)
-                       return rc;
-       }
+       rc = swiotlb_init_late(swiotlb_size_or_default(),
+                              xen_swiotlb_gfp(), NULL);
+       if (rc < 0)
+               return rc;
 
        cflush.op = 0;
        cflush.a.dev_bus_addr = 0;

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 1c0a49e6685a91a84f5487e8098dd1ad3c79dab4..ee57fd9949dc227c4561eb14137f92c34c32d864 100644 (file)
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -384,6 +384,9 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,
        bool retried = false;
        int rc = 0;
 
+       if (io_tlb_default_mem.nslabs)
+               return 0;
+
        if (swiotlb_force_disable)
                return 0;