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=ham 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 28E77C43214 for ; Sat, 28 Aug 2021 15:38:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 166BC60E90 for ; Sat, 28 Aug 2021 15:38:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234607AbhH1Pj1 (ORCPT ); Sat, 28 Aug 2021 11:39:27 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:49661 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234505AbhH1PjT (ORCPT ); Sat, 28 Aug 2021 11:39:19 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 31173580A70; Sat, 28 Aug 2021 11:38:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 28 Aug 2021 11:38:28 -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=iBZuNFnMAvAXF VZFIFKfDQcXdgvOjdknTaSW4E1ZtzY=; b=c/VwfpjRKGKyjAnHha0tIGkrNmWyq 0g3szPYIKnzu4aAfk80wCEnn66CGQJeQsyJ5K0Jy6vTchiUFKgmSvX40FeCVkJ1Z Gf+IoW0tbRtXQsFnByhX2t52e2sBnB0JFHBMN7Ftwryi9bXrh0dz0eZMblKyQbjV uvHB9ArRdLD2w7khy7O+JhmiqPG1TSnH3al+efim+J/zNWjXuS6U+llxy2/VnLUw rKrtp46xJLZOzYYk+FHnXRwillocXYCR5/M5xrmv2pBQd6hXZc9ajFtWWJyQWPpC BcMf/jUQBDc7NGrzEFTdfVtMDxUULXkq4oyyCp5tPDJMhOFwCVRM9oeTw== 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=iBZuNFnMAvAXFVZFIFKfDQcXdgvOjdknTaSW4E1ZtzY=; b=tAu3pq1n ozKuH7rLXQa2DquSzgz7ffOBjSG4J8xzN1yte5s0Il7oI15Oh7vNf6BWyQtCdZUh r07hGHCLi9umT3pKd2003R97lkHRFRPz9NFAM1jqXdA2rknmAVWYf0NjfmSHOyxv qfTa3uYtLs7zwJ4p5QqOhupE9AOyYeBRk5u4K2MqhryfhT8v6htchX58y7jRqFpT CAT2cSYQ0BRbnslSt4AQMSMCHPee+wLDGfn2RwlzizifA3cWH5vcVAaHumEfEo+4 VjhZMDczeIfET3ceaTNARgllIcYgtBlg/xrXaoYyrSoIwb0cc9b9h+vWr4iMzAqT FJNjCS1CXFfhTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudduhedgleduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefuvhgvnhcu rfgvthgvrhcuoehsvhgvnhesshhvvghnphgvthgvrhdruggvvheqnecuggftrfgrthhtvg hrnheptedvkeetleeuffffhfekteetffeggffgveehieelueefvddtueffveevlefhfeej necuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomhepshhvvg hnsehsvhgvnhhpvghtvghrrdguvghv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 28 Aug 2021 11:38:26 -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 7/8] iommu: Introduce __IOMMU_DOMAIN_LP Date: Sat, 28 Aug 2021 17:36:41 +0200 Message-Id: <20210828153642.19396-8-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 __IOMMU_DOMAIN_LP (large pages) indicates that a domain can handle conditions where PAGE_SIZE might be smaller than the IOMMU page size. Always allow attaching devices to such domains and set the flag for IOMMU_DOMAIN_DMA, which can now handle these situations. Signed-off-by: Sven Peter --- drivers/iommu/iommu.c | 2 ++ include/linux/iommu.h | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f02b727d3054..77d1ee14c7d0 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1980,6 +1980,8 @@ static int iommu_check_page_size(struct iommu_domain *domain) { if (!(domain->type & __IOMMU_DOMAIN_PAGING)) return 0; + if (domain->type & __IOMMU_DOMAIN_LP) + return 0; if ((1 << __ffs(domain->pgsize_bitmap)) > PAGE_SIZE) { pr_warn("IOMMU page size cannot represent CPU pages.\n"); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 6633040a13f9..40c1ad6be4e7 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -62,6 +62,8 @@ struct iommu_domain_geometry { implementation */ #define __IOMMU_DOMAIN_PT (1U << 2) /* Domain is identity mapped */ #define __IOMMU_DOMAIN_DMA_FQ (1U << 3) /* DMA-API uses flush queue */ +#define __IOMMU_DOMAIN_LP (1U << 4) /* Support for PAGE_SIZE smaller + than IOMMU page size */ /* * This are the possible domain-types @@ -81,10 +83,12 @@ struct iommu_domain_geometry { #define IOMMU_DOMAIN_IDENTITY (__IOMMU_DOMAIN_PT) #define IOMMU_DOMAIN_UNMANAGED (__IOMMU_DOMAIN_PAGING) #define IOMMU_DOMAIN_DMA (__IOMMU_DOMAIN_PAGING | \ - __IOMMU_DOMAIN_DMA_API) + __IOMMU_DOMAIN_DMA_API | \ + __IOMMU_DOMAIN_LP) #define IOMMU_DOMAIN_DMA_FQ (__IOMMU_DOMAIN_PAGING | \ __IOMMU_DOMAIN_DMA_API | \ - __IOMMU_DOMAIN_DMA_FQ) + __IOMMU_DOMAIN_DMA_FQ | \ + __IOMMU_DOMAIN_LP) struct iommu_domain { unsigned type; -- 2.25.1 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 19AA5C432BE for ; Sat, 28 Aug 2021 15:38:40 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D652E60E52 for ; Sat, 28 Aug 2021 15:38:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D652E60E52 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lists.linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B75CF40264; Sat, 28 Aug 2021 15:38:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vaPfX4nrgGTc; Sat, 28 Aug 2021 15:38:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id F2093402F8; Sat, 28 Aug 2021 15:38:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CD7F9C0010; Sat, 28 Aug 2021 15:38:34 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9557EC000E for ; Sat, 28 Aug 2021 15:38:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6BABF4022F for ; Sat, 28 Aug 2021 15:38:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=svenpeter.dev header.b="c/VwfpjR"; dkim=pass (2048-bit key) header.d=messagingengine.com header.b="tAu3pq1n" Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iTuPtUci2_Hu for ; Sat, 28 Aug 2021 15:38:29 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from new3-smtp.messagingengine.com (new3-smtp.messagingengine.com [66.111.4.229]) by smtp2.osuosl.org (Postfix) with ESMTPS id E449B40249 for ; Sat, 28 Aug 2021 15:38:28 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 31173580A70; Sat, 28 Aug 2021 11:38:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 28 Aug 2021 11:38:28 -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=iBZuNFnMAvAXF VZFIFKfDQcXdgvOjdknTaSW4E1ZtzY=; b=c/VwfpjRKGKyjAnHha0tIGkrNmWyq 0g3szPYIKnzu4aAfk80wCEnn66CGQJeQsyJ5K0Jy6vTchiUFKgmSvX40FeCVkJ1Z Gf+IoW0tbRtXQsFnByhX2t52e2sBnB0JFHBMN7Ftwryi9bXrh0dz0eZMblKyQbjV uvHB9ArRdLD2w7khy7O+JhmiqPG1TSnH3al+efim+J/zNWjXuS6U+llxy2/VnLUw rKrtp46xJLZOzYYk+FHnXRwillocXYCR5/M5xrmv2pBQd6hXZc9ajFtWWJyQWPpC BcMf/jUQBDc7NGrzEFTdfVtMDxUULXkq4oyyCp5tPDJMhOFwCVRM9oeTw== 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=iBZuNFnMAvAXFVZFIFKfDQcXdgvOjdknTaSW4E1ZtzY=; b=tAu3pq1n ozKuH7rLXQa2DquSzgz7ffOBjSG4J8xzN1yte5s0Il7oI15Oh7vNf6BWyQtCdZUh r07hGHCLi9umT3pKd2003R97lkHRFRPz9NFAM1jqXdA2rknmAVWYf0NjfmSHOyxv qfTa3uYtLs7zwJ4p5QqOhupE9AOyYeBRk5u4K2MqhryfhT8v6htchX58y7jRqFpT CAT2cSYQ0BRbnslSt4AQMSMCHPee+wLDGfn2RwlzizifA3cWH5vcVAaHumEfEo+4 VjhZMDczeIfET3ceaTNARgllIcYgtBlg/xrXaoYyrSoIwb0cc9b9h+vWr4iMzAqT FJNjCS1CXFfhTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudduhedgleduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefuvhgvnhcu rfgvthgvrhcuoehsvhgvnhesshhvvghnphgvthgvrhdruggvvheqnecuggftrfgrthhtvg hrnheptedvkeetleeuffffhfekteetffeggffgveehieelueefvddtueffveevlefhfeej necuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomhepshhvvg hnsehsvhgvnhhpvghtvghrrdguvghv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 28 Aug 2021 11:38:26 -0400 (EDT) To: iommu@lists.linux-foundation.org Subject: [PATCH v2 7/8] iommu: Introduce __IOMMU_DOMAIN_LP Date: Sat, 28 Aug 2021 17:36:41 +0200 Message-Id: <20210828153642.19396-8-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 Cc: Arnd Bergmann , Sven Peter , Will Deacon , Hector Martin , linux-kernel@vger.kernel.org, Alexander Graf , Mohamed Mediouni , Robin Murphy , Alyssa Rosenzweig X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sven Peter via iommu Reply-To: Sven Peter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" __IOMMU_DOMAIN_LP (large pages) indicates that a domain can handle conditions where PAGE_SIZE might be smaller than the IOMMU page size. Always allow attaching devices to such domains and set the flag for IOMMU_DOMAIN_DMA, which can now handle these situations. Signed-off-by: Sven Peter --- drivers/iommu/iommu.c | 2 ++ include/linux/iommu.h | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f02b727d3054..77d1ee14c7d0 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1980,6 +1980,8 @@ static int iommu_check_page_size(struct iommu_domain *domain) { if (!(domain->type & __IOMMU_DOMAIN_PAGING)) return 0; + if (domain->type & __IOMMU_DOMAIN_LP) + return 0; if ((1 << __ffs(domain->pgsize_bitmap)) > PAGE_SIZE) { pr_warn("IOMMU page size cannot represent CPU pages.\n"); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 6633040a13f9..40c1ad6be4e7 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -62,6 +62,8 @@ struct iommu_domain_geometry { implementation */ #define __IOMMU_DOMAIN_PT (1U << 2) /* Domain is identity mapped */ #define __IOMMU_DOMAIN_DMA_FQ (1U << 3) /* DMA-API uses flush queue */ +#define __IOMMU_DOMAIN_LP (1U << 4) /* Support for PAGE_SIZE smaller + than IOMMU page size */ /* * This are the possible domain-types @@ -81,10 +83,12 @@ struct iommu_domain_geometry { #define IOMMU_DOMAIN_IDENTITY (__IOMMU_DOMAIN_PT) #define IOMMU_DOMAIN_UNMANAGED (__IOMMU_DOMAIN_PAGING) #define IOMMU_DOMAIN_DMA (__IOMMU_DOMAIN_PAGING | \ - __IOMMU_DOMAIN_DMA_API) + __IOMMU_DOMAIN_DMA_API | \ + __IOMMU_DOMAIN_LP) #define IOMMU_DOMAIN_DMA_FQ (__IOMMU_DOMAIN_PAGING | \ __IOMMU_DOMAIN_DMA_API | \ - __IOMMU_DOMAIN_DMA_FQ) + __IOMMU_DOMAIN_DMA_FQ | \ + __IOMMU_DOMAIN_LP) struct iommu_domain { unsigned type; -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu