Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Lu Baolu <baolu.lu@linux.intel.com>,
        Joerg Roedel <joro@8bytes.org>,
        Kevin Tian <kevin.tian@intel.com>,
        Matthew Rosato <mjrosato@linux.ibm.com>,
        Robin Murphy <robin.murphy@arm.com>
Cc:     Alex Williamson <alex.williamson@redhat.com>,
        ath10k@lists.infradead.org, ath11k@lists.infradead.org,
        Christian Borntraeger <borntraeger@linux.ibm.com>,
        dri-devel@lists.freedesktop.org, iommu@lists.linux.dev,
        kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org,
        linux-rdma@vger.kernel.org, linux-remoteproc@vger.kernel.org,
        linux-s390@vger.kernel.org,
        linux-stm32@st-md-mailman.stormreply.com,
        linux-tegra@vger.kernel.org, linux-wireless@vger.kernel.org,
        netdev@vger.kernel.org, nouveau@lists.freedesktop.org,
        Niklas Schnelle <schnelle@linux.ibm.com>,
        virtualization@lists.linux-foundation.org
Subject: [PATCH v2 08/10] iommu/intel: Use GFP_KERNEL in sleepable contexts
Date:   Wed, 18 Jan 2023 14:00:42 -0400
Message-Id: <8-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com>
In-Reply-To: <0-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com>
References: 
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D4pi8WCKPrVH02kCBQ7m5F2S4awYjEluHqNTutFAttYZlYMDYw21IAprhzB9?=
 =?us-ascii?Q?U76DS9pfjusV7PZ1TUEYMC5hSLawd6G67XN9qymgSp0VYnjwvn6lEadrXsFD?=
 =?us-ascii?Q?uR9lafgh3Jhu2s62/qf185IiNkNtQlo8nPZAOMC01uOEnPiOClYrYWceSeBj?=
 =?us-ascii?Q?FHE+O1gMkO3hgj67d11ieqh7YfO7VuKo8ejGIHhHdomVi2BhD01TRPX89K1s?=
 =?us-ascii?Q?HPAzG9x7tn/wc25zRzex4UJ9PgwYJvg2GH14+xWfEnv7dh642U8WgiJC/Tqv?=
 =?us-ascii?Q?8ZEmFQ2QwOPZHJyjeGHa69mm61MI29Ck8T7/TBuEIEtrZFKljn6goFENT5hk?=
 =?us-ascii?Q?OjMCQpvBIom5k6DhDkNlHMLYdkw1TWRAIObeQFQsxSy+T1XThM25bcapN+gQ?=
 =?us-ascii?Q?Sh57NFHQRCPZ6h0rOvbGONbSIWr5ZHwx666/IvPM/aBJ7AXDct/b+FpxBMwy?=
 =?us-ascii?Q?mgsH38SYrIUvN09KzNSdcZo+AHPMn4GB8qb3gxXKjq0LgknJxtp570cV2SUJ?=
 =?us-ascii?Q?SSMm+OSABuBgdoe8q7bTtIylMpUwt+7xUCQd11khdRlbRRsbCEIIBnSuQtwN?=
 =?us-ascii?Q?gCQCvYkCe0FTW2FhfyN3ZXTu+ecnZNutmAZ/p+AeFqtwxaGNxerHREu7yBCP?=
 =?us-ascii?Q?PrJYjNluSH42+jynau/guFwqRRRCUA27+hLuqVCrdroqvgwKyEiWKyrfT6/4?=
 =?us-ascii?Q?Y7EB+HTZq1A5XeMUtI+vQ+Y+uXpDNncGKwqD7U02d4P1zSUe0doXtCQSelY3?=
 =?us-ascii?Q?nUd6eAI+ZbfpwKwGkUECWixMEQQ9VzTdR2qsLuxBqkWCG4Oo4BQrZcTkD7Ch?=
 =?us-ascii?Q?uQKOEKlf2SJErshLKp4K5MBIiciaBra9Szsy+d7UfugQXy9KwfcfxbUMrySo?=
 =?us-ascii?Q?iduTj08enSaOSKOWJFuHgpClYsWYSUyeogtVJUe1BkhhOD+bXrOPSYhj5fLb?=
 =?us-ascii?Q?H8+x2VmpKMbgcW7x5J0xpHG2+zUvCAvd3C5hxLt33WGVsQoprOvXrAOgLCCr?=
 =?us-ascii?Q?+8tiReLlwOuzxlnAvRPoVrLEF3NyHQiDz6AdKfltgZ0zwZw8QVcA767jK3lG?=
 =?us-ascii?Q?OxXuXjLlrslTRAri6wC+L+4K1/9PaFN8HgTDbfoyaX45DDsSywjDXOBNpcZl?=
 =?us-ascii?Q?N857Aux5K1xnrq8hjBC637aDhX1tXSfhkRjdVy0M346r5aplQB6BXHqeUPcF?=
 =?us-ascii?Q?Wg7WA7qt8ndoa24WHIe8yD12ZG5QYFi2RuaQyp0oi6wcxtHmcwoWtFBMlhl9?=
 =?us-ascii?Q?WSSmh1XKJkUfTB5fiqntrM+ugj722OCyPlLVWkDYgScv7i3ZxKClNdJgxpVb?=
 =?us-ascii?Q?EDHgMgcOGc+eKCJizuoWjW66iHtUAcvFiNBMjm7hx4zesafkEBtQ2kM4g6p/?=
 =?us-ascii?Q?r2o8A5fHFk7h2Zpo0jUImadYKbTlq1b3j8sCtVOfqR24mDzj9gK49vM/pjtt?=
 =?us-ascii?Q?nISUVK6iHyJkD0jHdxrjCp2n/m3Ny4/5mXrBaHf1BI+Ghw+4PQ8zfXbRqJmC?=
 =?us-ascii?Q?+yEl8ko/wtcs48wBGKPs6DEcnb9AD097uUnnvs+uLohG5WqFlw7O4LfDJMuL?=
 =?us-ascii?Q?E/5yXWWw54zirJxtFegH1/gMudn5jK9GKxGGOsBZ?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a5a69345-a01c-436b-51ce-08daf97dec4b
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 18:00:45.9902
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jIMex9DmzSNfbXvUopUHrmQVwxPw3OnGg2iXBoYF6MRDT132YRNeIOLlx7/qi50I
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7614
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

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

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
 drivers/iommu/intel/iommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index e95f7703ce7b83..a1a66798e1f06c 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -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;
 
-- 
2.39.0