| From 93dff458c89b63e1c677ea6a55668609c6d4a675 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 29 Aug 2024 21:06:11 -0300 |
| Subject: iommu/amd: Allocate the page table root using GFP_KERNEL |
| |
| From: Jason Gunthorpe <jgg@nvidia.com> |
| |
| [ Upstream commit b0a6c883bcd42eeb0850135e529b34b64d57673c ] |
| |
| Domain allocation is always done under a sleepable context, the v1 path |
| and other drivers use GFP_KERNEL already. Fix the v2 path to also use |
| GFP_KERNEL. |
| |
| Fixes: 0d571dcbe7c6 ("iommu/amd: Allocate page table using numa locality info") |
| Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> |
| Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
| Link: https://lore.kernel.org/r/2-v2-831cdc4d00f3+1a315-amd_iopgtbl_jgg@nvidia.com |
| Signed-off-by: Joerg Roedel <jroedel@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iommu/amd/io_pgtable_v2.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/iommu/amd/io_pgtable_v2.c b/drivers/iommu/amd/io_pgtable_v2.c |
| index 664e91c88748e..6088822180e1e 100644 |
| --- a/drivers/iommu/amd/io_pgtable_v2.c |
| +++ b/drivers/iommu/amd/io_pgtable_v2.c |
| @@ -362,7 +362,7 @@ static struct io_pgtable *v2_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo |
| struct protection_domain *pdom = (struct protection_domain *)cookie; |
| int ias = IOMMU_IN_ADDR_BIT_SIZE; |
| |
| - pgtable->pgd = iommu_alloc_page_node(pdom->nid, GFP_ATOMIC); |
| + pgtable->pgd = iommu_alloc_page_node(pdom->nid, GFP_KERNEL); |
| if (!pgtable->pgd) |
| return NULL; |
| |
| -- |
| 2.43.0 |
| |
