From patchwork Tue Aug 27 16:59:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13779865 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 499EAC5472F for ; Tue, 27 Aug 2024 17:08:49 +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-Type: Content-Transfer-Encoding:MIME-Version: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=ebiOam/XcwPXKNfo9r5+oOgFBW07nF+uKs/nfcrVn44=; b=aymMsFLN31zRBChSAAnxAc11yP KuJWGeK0rciYkBDYgyeb56Unyb7I5EOhwR2iutzgxdL+vYJ/hkLzeuulIOKqiwQlXal91jxha2ADW tzcCah6aNaxjU2EfZhWXzKrZSJDaX1ziQikJgxAIk7IAIGdxPA6Tm414MHKM6wE98Bl3bvPsYHPjc rfFG8PQorjtt1uVGpwHMB11NBcYb6R4tshsu/iak4AKYPzwNnKROijBLtqc5S9Gd8uxtJHfwPcBx9 qZvk3NVzaEh7X9/EjmvLF/IYO4YaBDKb0uT6a2ztT/WrGwlaCFn0H/E+rbM3Pht8kd1XAYmpvXXvR 0/1ld0Ow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sizgL-0000000CEOb-2AlF; Tue, 27 Aug 2024 17:08:37 +0000 Received: from mail-mw2nam12on20622.outbound.protection.outlook.com ([2a01:111:f403:200a::622] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sizZt-0000000CBkJ-11aR for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 17:02:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fJjw8MyvlUwnIBRZuENkhtrCwr+gqjs2XCDmQ+6TrqIJJoVt3iN4+3atDTqVzSSUf3CU4dKelSdeC+2WqkMGZ2eHZ5ZBAWdrFAG5pIbunPapz3+uhv1yAfko/JQ4N1yIJL0P925qnz/vHfWKfs1ftKyaH+6PrBxn01YfGbg128SKuHZqBVztBHqv8EwBj9dgUN1XkQFiCpyGKU9wFm9jk/oGv/khigHdNJ9C0S4J+Zvb/kiPr+xTnveqOuml0qTD1AsBEbCuQbputaRk2UMgA3cdAKuYI1Q3xNGBpJ4rMzoXOqOwXG66sHJX2I8Fgn09xjg6sJDTckU3UE/5znuPoA== 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=ebiOam/XcwPXKNfo9r5+oOgFBW07nF+uKs/nfcrVn44=; b=lOX2lJM8JDg49zV3c64M3RcUpAv+CTjHP3NUUaQEnERimJhvpw8kdAL3tOYemBFlsIrAKsgjgOeUNeH/gEbV6ngXafTryzBaTYXws8g+i/0cAaWVD/n7WLxlqrw7csNCu7aGxG2cEIz6YmlP2EN/TPRqRO0vA+UU/tM3yERzEYWyxfklFPn8e7gN12auGnC0P/K8ODGOjP6EOQkR9l4muTxdFoxxWFkT0HoaMTmfk1F75DRALPFBeMzZVBPBiOtjrBHBjPfQ1iHIWEHzpAFvPl+uagn6VlrBStBi1JMZkf8BVXp+k2CNvPyMbopuzKIYvq1yKaD4ed0YU0y0d/54bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=ebiOam/XcwPXKNfo9r5+oOgFBW07nF+uKs/nfcrVn44=; b=ee9R9Zh+bm9lgMI5b89Qt1YnimMB6zWo4LzPcGE6P3qTMol776jxjvT9weLZAE58lxFAx4CAEV/poq1+sDmhwdjxeCzsZWn80ll6QARaa4sUCSpoS/02Fs9ruhtdG4BqGWL0axvJ9OtesDYVnCRuU8Uh8Px+1v9XV2ukT6JD0RC/o56NToX5WE7jF6EpbCkBeSOCED6UwxlL6h5k4MHOYOENuLz7AIxSrZaJ/QobUFusyrj8mYmkv75w718p2PtIm4+w0ZC4zWjhNcYWL1SBWc8as1Y5bXh0gS8jCDOjQ6f3bvztigOirH58Hup4YqLBPOXkZEHAdbAjG4s2VlxBVg== Received: from PH7PR17CA0072.namprd17.prod.outlook.com (2603:10b6:510:325::20) by SA3PR12MB8440.namprd12.prod.outlook.com (2603:10b6:806:2f8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.24; Tue, 27 Aug 2024 17:01:49 +0000 Received: from SN1PEPF000397AE.namprd05.prod.outlook.com (2603:10b6:510:325:cafe::96) by PH7PR17CA0072.outlook.office365.com (2603:10b6:510:325::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.20 via Frontend Transport; Tue, 27 Aug 2024 17:01:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by SN1PEPF000397AE.mail.protection.outlook.com (10.167.248.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Tue, 27 Aug 2024 17:01:48 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 27 Aug 2024 10:01:34 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 27 Aug 2024 10:01:34 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 27 Aug 2024 10:01:33 -0700 From: Nicolin Chen To: , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v2 03/19] iommu: Pass in a viommu pointer to domain_alloc_user op Date: Tue, 27 Aug 2024 09:59:40 -0700 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397AE:EE_|SA3PR12MB8440:EE_ X-MS-Office365-Filtering-Correlation-Id: 712faec6-6a0f-4521-de8e-08dcc6b9f05b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: liz7OOjYtB8wi8tC9y496dZnfzZF7aTdUzxonWFnj/Nrc5O1WttRqcM3DkxS8WEXksTkkrGeX7U6ZYLzDTzgrm1SRMszFxPi/EDRtvNuffEO60fCEtzpFVoGyUQU4dCg+7330TByY7rFBgPLt0Gp6BY89/nH64cibiQn2ZrOMP5KfSBm+jfkvyS1Z59hUWRCK+8xqpU138i3FWfmpAemQ1XwRLC7/z6hRKwSF3oByRtGOdsNu10uDiskjc4IvZ8DBbLHpZ7CFk0UUSSO/OGJLkiy8BQ4nT0y2a2UeeSiQ/62WoiSoaERpFKyfrgqbA2UzbpDz+57anv3zS47uZHiHWLRBwmL44Pk5LY94vVIZXuwhlInXhlueVVkthSGu7Zj4X0+lOQZ1cid1F9KcxOKsBsxW3WTXl486xziQrnlvRidWOCsoRoFN3bdt0bmZCLv/fcj6Sia+o8tcx34kpb+JmcWWmv9+222uWo8g50DV5t09pYOxC+OLPyGAyWm9YMHdql2AJeTxYGxa+L/MELW9I1zr70OM8J25UZ1AkdrKnzj34QpmSuUX0aAw58t72xsQMeXQ82wtB9HTE81xWOCm94eJa0VOliTSTCmgdGrBnEFQsayJpVvPVKkoBg83E+lYrvOr/omztwLRKS1IPNri1eTjvKcgW5FCwgsWkHB0oKpn6RjKAkj6TYMEj6+3nEEQewdm6vjcgITVo+1X+/JWxM/ngsa8T4ILFsEFZHImGigZxxV8ip6HFTZ8OXs0oaLXXahYqygO/RTEVUqr7fAteyA+fqGaM6J1Sg+s3pT99p/4+2Fcry3mUZDH4dMG2Zc37MmoRadX18f+VLnpwHRZzUx20xEE7RH4Wnc3gNrUwLWVE9Y0qKiI66cN8mbsHciOhO6WlnRr6zkSFdwN8PX1UteTLD/MeLIpUYIPuSJloQGXsG8mwewSVk9P8bsgxNZgr3FMSz5EHvBOWTko8LtIsfXPzriMzodhvUHeZZsvqP/ZkLRjMvhI5cZFCucjocSL0+0zZW/omDVZu019BHnRXAHDPstzJOfCBb5xIN9ZOnuxW+Lb96mb18Xxo7Xy/xBGeuP2z7Uw4wGXVD7atqpOgrbOLsOVDvVNz8Yfp5rGKM9Cv8bjDOKwu6zwW88iFMNoNgLy4OmrIBKXxs2cjhy1uydpO37MSsy+QJiMIo2vQTRDXD8tpsQPLntQ7fApJHpIWDpQPHi0DhyTYDSwNpPbXOFWb3x9juYIkEK+neKvRRhf8dbpgsQ3G8esrEo0pb4hdC+BtGLpVzB2X8psClVXIF9pvdQ1Bg9sM8fEwc3JVgvwxDcKaJ+lk1o8y9B4qj6BT+mhZIpdtVgLdy4D9Mb9AD4fmBicEdqivJ+G1de2YthPz/K/iNQkwNyGU/j1N61rqGGixnM+osllOHKMq7kATBVS2dAONr7sleB23007ar/iSo/ZvwfgtLxC/QrD3De X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2024 17:01:48.1382 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 712faec6-6a0f-4521-de8e-08dcc6b9f05b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000397AE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8440 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_100157_372404_A03D41D8 X-CRM114-Status: GOOD ( 13.45 ) 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 With a viommu object wrapping a potentially shareable S2 domain, a nested domain should be allocated by associating to a viommu instead. Driver can store this viommu pointer somewhere, so as to later use it calling viommu helpers for virtual device ID lookup and viommu invalidation. For drivers without a viommu support, keep the parent domain input, which should be just viommu->hwpt->common.domain otherwise. Signed-off-by: Nicolin Chen --- drivers/iommu/amd/iommu.c | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + drivers/iommu/intel/iommu.c | 1 + drivers/iommu/iommufd/hw_pagetable.c | 5 +++-- drivers/iommu/iommufd/selftest.c | 1 + include/linux/iommu.h | 2 ++ 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index b19e8c0f48fa..e31f7a5fc650 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2432,6 +2432,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned int type) static struct iommu_domain * amd_iommu_domain_alloc_user(struct device *dev, u32 flags, struct iommu_domain *parent, + struct iommufd_viommu *viommu, const struct iommu_user_data *user_data) { diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index fa75372e1aa9..6d40f1e150cb 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3347,6 +3347,7 @@ arm_smmu_domain_alloc_nesting(struct device *dev, u32 flags, static struct iommu_domain * arm_smmu_domain_alloc_user(struct device *dev, u32 flags, struct iommu_domain *parent, + struct iommufd_viommu *viommu, const struct iommu_user_data *user_data) { struct arm_smmu_master *master = dev_iommu_priv_get(dev); diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 9ff8b83c19a3..0590528799d8 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -3703,6 +3703,7 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) static struct iommu_domain * intel_iommu_domain_alloc_user(struct device *dev, u32 flags, struct iommu_domain *parent, + struct iommufd_viommu *viommu, const struct iommu_user_data *user_data) { struct device_domain_info *info = dev_iommu_priv_get(dev); diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c index aefde4443671..c21bb59c4022 100644 --- a/drivers/iommu/iommufd/hw_pagetable.c +++ b/drivers/iommu/iommufd/hw_pagetable.c @@ -137,7 +137,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, if (ops->domain_alloc_user) { hwpt->domain = ops->domain_alloc_user(idev->dev, flags, NULL, - user_data); + NULL, user_data); if (IS_ERR(hwpt->domain)) { rc = PTR_ERR(hwpt->domain); hwpt->domain = NULL; @@ -239,7 +239,8 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx, hwpt->domain = ops->domain_alloc_user(idev->dev, flags & ~IOMMU_HWPT_FAULT_ID_VALID, - parent->common.domain, user_data); + parent->common.domain, + NULL, user_data); if (IS_ERR(hwpt->domain)) { rc = PTR_ERR(hwpt->domain); hwpt->domain = NULL; diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c index b60687f57bef..4a23530ea027 100644 --- a/drivers/iommu/iommufd/selftest.c +++ b/drivers/iommu/iommufd/selftest.c @@ -318,6 +318,7 @@ __mock_domain_alloc_nested(struct mock_iommu_domain *mock_parent, static struct iommu_domain * mock_domain_alloc_user(struct device *dev, u32 flags, struct iommu_domain *parent, + struct iommufd_viommu *viommu, const struct iommu_user_data *user_data) { struct mock_iommu_domain *mock_parent; diff --git a/include/linux/iommu.h b/include/linux/iommu.h index c16ffc31ac70..f62aad8a9e75 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -42,6 +42,7 @@ struct notifier_block; struct iommu_sva; struct iommu_dma_cookie; struct iommu_fault_param; +struct iommufd_viommu; #define IOMMU_FAULT_PERM_READ (1 << 0) /* read */ #define IOMMU_FAULT_PERM_WRITE (1 << 1) /* write */ @@ -564,6 +565,7 @@ struct iommu_ops { struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type); struct iommu_domain *(*domain_alloc_user)( struct device *dev, u32 flags, struct iommu_domain *parent, + struct iommufd_viommu *viommu, const struct iommu_user_data *user_data); struct iommu_domain *(*domain_alloc_paging)(struct device *dev); struct iommu_domain *(*domain_alloc_sva)(struct device *dev,