From patchwork Wed Aug 7 20:10:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13756715 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 F0400C52D6F for ; Wed, 7 Aug 2024 20:19:02 +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=IAMVu4DFsuu/fqBPno6W61KUtQwiq8UyhtoUcscWChk=; b=s5QnjZl9bYxj+/Tp55eL8wfidi vTKgkUw/zQfxUh20iR5adiSMvOjr1Bev070qOS+12EvpHthJSPEvgFosLkHCTSWxKRHmFsvxPOuu6 zqGSnP8r+v09II2xbD/Mp0sBgtmna+CQ11t4R7gStX0yzofC2P7LL3sDvDk7p2WQlIo2aeMKh0J8D JLevJTkdgF1paNTBaM1ZiD5FCGkmXb9qrL1FUfiO1AqsiqCj7bS4KP5HxlbHN5OJf1hrUwOgeWFZ9 joph9IK2Pbj0nqHCWqlI1zNn0R/uxLPE2uEVDRVmvjVP52bviM0bLZiworu+mOUybKyoO/ehNcTM0 h9O34A1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbn7W-00000006BVw-23kw; Wed, 07 Aug 2024 20:18:54 +0000 Received: from mail-dm6nam11on20600.outbound.protection.outlook.com ([2a01:111:f403:2415::600] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbn0e-000000069KF-30yp for linux-arm-kernel@lists.infradead.org; Wed, 07 Aug 2024 20:11:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ao1Smp2Y2MhFTLluuO8GwLT1pr0NwOL4YbPgpvdiKE7pX1NGVFkRqkLCjOlnksixBYwUMsgQp+jDYvHabUY5GuzsP3fTG124PJivXjp+1QpjYJ9JA86zvP8nw5gmr8YxkwktYGbUu9EeQobMZvxJE5oQDJZNzBWFeWQ5EInoFG5EPIxRBC1SkoFX+U4zQgeDeDyFLVBCNQJSIrGU1leuF3ejkeGtQE0oNhR9m+CnGT1dypwQuxsWVVVKan+/OoekRdhrNRXrh7nHh3FyN9vAhODcpYznDoC+iB4NW9LKYMZXdzmWWsdfN/wSkIZ4wZMuX7OvjLugOy9/vdhLGI3DgA== 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=IAMVu4DFsuu/fqBPno6W61KUtQwiq8UyhtoUcscWChk=; b=uidfEiinAidcJSRhohLcyEycNza9cTRhMicttFCCT/bBamYrVLnMgvnDVp+YTPB98ve1xzZcQKSoWz8dlp4TO65DihsKMA4T04GYWXlkxgg4mlSHVqi5eiarSVqjfyIEKWJpvio3wwJyscPPbrc7oVvbmpZoW6VB0oqsPH9kRPjqjxYZ6aqqsY2j0NQP15MiIcshqKfukXXAt/Yzmk7LP52Uz1moz5ps06rHGF7+sYaYxbzDhpjaJngC/GZu1vtJwqdFdf/JMceuaiDYG0t5WPaQPX4teqNPheQvzUevzQXIfwtVncGbPs3FlI7nHJ/SWc7Q80r7UQ59mQ3p3lRphw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=IAMVu4DFsuu/fqBPno6W61KUtQwiq8UyhtoUcscWChk=; b=ByPIq/rnC6e0AB4bqMf9aww5VIqc/QOEXnRzxztC0InC9Zxp0tbiJ8d/z54HRC09B0EBNzRZLJvwdeCd+I0sCeTfWq2qK0AWBr0BR0sFZwa850pxFvpvSnfmTmpHjlhHztluUvVWeOKXRvOphWZdeTjWWSowdVR+BuiN/NdQAuoldgnjq9bDLPbeM0tiqrrFXnOUZXk8KGVmxdNpAcFJjjfjeXzol65ywfPTdSyNAAp//WrEz8q3d3j95Wi2xV2S13fZlFYOuhXI+iK7wpE2CA8ATUtbUTCGqGhT647tcwmMHcxVRnmlueyF+JVzC5m5pqksnOaLuOr3Zypkiubqbw== Received: from CH2PR02CA0026.namprd02.prod.outlook.com (2603:10b6:610:4e::36) by IA1PR12MB6625.namprd12.prod.outlook.com (2603:10b6:208:3a3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.21; Wed, 7 Aug 2024 20:11:44 +0000 Received: from CH2PEPF000000A0.namprd02.prod.outlook.com (2603:10b6:610:4e:cafe::4a) by CH2PR02CA0026.outlook.office365.com (2603:10b6:610:4e::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14 via Frontend Transport; Wed, 7 Aug 2024 20:11:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH2PEPF000000A0.mail.protection.outlook.com (10.167.244.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Wed, 7 Aug 2024 20:11:43 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 7 Aug 2024 13:11:28 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 7 Aug 2024 13:11:27 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 7 Aug 2024 13:11:26 -0700 From: Nicolin Chen To: , , CC: , , , , , , , , , Subject: [PATCH v1 16/16] iommu/arm-smmu-v3: Allow ATS for IOMMU_DOMAIN_NESTED Date: Wed, 7 Aug 2024 13:10:57 -0700 Message-ID: <442b3d5d2b15182f5cc100346183f8c710b7e909.1723061378.git.nicolinc@nvidia.com> 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: CH2PEPF000000A0:EE_|IA1PR12MB6625:EE_ X-MS-Office365-Filtering-Correlation-Id: f6351630-0dae-4498-5ae5-08dcb71d2871 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: a0lBqDPwfbuVGhoNWwBklzZOK/GRb1n4WsDDDlUqObC4lbm+d+/i7nTkV7rC41g5fM4ghvgyLxSvonlp6KEMNnrEb7o1dyP287TjiBpfOkxiBbEinO6EcAMCSGoWSoTEJmVQBYhxz6zkau0aEWqlJgklos+q70t/g5VBl3xlSbHXpx6GGcdgcA5tEun4ucBG7cSntbPoXW0sTQwT4B2lGlaS/fefIN6KNSRPiWDZLvadEfb0EgbgEfbp6BNp5SjpQcQujAgf7e/74afgSnF475TwhKvqqnfkaTrMc0LAqCse5MP8ejHPRGkMEEGxf+C72klE6pYLCGpRl1ZXn4haGVO0S8YLi1dppjgRacagEtz2XjTufma/lrOihLP2VU2XJJ3S5AIrIA2s33yhNZXtMjFuhWk5/8/xgRiGqv+soUQJC1xWo3xgMpzMvd2nAznOgg5Zfy5Ps/YxB0kuVbk5TYH2dgoy+8yx9xKsyQxcy9N4RZjy9N3zN6C/w4U4rESCB/d30TpzlX7V07z4A92M3aY//PTL11t2DLt5SOOCgmXP6BW9LnRX+Ka1gRUSX7lJwNyX9vTRc/yZ/pyOwfc5pzcg962f6FKeKYUG3BldIsfH9SEiT8mod1/Ch9IJo/OQTZdMSOMdK+S+RqCflAAsa8SNm/AlKY+xfoUsch0oARA+cDxGezJ3pNP5RWjiujaee3E9Du6qZCN299xK5SkaYhLbWmiBQSq4hD7+etDV/xNnIqfvOQSyqcBWIiF/DkWEslgyj2YAqTUzZBk/t49rAERS3Q9aONYmrEILwMRb5B8ZmZZl2MR91kDu10/7reCC96wwqb2xRJwlkPJBu7DOeSs/I9wj/dAN887NHcZ8393deI1mFsW+iMxyELI86YBehS859W58cKP2bpuXAhfZjOg/E1cMyJJfY5yXbXQulUGWscnwarcDWXpKeVS/sAsqxAYvTAh2xF9Z2TTkKW0LRCdCffu2GHmzNW3d5L3LHjxw5oiKdZhXg+7XOUGCNJrK7E7jYCsbj4+P0tVaSjoznMcK/On7MILpIEU+jN7bD+lyKPbckGzeJ1GYGeliPyiIrFlab/NHNkZH2fdcphyO3KGgHMDcsw+nmDlQ99oOmEBdwXZWQZDfnFoVXXT1cLqrIbj4UiPUtv+ZqleWqlObZ+UkRdKZUeqSBeIxMDOnDI/yDTPEqJ3wlZsp8OhWpYRB7W/fF4W6SItalOrseAtK/n9TIMl7TF6YGmAbHNQleS+CmTry2smY+OSZGh1Vp5QCqQeezK0sK8ymNGTOusNnFOizNhjqEsF2RTqLE4RaOtk1pskXUSYdlT8vNs7r5e2sJ8TWq9l+TcHQX4k2vUFknuHIfUwwzmjgKx6NbjbuFEImUw5UjTYg+iVZ/VR1TOdzU5vy72DiEwb4w33CPmJ7RpheYufGNLjBN0qUnhq/zIE3MfsWa/RG1QP25NHaX7kw X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2024 20:11:43.8657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6351630-0dae-4498-5ae5-08dcb71d2871 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF000000A0.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6625 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240807_131148_955399_2DF97291 X-CRM114-Status: GOOD ( 16.14 ) 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 From: Jason Gunthorpe Now, ATC invalidation can be done with the VIOMMU invalidation op. A guest owned IOMMU_DOMAIN_NESTED can do an ATS too. Allow it to pass in the EATS field via the vSTE words. Signed-off-by: Jason Gunthorpe Signed-off-by: Nicolin Chen --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 15 ++++++++++++--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) 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 be4f849f1a48..ce84f0c04022 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3189,8 +3189,6 @@ static int arm_smmu_attach_dev_nested(struct iommu_domain *domain, .master = master, .old_domain = iommu_get_domain_for_dev(dev), .ssid = IOMMU_NO_PASID, - /* Currently invalidation of ATC is not supported */ - .disable_ats = true, }; struct arm_smmu_ste ste; int ret; @@ -3200,6 +3198,15 @@ static int arm_smmu_attach_dev_nested(struct iommu_domain *domain, return -EINVAL; mutex_lock(&arm_smmu_asid_lock); + /* + * The VM has to control the actual ATS state at the PCI device because + * we forward the invalidations directly from the VM. If the VM doesn't + * think ATS is on it will not generate ATC flushes and the ATC will + * become incoherent. Since we can't access the actual virtual PCI ATS + * config bit here base this off the EATS value in the STE. If the EATS + * is set then the VM must generate ATC flushes. + */ + state.disable_ats = !nested_domain->enable_ats; ret = arm_smmu_attach_prepare(&state, domain); if (ret) { mutex_unlock(&arm_smmu_asid_lock); @@ -3420,8 +3427,9 @@ arm_smmu_domain_alloc_nesting(struct device *dev, u32 flags, cfg != STRTAB_STE_0_CFG_S1_TRANS) return ERR_PTR(-EIO); + /* Only Full ATS or ATS UR is supported */ eats = FIELD_GET(STRTAB_STE_1_EATS, le64_to_cpu(arg.ste[1])); - if (eats != STRTAB_STE_1_EATS_ABT) + if (eats != STRTAB_STE_1_EATS_ABT && eats != STRTAB_STE_1_EATS_TRANS) return ERR_PTR(-EIO); if (cfg != STRTAB_STE_0_CFG_S1_TRANS) @@ -3434,6 +3442,7 @@ arm_smmu_domain_alloc_nesting(struct device *dev, u32 flags, nested_domain->domain.type = IOMMU_DOMAIN_NESTED; nested_domain->domain.ops = &arm_smmu_nested_ops; nested_domain->s2_parent = smmu_parent; + nested_domain->enable_ats = eats == STRTAB_STE_1_EATS_TRANS; nested_domain->ste[0] = arg.ste[0]; nested_domain->ste[1] = arg.ste[1] & ~cpu_to_le64(STRTAB_STE_1_EATS); diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index a3fb08e0a195..65f90b00e16d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -811,6 +811,7 @@ struct arm_smmu_domain { struct arm_smmu_nested_domain { struct iommu_domain domain; struct arm_smmu_domain *s2_parent; + u8 enable_ats : 1; __le64 ste[2]; };