Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b47e324 authored by Joerg Roedel's avatar Joerg Roedel Committed by Greg Kroah-Hartman
Browse files

iommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map() 



commit 3057fb9377eb5e73386dd0d8804bf72bdd23e391 upstream.

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: default avatarQian Cai <cai@lca.pw>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: 781ca2de89ba ("iommu: Add gfp parameter to iommu_ops::map")
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7519069f

drivers/iommu/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -3114,7 +3114,7 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, 
		prot |= IOMMU_PROT_IW;



	mutex_lock(&domain->api_lock);

	ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);

	ret = iommu_map_page(domain, iova, paddr, page_size, prot, gfp);

	mutex_unlock(&domain->api_lock);



	domain_flush_np_cache(domain, iova, page_size);