Commit 4951eb26 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu/intel: Use GFP_KERNEL in sleepable contexts 



These contexts are sleepable, so use the proper annotation. The GFP_ATOMIC
was added mechanically in the prior patches.

Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/8-v3-76b587fe28df+6e3-iommu_map_gfp_jgg@nvidia.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 2d4d7676

drivers/iommu/intel/iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -2372,7 +2372,7 @@ static int iommu_domain_identity_map(struct dmar_domain *domain, 


	return __domain_mapping(domain, first_vpfn,

				first_vpfn, last_vpfn - first_vpfn + 1,

				DMA_PTE_READ|DMA_PTE_WRITE, GFP_ATOMIC);

				DMA_PTE_READ|DMA_PTE_WRITE, GFP_KERNEL);

}



static int md_domain_init(struct dmar_domain *domain, int guest_width);
@@ -2680,7 +2680,7 @@ static int copy_context_table(struct intel_iommu *iommu, 
			if (!old_ce)

				goto out;



			new_ce = alloc_pgtable_page(iommu->node, GFP_ATOMIC);

			new_ce = alloc_pgtable_page(iommu->node, GFP_KERNEL);

			if (!new_ce)

				goto out_unmap;