From mboxrd@z Thu Jan 1 00:00:00 1970 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 10EA9C021A0 for ; Sat, 15 Feb 2025 10:00:35 +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:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wn5PqQDu8hz9K4Oy4JOIS3Q71qnLvlCk/FbvxOIh0t0=; b=WzRrHZ/j+d6yWQ/4hCLIoCYIk+ Q1BGG7Dre00PkkY9fooq/RkRSAoPQoGx4+UGy+fSI1YS0j7NGli7c0B4TfffW3ZhVA4/sJt7veULA r9z8SVtreBZBJxc33mmHvlhhZ+wEOxtlxVKw4e2xp8Xh1BgV1dGC3pG/E6Ev0NaQ5QOF7Dx7JyzWm 7q2XOatC1VK4eEsn4E+iuK+KqRue2UHn+RD7KmPYIZZr+a54P6Il/e66tkXhkgurkbRejn1WmGV4x CfDfGsknsJVoHj5X7Za7RRdHOt8FYPycm95IjO11EBsQ0PdUOUvCq8a1CQ1K5nNw8csVUjt7khGTM ljq89ytw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tjEyG-0000000HOWq-1OCd; Sat, 15 Feb 2025 10:00:24 +0000 Received: from mgamail.intel.com ([198.175.65.9]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tjEpA-0000000HNLG-1yDh; Sat, 15 Feb 2025 09:51:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739613060; x=1771149060; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=MYtye3mXOSgmjNVwAdiLAWnVTAT6ccam/tc+AZHY5DU=; b=mjhbU+GTzvDhJAr1978ue7rsM8wxVYVYEiZptbfarIZQl9Po+D3uA6md oneL6qXUBvlig5eqlZUlNBh64vA8SuE3cACb3YfCLHx8pVMvGzvYXjups WjJbERIdRjzySQjZPaon/5dMzdO3xN8XsVETpcy5c/DG2AT1x1TGcvO27 PbRxFPKtiR/UQROTfyw4iYAbXSYpsjQb8wpi6HDE+M/eQ4YGbR4FlKsID MzVDSmu9qHWqEu8jolUNnGAkfTEpDu4ctZM7IVY1Eo6nwAhzOyEGve052 Ad9M87Qha2Jg/aDfnsEf5Fp3YhQJ7L0kIvFI37hChRzFDgSSD2DMiWLR8 w==; X-CSE-ConnectionGUID: CKjC3y4bSguxWC484j4fXA== X-CSE-MsgGUID: YiTkGTiVSiyo9wycb3v2cg== X-IronPort-AV: E=McAfee;i="6700,10204,11345"; a="62830874" X-IronPort-AV: E=Sophos;i="6.13,288,1732608000"; d="scan'208";a="62830874" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2025 01:50:56 -0800 X-CSE-ConnectionGUID: Wx9nhBKeSyWUiDCwEGa+UA== X-CSE-MsgGUID: tBrnDxKzSJ2qq/G5C/lSng== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,288,1732608000"; d="scan'208";a="113858921" Received: from allen-sbox.sh.intel.com (HELO [10.239.159.30]) ([10.239.159.30]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2025 01:50:48 -0800 Message-ID: Date: Sat, 15 Feb 2025 17:47:51 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 23/23] iommu/pages: Remove iommu_alloc_pages_node() To: Jason Gunthorpe , Alim Akhtar , Alyssa Rosenzweig , Albert Ou , asahi@lists.linux.dev, 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 References: <23-v2-545d29711869+a76b5-iommu_pages_jgg@nvidia.com> Content-Language: en-US From: Baolu Lu In-Reply-To: <23-v2-545d29711869+a76b5-iommu_pages_jgg@nvidia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250215_015100_543037_C795768E X-CRM114-Status: GOOD ( 13.07 ) 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 On 2/15/25 01:07, Jason Gunthorpe wrote: > diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h > index dd980808998da9..1036ed0d899472 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 */ Can we keep this line of comment, and move it ... > -#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 d6b796f8f100cd..735e26498ee9f2 100644 > --- a/drivers/iommu/intel/irq_remapping.c > +++ b/drivers/iommu/intel/irq_remapping.c > @@ -538,11 +538,10 @@ 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); > + ir_table_base = ... here? > + 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; > } Thanks, baolu