From patchwork Tue Apr 8 16:54:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 14043430 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 20D89C369A4 for ; Tue, 8 Apr 2025 17:07:15 +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=g4sZRYMUl4o4qdaBcEF9O7suZPS2wa7CRY7hmjO9By0=; b=rUHwPyzsiyEcZxqs4yGWJaL3cS C0655y6P482zWx5A/xrHcPENE0cpA5fOi4gBws82e/SnD7r1tyC+R78oWCv+XdXnkOwsRXrf4nJKZ mFZzY/JS5fLKWPsdihHKjhqugVlOe/sbQ3y/CVueoT5o6uukwI4CUjlcQs3V/fJZU0XsXfx93jsnb nGhm5DQnNr4I8bijq3jkHktQN/yb7g+vbZEbeli+wlDEMspIxSSgMMl4zhx2H9XSfY5aXttRNMGRY fcJEeKQollU7jDKLvTKVnA84MZbrAqEeG4/BOZ1BkPD7TjALwnJLcJAERC/eXsI6/2FfVgluz8CY7 vc6SnWxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u2CPg-00000004v23-16oP; Tue, 08 Apr 2025 17:07:04 +0000 Received: from mail-bn7nam10on2062c.outbound.protection.outlook.com ([2a01:111:f403:2009::62c] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u2CDS-00000004sBS-1f1H; Tue, 08 Apr 2025 16:54:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H1xAsrAFlp8QvXh3f7FDECujNnYm8Ceyytaj8tmG4L2EmpuW85KjM7c8chhKw0HFZvSw3il6cjtkLnE0VJw3pNjpEvMkghwxoxgFR15gwB/btk90Bt0jvxXC0K1/VELErlIhX1UvzzM1j9q18oK2c0IDIulsKxCEOgpX9z+V91+iOG2+Y4TLNFawxFtKo80Uy1KNQ7MHMdq7qg/v/9JAJx0WE0QxzwiPyq8mu+CmkGhN6wrwYFAQjEMQTygmNWS9wyHj944rnNR35Hah20Vp63xE7+GU4JixPUQ3DBQCxGl+fgGCdMplWpSpCO+jllCUgt56GhX3Q/Hg6IOBKvFyug== 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=g4sZRYMUl4o4qdaBcEF9O7suZPS2wa7CRY7hmjO9By0=; b=tGNRiDG4CInU4dOlmyC7DiT5eC5o6U7CqWDacqtJLImyqqKecsVCeiW5w8fBsoOnGVhPBMFzUtyZCeVS4lUtfDNaD/za1u0sxGicxyG4V9gE6Fm/06SK6QR3PrAN4Lb7/vJK3lmKVNFs8cDlWCc+1fG21w+Z7qX6VoGXyykKlGIIYHaeGL75j3BiqRLuzi3urfh90E9fDZZANTVvhVdwCXaPWiS86Ib0NItaq9W6nf0R4FJNIMOG9WINgcbIg5cJBsOlxFPAgFyrpOgBzUVJIsyLlnk91h3DLtWfCgFsbFDHYo1r+sLtKU/Aytn+dM97QFLfyPUk1JKtE/okNeJ8Jw== 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=g4sZRYMUl4o4qdaBcEF9O7suZPS2wa7CRY7hmjO9By0=; b=JQQtsShC4ciafugRuRuFfJg9jwjD0S/h2SD5ky+1tv7TWiR73/PK6vg8JH4yrEi1db8kURqDk5NJke4BIc5mQrMrb3Jd0W2jrnwwFsaV3lfPtqUY7iZ1ACxYhGkiw79903Kn9H6JXSpJ01rIxKLmT+XZEl7ejY0WIVYrtAxHaHygpWZU7LF1XWSaiPRKXStspVWZPbDZGhsv6QjYiljboAEbe7npnB8Sz7jw7JEeWZJ1VaM2tCn8ubgThc0mLQxIMmigtoi/qev/S85SHOZSl0/ZlmhC9cQq72CjS00IbJeN1ZmXGycGvIG3/Td/IL0HD1C6ZN7esSOLLdHL/SmPsA== 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 BL1PR12MB5971.namprd12.prod.outlook.com (2603:10b6:208:39a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 16:54:17 +0000 Received: from CH3PR12MB8659.namprd12.prod.outlook.com ([fe80::6eb6:7d37:7b4b:1732]) by CH3PR12MB8659.namprd12.prod.outlook.com ([fe80::6eb6:7d37:7b4b:1732%4]) with mapi id 15.20.8606.028; Tue, 8 Apr 2025 16:54:17 +0000 From: Jason Gunthorpe To: Alexandre Ghiti , Alim Akhtar , Alyssa Rosenzweig , Albert Ou , asahi@lists.linux.dev, David Woodhouse , Heiko Stuebner , iommu@lists.linux.dev, Janne Grunau , 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 , Neal Gompa , Palmer Dabbelt , Paul Walmsley , Robin Murphy , Samuel Holland , Suravee Suthikulpanit , Sven Peter , Thierry Reding , Tomasz Jeznach , Krishna Reddy , Chen-Yu Tsai , Will Deacon Cc: Alejandro Jimenez , Bagas Sanjaya , Lu Baolu , Joerg Roedel , Nicolin Chen , Pasha Tatashin , patches@lists.linux.dev, David Rientjes , Mostafa Saleh , Matthew Wilcox Subject: [PATCH v4 23/23] iommu/vtd: Remove iommu_alloc_pages_node() Date: Tue, 8 Apr 2025 13:54:11 -0300 Message-ID: <23-v4-c8663abbb606+3f7-iommu_pages_jgg@nvidia.com> In-Reply-To: <0-v4-c8663abbb606+3f7-iommu_pages_jgg@nvidia.com> References: X-ClientProxiedBy: BN9PR03CA0049.namprd03.prod.outlook.com (2603:10b6:408:fb::24) To CH3PR12MB8659.namprd12.prod.outlook.com (2603:10b6:610:17c::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR12MB8659:EE_|BL1PR12MB5971:EE_ X-MS-Office365-Filtering-Correlation-Id: caa8db0f-3782-438f-82d2-08dd76bdfe4d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|366016|921020; X-Microsoft-Antispam-Message-Info: rtBsS5Vo4B8SZ4xqqGjxwRxZ4Gdw1QcLU7vTAy8Txddh9ewSTbDw6UOyZsIGUGwGPvEvdrtSFe7PiXUmLh0AH6alHRG4Wmpwp1V78TIka3bp5CoHAiy2ldDwfo/JE7u4XPWuHF1Zhdx4vDwCfs9BGLVj2cXCwzBhnHorMSAOShZel7F1BJ9zmwjtNd9mloncKO+LEAdYIPMcxWbwAkNhORMmBxnm0uYoId5HLn1ZAHC4o8ibSwGNEDIETJq502qzPphOUJXc93/lqdPFULEaey6gPzPmz10VMrRxw50UV+uCwwLc7wuvpL2oVj4pfEX7F1rkudwRA6ioRQxFYKslCUMiPXtlhWyOF3nHPH2O7wpBvR5gTfAirp13J0NnUR0LH1T2aa9lpGnx+5P53t68GAiHxZpHPlh5lLt0a98PPtt0QF8XGLdMDAygOzXN7AiQ8IKyZ8mDwkoR3j5Kc3lE8mqvPWSSHJZivralzemc6SPxtrqy9wvXUM0IZ5BtoiRhjzHNFO1/EEPmfa11Fo1SJTcBqyof0AGl6NLd8OCr0CZ231EVqaI6/UlbsJrJzzFgjXOkFrtx4AWo3zq0Rc3oFBnQrXX7DoTB0IVMnNb4MgTxgSFHGxArJN+3KhYEjE5MrZ/R8zSJvARbC7pzTUWYiOOwTHNvn3HImXQkeuLCYweQZIdcMEQbKL6tiuIaeGQQrPz1jS4IhCs0GAjwI5Us6tOHA8OR9AlbmbNJOeJMsnxi5ZfBI5sY5VjZkOB6CEHzt+qGjV0Au5JeihF782riTqzgfnMKGBQmH+bmYLQb6USVCb4eRdq9C6b0O2ruN7RyZ+1cU5Xxzu/PTha+VHkwwVNvFE6ksuMjdAq/PVC3yOBIRyAVsQP6xdigNE0WeKL7pogK7pfs1L56bbMgYveqy48DJaayjAyutGu+N4m6om0b9//irBxMJeu7Dof3i7U8NHulVTZ2YwPvBPoZ8vR/bjiIEfIcsP6pcMhQWIOP8oq+GminmfKgoGGf0rmJez/Nhze/iVXZr0J5RLGflcygS9TFiprME2lGVl1gwS+ALNmOpKkDmC4xxJnJCBFkaVbd7nRueLwMSuW9R7/wKvjYCNgwH2YjYuajFbMfGNJwwcKOKVN+RLuTtylf9rfPOMGWvdMb9HGTdy9gPqXXfz5Q64Y12KuooXmekKMyfeqs0Xwkyq0k58KfCCID8ukbiGNNQsbwFGFUk2RZnKceyP+ElPAyt+7bx6p+udMj6JW3uVIvE6ayZvU/ov4oCDwstkUwNJb0a6U0nXyQjJ9nD/qT9ZG7WYsxoNLso6ruEpAc3k0YBlluNJb36Y+v0/wkW0ZDvrAWE1df25iA8WEhsSRvVVub7iuoOc9s6H9okPYytCTO/8J+OlzF9b+1acZTaFrQ9JYWo2PYgy63dghfKBU1sTCy8lN097IgeG8SfOfRVNdBm4mPDyTiqLg0fF4XP08P0wHSjU/gr/Gu72gmqHY1XA== 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)(1800799024)(7416014)(376014)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PZD+kHf3TQ+qiAzeKG5FJG6/F6Fi6tQ98tFfmub2iaSbU6AuHdudoCVqNY2DYrCxd3zla+p3bvrpXj7nxDFOuUSyRqXPrDyBy8c3knAosMGU8RD8lKKKgDAfs5eXEDRd6/5UwrDkoJFJbznHy/QjHEIUXYeYKbDsh4gwWqxp7YWJYd9Z6LhIjoqUPV60IWIrRpjjfvNxsP+YBZ5VGGH9rFN4qzWFLv16Nqn7ZYRrrWMwAb8h9KQKMH25eu54Igmga+bcUmZYokR/d4Szlhc01VIatYUwLPtIYNCO0YGS9bszHa3qVmPu/N/ZEwnFHz7Cf53VPzZDkCKG9Sbm1AZOafAoo2GgLzMSX+2x1h7SzUTxC2JMhWtJcbOfbgVR6GrE/raL8iFPzU47I49JP+rtE4bCqEdRMxIpOLRl2LfYw2MUrUGC7MF+iuk2DDTDbmd4tTMufJd02Yi4PyTYMBC2bnr/CYK4FGZ3im1KMazkEaQ8sFgqNRA5Z6zs1ZizlpXPlz7F4M9AJrB7eP/EjLxCd+dDXpMCB4n09bVuOlFOomeypqc+nkx9H5IraKXTMsmJqp47Q6JuR0RE6AoYI9T3/4PVtkvzUf1GGouQdBDGx1mlNESv+0Ptfu5obQ+eflEycIRjsB2XHXm38hUtneg6TOWJxihcw5GOideMxPR6b5fhorva0WuRzysyShmEFs9BSqMIiab7KxJoY45Lq0AHspgaxJtdBpj8cTQHM0BZJhPJJlcKrO39LLFIh3Z3WVQ+MS6MCCP9gMvCsFFVaiJz3OXzrOooyTy7QaaTZOMpP4Bs2J+zei7F9llqnDA60egEMlqBrU9WVr1rzTLrqv8lYtWgrx27Fc/S5DnYsZyYpaTkq76rBEJtkXRdbb+Wr2nMhENdmLFGdVMl7PXrsGHhW8Z5Oc0LZPMC7gFC8oPcf0uxt2gdBTaF12HAraR4EBewx0zwSeAzi/AY5xFnZMqAOtuNZ375iFlJdymBMyAz98djYz111BoBXShUNK2/3kS17NlyySIqN2IipCO7gJZjOAQlsirCD76hHAJrem5NNr5cnVp448DaF4zKmYeh5UhBOD4u6zXsrJS3qY5GY6Qq2wcgw1pCgd5mZOX4/f5DiATSIhrU+QcCupFqYiOWlK3Pk7o8BULZX8PtWrBf7O6TMk33Gukn7VXxIQReJljBQEt72cnacaFGRJ5+uY33YN38NEid4l1pS4fbUsvWdIgC31IBGvugn4apJ2Ji5o/aNkfoIxclJeWwGe3XZrY2QeFvlQe/uzkHFoMiOIqCmMT1r0cHdLaecDM9Di6DaJ80Oj6936APcipZ94CkQhOrGGMZ8lhQm1SZAhoRVe0hFyd7D2+/fCaMkiexZ0JAmhZ79RPTcKQxAq7P8iFkR7lER5nObiaN8tWCoIODo2ORj+Kq0DTy0fKq95waukbs8PhT7gb3o5NerOtsD0tMlrgvX8bFac8eiEY5h4WdeG3JCPUoAwBIZS5mnBOP5n1TzFPmpYE82gjhIa2KGKh2nCHbjaAMUBeb/YZYws0U9dML+dd6at5RAkMtCw/Vx2OTckb03vLKfkAEPivCBX4EfFP2P1Eg X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: caa8db0f-3782-438f-82d2-08dd76bdfe4d X-MS-Exchange-CrossTenant-AuthSource: CH3PR12MB8659.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 16:54:14.7212 (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: FhlBuWK95MGm/IC9lpJfjpPofFqfgO3a16HeVXC5KjHLDqUl/ipK33EfWJVrk+9L X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5971 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250408_095426_437460_4A1C49F7 X-CRM114-Status: GOOD ( 13.11 ) 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 Intel is the only thing that uses this now, convert to the size versions, trying to avoid PAGE_SHIFT. Reviewed-by: Lu Baolu Signed-off-by: Jason Gunthorpe --- drivers/iommu/intel/iommu.h | 7 +++---- drivers/iommu/intel/irq_remapping.c | 8 ++++---- drivers/iommu/intel/pasid.c | 3 ++- drivers/iommu/intel/prq.c | 3 ++- drivers/iommu/iommu-pages.h | 16 ---------------- 5 files changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index c4916886da5a08..8d5d85bf00802f 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -493,14 +493,13 @@ struct q_inval { /* Page Request Queue depth */ #define PRQ_ORDER 4 -#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) -#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) +#define PRQ_SIZE (SZ_4K << PRQ_ORDER) +#define PRQ_RING_MASK (PRQ_SIZE - 0x20) +#define PRQ_DEPTH (PRQ_SIZE >> 5) struct dmar_pci_notify_info; #ifdef CONFIG_IRQ_REMAP -/* 1MB - maximum possible interrupt remapping table size */ -#define INTR_REMAP_PAGE_ORDER 8 #define INTR_REMAP_TABLE_REG_SIZE 0xf #define INTR_REMAP_TABLE_REG_SIZE_MASK 0xf diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c index 6866b4e6284842..9119170f95d94c 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -530,11 +530,11 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) if (!ir_table) return -ENOMEM; - ir_table_base = iommu_alloc_pages_node(iommu->node, GFP_KERNEL, - INTR_REMAP_PAGE_ORDER); + /* 1MB - maximum possible interrupt remapping table size */ + ir_table_base = + iommu_alloc_pages_node_sz(iommu->node, GFP_KERNEL, SZ_1M); if (!ir_table_base) { - pr_err("IR%d: failed to allocate pages of order %d\n", - iommu->seq_id, INTR_REMAP_PAGE_ORDER); + pr_err("IR%d: failed to allocate 1M of pages\n", iommu->seq_id); goto out_free_table; } diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c index 728da85a910068..ac67a056b6c868 100644 --- a/drivers/iommu/intel/pasid.c +++ b/drivers/iommu/intel/pasid.c @@ -60,7 +60,8 @@ int intel_pasid_alloc_table(struct device *dev) size = max_pasid >> (PASID_PDE_SHIFT - 3); order = size ? get_order(size) : 0; - dir = iommu_alloc_pages_node(info->iommu->node, GFP_KERNEL, order); + dir = iommu_alloc_pages_node_sz(info->iommu->node, GFP_KERNEL, + 1 << (order + PAGE_SHIFT)); if (!dir) { kfree(pasid_table); return -ENOMEM; diff --git a/drivers/iommu/intel/prq.c b/drivers/iommu/intel/prq.c index 9859bcbd425e16..52570e42a14c05 100644 --- a/drivers/iommu/intel/prq.c +++ b/drivers/iommu/intel/prq.c @@ -290,7 +290,8 @@ int intel_iommu_enable_prq(struct intel_iommu *iommu) struct iopf_queue *iopfq; int irq, ret; - iommu->prq = iommu_alloc_pages_node(iommu->node, GFP_KERNEL, PRQ_ORDER); + iommu->prq = + iommu_alloc_pages_node_sz(iommu->node, GFP_KERNEL, PRQ_SIZE); if (!iommu->prq) { pr_warn("IOMMU: %s: Failed to allocate page request queue\n", iommu->name); diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h index 7ece83bb0f54bb..b3af2813ed0ced 100644 --- a/drivers/iommu/iommu-pages.h +++ b/drivers/iommu/iommu-pages.h @@ -84,22 +84,6 @@ static inline bool iommu_pages_list_empty(struct iommu_pages_list *list) return list_empty(&list->pages); } -/** - * iommu_alloc_pages_node - Allocate a zeroed page of a given order from - * specific NUMA node - * @nid: memory NUMA node id - * @gfp: buddy allocator flags - * @order: page order - * - * Returns the virtual address of the allocated page. - * Prefer to use iommu_alloc_pages_node_lg2() - */ -static inline void *iommu_alloc_pages_node(int nid, gfp_t gfp, - unsigned int order) -{ - return iommu_alloc_pages_node_sz(nid, gfp, 1 << (order + PAGE_SHIFT)); -} - /** * iommu_alloc_pages_sz - Allocate a zeroed page of a given size from * specific NUMA node