From patchwork Mon Mar 4 23:44:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13581397 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 EF4BFC54E49 for ; Tue, 5 Mar 2024 00:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=RBwYN50ZgacmtdF5mE3ycUAKu6+eS39j69UDF+z7gxs=; b=4DxxZiR3P3ZKR5 DHZgRwhVKFHBwPJVWizFdLasIICUYLplBQKcJUrMwKengBLyqZ66z2bEwIZUOjJI96ep1QljMBKRY dXnvyHmWUSPL0On5c80M8t9voLWvcogL2hG58q12PH+9Y7ILpZePHy8A5Meo/qMG5+/muQBtvrsCz /XRxvrYcl+VzcIoEhE9rFQpbknVEAIJXn8MZnF+8fztVDFT/IjvfnSiiJzTXbhf8759YFJeDyrAyx Rp422yB6pWHcDGy0eM5dp+FXY2YGNSSG6IIaOvPlrXyyXG4mqqnL3wsazrIMpa/PJ3ZYHgbZi2Y8Q ybDpRVEFSGf8xYIIwc4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rhJ1B-0000000BHWj-3CM4; Tue, 05 Mar 2024 00:50:53 +0000 Received: from mail-bn8nam11on20601.outbound.protection.outlook.com ([2a01:111:f403:2414::601] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rhHz7-0000000B7Kx-0iN5 for linux-arm-kernel@lists.infradead.org; Mon, 04 Mar 2024 23:44:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L57weEBuPJS44lMlwY9q0bFJV8NVA3JqdENwVGeNY8i0X/JMUYcbvXbPNGlXpxF6W3wwhlwOK0AOnqX5T0GNPmicVp/Xqisg0KxfGvPhcQT8r7MB4cOtabP4YElsj0oMYJVwBHHglcp6maB/Xo/Yjz7lCvCIrTJ1aq0eFebIkjhDOSq8Oe92V4x8AfNeDZJ/C18vuL/9drWcHjayRu/KOpbGwA/Fd3xu6ah27hZKGH1Q6pvCVCzQFMDNxW9OFAhGM2h09EN1hJYjijWwej+202XB5aCpMk86LS4wtEBTk7Ga1nVLSs6MfAnHLtezT3ZcFRUkQ1DTU79V52C0DnLWOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=AIII3wxtG2zCCtTHh29POSsCw1px1TyzzQ45+o2SN6Y=; b=PEEgoLK1WbBQ/AnLM0FEBCqB52imaLWO+fqtLtVIymD//Kzo2n9M566xNfyLJhhR5Rm13LJAzN+OVnI2hBnXbKqOTHz0w2ZYaO1JMzRDVvGlm7Pp2FES4kuihcrO8Fr4mr8iJLYgtC+mJQTaUcAiN/j3/W0BIvsEp2ecVGQ5yoXkbCgMjhnBFRbnAioJOT6H/4RXX99beiibbo6to/JBI1Y6IgCyvKXFQpPqW3KrDglgv8iLDa/Lc3068yNXMkJF3tBvapAXiPl/JZ46XDHBKFi4Sv0Pc7lIBgTKoJqEbsJNB74Iv9bHWdcI5yGGdV/m77P9U8jIoxx6VwImmHV5ZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none 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=AIII3wxtG2zCCtTHh29POSsCw1px1TyzzQ45+o2SN6Y=; b=HFzEnc9Zodhj7Ya7LirDIpJE8qEs0pqxt+CgFPRCR0dbyqfBPEuGraFzVkw0k1AahuK/Jy+6UnUnUFleqSE2e5Vtq3NznINcURb75ZW/GioHKBgr0zrcQ+sbazxumPg8xEsDtFuaaHe4tKA0nr6YVNpf0MsMt3WOlmDpG7szuPik/mrSTBtSyovopaQFs4qYebJuV60bl+COuKfON0N92O/5PYIDh6vFso+VoS+uJWeZ7VGL9a489vqGNMXvC6uZKzugLMhugp1SHLWkVPQjrpeYAaAiQGSAo/pctzkGrI+wRm07EafIc449GExY2mHWEMoR+IGhSkSF6YrPOXMMSA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DM6PR12MB3849.namprd12.prod.outlook.com (2603:10b6:5:1c7::26) by DS0PR12MB6584.namprd12.prod.outlook.com (2603:10b6:8:d0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Mon, 4 Mar 2024 23:44:23 +0000 Received: from DM6PR12MB3849.namprd12.prod.outlook.com ([fe80::c33c:18db:c570:33b3]) by DM6PR12MB3849.namprd12.prod.outlook.com ([fe80::c33c:18db:c570:33b3%5]) with mapi id 15.20.7339.035; Mon, 4 Mar 2024 23:44:23 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Eric Auger , Jean-Philippe Brucker , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameerali Kolothum Thodi Subject: [PATCH v5 16/27] iommu/arm-smmu-v3: Keep track of valid CD entries in the cd_table Date: Mon, 4 Mar 2024 19:44:04 -0400 Message-ID: <16-v5-9a37e0c884ce+31e3-smmuv3_newapi_p2_jgg@nvidia.com> In-Reply-To: <0-v5-9a37e0c884ce+31e3-smmuv3_newapi_p2_jgg@nvidia.com> References: X-ClientProxiedBy: BL0PR1501CA0035.namprd15.prod.outlook.com (2603:10b6:207:17::48) To DM6PR12MB3849.namprd12.prod.outlook.com (2603:10b6:5:1c7::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR12MB3849:EE_|DS0PR12MB6584:EE_ X-MS-Office365-Filtering-Correlation-Id: 6db4577e-5789-4896-4e17-08dc3ca50185 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NnDOKiufJf0zZMSPPjvEqX41COMOSbnCsVXUiVzxM1wvIS3Lh9/LCvroDZCgFD3lLNs+VXCr7Ahzi5RQJ6glYsVpqvrNwCbQtLFcH2MjZZzEhcJWkrOZmOPDbV3Wsz9Y9im4vfY/t/7H6wy002f2P8JE898MiX7McYvHvSDQpBiTerAkwtSs95AVen1CiJbIdZM47zdnTSV9N76WjoPiXoG2GfGE2C9fQPTXSUPYZgu8Lsgb6/AnD8xdEaN/eLqOVz+8jLzmtM1+eXe1OHazE6OCotkMfclAN2VtAQEkdLOyOG15gVT+b0Nbf7BwJsNLxsJprPAxJ8qNRo+TKjQpXyl+hhwJq45f3v5SZRhFEJXW/Sjuz9v7pZVQ4dlTtUlKpdYIdp82vZU+g4WE6Ras9E4CzzGNnbbzT40fUlkkPxdO+DUvidUiGh6H7Z91XY0pAVV65G1OxqhQwabMcUwhzWp9k6Lg6Zd93g5pUWcRIc+7BrZrgJwY8Zb/n9ViwiOR4TD2JganYaexG6xztxdNC29fr5WIdlCQqST4LxVFCk3AMy1aISCOOLW5bpY2kkaZAx05bhQFob/PBSC9mjpUlkxilZjk1jKVkmlaBHZ3JSMLaXDsJf9MdrrOyU36K01nnEddUU2oax7xyXhJcSlF+R3cSewmqaifS/RFI2gnBJQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3849.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /txMTfrC2Az9Levm3TOTlQgtRNyEeFdrWT2+wXoK5/4FnzFjE8CwrK8PGGNNy0csxOVMYy0f5sTR1Dt7CDX5937871LpW4cCxcNNlUCxidoXMIM4Rfe4jmjIq2H23IoUYrNkOoCmT6MKWK3Ai1hGCMSVM5cXP69m1EP6AocbJCvtAI0NkPlBIuQC13kE3ucVuVkde23E2YAu8cKoU2QYXHdvBlROZn9OfayODWt76lfqCh0dzhItilyAASZVfBIXPKtgoFZz9wv/GPICV/EuBWpj160+cFnFdv/TodPyJ91b+thJCnln63NPt2UuL40knjRHc2hEjgkG7pfidoVI1LtsvSZzKTckn+lfPZAc9cyjuxt4g5NoCgWjnCvbF1AVI8bYfXo8kNX4zv1RZ3RLO3E9pq4oHJntudAxLqokZTEg3FLZzLmG76Wpd3F2pTbHnD5cPE0Y9iD18fEG1jYoFc551+Y2isWCjrEViU6pw9gMw3dKG11C+mqQxr50D8rV8PIJainfSytcPA+R5Qyxjxvbq82f4nw4LVxzTTSs1WPBgLkQ9jQ8nxzGXNm//sMw7IZvehMuxbXhN4o919awxJjU3FAlK8Zx9+xU7xz6MhB6kqKL7BzwsXw2V8Mle9CaEs9/JWQpQZCy13r8BGUfjsZwgzxcUmd4uLMz75OjcdlPTVizqO47tr5uzylM5QhNZyJKqrubU8oaoO6G00CDVbJuAHhgi/wpPkFPg9aheE/w+8ff1MPxOCIXHU7pYQUg7lYI3bSdWT2E8iWTecXy0EwneyYjw3P0KMBysAD5Wbkq2g64g1DmsIvPyHwAq1EBrs+vsVx34usMkGGcjPirZtQvgudFiau483Wv+k1T5qwZfomHuthaMVwBXURO72ocJHcAPaGQJw6M0EWFQQX8PAxvGFTIH4BWXR1fRva0H1G/vLxCAoduq9lCqLa5djXJLdgAfUJ8BRUh271T94ZFMtt/YGe/tGahH6VNW0/AzHl5tXGC1z6XtE3M3H5dYHOOHGMjSMrD6JWvDMJ5QGEWJpyD8nbsYMHe2VWNmn8TPf8qFBvBxLuU0i6nbEgoDqUVegG+cS76r25Rd+zOVk8tE+SnKfBaI8BH8+E12hH6r7HBE0OBWZGP80Pk7Gt8u0DiO5ql4qVhD2uBgcrAQQjQ6NZx+BRImNmd4YIdVlOu8cHdcq2qxZlpXh6+Bja5t7TQIBWdytkfwY3RAXiYzVzO1cotdwkS0RIy/juR9aHvWDzsZUddWHFhV55q+U7E8Vsj5U0IhUOGLqDkkg1zT3ezCo+nVYqrB9b0Eb32xsCzuRBd/iAv0n8Gp0J5MPW+NVJ2Z7NsYQd8c2oRoNrfPl2hYbdLfRkHT/2O0kbPNp6I5MuOi2z8OnJqMfUFaNyknuncHHHcTeHOQLGiqqTgUwUKXWOLRskdudAPqcN2k2pdaAxIjMwhTT0H5GzV4QtIa281Waj/eIFg0fAMr90NPMJnD3WdtNqxiyB9oC4qWJqg6vdGTzOBPLAze3+cFIlr6atv7DYpB2RyDnq4qY7+5YT9UuhH9rM/vrw+Z8UDuhPAip/nCGMYQkbTEu/QalfRpeah X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6db4577e-5789-4896-4e17-08dc3ca50185 X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3849.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 23:44:17.3547 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: r/O8l7LxdpTI6FOoPXKdU6c+VYGDYTMN5L6PFOJKSZrQYbTGMFE4/AbtGk/ZHHak X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6584 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240304_154442_557368_A41EACF6 X-CRM114-Status: GOOD ( 18.97 ) 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 We no longer need a master->sva_enable to control what attaches are allowed. Instead keep track inside the cd_table how many valid CD entries exist, and if the RID has a valid entry. Replace all the attach focused master->sva_enabled tests with a check if the CD has valid entries (or not). If there are any valid entries then the CD table must be currently programmed to the STE. Tested-by: Nicolin Chen Signed-off-by: Jason Gunthorpe --- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 5 +--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 26 ++++++++++--------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 10 +++++++ 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c index ab9de8e36c45f5..82b9c4d4061c3d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c @@ -433,9 +433,6 @@ static int __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm, if (smmu_domain->stage != ARM_SMMU_DOMAIN_S1) return -ENODEV; - if (!master || !master->sva_enabled) - return -ENODEV; - bond = kzalloc(sizeof(*bond), GFP_KERNEL); if (!bond) return -ENOMEM; @@ -638,7 +635,7 @@ static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain, struct mm_struct *mm = domain->mm; struct arm_smmu_cd target; - if (mm_get_enqcmd_pasid(mm) != id) + if (mm_get_enqcmd_pasid(mm) != id || !master->cd_table.used_sid) return -EINVAL; if (!arm_smmu_get_cd_ptr(master, id)) 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 26c6b9f6f34fd3..fc19585bf192c6 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1285,6 +1285,8 @@ void arm_smmu_write_cd_entry(struct arm_smmu_master *master, int ssid, struct arm_smmu_cd *cdptr, const struct arm_smmu_cd *target) { + bool target_valid = target->data[0] & cpu_to_le64(CTXDESC_CD_0_V); + bool cur_valid = cdptr->data[0] & cpu_to_le64(CTXDESC_CD_0_V); struct arm_smmu_cd_writer cd_writer = { .writer = { .ops = &arm_smmu_cd_writer_ops, @@ -1293,6 +1295,15 @@ void arm_smmu_write_cd_entry(struct arm_smmu_master *master, int ssid, .ssid = ssid, }; + if (cur_valid != target_valid) { + if (cur_valid) + master->cd_table.used_ssids--; + else + master->cd_table.used_ssids++; + } + if (ssid == IOMMU_NO_PASID) + master->cd_table.used_sid = target_valid; + arm_smmu_write_entry(&cd_writer.writer, cdptr->data, target->data); } @@ -2725,16 +2736,6 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) master = dev_iommu_priv_get(dev); smmu = master->smmu; - /* - * Checking that SVA is disabled ensures that this device isn't bound to - * any mm, and can be safely detached from its old domain. Bonds cannot - * be removed concurrently since we're holding the group mutex. - */ - if (arm_smmu_master_sva_enabled(master)) { - dev_err(dev, "cannot attach - SVA enabled\n"); - return -EBUSY; - } - mutex_lock(&smmu_domain->init_mutex); if (!smmu_domain->smmu) { @@ -2750,7 +2751,8 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) cdptr = arm_smmu_get_cd_ptr(master, IOMMU_NO_PASID); if (!cdptr) return -ENOMEM; - } + } else if (arm_smmu_ssids_in_use(&master->cd_table)) + return -EBUSY; /* * Prevent arm_smmu_share_asid() from trying to change the ASID @@ -2825,7 +2827,7 @@ static int arm_smmu_attach_dev_ste(struct iommu_domain *domain, struct arm_smmu_master *master = dev_iommu_priv_get(dev); struct attach_state state = {}; - if (arm_smmu_master_sva_enabled(master)) + if (arm_smmu_ssids_in_use(&master->cd_table)) return -EBUSY; /* 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 98dc5885c48655..7e1f6af4ce4e79 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -602,11 +602,21 @@ struct arm_smmu_ctx_desc_cfg { dma_addr_t cdtab_dma; struct arm_smmu_l1_ctx_desc *l1_desc; unsigned int num_l1_ents; + unsigned int used_ssids; + bool used_sid; u8 s1fmt; /* log2 of the maximum number of CDs supported by this table */ u8 s1cdmax; }; +/* True if the cd table has SSIDS > 0 in use. */ +static inline bool arm_smmu_ssids_in_use(struct arm_smmu_ctx_desc_cfg *cd_table) +{ + if (cd_table->used_sid) + return cd_table->used_ssids > 1; + return cd_table->used_ssids; +} + struct arm_smmu_s2_cfg { u16 vmid; };