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 X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 587CBC432BE for ; Sat, 28 Aug 2021 15:38:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C7CE604AC for ; Sat, 28 Aug 2021 15:38:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234548AbhH1Pjb (ORCPT ); Sat, 28 Aug 2021 11:39:31 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:46815 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234492AbhH1PjT (ORCPT ); Sat, 28 Aug 2021 11:39:19 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 5AF3D580A6E; Sat, 28 Aug 2021 11:38:26 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 28 Aug 2021 11:38:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svenpeter.dev; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=CS8lpBDlbS1UJ 6ySK75MXPRXLnRGvABr606Ey2hH1vQ=; b=YkoMDdT/TdLNc7bTMVpfEBjGjr0Ap 0umsopYTDeMEY8rBSk3zT2wuWJTmorm8/7pthF2ePhJUA5nJA61m9P1jaCp+Jg1g /0NLNyVTfKDP0jQYQksRSCyh1QPHo5e4358wVVy9zwGvnR3aQfvVqIwdsd483WXn sG4pZ1HqruJhl3FvCqs9HrZRl0OYeBwazV5GXhLhQ9yumPY0a3CdI3LbTKAPBOh7 ZHsxPCBiSWBsK+uKS3UR8IytqhAW/GeAi5uW0zD3tOL7Px8UC78hcTIY8cjWHdSR leyAHfu7IIpngorttqf1Znzw83SSGh+qtDqV/y5RMFnJicnc9m1OFqx8w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=CS8lpBDlbS1UJ6ySK75MXPRXLnRGvABr606Ey2hH1vQ=; b=FnxDWvPr cmTLUO7bMyA/4o2klq5B5fFMp3RlJ7k/6hEw5sHd7pkUX9JPfhygN2RfH5EGnZim j8Q/mMR3Rp47kz5wGqtuEe4QKlhALQ+H9fWgYuv4lUnNNBXqMjxUl2/LHnO2H5hh rIzsY2UKsG7xelLVhu33/H/56lHV24X74Ktrj6KfyCvKUCyMVVtMtjsLBrHqIpqh /MafJuNcbkYjs+9Wdhnqa1DHiMAaQ/wCM1hECclFOEOSrfs+lsQYA+JLWjDggjhX 3Wh44xXUzja/WndIv1dBhS/JewNq/zh7lAjoYjNhI7O/mK0Pc+K2MFUA+/C21GVe sucQS5hyb063XQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudduhedgleduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefuvhgvnhcu rfgvthgvrhcuoehsvhgvnhesshhvvghnphgvthgvrhdruggvvheqnecuggftrfgrthhtvg hrnheptedvkeetleeuffffhfekteetffeggffgveehieelueefvddtueffveevlefhfeej necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshhvvg hnsehsvhgvnhhpvghtvghrrdguvghv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 28 Aug 2021 11:38:23 -0400 (EDT) From: Sven Peter To: iommu@lists.linux-foundation.org Cc: Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy , Arnd Bergmann , Mohamed Mediouni , Alexander Graf , Hector Martin , Alyssa Rosenzweig , linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] iommu: Move IOMMU pagesize check to attach_device Date: Sat, 28 Aug 2021 17:36:40 +0200 Message-Id: <20210828153642.19396-7-sven@svenpeter.dev> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210828153642.19396-1-sven@svenpeter.dev> References: <20210828153642.19396-1-sven@svenpeter.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The iova allocator is capable of handling any granularity which is a power of two. Remove the much stronger condition that the granularity must be smaller or equal to the CPU page size from a BUG_ON there. Instead, check this condition during __iommu_attach_device and fail gracefully. Signed-off-by: Sven Peter --- drivers/iommu/iommu.c | 34 +++++++++++++++++++++++++++++++--- drivers/iommu/iova.c | 7 ++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index b4499b1915fa..f02b727d3054 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -79,6 +79,8 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, unsigned type); static int __iommu_attach_device(struct iommu_domain *domain, struct device *dev); +static void __iommu_detach_device(struct iommu_domain *domain, + struct device *dev); static int __iommu_attach_group(struct iommu_domain *domain, struct iommu_group *group); static void __iommu_detach_group(struct iommu_domain *domain, @@ -1974,6 +1976,18 @@ void iommu_domain_free(struct iommu_domain *domain) } EXPORT_SYMBOL_GPL(iommu_domain_free); +static int iommu_check_page_size(struct iommu_domain *domain) +{ + if (!(domain->type & __IOMMU_DOMAIN_PAGING)) + return 0; + + if ((1 << __ffs(domain->pgsize_bitmap)) > PAGE_SIZE) { + pr_warn("IOMMU page size cannot represent CPU pages.\n"); + return -EFAULT; + } + + return 0; +} static int __iommu_attach_device(struct iommu_domain *domain, struct device *dev) { @@ -1983,9 +1997,23 @@ static int __iommu_attach_device(struct iommu_domain *domain, return -ENODEV; ret = domain->ops->attach_dev(domain, dev); - if (!ret) - trace_attach_device_to_domain(dev); - return ret; + if (ret) + return ret; + + /* + * Check that CPU pages can be represented by the IOVA granularity. + * This has to be done after ops->attach_dev since many IOMMU drivers + * only limit domain->pgsize_bitmap after having attached the first + * device. + */ + ret = iommu_check_page_size(domain); + if (ret) { + __iommu_detach_device(domain, dev); + return ret; + } + + trace_attach_device_to_domain(dev); + return 0; } int iommu_attach_device(struct iommu_domain *domain, struct device *dev) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index 0af42fb93a49..302e6dfa7cdc 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -50,10 +50,11 @@ init_iova_domain(struct iova_domain *iovad, unsigned long granule, { /* * IOVA granularity will normally be equal to the smallest - * supported IOMMU page size; both *must* be capable of - * representing individual CPU pages exactly. + * supported IOMMU page size; while both usually are capable of + * representing individual CPU pages exactly the IOVA allocator + * supports any granularities that are an exact power of two. */ - BUG_ON((granule > PAGE_SIZE) || !is_power_of_2(granule)); + BUG_ON(!is_power_of_2(granule)); spin_lock_init(&iovad->iova_rbtree_lock); iovad->rbroot = RB_ROOT; -- 2.25.1