]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map()
authorJoerg Roedel <jroedel@suse.de>
Fri, 18 Oct 2019 09:00:33 +0000 (11:00 +0200)
committerJoerg Roedel <jroedel@suse.de>
Fri, 18 Oct 2019 09:40:38 +0000 (11:40 +0200)
A recent commit added a gfp parameter to amd_iommu_map() to make it
callable from atomic context, but forgot to pass it down to
iommu_map_page() and left GFP_KERNEL there. This caused
sleep-while-atomic warnings and needs to be fixed.

Reported-by: Qian Cai <cai@lca.pw>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 781ca2de89ba ("iommu: Add gfp parameter to iommu_ops::map")
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/amd_iommu.c

index 0d2479546b7782d7f193ccfa7e24161486aa5599..fb54df5c2e11ae33ad33dd33090a391bfb08bffc 100644 (file)
@@ -2561,7 +2561,7 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,
        if (iommu_prot & IOMMU_WRITE)
                prot |= IOMMU_PROT_IW;
 
-       ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);
+       ret = iommu_map_page(domain, iova, paddr, page_size, prot, gfp);
 
        domain_flush_np_cache(domain, iova, page_size);