From patchwork Fri Feb 14 17:07:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13975376 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96D21C02198 for ; Fri, 14 Feb 2025 17:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+GoiDYRV+OIDEEhJo+udCSIygEd3petayce6lj2L54E=; b=J02TiMUGhUxdzmPG9ZKlmiWQpo Il1x1u8JIrV75L5J6Rz/QxCDhm94ZF74YrolXPwylP9bnLGl1lAaTVjKDTncZ7YyisangrQozO5Hc 2/tf1Hios6+ZEF5qg+5pE4vb5V3aGZ2lXYk149gKcbbrPqMM5lGkkvHUcym60WhTMFl9MCsHcIONy GojPnXoqwO/mi5LGZu1w2V+N3zoUtEaZrO25IVcoOSqO+BGdsb6yCzi020HhNCBQxoo45BT7mtzQT oE4vevt61Zup5Orh6dmlMYDV4tJ3I+TqJpqCBBSSuZe5pkVRicghGvSF1MpgOyi63jdZAKfz1hLey fWsJTCcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tizP2-0000000FgxK-3Bz7; Fri, 14 Feb 2025 17:23:00 +0000 Received: from mail-mw2nam12on20600.outbound.protection.outlook.com ([2a01:111:f403:200a::600] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizAj-0000000Fcpb-1YEb; Fri, 14 Feb 2025 17:08:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DUy58ovA1p2LGjt2AvmuUj15TE6Dp+ALAnuQS4b2aH1pGJF9OAgF5aYZV0SeCl+SBtpPH2k3+PoSHAIZstnG8lh6C06Vvk0d1cULaJkelexonKEF3AqvwizklTrRJAOtPMP+mTX9V6oSDe+lOScEWKSNVeMB4vPvTZc/imG8O/e5aWP4pPQSeMQfai5+iE4K5xuy1fYjxrenfDGSJhd/B+9vCSk9H1hRmOr7zcJG0fB+D3piiWcSjDV73TTrNY0MBuPfO+lpBBu4od68WOn6BARUVpaVIB8BECvz2KnZnctK2e+xmqlac/UxtfiHjFg/hqEQ7iK86aj6xXStaemkmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+GoiDYRV+OIDEEhJo+udCSIygEd3petayce6lj2L54E=; b=BzyKGwy2mg5yX7ZdfSFrCqtWZQh/9N9ZTcEk7xrW3AADDh+VOb5HQqnOcIMAqCJihDJGh8yNgsi1sBwcG4TWexppTV+p40q0m35d0oI6fF6/mMt0u/PhRsHhMWEO7p1W24ShALApjgDClPdSN0qFMzvLyuSD1QWnAqGHbjljJvKTFXsLnhLBNYgPRM+Iu3/Y2a+HJy87nDEU005coh2b9W4EPbDKK1gEnjsBf7s0TfxMwsv+K/iz+DVzoJQz2TV9cLHjFCO/8Qhz/KAFAKC3gprSRrbX8qKNiNOFPIzbWlP6gdApSQ59jjM47RfYg1w4qO2NIoP3ziCWEYcoXY6C3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+GoiDYRV+OIDEEhJo+udCSIygEd3petayce6lj2L54E=; b=S1QkLCUAo1DQXd2LBAS8ci7zW+rag1kWuXv13gVJE84KYipIQTyeYhNqm0Jdkn9p5TAMgHncEySxeA86Djxwk75aYOwvdrIiE2ueLkDIcBY3Vl7Zq0z1LpKEWHXVJhprcX59FR9zSfIhP1YHZEDhO5Ynl3py/XIQBKw1auhXKePQ+FBnO5RBLu+1No7h1pUJzzvbtNIKQzFy2xRHopW3SsXNDN8XTtN2oCbTZEUVuzFxN8aXR+vxjkoX7crPbaL6EpNdp4blG7zgyG47GlqI211EFmsKxFRq1e4gZA+nqdL7/wjsVnLrFi+ljYD8KISb5T3JMnXxtiZU8VE+dVxLiQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH3PR12MB8659.namprd12.prod.outlook.com (2603:10b6:610:17c::13) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.15; Fri, 14 Feb 2025 17:08:06 +0000 Received: from CH3PR12MB8659.namprd12.prod.outlook.com ([fe80::6eb6:7d37:7b4b:1732]) by CH3PR12MB8659.namprd12.prod.outlook.com ([fe80::6eb6:7d37:7b4b:1732%6]) with mapi id 15.20.8445.013; Fri, 14 Feb 2025 17:08:06 +0000 From: Jason Gunthorpe To: Alim Akhtar , Alyssa Rosenzweig , Albert Ou , asahi@lists.linux.dev, Lu Baolu , David Woodhouse , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Jonathan Hunter , Joerg Roedel , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, Marek Szyprowski , Hector Martin , Palmer Dabbelt , Paul Walmsley , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Sven Peter , Thierry Reding , Tomasz Jeznach , Krishna Reddy , Chen-Yu Tsai , Will Deacon Cc: Bagas Sanjaya , Joerg Roedel , Pasha Tatashin , patches@lists.linux.dev, David Rientjes , Matthew Wilcox Subject: [PATCH v2 08/23] iommu/vtd: Use virt_to_phys() Date: Fri, 14 Feb 2025 13:07:41 -0400 Message-ID: <8-v2-545d29711869+a76b5-iommu_pages_jgg@nvidia.com> In-Reply-To: <0-v2-545d29711869+a76b5-iommu_pages_jgg@nvidia.com> References: X-ClientProxiedBy: MN2PR14CA0026.namprd14.prod.outlook.com (2603:10b6:208:23e::31) To CH3PR12MB8659.namprd12.prod.outlook.com (2603:10b6:610:17c::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR12MB8659:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 81f3bb53-0ce0-4407-d301-08dd4d1a2204 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024|7416014|921020; X-Microsoft-Antispam-Message-Info: pEk+SUJo5Bx0LeZ6T68q1u8oX5QWOsR4SdxjhPjqJK2jUwKmviaEkOgs0BiTRMVl6kXwVKj+k/Sdf5qXJdG2YeJOk0iYhbsMTCCWthwO8mGh9vS1b4h4zhRI5qFlTc5F+MfqiOXVaExCY6qgK8PRKbsURqiShPR8vINxEyD2D38fVNMBC2z/+8eVQ3VpvdnqEtc6Cz25cvu4/91JTffe5FaKcsYjpx0iazpZn77Kh4EumWFqwN2gX+U/fgM7slgWp7Ml09WeXPehLmUIc7j6FRa4fJ56K90ibZ44yDrU0iiow7b0AEyqiHPMHaQMNiuUkKT8qbAuvZ+J6QLUkza8ggY5Pf0MW6SZuDVm8M576XgIq5Z6gsD4RyQm4NaBeYDTeA2/hKvcHLGA8Bue3ceywgGRJ2YLL4t/GZ8siq7A8sfVBb1hEElxlzey4e4iz32ddhfgDXmmCM2aj1/2kUgwu1DCsMBesxCcU6J1R/naMeQ6GuDlLHJj18fAytwhaQYcStYG8V/1LFBiW0KE5rU5IDiOs0+jfCanBpJ1Gs+wnox6HBuOJI9PXfQ/KfMPrVQHm4Oq7COwtaJR0KyTviZ3uXJh60RTeUlIR/1JNX4v1EFTRSlwZHHxLEd4dkiI8Z1n8xa64yg8sf0w2bHapR/fDseBZuCPhnMm7PePuo49sTM8+cWg85GeIhwLzinZomlSOJOubVEf4vr3TwlkYEHTgrbIUJEtrO6OZiZDKrhByvuxJLJtQRDywRA8DhwGlq3r+YZahyzhWkFdsFnZjWz7t+7xLz09CgJEE4N3lgJhX1RJKQq6nHJPGAphwi1hWcTNk83+6jwibxj+up7QiRDTJ/foPNscWjzoun4Jk+Dy2m0zkbmZQCMpAcoxzza0liJJ5vlCIElMnDuHfm5B6JThYc+/l99cREfUr9129/ZA7x15QhEyG94RE6vfCZjBRNK9dFpzr5p9Exd5P44abuBncwu7l45ysTT2GeuLbL9k8VXBgj0gTklwn9AGG1lbXewFrykhRD2+UTWMh2EetdjrGrin+OmtRD3gJQPT4d2QdRJBkTkzhz3Xy2VYxygPqalDCGPp6k6y50TvZ6EYv0yBlRVcPB4wP1yGPinWZuYwbsS1WjDSDQI30GWTfu6NVk0iKRL5cZpfobJ38mjunrgJkaEqYks6XCK03eniMqAmYKmK6NTffO37yTokYC6FxMRtiBXiJiZerMD2o1MD/LmLlt59wFZIjl9cdK13EXMEgOLw4SEBhi9slnijTamY/8Q3jq3ESzNSda6YxxuWb4G962poYLICVmk6/50gCj/P0MiNfHhGAk6AnnVn1E72+M8A/awiOXdfFeydiGq5tpyY0pNZcGUcXUIZfUDHyWFSihBtV/3GyClKPumESRwTp6uWiHMplzL7JxGrqyuq6Ir97L3cC6K5xjKFZN9D8wpMgL8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR12MB8659.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(7416014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1AX2tBltEgax8tlJ3xMp6GZ32y0qRyrg6U6xMyEAs/jbLiC1af/V8+SUSVkIpvUowKEG0ZvckN2TGuDbpTVkW7Ed/KPMR3yVxe1f+97kS69RzLetn+7pZGzGdcu/qHIjVogMbUf5KbxlE7+7i8sUPf7zOdnkDRiYIqWW+n7U14Ej0lYzvG4m0sRr3K+PKSp1vMbT8b9RJ1LJSVxN17LcyNtYHg3pxswASIBHxjl7GiaLZrsCATuPsdhUePNXKlRlVWmAJYlGu2tF5zp/kRC9Xlcvh5MuJCgEjANWFAv4YWr/bf2QC7mDfAbGJoCciJ2H0D4t1e8deWojbLzF2wjDucRGg6UFkuLiK3qv3SyiaiMqDa/KkkbhQAGx+TLgnhK8QbP/HQcRZO+i1n+oKFjkF4ZYmIJYNXr/i0Afn8zOQHEdgI7lN+El+5Q2rrpupBX+cCkz44/qm50/sVLv5NXEVmq3DPf1vVIbIYoLdjkfFI2w6TINt1feJbIh4ESfGfMlf31R6Ds2lwL1L+WoQh8PeAtOFvDiJ+0XNSK0ADYNfYbqxA48Zem8bJ8ukQKGkoLw09efenLCT6wqjHeRCZ076jslAQkfRv5dX83ICqZzY7lBmPHvBzXNxRT/Vy9e884gHpOIFrbSiUjqY9ytZRbnm4PUrRWuiPBCeRyuS2cCuSaJAH8UDc41awuj3jDK/32dFXxyGwlWHeSIgfIub1HTp4fGKTezHwpdHK+sl3/PX4xR1mWe/3Al12PVtjAe3BASXW0frFLC5z11AiUc12/cIgL6bGcvako13hEEWXOD4eqXP8FCEjNVdpS12Do6cr8KqFVqF1F+1+QN5tOuHCF9OS8HU0Gn7vcmRkjlqpy8u1/YLQYBsvDSPixeTksK1w4ohRMvPq+jI1lz1vc/dUyGHkXf89/cy+2Of0uXQAXNuyQABVS6s35ZxF3Kcjl4tyGlJM5Yruot9tPrObmtQ9vK8WMv4Z1AGNV+QSbJGK+eYZafL2t4dj+f8NcI2ttOAMPQ4cymSDIuczemZBlp7z+uifuiGRXD4MOVtbeD6APU0QJ72GIukJtapj5T/uLIiCEIKLGMwiGHbPBt9qQpqTsJ6iDIWgzqY7OBNKkjdVCihl3+GV0XI46d0K3GwntnRLIMyCouW4dfT73kL30TR2pRDoqotuYPrf2sSIXlE4jx9agv80kyVx1iEd4XB6s9YoUN5IiHZW7nbmnbXGt8yFgp6jxPF2EoFRpjLl+jBUyBdkVLqCwHVMSPtIhSGirXWZ5Vnohy5khKOCIUUMmos5+OzTakt9flriSCEBO3eTVrC7n9PhsraYPgY1uGNnScUjsRKWW5/SpM7fIljlBcAZH087lqkdFJk6cZU6qNG+xQgeQ95SfuIU7D2/tGcxAVMtS0ouxFiZ79OXTnZbA3e4H146LHQS8UgkzTBibwHDiMY/zlw1Nc1+S2kBNlAyTetS3oJnkZMvZTJtjNEgZIpqynx58m+uwN9zGLf3+9hbaEK/w8pS9jvMMwC5uao0f0a86lQiEcdRAxGIt8HAhH5KuhRQbmRlojv7ay8thcw5tVFtg= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81f3bb53-0ce0-4407-d301-08dd4d1a2204 X-MS-Exchange-CrossTenant-AuthSource: CH3PR12MB8659.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2025 17:07:59.3686 (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: Xto0QSs2bKQq2d/JCg0v3p0wZ9nSLBHSiY3feZn7a3QsWp+L//6GYySwLEPJ0Ks5 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250214_090813_411388_B72C8E82 X-CRM114-Status: GOOD ( 10.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If all the inlines are unwound virt_to_dma_pfn() is simply: return page_to_pfn(virt_to_page(p)) << (PAGE_SHIFT - VTD_PAGE_SHIFT); Which can be re-arranged to: (page_to_pfn(virt_to_page(p)) << PAGE_SHIFT) >> VTD_PAGE_SHIFT The only caller is: ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) re-arranged to: ((page_to_pfn(virt_to_page(tmp_page)) << PAGE_SHIFT) >> VTD_PAGE_SHIFT) << VTD_PAGE_SHIFT Which simplifies to: page_to_pfn(virt_to_page(tmp_page)) << PAGE_SHIFT That is the same as virt_to_phys(tmp_page), so just remove all of this. Signed-off-by: Jason Gunthorpe Reviewed-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 3 ++- drivers/iommu/intel/iommu.h | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 1e73bfa00329ae..d864eb180642f2 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -737,7 +737,8 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain, return NULL; domain_flush_cache(domain, tmp_page, VTD_PAGE_SIZE); - pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE; + pteval = virt_to_phys(tmp_page) | DMA_PTE_READ | + DMA_PTE_WRITE; if (domain->use_first_level) pteval |= DMA_FL_PTE_US | DMA_FL_PTE_ACCESS; diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 6ea7bbe26b19d5..dd980808998da9 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -953,25 +953,6 @@ static inline unsigned long lvl_to_nr_pages(unsigned int lvl) return 1UL << min_t(int, (lvl - 1) * LEVEL_STRIDE, MAX_AGAW_PFN_WIDTH); } -/* VT-d pages must always be _smaller_ than MM pages. Otherwise things - are never going to work. */ -static inline unsigned long mm_to_dma_pfn_start(unsigned long mm_pfn) -{ - return mm_pfn << (PAGE_SHIFT - VTD_PAGE_SHIFT); -} -static inline unsigned long mm_to_dma_pfn_end(unsigned long mm_pfn) -{ - return ((mm_pfn + 1) << (PAGE_SHIFT - VTD_PAGE_SHIFT)) - 1; -} -static inline unsigned long page_to_dma_pfn(struct page *pg) -{ - return mm_to_dma_pfn_start(page_to_pfn(pg)); -} -static inline unsigned long virt_to_dma_pfn(void *p) -{ - return page_to_dma_pfn(virt_to_page(p)); -} - static inline void context_set_present(struct context_entry *context) { context->lo |= 1;