From patchwork Thu Jan 25 23:57:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531905 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 2FA79C47258 for ; Thu, 25 Jan 2024 23:58:16 +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=WHZuEE5o6F3rX9s12pS1lnm81ixeMx4FhGL9KUXoogk=; b=cPv5bDC272QCPx onIA7Aaf2UQ8N2J5ZnWE6rrTEt1x2laraENoex7THVyVoOA4Z9GGV5X0uOr4G5Wnx2YFjixRWX60o iYWMZ7bXpYOSoLo/JaMHS+GLU5Rp+trDKMBzP5R5zZuvDt6JQqD8Bdl0JnUy/MCUwOQ4K02vwYSO8 +UdKmVHpA0Dgd20ZnP67S31sjtI/0OFXTFMB4WtVcocWl20sGmPJspkG/jGUdezxpRm1Ww3Je069U 3uVFj1Z9EyqWkPtUdH7D/yfH/7VTC963CmZWxDdBEmRFRrOoA3BS8EQk+jCMMxsdbmwUhYdj++ZI3 ZcD6lIRyojlbq9OWQ0yQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9ba-00000002XMG-2xLs; Thu, 25 Jan 2024 23:57:58 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bM-00000002XA1-2hff for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h04sCq/u5iCS5lhw+ExOLMfKwDawQG2biN1OfGBjvLdpl269+KjtGOXfCz8gWnqv6ywANWXv+Oei3s7fLq5fImqXKraH0oFRf2C0mNWUwG/A8Hgxfkm9jrEeZ3kjsmpN7MX3tiD0tNRKrnNcLUJaXSIYLsXHVG0xns2KeTuMS0w6vRw8mpNklGhIDv2rZepkTsm9aoGi5pTMWRPglFOJGfvpPl6WR8TNM43olqlnLuxIQ/TxYP2tjJwfrbQpLW+Tev4U4DWll7f1KOXgL7x9sozw8FsVCzo9xudway0OCfYe81HHU4pQcEbBShJ2BaxOH65U0n7bCNddK91YZiZMiQ== 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=B5/HzmMnkKfNrp7BEVzN4XKbeHy60/qXCN+NgPhS9yk=; b=I/Q/QJ+bH3pQRtNyAqagmSHKUqK6ZwhJtU2nHGrNS7EFRWOodRO4Tbo7CFCRy/uBQWBk6d4AFPhmiP0q5qVAcZr5LtD93NyoAZ2t3GSmYIRhV4qIHTY/9gl6V/ZyQersYl6AautjoLXKV6DOtjVj5+HRc+j+/Vu5+slR8CzjOSiNY4f501HJSod7s9vKCobL5nXLS0+1VayxvXUjmqtiuSy5uXYEfmBg8LP94OHiKlX8lAcxRAcaDul2SOfKYgqwS/G2eEd9Ytz7aHZUZPXplP9BLhuuH0XMDvfLur69DEynTSnWS6d/k99pk26KZN0bWkD1ISeFNDX4C+A127lxcg== 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=B5/HzmMnkKfNrp7BEVzN4XKbeHy60/qXCN+NgPhS9yk=; b=aVYyMoyoOoghNJDDwKLYBI9ML4hh2oD2cBrjzAuN1DiA925CVhFPzWq7CcKFVy2yyQbex5CqtluAzP1C/ndEtqOOUl0+IUTAIpauzhNJ9Blzb1dq4BpGwUhVYWMCUwR1TnopTUNYl38dmCqVBvl2bC1A8CIURk6lyIBmuYKlbarUqTRrpRlTOi12O6LXjKXki2Ctkp7Y/bLe55lGiu8V/XroiUgJOdiGt4+v7TYZ4DBAhEMLBz1lmFGG0fkpuQ91Y28vDnV/tr7NgTX3q4uceDnOoYFgx43HwdFNlS3wmA5N8cZO5Kzlg9cVoAzHoVbiOB5LBi7NmAPvo4K3VMSvGA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:33 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:33 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 01/16] iommu/arm-smmu-v3: Make STE programming independent of the callers Date: Thu, 25 Jan 2024 19:57:11 -0400 Message-ID: <1-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA9PR11CA0004.namprd11.prod.outlook.com (2603:10b6:806:6e::9) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 9089e2f5-65ad-4571-bd01-08dc1e01630d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ydrze4hZsbEH27VUf0gfrJRiQH6839Qy/dIn4sK1e4S3ymRMbcRbeOEeGOeD0oeNpVhvQHVNTYmEw1lw4U2liafxOueHI0TF4unrVfHwPZ+lvUacxrEdXUB3Ry0az+tPZzkEfVsisdQtuwbt6I7GJRTZwnnEgtYbiSBHZZ2iZJC6klVuyed7gjSXEsknw/fDSR6r+f7QnJXdRg1TqZ5dNB8Aj6Uyt+Jl3D+DO2+rPLQC/NyIxtRI2GPjXYDYauIzHLoklWb4Oa/GSPjyY5xITabTl189eUnrnsLOw+Q7rSfnZ6Fb9quvAwRwL1G7ZmqnsPAH58fuF87j8Dzdn/Cz/CmhK30lWH/q2ItgDNPevXuc5Q/0hrqU2ILFT5gd7rrN1O6WaEN2Z6XKTWcHYIkH9Hoxisp6crYSdpVHA2JMr7lycQQA6TcORLB59WWnt7pZexHbaP3ivNoxBNqltHr/qpqFNQwvwqBCFX2lRP8pWMX7MSUwskJEWV56crcZFIQ3k1tTjYKA1bm77PcsRPyruEZTyJ7RT2J+VGlS3vqHMLYkJTx5THo/G/dZPkdr8tpOBezr3ketEMw9CozACRetvK8o1MCxEhJgD5VIVOMohtk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(30864003)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(66899024)(316002)(8676002)(4326008)(8936002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bRhLwzyEJmNbmFt0hwkXMezrhNe1MOBYgU1gyPIsHWNr5rQQtgC0pYZTi55oDbQbqllVezDDJeVYgQLGyeIx9Is7xNJyNCvnItc7NUA2p9DTIpJ8zG4qIy2MgEK9sIwwnaYXL1B28oiiQxY7Yh8ajzZFBWB3PUGN+z4g+A6PS7ZAvuU5AtqkIxqaxSSvBu+BUOtN9gMHaPud4CwCKdiyROLRhE29Uasgz8oEqB5WVrN8482YHwZ2QJG8mDt3987lAVRCKbzMZH8hhvN0TNKibNoTWDfKjaGd5dDxIybV/V7oyC1Dc0qsgw6rvKekPIbkruPmYPbTJNmJaf6EKmEwD8tOAPI3Ey1hkiJh0A4dYhFpm/67mngxmUV9lK0Evg13tQ7h83OSULZwV9vfLnDyuiQ0h43l0VXgz0e/0oHULqfW4pcTlMokE/VFBCJmCepxP4xLu72llL/iP/kM9RdY8SdGUn14+X2U7/D67HCHsd7/UatKoG0iw2GctD7ct3sqCvY1iTpYscLq3OuwbIN2pYc6GxsDq0G4Ex49x4mukdGouBxTxERKjUoeYEPLB3BaNi9lgXCEXo/SYgpLlZZeZkSaIQZS4oq2PXJU+jeZOe9ZQa+Qr5EPK2PKn8mSf+QjU0AdGa1V3+4CYFX9VEjgM/inZIjcud+BpeQXFJlm3zqEgIAG8g01rpYBn8/B3zIMtsX44cxeMNKXrx5a/IKUowTBsb3GaJ5a1mQpc0GSuUQiwyFGctgqN0xuH/9NS8fUE3AW+G768Y5bcX9DPsQHATZwpeewmcKTbtRULrbCoOfShy+4Vixv8lD2S/1BQhmKqFfL+W2wijUtcK4O8McPEV87QaTY+CIekbN4mfHRWIBu1SCEgdk5denhY5bUYjIzP6KMOUZ3B4Ce9cfPTa1MO69RJspTa6kHw+3hM3IMRmQyFH5yWDzsaEsLydEOj0KDQV6mWt3VD4p+vraEjbiFjfXno8GPL8cZFygQ2SejF7e+K82TP9MgS/WKpx0R+FzMCop4jagnJ2qQMY0J/INmdpDfRAAGed7GdzYO6cGpZ0y9oSteKjOEDC9aLpu7gykD5xB0sgtj+c8BVcq4RaNzP1dUUmwcPH8vropnu5c3oLblPpD+0yjlBZkX8iea64M3IuIsoHFvaAh1HSMkgkBSW9gTNn4GOBwfkkzvzptJeplT82xkNfwHpkMCqmtiDN2wPxXE/IN7Ytpz1kuG8ffIUVmq26h2MjyC9j9WUfRhIdZll6BrJYaOcQ2bEEvqrqpG+5TDzjBjJ241IOO5ztoKQMMfxCRNDdoE2PCZ1HqxAGh0zD/k6q2p5LeIVr3a2gi7fzqah59oz5SWjoPBSheS+GpoZ6GwOvTo/1uSp/r3zradMOd2rXI8D5bkh0dzWNN8qF/B8UK9rsTMiK+TqPjJTdd5Twy64E37U1h/Vpdo9F1UOYGOkhsUe4qXJvmoUngneel0suLqeG/130HScdCTGekPFCH/qAIIKJ+6s0wke8fnUUbRhO/QnuNzyNnC3pwH6MvnuPwac9rlMvWI6gCHkgKhGlKufFLu5hpalHz03fYtKV6GQO5yafVNxPcRRSp6 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9089e2f5-65ad-4571-bd01-08dc1e01630d X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.7700 (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: TQDOkYPG8QTMD3SN9ZO4eRYumDbgVlZqOPDY8+8ycmKQJ7O+JOueZg+FGbZs5cS7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155744_835857_238773A5 X-CRM114-Status: GOOD ( 36.33 ) 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 As the comment in arm_smmu_write_strtab_ent() explains, this routine has been limited to only work correctly in certain scenarios that the caller must ensure. Generally the caller must put the STE into ABORT or BYPASS before attempting to program it to something else. The iommu core APIs would ideally expect the driver to do a hitless change of iommu_domain in a number of cases: - RESV_DIRECT support wants IDENTITY -> DMA -> IDENTITY to be hitless for the RESV ranges - PASID upgrade has IDENTIY on the RID with no PASID then a PASID paging domain installed. The RID should not be impacted - PASID downgrade has IDENTIY on the RID and all PASID's removed. The RID should not be impacted - RID does PAGING -> BLOCKING with active PASID, PASID's should not be impacted - NESTING -> NESTING for carrying all the above hitless cases in a VM into the hypervisor. To comprehensively emulate the HW in a VM we should assume the VM OS is running logic like this and expecting hitless updates to be relayed to real HW. For CD updates arm_smmu_write_ctx_desc() has a similar comment explaining how limited it is, and the driver does have a need for hitless CD updates: - SMMUv3 BTM S1 ASID re-label - SVA mm release should change the CD to answert not-present to all requests without allowing logging (EPD0) The next patches/series are going to start removing some of this logic from the callers, and add more complex state combinations than currently. At the end everything that can be hitless will be hitless, including all of the above. Introduce arm_smmu_write_entry() which will run through the multi-qword programming sequence to avoid creating an incoherent 'torn' STE in the HW caches. It automatically detects which of two algorithms to use: 1) The disruptive V=0 update described in the spec which disrupts the entry and does three syncs to make the change: - Write V=0 to QWORD 0 - Write the entire STE except QWORD 0 - Write QWORD 0 2) A hitless update algorithm that follows the same rational that the driver already uses. It is safe to change IGNORED bits that HW doesn't use: - Write the target value into all currently unused bits - Write a single QWORD, this makes the new STE live atomically - Ensure now unused bits are 0 The detection of which path to use and the implementation of the hitless update rely on a "used bitmask" describing what bits the HW is actually using based on the V/CFG/etc bits. This flows from the spec language, typically indicated as IGNORED. Knowing which bits the HW is using we can update the bits it does not use and then compute how many QWORDS need to be changed. If only one qword needs to be updated the hitless algorithm is possible. Later patches will include CD updates in this mechanism so make the implementation generic using a struct arm_smmu_entry_writer and struct arm_smmu_entry_writer_ops to abstract the differences between STE and CD to be plugged in. At this point it generates the same sequence of updates as the current code, except that zeroing the VMID on entry to BYPASS/ABORT will do an extra sync (this seems to be an existing bug). Going forward this will use a V=0 transition instead of cycling through ABORT if a hitfull change is required. This seems more appropriate as ABORT will fail DMAs without any logging, but dropping a DMA due to transient V=0 is probably signaling a bug, so the C_BAD_STE is valuable. Signed-off-by: Michael Shavit Signed-off-by: Jason Gunthorpe Reviewed-by: Michael Shavit Reviewed-by: Moritz Fischer --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 328 ++++++++++++++++---- 1 file changed, 261 insertions(+), 67 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 0ffb1cf17e0b2e..690742e8f173eb 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -48,6 +48,22 @@ enum arm_smmu_msi_index { ARM_SMMU_MAX_MSIS, }; +struct arm_smmu_entry_writer_ops; +struct arm_smmu_entry_writer { + const struct arm_smmu_entry_writer_ops *ops; + struct arm_smmu_master *master; +}; + +struct arm_smmu_entry_writer_ops { + unsigned int num_entry_qwords; + __le64 v_bit; + void (*get_used)(struct arm_smmu_entry_writer *writer, const __le64 *entry, + __le64 *used); + void (*sync)(struct arm_smmu_entry_writer *writer); +}; + +#define NUM_ENTRY_QWORDS (sizeof(struct arm_smmu_ste) / sizeof(u64)) + static phys_addr_t arm_smmu_msi_cfg[ARM_SMMU_MAX_MSIS][3] = { [EVTQ_MSI_INDEX] = { ARM_SMMU_EVTQ_IRQ_CFG0, @@ -971,6 +987,140 @@ void arm_smmu_tlb_inv_asid(struct arm_smmu_device *smmu, u16 asid) arm_smmu_cmdq_issue_cmd_with_sync(smmu, &cmd); } +/* + * Figure out if we can do a hitless update of entry to become target. Returns a + * bit mask where 1 indicates that qword needs to be set disruptively. + * unused_update is an intermediate value of entry that has unused bits set to + * their new values. + */ +static u8 arm_smmu_entry_qword_diff(struct arm_smmu_entry_writer *writer, + const __le64 *entry, const __le64 *target, + __le64 *unused_update) +{ + __le64 target_used[NUM_ENTRY_QWORDS] = {}; + __le64 cur_used[NUM_ENTRY_QWORDS] = {}; + u8 used_qword_diff = 0; + unsigned int i; + + writer->ops->get_used(writer, entry, cur_used); + writer->ops->get_used(writer, target, target_used); + + for (i = 0; i != writer->ops->num_entry_qwords; i++) { + /* + * Check that masks are up to date, the make functions are not + * allowed to set a bit to 1 if the used function doesn't say it + * is used. + */ + WARN_ON_ONCE(target[i] & ~target_used[i]); + + /* Bits can change because they are not currently being used */ + unused_update[i] = (entry[i] & cur_used[i]) | + (target[i] & ~cur_used[i]); + /* + * Each bit indicates that a used bit in a qword needs to be + * changed after unused_update is applied. + */ + if ((unused_update[i] & target_used[i]) != target[i]) + used_qword_diff |= 1 << i; + } + return used_qword_diff; +} + +static bool entry_set(struct arm_smmu_entry_writer *writer, __le64 *entry, + const __le64 *target, unsigned int start, + unsigned int len) +{ + bool changed = false; + unsigned int i; + + for (i = start; len != 0; len--, i++) { + if (entry[i] != target[i]) { + WRITE_ONCE(entry[i], target[i]); + changed = true; + } + } + + if (changed) + writer->ops->sync(writer); + return changed; +} + +/* + * Update the STE/CD to the target configuration. The transition from the + * current entry to the target entry takes place over multiple steps that + * attempts to make the transition hitless if possible. This function takes care + * not to create a situation where the HW can perceive a corrupted entry. HW is + * only required to have a 64 bit atomicity with stores from the CPU, while + * entries are many 64 bit values big. + * + * The difference between the current value and the target value is analyzed to + * determine which of three updates are required - disruptive, hitless or no + * change. + * + * In the most general disruptive case we can make any update in three steps: + * - Disrupting the entry (V=0) + * - Fill now unused qwords, execpt qword 0 which contains V + * - Make qword 0 have the final value and valid (V=1) with a single 64 + * bit store + * + * However this disrupts the HW while it is happening. There are several + * interesting cases where a STE/CD can be updated without disturbing the HW + * because only a small number of bits are changing (S1DSS, CONFIG, etc) or + * because the used bits don't intersect. We can detect this by calculating how + * many 64 bit values need update after adjusting the unused bits and skip the + * V=0 process. This relies on the IGNORED behavior described in the + * specification. + */ +static void arm_smmu_write_entry(struct arm_smmu_entry_writer *writer, + __le64 *entry, const __le64 *target) +{ + unsigned int num_entry_qwords = writer->ops->num_entry_qwords; + __le64 unused_update[NUM_ENTRY_QWORDS]; + u8 used_qword_diff; + + used_qword_diff = + arm_smmu_entry_qword_diff(writer, entry, target, unused_update); + if (hweight8(used_qword_diff) > 1) { + /* + * At least two qwords need their inuse bits to be changed. This + * requires a breaking update, zero the V bit, write all qwords + * but 0, then set qword 0 + */ + unused_update[0] = entry[0] & (~writer->ops->v_bit); + entry_set(writer, entry, unused_update, 0, 1); + entry_set(writer, entry, target, 1, num_entry_qwords - 1); + entry_set(writer, entry, target, 0, 1); + } else if (hweight8(used_qword_diff) == 1) { + /* + * Only one qword needs its used bits to be changed. This is a + * hitless update, update all bits the current STE is ignoring + * to their new values, then update a single "critical qword" to + * change the STE and finally 0 out any bits that are now unused + * in the target configuration. + */ + unsigned int critical_qword_index = ffs(used_qword_diff) - 1; + + /* + * Skip writing unused bits in the critical qword since we'll be + * writing it in the next step anyways. This can save a sync + * when the only change is in that qword. + */ + unused_update[critical_qword_index] = + entry[critical_qword_index]; + entry_set(writer, entry, unused_update, 0, num_entry_qwords); + entry_set(writer, entry, target, critical_qword_index, 1); + entry_set(writer, entry, target, 0, num_entry_qwords); + } else { + /* + * No inuse bit changed. Sanity check that all unused bits are 0 + * in the entry. The target was already sanity checked by + * compute_qword_diff(). + */ + WARN_ON_ONCE( + entry_set(writer, entry, target, 0, num_entry_qwords)); + } +} + static void arm_smmu_sync_cd(struct arm_smmu_master *master, int ssid, bool leaf) { @@ -1238,50 +1388,123 @@ arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc) WRITE_ONCE(*dst, cpu_to_le64(val)); } -static void arm_smmu_sync_ste_for_sid(struct arm_smmu_device *smmu, u32 sid) +struct arm_smmu_ste_writer { + struct arm_smmu_entry_writer writer; + u32 sid; +}; + +/* + * Based on the value of ent report which bits of the STE the HW will access. It + * would be nice if this was complete according to the spec, but minimally it + * has to capture the bits this driver uses. + */ +static void arm_smmu_get_ste_used(struct arm_smmu_entry_writer *writer, + const __le64 *ent, __le64 *used_bits) { + used_bits[0] = cpu_to_le64(STRTAB_STE_0_V); + if (!(ent[0] & cpu_to_le64(STRTAB_STE_0_V))) + return; + + /* + * If S1 is enabled S1DSS is valid, see 13.5 Summary of + * attribute/permission configuration fields for the SHCFG behavior. + */ + if (FIELD_GET(STRTAB_STE_0_CFG, le64_to_cpu(ent[0])) & 1 && + FIELD_GET(STRTAB_STE_1_S1DSS, le64_to_cpu(ent[1])) == + STRTAB_STE_1_S1DSS_BYPASS) + used_bits[1] |= cpu_to_le64(STRTAB_STE_1_SHCFG); + + used_bits[0] |= cpu_to_le64(STRTAB_STE_0_CFG); + switch (FIELD_GET(STRTAB_STE_0_CFG, le64_to_cpu(ent[0]))) { + case STRTAB_STE_0_CFG_ABORT: + break; + case STRTAB_STE_0_CFG_BYPASS: + used_bits[1] |= cpu_to_le64(STRTAB_STE_1_SHCFG); + break; + case STRTAB_STE_0_CFG_S1_TRANS: + used_bits[0] |= cpu_to_le64(STRTAB_STE_0_S1FMT | + STRTAB_STE_0_S1CTXPTR_MASK | + STRTAB_STE_0_S1CDMAX); + used_bits[1] |= + cpu_to_le64(STRTAB_STE_1_S1DSS | STRTAB_STE_1_S1CIR | + STRTAB_STE_1_S1COR | STRTAB_STE_1_S1CSH | + STRTAB_STE_1_S1STALLD | STRTAB_STE_1_STRW); + used_bits[1] |= cpu_to_le64(STRTAB_STE_1_EATS); + break; + case STRTAB_STE_0_CFG_S2_TRANS: + used_bits[1] |= + cpu_to_le64(STRTAB_STE_1_EATS | STRTAB_STE_1_SHCFG); + used_bits[2] |= + cpu_to_le64(STRTAB_STE_2_S2VMID | STRTAB_STE_2_VTCR | + STRTAB_STE_2_S2AA64 | STRTAB_STE_2_S2ENDI | + STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2R); + used_bits[3] |= cpu_to_le64(STRTAB_STE_3_S2TTB_MASK); + break; + + default: + memset(used_bits, 0xFF, sizeof(struct arm_smmu_ste)); + WARN_ON(true); + } +} + +static void arm_smmu_ste_writer_sync_entry(struct arm_smmu_entry_writer *writer) +{ + struct arm_smmu_ste_writer *ste_writer = + container_of(writer, struct arm_smmu_ste_writer, writer); struct arm_smmu_cmdq_ent cmd = { .opcode = CMDQ_OP_CFGI_STE, .cfgi = { - .sid = sid, + .sid = ste_writer->sid, .leaf = true, }, }; - arm_smmu_cmdq_issue_cmd_with_sync(smmu, &cmd); + arm_smmu_cmdq_issue_cmd_with_sync(writer->master->smmu, &cmd); +} + +static const struct arm_smmu_entry_writer_ops arm_smmu_ste_writer_ops = { + .sync = arm_smmu_ste_writer_sync_entry, + .get_used = arm_smmu_get_ste_used, + .v_bit = cpu_to_le64(STRTAB_STE_0_V), + .num_entry_qwords = sizeof(struct arm_smmu_ste) / sizeof(u64), +}; + +static void arm_smmu_write_ste(struct arm_smmu_master *master, u32 sid, + struct arm_smmu_ste *ste, + const struct arm_smmu_ste *target) +{ + struct arm_smmu_device *smmu = master->smmu; + struct arm_smmu_ste_writer ste_writer = { + .writer = { + .ops = &arm_smmu_ste_writer_ops, + .master = master, + }, + .sid = sid, + }; + + arm_smmu_write_entry(&ste_writer.writer, ste->data, target->data); + + /* It's likely that we'll want to use the new STE soon */ + if (!(smmu->options & ARM_SMMU_OPT_SKIP_PREFETCH)) { + struct arm_smmu_cmdq_ent + prefetch_cmd = { .opcode = CMDQ_OP_PREFETCH_CFG, + .prefetch = { + .sid = sid, + } }; + + arm_smmu_cmdq_issue_cmd(smmu, &prefetch_cmd); + } } static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, struct arm_smmu_ste *dst) { - /* - * This is hideously complicated, but we only really care about - * three cases at the moment: - * - * 1. Invalid (all zero) -> bypass/fault (init) - * 2. Bypass/fault -> translation/bypass (attach) - * 3. Translation/bypass -> bypass/fault (detach) - * - * Given that we can't update the STE atomically and the SMMU - * doesn't read the thing in a defined order, that leaves us - * with the following maintenance requirements: - * - * 1. Update Config, return (init time STEs aren't live) - * 2. Write everything apart from dword 0, sync, write dword 0, sync - * 3. Update Config, sync - */ - u64 val = le64_to_cpu(dst->data[0]); - bool ste_live = false; + u64 val; struct arm_smmu_device *smmu = master->smmu; struct arm_smmu_ctx_desc_cfg *cd_table = NULL; struct arm_smmu_s2_cfg *s2_cfg = NULL; struct arm_smmu_domain *smmu_domain = master->domain; - struct arm_smmu_cmdq_ent prefetch_cmd = { - .opcode = CMDQ_OP_PREFETCH_CFG, - .prefetch = { - .sid = sid, - }, - }; + struct arm_smmu_ste target = {}; if (smmu_domain) { switch (smmu_domain->stage) { @@ -1296,22 +1519,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, } } - if (val & STRTAB_STE_0_V) { - switch (FIELD_GET(STRTAB_STE_0_CFG, val)) { - case STRTAB_STE_0_CFG_BYPASS: - break; - case STRTAB_STE_0_CFG_S1_TRANS: - case STRTAB_STE_0_CFG_S2_TRANS: - ste_live = true; - break; - case STRTAB_STE_0_CFG_ABORT: - BUG_ON(!disable_bypass); - break; - default: - BUG(); /* STE corruption */ - } - } - /* Nuke the existing STE_0 value, as we're going to rewrite it */ val = STRTAB_STE_0_V; @@ -1322,16 +1529,11 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, else val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_BYPASS); - dst->data[0] = cpu_to_le64(val); - dst->data[1] = cpu_to_le64(FIELD_PREP(STRTAB_STE_1_SHCFG, + target.data[0] = cpu_to_le64(val); + target.data[1] = cpu_to_le64(FIELD_PREP(STRTAB_STE_1_SHCFG, STRTAB_STE_1_SHCFG_INCOMING)); - dst->data[2] = 0; /* Nuke the VMID */ - /* - * The SMMU can perform negative caching, so we must sync - * the STE regardless of whether the old value was live. - */ - if (smmu) - arm_smmu_sync_ste_for_sid(smmu, sid); + target.data[2] = 0; /* Nuke the VMID */ + arm_smmu_write_ste(master, sid, dst, &target); return; } @@ -1339,8 +1541,7 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, u64 strw = smmu->features & ARM_SMMU_FEAT_E2H ? STRTAB_STE_1_STRW_EL2 : STRTAB_STE_1_STRW_NSEL1; - BUG_ON(ste_live); - dst->data[1] = cpu_to_le64( + target.data[1] = cpu_to_le64( FIELD_PREP(STRTAB_STE_1_S1DSS, STRTAB_STE_1_S1DSS_SSID0) | FIELD_PREP(STRTAB_STE_1_S1CIR, STRTAB_STE_1_S1C_CACHE_WBRA) | FIELD_PREP(STRTAB_STE_1_S1COR, STRTAB_STE_1_S1C_CACHE_WBRA) | @@ -1349,7 +1550,7 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, if (smmu->features & ARM_SMMU_FEAT_STALLS && !master->stall_enabled) - dst->data[1] |= cpu_to_le64(STRTAB_STE_1_S1STALLD); + target.data[1] |= cpu_to_le64(STRTAB_STE_1_S1STALLD); val |= (cd_table->cdtab_dma & STRTAB_STE_0_S1CTXPTR_MASK) | FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S1_TRANS) | @@ -1358,8 +1559,7 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, } if (s2_cfg) { - BUG_ON(ste_live); - dst->data[2] = cpu_to_le64( + target.data[2] = cpu_to_le64( FIELD_PREP(STRTAB_STE_2_S2VMID, s2_cfg->vmid) | FIELD_PREP(STRTAB_STE_2_VTCR, s2_cfg->vtcr) | #ifdef __BIG_ENDIAN @@ -1368,23 +1568,17 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2AA64 | STRTAB_STE_2_S2R); - dst->data[3] = cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); + target.data[3] = cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S2_TRANS); } if (master->ats_enabled) - dst->data[1] |= cpu_to_le64(FIELD_PREP(STRTAB_STE_1_EATS, + target.data[1] |= cpu_to_le64(FIELD_PREP(STRTAB_STE_1_EATS, STRTAB_STE_1_EATS_TRANS)); - arm_smmu_sync_ste_for_sid(smmu, sid); - /* See comment in arm_smmu_write_ctx_desc() */ - WRITE_ONCE(dst->data[0], cpu_to_le64(val)); - arm_smmu_sync_ste_for_sid(smmu, sid); - - /* It's likely that we'll want to use the new STE soon */ - if (!(smmu->options & ARM_SMMU_OPT_SKIP_PREFETCH)) - arm_smmu_cmdq_issue_cmd(smmu, &prefetch_cmd); + target.data[0] = cpu_to_le64(val); + arm_smmu_write_ste(master, sid, dst, &target); } static void arm_smmu_init_bypass_stes(struct arm_smmu_ste *strtab, From patchwork Thu Jan 25 23:57:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531920 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 6DA15C48285 for ; Fri, 26 Jan 2024 01:05:03 +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=8uHiRDCG9Ca5ex//StQFvhvv7I5VNNkAgKEnOf+4zF8=; b=1CCBGJ3Ip78sC2 7ERxj+ZdrnVrSYIuNufF5K7mjxLCrcZ+3iakxR5GXDwDMAOkyJtK88+HpcZMwPu5EH3Fmp0JVn3i+ tHGtFmx7DQUs6ygFtbk9pR3DXQfBK87NYndH6Qrh9tQ+ICSheMcFzi06ky1clTU00C6DFkEyAB2U7 MItlQ9C9TRSaByPJ6FgKSJi0OdlAT9kvbIVVkPVZLnr4thNPzVQGJfU1+5IAHJw6dNTAlJawp6tuz NlYXlChNPUnHtLtkn9j9LnEe0OYiwe/eOJfA2cGyHrO1yH2a2oDNh0zWJR8gQLOCi2fD4kmqZj5ms K/8HjGid1E9xpgGTT9Rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTAeJ-00000002hQo-3JiR; Fri, 26 Jan 2024 01:04:51 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bR-00000002XD8-09aB for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fliMKW6wFo3KqxhnZeLChftZCrlaD5KCOdpIEr+rdovurosTNoRrwsPQqN4hKiHlszZBDwCb3X2Opdq5F/s4PeSU9A/r6Fxu3JO/1WQr6dR2Rm6oimY13sNYigXGUbIntM+yY9xvf3FPmn9eCqpiaLsHDofBwZ0mXmHnYqq/gJuNwu//WKJ+GpHWDoqYVmdiSbaLAvICbnOBPdsaCtOOXo6KA/59hr+/eBPsLIJFZjJT6sXkTTAA6ynG2UEMcsPewx7uJYes96G6lFr/WePi4i5L70qJAc3a/57lHVr+u8uEPLFl7VrsjPRg1eoH7LiWvdgLvO7q/ZPHnVTvpocgog== 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=EXBdG6x59BYBIEfcytUTgWGIVzbNdAceHkSaMhsELPE=; b=MuU4XX4ynXlAqU5sozauD4DUc2DjrelNUnUQC2C15c6D3qj9cKS9Y1OKzoAk9vqpndxtS2/QQ9WJfqtzpkgMsU4O71m+XnrOZK9dXYKaHzAN9E1VbN8vIiFQBNI4XFpg3LH1rQneVyi++F9090SHGEVR+C06DSI2vH0ExxDp/TvRwZ4TYgghBQ0yTz87SCXvnuoIcrsWwP12iJsaCd9ye4F9TYk7NxHDge4i5EYbasc1dgke5k2URLHE43aYVtY5gzpCY/Aa7kbNBwDDxOV/rYa+hKnv1hOt2cwph6KpIzyaY+4DHikvQy0TMSQ03mGMbPlb/uOm4gUw/3mLnHsvuQ== 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=EXBdG6x59BYBIEfcytUTgWGIVzbNdAceHkSaMhsELPE=; b=q5s105plSfCm146esfLpnNVnv84cFjPgzz0DqHJjZxdd3Oxgoen5TZ2jwISv6i3A7ZbdLqh+qvXnSP0uYiVO73a7S2dw6qS14CN4dkBqOkMWKuPHR/11MHHphnEfLnyamQRISDormgo8xusWyeNRAG3eYjNSgw9vyb4sa/AB6eXP6XkAmEuX+KkqqcL5aSD/Md1dSxqjVr/dbvF0EONIStfMz/r9of0NgLu5i1UPDb1yfGF1c4/irNqd4qXtdJYPD+IsoddVEiDYs4y56ZxuRJONAiHifN4VPW5y1f33QCcRXoHDzKq3rwnZJhXkBdN6tdZc7qv/TxGljHSdGdtd8A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:37 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:37 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 02/16] iommu/arm-smmu-v3: Consolidate the STE generation for abort/bypass Date: Thu, 25 Jan 2024 19:57:12 -0400 Message-ID: <2-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA0PR11CA0047.namprd11.prod.outlook.com (2603:10b6:806:d0::22) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: e7b3d1e2-420d-47b9-8c29-08dc1e01641e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DVI3vzvM1Sp2+qZNFjPRxRa8o+PbBZxzjwoAJyNG2u/C/g0/8vnR4F4Jt8vqqc7PRAka84iw++K9WXjO2Tp2UEtESCe70pwCYaI3jM6xS4AX4wzXnL0Kd4GFQQC012SPX1vYfh0N3GYrNyt/HlnkHS0oPU3c7yvXRgYQsQjoAK5PNKZlfAY8wZH+kMcb+SDacMWTzcMIfrYjA/YprwjFcxH+m6sh9EbYtJtrMKYGTxOYCnrreRKZEcWf1RcJs1h52D8GqBTzEEd5Eg7JrwhJ1Nn3LJ0Bgd48s6R6v4qOSoVg1F43yxl7GLF6b2ucGc26dvVQV0ImuPiAEOtXa4fYpmXBQ9LmlRehfcUbIdfOUPFCg2IWI7vz+WLWoFbTadUEOOs2kChSunsbl8xf1w6F1ZYkqqalT1A6QYMzCl5qxWG8DBGtOrARsrzB56RTAaUO38HKYcxn8gsh2nECuRDPxBdrGL1j8bdvbQ5wDmSiPCDCDS+2F/6vEc0ZTQBlHATr8zFXITY6eL+3SkK0UPdAneobDOvYtRpKP867rLiWlXURj92iuEJ7zYVMXxktPfcld4lHLhD+YHHUBQXEBpOVkVgpgpKyuApV/QqaeRBqR5E= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IyL/rDvnRf1u7GRWRB6Y3kMoFhi22238lOt0//pn4A96Lt3eJ6vtijkpVUBO+EtcS9vyXcBnyRePsjT6tLrsHKrByT6BQFCUfZTGfuhbQhfM3T3yz1BAMyQFB45heCf1xjdI6Tfd6Cw7WO+v8GI/zMkTuFE94BrtofYb+Tt7we5GsmgwxcFOAZvl21Ih78nS+W0Xg/zBcmhfcTZq3YyDK2n7Z2yKurFp5Nuruinx/G8h+Gtjg2YCo4nQ6lQ5RxFYiOcbbM+1jZR18xUSWRUnnz1o4W+sd2lw5zJ+oDFw2614bBTNumJBrsGXcle/nuPXjBBboy80P1UnIf8/5D00eeuFhYGw2YfUq3Zu6X6/8CbWtg1l8ZZypO07Ayd5TbogHTpdYudywQ9AETBH8Na74PdYQEPQS3mEkDbe/tP1PPEYQ4iXo0XtY3lqsvYwNWpo36uqtRPJtpfOkjeqIhlZvw714g5EDeHpThoSBpKmiAN1lGPc5m8ghfquSZQQmD432YMCBQHf5rpKWVMLxN1OCrhUNITSs1Fydix5igKwy443XhGLBT//5Nf9oBfBSvNnT1lhHvaBdZsgko1JGsAdPp3Bw9c/mbjQXxKOactIdxBXdeH3zOR/uDh/Nh87cpbIjFV7FDCYqoJMHeVRZ4JZJOft+ki0UMjwSX/dV/1jTfPnluAAlCZRINMtCBxQkvYTFmQPRpu+o7c852T4nnERgnB60qWxRZeF83aww4f8UzHR5eCpRkqgwc2TNcgDR2qSGk3ZqN1JKzXuekj6iH7XMIEGp51d3besmjyoQ4P7NrSavHhQMZRxVjCP43CrR2f+WMr1C+dEuER6fqtMD6abhuifoB7S/7c+2nh0h1hN/B+OF6YH/+lNpCtYVNDshf4o4TaBTQemhRNtr2q+Vu31wFELumMg4ZP+PhsQXu8hU3NbuidgT6Ox5hLC5aEegsc2YP4QL95QHakcb3EiwxKN+rXQae3TJgxTJCAVi+TYkPpnWvWjevoJy6MK/1XW1cQ2aoM227W04tHfHl8UnuFdQqkMoMt7Y/cJlIADC5ZFwtlqPqABiL5gu3Z6SmlQO7e4MZGxXF9bezB9i7ex9X4b/4KLYzdFGmXTTYj9vNGue6V0yowjPBkUugmfwbwJHcun//Xj28hc5mnDlzqFttSDhOdYvdx0qOJM/5xcBFhVNdZAq99NvQIjkIbNFlRc6ZZVamuqksuGJkYon57Rb2TetpSCaSnCNVOqFesMXslj41fkmWYLjHoxj+ey63BSLsZNlg/sgqBqsONsLhkeVkIzbZpPu8ZHWm/ag6LUt7y7I5UMpUXAx50P7AFLjeAfEMbhz/lXdeKJzY0LVNgGsa+ZdA0195aizroyWwFuxXtfGSlCkwDOB0Jq7ijqvfcLOzlm+h7OFO4eT/Yj/7tNQ2l5JPm3PpJ1XsV0p03B+oex4okZwYniezAwPAEnFW2DxEP0E85EAGdb03dd/SRIRNm7RNOisDj2YmSd3wMlACPcT2l6ROmMwdQegHSDAsu3ZXm8ypdDXj7nkW+8YBmVdeIHxWY9qUe3h7hxnhTnSN3qQtqI8xKWTPrjrFRcHldF3F66 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7b3d1e2-420d-47b9-8c29-08dc1e01641e X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:30.4185 (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: 6In3mdzTNEK0HAHfFWjA6phm8l4hAyP9rqnQsbbXvBKC95GKdD9538kADwbnq3dJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155749_181429_F3A06227 X-CRM114-Status: GOOD ( 15.19 ) 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 This allows writing the flow of arm_smmu_write_strtab_ent() around abort and bypass domains more naturally. Note that the core code no longer supplies NULL domains, though there is still a flow in the driver that end up in arm_smmu_write_strtab_ent() with NULL. A later patch will remove it. Remove the duplicate calculation of the STE in arm_smmu_init_bypass_stes() and remove the force parameter. arm_smmu_rmr_install_bypass_ste() can now simply invoke arm_smmu_make_bypass_ste() directly. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 89 +++++++++++---------- 1 file changed, 47 insertions(+), 42 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 690742e8f173eb..38bcb4ed1fccc1 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1496,6 +1496,24 @@ static void arm_smmu_write_ste(struct arm_smmu_master *master, u32 sid, } } +static void arm_smmu_make_abort_ste(struct arm_smmu_ste *target) +{ + memset(target, 0, sizeof(*target)); + target->data[0] = cpu_to_le64( + STRTAB_STE_0_V | + FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_ABORT)); +} + +static void arm_smmu_make_bypass_ste(struct arm_smmu_ste *target) +{ + memset(target, 0, sizeof(*target)); + target->data[0] = cpu_to_le64( + STRTAB_STE_0_V | + FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_BYPASS)); + target->data[1] = cpu_to_le64( + FIELD_PREP(STRTAB_STE_1_SHCFG, STRTAB_STE_1_SHCFG_INCOMING)); +} + static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, struct arm_smmu_ste *dst) { @@ -1506,37 +1524,31 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, struct arm_smmu_domain *smmu_domain = master->domain; struct arm_smmu_ste target = {}; - if (smmu_domain) { - switch (smmu_domain->stage) { - case ARM_SMMU_DOMAIN_S1: - cd_table = &master->cd_table; - break; - case ARM_SMMU_DOMAIN_S2: - s2_cfg = &smmu_domain->s2_cfg; - break; - default: - break; - } + if (!smmu_domain) { + if (disable_bypass) + arm_smmu_make_abort_ste(&target); + else + arm_smmu_make_bypass_ste(&target); + arm_smmu_write_ste(master, sid, dst, &target); + return; + } + + switch (smmu_domain->stage) { + case ARM_SMMU_DOMAIN_S1: + cd_table = &master->cd_table; + break; + case ARM_SMMU_DOMAIN_S2: + s2_cfg = &smmu_domain->s2_cfg; + break; + case ARM_SMMU_DOMAIN_BYPASS: + arm_smmu_make_bypass_ste(&target); + arm_smmu_write_ste(master, sid, dst, &target); + return; } /* Nuke the existing STE_0 value, as we're going to rewrite it */ val = STRTAB_STE_0_V; - /* Bypass/fault */ - if (!smmu_domain || !(cd_table || s2_cfg)) { - if (!smmu_domain && disable_bypass) - val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_ABORT); - else - val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_BYPASS); - - target.data[0] = cpu_to_le64(val); - target.data[1] = cpu_to_le64(FIELD_PREP(STRTAB_STE_1_SHCFG, - STRTAB_STE_1_SHCFG_INCOMING)); - target.data[2] = 0; /* Nuke the VMID */ - arm_smmu_write_ste(master, sid, dst, &target); - return; - } - if (cd_table) { u64 strw = smmu->features & ARM_SMMU_FEAT_E2H ? STRTAB_STE_1_STRW_EL2 : STRTAB_STE_1_STRW_NSEL1; @@ -1582,21 +1594,15 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, } static void arm_smmu_init_bypass_stes(struct arm_smmu_ste *strtab, - unsigned int nent, bool force) + unsigned int nent) { unsigned int i; - u64 val = STRTAB_STE_0_V; - - if (disable_bypass && !force) - val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_ABORT); - else - val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_BYPASS); for (i = 0; i < nent; ++i) { - strtab->data[0] = cpu_to_le64(val); - strtab->data[1] = cpu_to_le64(FIELD_PREP( - STRTAB_STE_1_SHCFG, STRTAB_STE_1_SHCFG_INCOMING)); - strtab->data[2] = 0; + if (disable_bypass) + arm_smmu_make_abort_ste(strtab); + else + arm_smmu_make_bypass_ste(strtab); strtab++; } } @@ -1624,7 +1630,7 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) return -ENOMEM; } - arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT, false); + arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT); arm_smmu_write_strtab_l1_desc(strtab, desc); return 0; } @@ -3243,7 +3249,7 @@ static int arm_smmu_init_strtab_linear(struct arm_smmu_device *smmu) reg |= FIELD_PREP(STRTAB_BASE_CFG_LOG2SIZE, smmu->sid_bits); cfg->strtab_base_cfg = reg; - arm_smmu_init_bypass_stes(strtab, cfg->num_l1_ents, false); + arm_smmu_init_bypass_stes(strtab, cfg->num_l1_ents); return 0; } @@ -3954,7 +3960,6 @@ static void arm_smmu_rmr_install_bypass_ste(struct arm_smmu_device *smmu) iort_get_rmr_sids(dev_fwnode(smmu->dev), &rmr_list); list_for_each_entry(e, &rmr_list, list) { - struct arm_smmu_ste *step; struct iommu_iort_rmr_data *rmr; int ret, i; @@ -3967,8 +3972,8 @@ static void arm_smmu_rmr_install_bypass_ste(struct arm_smmu_device *smmu) continue; } - step = arm_smmu_get_step_for_sid(smmu, rmr->sids[i]); - arm_smmu_init_bypass_stes(step, 1, true); + arm_smmu_make_bypass_ste( + arm_smmu_get_step_for_sid(smmu, rmr->sids[i])); } } From patchwork Thu Jan 25 23:57:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531901 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 4FC45C47DDF for ; Thu, 25 Jan 2024 23:58:08 +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=IDxeIwa3/XbgTYHBHsVy9Fh/Ra+XE9uszB46baDoAdw=; b=G2MUhIfZk5bwBN xNz1Jxr200mpcbbFkelML22YMMgXR0vck6+i8vJsVHy5iQUi+ZHJRJuKUXRilnTWWx/XXP5rvSi1X 0QQVzMStWH6mupdNZlpyYoKE6251OMd634xZA22oNJpY7U3kqPCTGsPTiEUQiLCSdtbCOmG8fZpzR cNY4WjVLUaKwokXPKrYulr8naz1R/iMDKxb6Quez3fi55ZfW9uNjOj9aayxHtR3klEYtmmJ629L94 hxfTO8Gg+gw5OkxwF5kuPvX8+Y59CDhgMhgOM7k2pQinP7R3M5NLyIsKkcuxdKpzpXPb7b5j38EdG vreGVhWGNa8lqCgaQfhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bZ-00000002XLc-21G4; Thu, 25 Jan 2024 23:57:57 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bM-00000002XD8-1M7O for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MaeARnS5HmBYyiKM/3zRknW/VMWIhDd8PaHBxQN0dNfv+S8jZ0zSKpFAs85CirPf4W2dO4GxG+TFBCm8/oc1er05EJOyZ3S9im7ESmzfNnxfyG7OP8rnt81k4RedqlGbvcTywWSi7+ADPPg5kdVvd62iUgD23EouKTvBrHD1ENErLjopx3YlGRt14JNFxVs6aNFKTRmwoVx3lkZc/RMXAtL6N+oUg3JVOFw95B1vCCM7VGSC7qP+lLIuKm2JHbyBNgQTYda0oOkdBwt9KyH3ejOWuzp/GfzwKmmpssCGzjESzUqndAEqOsj+6fVApLL6UoKGowZE1jdSIgDBW1qMeA== 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=T12PIwERlMo7T8nGB+bo6L7ogb91OoG9qKs8EBtnOM0=; b=QC1G71JcQeVh2QXnzpmjhjRcW2kupNzECu8prmPECozCcuKFM9OhGvORbPu//C+zy5/wVwE2mzyw0UhXRa9xR8aozRnnmdOapnWJIcMlVZRaiYr5RnOuXs2OOSibMrIWikwD5kRstQ7BERAxWLY7ZN0c1iKiH8SSjMZr8D0HoSQ02PXjAgi5GprMXBEw2VZdIIh5CMl+fPZTORKZKLzCV53OrobrBYJYGM1wr/h1NOAmDF4detLi6z2+3QuRWcY8hMedBmvac38HhtI3WXf+Qs++aKL8lomuuglwG7nI0O8Wrdh1LKdioWrE+BYadgjaxYrwwwkygB5QyCMQzHNHWw== 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=T12PIwERlMo7T8nGB+bo6L7ogb91OoG9qKs8EBtnOM0=; b=ZGhLZyoq4KeUN+My8Wy1DJi8H5wuJCR6Tr+vc0/DuYZ4HuiRsXm6eN4K+JIcEC+QT0Y4s1rOM/hRNuz9F8e3SFAMafhNHeZE9pCRE/uLdJTM2U4Ub70eqDxJtU9Xj+CzlV8TvUnU1wTUDArrOkrlWLETvg/+YqyHQ6xP/k6WD8+DHMqTSZDaWZyaKmp8GIkjocDfpqelfAMWtNV44YBexWXbpb3EjYz8BX1qDh529SDWCr429eCuNhJk17Figi5b1pGNiwyWkhzb/TOkFoWD9zNiPdDNlPohRjGi2yYbSZ64KxxbJubhapK8AYCMi4pLtvlQPjvYewVNwVmAz/lL2A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:32 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:31 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 03/16] iommu/arm-smmu-v3: Move arm_smmu_rmr_install_bypass_ste() Date: Thu, 25 Jan 2024 19:57:13 -0400 Message-ID: <3-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN4PR0501CA0038.namprd05.prod.outlook.com (2603:10b6:803:41::15) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: bb67fefe-ea0b-4a7a-7332-08dc1e0162f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mxV6lMrNpVIq5BVNnaNU8gDAcUOsDscuSblPtWNWE2GtInkRgBjQJLytskF23uK+k3rMVDevNMLSbjad81I6+tkPnUf2k+tZKuVpz9UyzPf26g1C6M7SmE0MIHTHII/y8a4VQZ8WEJskm6vH3ZwcYBUaROnSoTJHsY/DbARPIA8WRu/Ce5TeIaaeOsDbDABaLEKCRAYM91Rrd6nT980RSnfkucf7oJxjEk9GqHs0Yr+VKhYzIp3yyMgQ3Rf2SlwaZnvoQaZ0NCjbmwGjnW1/COGFPtBiicpecQseRWervBgN72TjDazMZh9wZ84X7Aeb9khN6OJ2lGoNvv5s/05yX0QGUGPqpY1OIcyxgXNZ2ye5PDo2YQTaKYMyVi2d0vwuF8duddb/Ty+RmwBSWAOs94y+25EJvPR5FsqDEHBQNTPdK6Kvwr+FVSm7x2O39KWv9XNtqelcZFcbiFnXiu2KQs1kL28ltXxTwULOWQzfFmiAVJ+ibuznfGVsIiToVfQ11yiuEDC4//U3IXpRdTxgT5rjHWYhRkmS3Ti+hn1JIs40tVLmOX2uiZHE13vdekt65PtRSeRX5yKdoWzw75zkeWDrcEPze455QmfgKn75Q/8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CPpmfON/zgDqvstTJbSyPm2vzfXbOxfwIzZDusCpz+BmdW8jHI3CRF0WU4DSCW9XRZ51MRTzairpus1fDrJGMnoqFRjxFqemTBAHzHcTMDuijkH0Mk7md71XBjWJJ+fZOvuo/kSYfXYL+PPr/WldJVgdMToW3acCJX/mYM9vuJuKdk95GIUpsSgXt3A/hx93M3xJ+I2bbgzZ8XubSfwgSkIGeDgnHvIsCzvUivyyLcgreLtcRNFchygfu4hv6ORfojftPSi3/cU1xl0kn5LPvgV6dsTQflCOd6gmCF0ry/Dso3ne3LvE0hOzGH6dtj7xkOJ3dDQxkORNVWXs0toC/TM3tvKKRPwc+5DdAWpAngXpwruPrF4oAa/2yVW6pXtr3Rn7qjVwg2MvzENUOAEPYL6s9ZPB81tTw6YhzvkWGtLbQOAjJapv/PDI/e3uczgQjozBOUfK/Lsx24QnrwKXNLfacNFrNgKpGjO80hFAKDK7fcYSsvy35y30scahh8KAUvxRPQens5Efdx5Og/H6zLzM8VJA6LHDUhlDTDk8vdfqkmQOryS3BpZz0znIU6EI3GpjoB5VmRQbtMbn+BbZY5U3pPNv66dg4TKTHk5RXreATfaxG78T5pv7DKs4dDFgunzhvLt5RHAQ4Q0F+VNDzSstujqWCYH7QiLw5v4VyWHuJZadc/31ktHgjdklM6TdvdDg1WFpY0M00xZ+OuDDVZ3/+ZHYolpXAirx8tmRN+/Ph5JV5iujuWtcJ1Dy4YfMOaUuw30CKToqJCoZ6fNlF2HJJ0gziTXTz51UsUXxS8kmHSIgEznVPoQ226SMuztMYhPQ4IdnZBpuS/I6Nv/hofCWJRkFESqD8KwjxlmgWgtn/K7uutd4XO1J4SDxEpQZ0hMufybXJrFsSEdBqsJZZZkM9pZSJc/9RI6IAw5eTKAn75rWxCwRxUuS8KG2b4vdRPwntbEO2qo/WhCWznZ7r00FWZpCsDxwmGER83JhmrYX5xL27plm6lE4xhs8KumF+rcQtewCYjSX0cRxQYVoki1y0m8idd3Hc3l79b4XffgXzwFlaw4QvOzsfjdJNArQfTRWIu13zR9WmBGiOkQH/9wBBD+WDlqQDbPRP09u+D6aJxlMJ+7E3bAEl9XEUQoTsdN7y0HwOFC9nWuCaoYdzaj55IPHe0+I4QgQbpaN5sr7kT+GFQhgzjr7QUWcoA9T1FhzGth3nweb478GCEazcM4uhrWvjOS69NjgocPRIK5Ue0PCYThUHSnAYyBfBq5MCBfMSdEWd3cS8LOUtSrAlIMicwFa7Ow0PHaHO43XxXzu/D60d5oDSG7r+/LsGscMOO8uUdpVv2glBVTirMRYDBE/kP2P28QCJC8ZD4RqnjTh/EN2YgX4GqT6x9qblbyQ2exyEIL9yzxQgwa48076qf6pADDuXSw0cka3aEAAqBW4O4sb/uXcqqfPM2Q9GRECF29XWJ6+acHqAlANHOKiqIcNHSiEdX1qTMG4z4FyX9mTDvLTN7gmkIQfO3CmC8OQcB896vmWO0Lo3saleYS7gdEwGJZYXV5wfE8YB12ixhx33nbmHfKUnvdvlUj69mUi X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb67fefe-ea0b-4a7a-7332-08dc1e0162f6 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.4902 (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: I8iesmqBIo5BWWBaUCVV+q3+6PKjXJInJo7coXua5m0EX90cON4Zhtdohh8Walwd X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155744_488603_2BDA868F X-CRM114-Status: GOOD ( 12.51 ) 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 Logically arm_smmu_init_strtab_linear() is the function that allocates and populates the stream table with the initial value of the STEs. After this function returns the stream table should be fully ready. arm_smmu_rmr_install_bypass_ste() adjusts the initial stream table to force any SIDs that the FW says have IOMMU_RESV_DIRECT to use bypass. This ensures there is no disruption to the identity mapping during boot. Put arm_smmu_rmr_install_bypass_ste() into arm_smmu_init_strtab_linear(), it already executes immediately after arm_smmu_init_strtab_linear(). No functional change intended. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 8 +++++--- 1 file changed, 5 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 38bcb4ed1fccc1..df8fc7b87a7907 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -102,6 +102,8 @@ static struct arm_smmu_option_prop arm_smmu_options[] = { { 0, NULL}, }; +static void arm_smmu_rmr_install_bypass_ste(struct arm_smmu_device *smmu); + static void parse_driver_options(struct arm_smmu_device *smmu) { int i = 0; @@ -3250,6 +3252,9 @@ static int arm_smmu_init_strtab_linear(struct arm_smmu_device *smmu) cfg->strtab_base_cfg = reg; arm_smmu_init_bypass_stes(strtab, cfg->num_l1_ents); + + /* Check for RMRs and install bypass STEs if any */ + arm_smmu_rmr_install_bypass_ste(smmu); return 0; } @@ -4063,9 +4068,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev) /* Record our private device structure */ platform_set_drvdata(pdev, smmu); - /* Check for RMRs and install bypass STEs if any */ - arm_smmu_rmr_install_bypass_ste(smmu); - /* Reset the device */ ret = arm_smmu_device_reset(smmu, bypass); if (ret) From patchwork Thu Jan 25 23:57:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531900 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 587C7C48285 for ; Thu, 25 Jan 2024 23:58:07 +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=s1obmJvJSvRCcc7hku9RPqREaQprFRIW+1IisvnoyMs=; b=QNKlirEGbCSf9q n0G+4vC/EmAE6XsKriyqdTNGFGNPR6IOc+ODBGXL1cXp8ltJcMJ2DY/bAsTbe7SkB81DlTLMhSeRP QdGUMSUbr/tQKI0pf+uSMxvq4hanMJCP6pxBAMPMyXrOS8PRos4jDW7dx10ueHmN7lhpCs4nOdTL+ /UaD4DQtki6eI8j2KY1QZK3mraNIx3YrG5tWWAdJAS6TwctOu0KfQ9MT8F8WugPKsd+/cqRsiOFlX lyn4E0FqVXBQbVXzDF8pJSSnrxcpwJeJkEjE38bhmPpRJVWslMLJFwe9M8gFpRfxPTW+mS4aRHf8n soKQRfqaINDLjEm2pCbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bX-00000002XKN-1icE; Thu, 25 Jan 2024 23:57:55 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bK-00000002XA1-2whH for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nNGjWwUMA5/SDu7rHoenPLLvzpbPLiKFSpyJHaAWz/6em+tPwFO07gTrrn3C3i7E/MOcQVhnbZdU7jULN1Zb3Mugexi5WKRxq4l0MPsCxe96i3RrJNqf0CbqETFhuJNRh9FaxID7Mh45USdL04emYNaUidwApW/kK0UEAZ2d5UP+MIihES+hnUbqx/oX56vjCSzyYsbXmP3ow7hJIGrap+f0bmqO/oBFMZ/PFZOJOd3LrhbycGYMdyuXwMN2LDNsMlXsUSodixy/L71deEHxBk4seQbtuNnUo9cL5PgoitcRP/GQqSVTEZzIj4uRiJKbZ3bvLRGI4de+1+BWaOXTCA== 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=VScJwSKYuH/PLSG5Eur7OXgttwJojTfNlgE+Ap0b6lk=; b=ZZMSYsdLgnEeHySlbFjavzBV8Pym7jtWgoWZrkvunA5TWYutqi3y2BJMkYeycwo87ZitLcbHTTQsqKfIR1DCBoR1vVM5eWj2uEQ0SBlXTmwyB+KjDyn5GypszVoj5flZo98JnGfVXQQvN+xLajezOsael/AHCyammDlqKsmgoThp1KJsRENpxapRDlRJuHAv4aYC1I7UOn8nqbDTfz6p8iH2KJKYyvTbgo/WbWVcxn8RZGQ6MGXPHUsdS7PQeryZwGVF04O6B4nhgbUjmebKTwM5a9bkz374G7m0EkQUMmGapfnL9NwaLhjxsVAA5zj2wMpAo5Lo0mnGjFFNEEwXiw== 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=VScJwSKYuH/PLSG5Eur7OXgttwJojTfNlgE+Ap0b6lk=; b=cVolLkQPQD6OM8/MxIiZgomjC9fZvrjQxxfS5nvIJSnnPi6ZRX4YtWhsffPLETp8rfyyUfx+e+yC+/bnI0hQf0ShOqolvRBGKCy6OKhWlYLqF1hUFbNN44BTfnVm1T2MnhPWF6rxfZOTyv5tkj6Tw5qVG4gjny3wBJezmCnn/ZfvfMXH/5rULlrMxVJTf+M/UdNnnQL9fHrpocuJ/xFmknohnER9jZvw2zRJ0Tz1lKqH0lxaL/adXcYqSBUc7a2h7IqzFwS0NpV8H5JshjTMQblEt1HMVOHZ2l5MuDszLkgi64lHH9Fa42Oa1icuSXUFI1oO9xlG/GdCbNcUNUcvaA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:32 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:32 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 04/16] iommu/arm-smmu-v3: Move the STE generation for S1 and S2 domains into functions Date: Thu, 25 Jan 2024 19:57:14 -0400 Message-ID: <4-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA0PR11CA0032.namprd11.prod.outlook.com (2603:10b6:806:d0::7) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 5dbe8329-2820-4a30-d8bd-08dc1e0162fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tkQWNLtJECFwVnMI7LMz89ejxspyUccV7/SX1u4x+YkVNwtZTz7CVHmz9Ae/rxhdvK9aWb826RnjvDjmc7VhYCvHUVW6iuNCQvkptadSnZY1sgAUUApWyFDYxE/H5iTHRzqfzxW4aXf95b74bJcNXWugo03TrEaGOnKMlH0S6UdNgdPFxEak01zXxTskg2sd+41U0FzkxvvVQRpnKKtJC1XHunAI48IyyiV89LVMt7g1KXyw8fV4k1UgwSNP9WbtX3NDcIuZamUnRrCUpIdAFQko8QVk2piUffJKmcr0FXdgqhVEcV3UXwASCUTc7uxr+XKZxS6hcmQgf9N2Yi3ZyFxnpsn+Dmrd015LY8+wDNmlHLCZ88y+ouNbbfXsvoTecLrCMCwSq31f2kz6McbiKhAo5IOrC0R4pIK4RrethzZqaO6AcG9Z/TRnCDSWyI+OmQ0DYctIDPVScDxNOEmCnMEZuNzwe1sMLnRzt6U4YVEiXLxBZKLaitQfXx3d2k4nnuSsYz4fIPsASVeMuroupU4YTLJbsy5dQ3cswQ9ZLVmZCU58gYMUwfkZoB8d+7mEDyxvDf58lOnI0lamxpjptW47JHwe8sxHNLyDX9gPO0dzD9wvfCkJtUwNpHqRPSBpygbi7L+QIljeWJCPI4plPA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002)(4216001)(473944003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hiUGw6JrjLzphdHcqyqzPLc+bu0Kpa+W8m/oH/9T9FdqguSk5b5IK77fcv7EgaLSaohHRcYabnOAajBEHG4AmM+Gb791cIcfDmmxFqGHPUeNngZxA8ZdCAzQW94IkMv9VWXmzGXlpoB1waFYYbdaFPUawmjycDYUDs33U4oXdj40ADsKvWa7YrZsUB2sJvLGsb06G4Fm4c0+RYucZ37uoPfKU+gi1rlBU0m9GWwUdbWNNuSQR7t67rgTFFM9vRCLredIlDJAww8c+Jrxs7XYLQJS2tRykn/bpMyTLxIyh/aQ6QdQX6HfgMpQ01ZmGX6O4F9HGHjuoPTrO3rRAXz2VvTO2u37WWUUUiNp7XoOnb4GkgVMc4LumMNgkMeY/iCKIgPmFPnT7mob1v98CIU61zZkfJxaNWqfEfvgDVdBZoge9EASBBjZ283fhPkWtqDBtSzS10MSSX9hPA59QYorKgahENHJpoAs+qCJqE4KvP5xaNgQ9F06sM7R6fMvQei/xz/G0CtNLZPIhq4KVlCrVYXatK2KA1+K9IFIDvjptEoj6uqrzcyEhdGIR7BSsR57P3pD/WF3A5UqTUxvZzpLR6rngy7MEWhGvxIgMVDmmVMyvmTD235ATvkJNGxk1ywAXVsMzXDpfxpLjOs4uEcE6IXrb3Du/dC1IMtANd6EPqNu10bHuJiyJBiEfaS4vmFehAr2UcpAAwx2/DURx1PSZFBd2OSWiqN1D7pbhzqZSKdiigtBdx1nFrrMp5o+SWM2anr2i09ifkiufss5+AcE3O5wYKRq9/pDVnbOLHokxEwXZVzkoSObzDypUWXvpRX1irOtjkXwHnGUybUxe9sEatlcrg8nNxBa1z2zsckz6aFeIHtyQatRt20q94KlouOcCBaOCHg7rLXJBVRkPk9BE1iNDUh8sM/KqxbmcWq5HWsEhH96UWbjTuufRwF+OXRtV35AjETv7ytx7AsWd/SHnTJQSW/0/Bs7th16nBxtjVBscplBVfJwo6V1700YptSkjtEwA3ohW7D5gunaov5Q0W3SvlAYC2UQWvunIiasS3g0s7Ee9qIoo5dmdbARA3GfrCHcnebi4QQOD1lInZEZOerfNYElFvvOQcPhupAtj6AymHi48Wvlr933bXAx3GZEuYzaCkhHU52qY7NDD9Ix4Lt73S+2+QpW9D2IMY0BLf03o6OEnfM80tVPvzy5BDRuaDOFNlpuXx7hPmVMphh/G5kery2dXm8fAKFjCXkKM3NRNzAXbg2FooraDbLXUY3zg0M1a7iwv2ewFehrXXBLpnPsIASsDKLSyl84SM5dxLWdzY6a9abBGGV0xKs303HEv9py7Ory2Ih5ZaNKwIhEVykUsY/L8ALYvNw4M6A3+6LP0O5cgfK/NiNIqmpDdvCHWYxiAQ5CTtd1Yvq/Cp96Dqdu88HAhSYifs2+nIJ5EnhHdc+2GBNRLLEElHU2/Zsu05ftj95OmOCyvZkvLYh93bfXfsvc9Dxxo72nKqHaUD5WOlqEK/8KG6w5QhKO7q/Mzw/AB7P0QZmKXZ5l3SnOcwOtGNNbEFhEovZLOWcwBg5o4I97/mftd5ASWQss2H9g X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dbe8329-2820-4a30-d8bd-08dc1e0162fa X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.5307 (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: wc2TXSO2f0/hydp1N8vLhm0rNZg0JQIb+AJ3D2xwfn+dqLFSdDnYymAqM3rvoSeG X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155742_960242_35776993 X-CRM114-Status: GOOD ( 11.70 ) 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 This is preparation to move the STE calculation higher up in to the call chain and remove arm_smmu_write_strtab_ent(). These new functions will be called directly from attach_dev. Reviewed-by: Moritz Fischer Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 115 +++++++++++--------- 1 file changed, 62 insertions(+), 53 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 df8fc7b87a7907..910156881423e0 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1516,13 +1516,68 @@ static void arm_smmu_make_bypass_ste(struct arm_smmu_ste *target) FIELD_PREP(STRTAB_STE_1_SHCFG, STRTAB_STE_1_SHCFG_INCOMING)); } +static void arm_smmu_make_cdtable_ste(struct arm_smmu_ste *target, + struct arm_smmu_master *master, + struct arm_smmu_ctx_desc_cfg *cd_table) +{ + struct arm_smmu_device *smmu = master->smmu; + + memset(target, 0, sizeof(*target)); + target->data[0] = cpu_to_le64( + STRTAB_STE_0_V | + FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S1_TRANS) | + FIELD_PREP(STRTAB_STE_0_S1FMT, cd_table->s1fmt) | + (cd_table->cdtab_dma & STRTAB_STE_0_S1CTXPTR_MASK) | + FIELD_PREP(STRTAB_STE_0_S1CDMAX, cd_table->s1cdmax)); + + target->data[1] = cpu_to_le64( + FIELD_PREP(STRTAB_STE_1_S1DSS, STRTAB_STE_1_S1DSS_SSID0) | + FIELD_PREP(STRTAB_STE_1_S1CIR, STRTAB_STE_1_S1C_CACHE_WBRA) | + FIELD_PREP(STRTAB_STE_1_S1COR, STRTAB_STE_1_S1C_CACHE_WBRA) | + FIELD_PREP(STRTAB_STE_1_S1CSH, ARM_SMMU_SH_ISH) | + ((smmu->features & ARM_SMMU_FEAT_STALLS && + !master->stall_enabled) ? + STRTAB_STE_1_S1STALLD : + 0) | + FIELD_PREP(STRTAB_STE_1_EATS, + master->ats_enabled ? STRTAB_STE_1_EATS_TRANS : 0) | + FIELD_PREP(STRTAB_STE_1_STRW, + (smmu->features & ARM_SMMU_FEAT_E2H) ? + STRTAB_STE_1_STRW_EL2 : + STRTAB_STE_1_STRW_NSEL1)); +} + +static void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, + struct arm_smmu_master *master, + struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_s2_cfg *s2_cfg = &smmu_domain->s2_cfg; + + memset(target, 0, sizeof(*target)); + target->data[0] = cpu_to_le64( + STRTAB_STE_0_V | + FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S2_TRANS)); + + target->data[1] = cpu_to_le64( + FIELD_PREP(STRTAB_STE_1_EATS, + master->ats_enabled ? STRTAB_STE_1_EATS_TRANS : 0)); + + target->data[2] = cpu_to_le64( + FIELD_PREP(STRTAB_STE_2_S2VMID, s2_cfg->vmid) | + FIELD_PREP(STRTAB_STE_2_VTCR, s2_cfg->vtcr) | + STRTAB_STE_2_S2AA64 | +#ifdef __BIG_ENDIAN + STRTAB_STE_2_S2ENDI | +#endif + STRTAB_STE_2_S2PTW | + STRTAB_STE_2_S2R); + + target->data[3] = cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); +} + static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, struct arm_smmu_ste *dst) { - u64 val; - struct arm_smmu_device *smmu = master->smmu; - struct arm_smmu_ctx_desc_cfg *cd_table = NULL; - struct arm_smmu_s2_cfg *s2_cfg = NULL; struct arm_smmu_domain *smmu_domain = master->domain; struct arm_smmu_ste target = {}; @@ -1537,61 +1592,15 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, switch (smmu_domain->stage) { case ARM_SMMU_DOMAIN_S1: - cd_table = &master->cd_table; + arm_smmu_make_cdtable_ste(&target, master, &master->cd_table); break; case ARM_SMMU_DOMAIN_S2: - s2_cfg = &smmu_domain->s2_cfg; + arm_smmu_make_s2_domain_ste(&target, master, smmu_domain); break; case ARM_SMMU_DOMAIN_BYPASS: arm_smmu_make_bypass_ste(&target); - arm_smmu_write_ste(master, sid, dst, &target); - return; + break; } - - /* Nuke the existing STE_0 value, as we're going to rewrite it */ - val = STRTAB_STE_0_V; - - if (cd_table) { - u64 strw = smmu->features & ARM_SMMU_FEAT_E2H ? - STRTAB_STE_1_STRW_EL2 : STRTAB_STE_1_STRW_NSEL1; - - target.data[1] = cpu_to_le64( - FIELD_PREP(STRTAB_STE_1_S1DSS, STRTAB_STE_1_S1DSS_SSID0) | - FIELD_PREP(STRTAB_STE_1_S1CIR, STRTAB_STE_1_S1C_CACHE_WBRA) | - FIELD_PREP(STRTAB_STE_1_S1COR, STRTAB_STE_1_S1C_CACHE_WBRA) | - FIELD_PREP(STRTAB_STE_1_S1CSH, ARM_SMMU_SH_ISH) | - FIELD_PREP(STRTAB_STE_1_STRW, strw)); - - if (smmu->features & ARM_SMMU_FEAT_STALLS && - !master->stall_enabled) - target.data[1] |= cpu_to_le64(STRTAB_STE_1_S1STALLD); - - val |= (cd_table->cdtab_dma & STRTAB_STE_0_S1CTXPTR_MASK) | - FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S1_TRANS) | - FIELD_PREP(STRTAB_STE_0_S1CDMAX, cd_table->s1cdmax) | - FIELD_PREP(STRTAB_STE_0_S1FMT, cd_table->s1fmt); - } - - if (s2_cfg) { - target.data[2] = cpu_to_le64( - FIELD_PREP(STRTAB_STE_2_S2VMID, s2_cfg->vmid) | - FIELD_PREP(STRTAB_STE_2_VTCR, s2_cfg->vtcr) | -#ifdef __BIG_ENDIAN - STRTAB_STE_2_S2ENDI | -#endif - STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2AA64 | - STRTAB_STE_2_S2R); - - target.data[3] = cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); - - val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_S2_TRANS); - } - - if (master->ats_enabled) - target.data[1] |= cpu_to_le64(FIELD_PREP(STRTAB_STE_1_EATS, - STRTAB_STE_1_EATS_TRANS)); - - target.data[0] = cpu_to_le64(val); arm_smmu_write_ste(master, sid, dst, &target); } From patchwork Thu Jan 25 23:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531902 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 5B37CC48286 for ; Thu, 25 Jan 2024 23:58:09 +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=BMf1oj+fyJxCfve9bk4W8l8HW5JJ610V+iNbYPE4OMw=; b=Ce/lZNNBKb4ks7 1H+szlqSREAZ0UNbJzyaBVoztGJPl4uSet/HhUc4Hr1svGyQjEHGBhmB8MCcWcMCjmBL57PEpJq6/ Xb/dUord+vQcqkATglqAufYe+wVTIOzptjp86G3uVaxOzkdVJmpWdn+84/JBp/OfnmzmcVFkNP3oF l/dLTQ6gIxxf5rv1ohQ0pihAv8r5bi5S6os7BlYZ81xIAi2QDZSo1ivFY+z3OvYhX2l37y2etjt/6 89oMoK/TGD4/6mtLc/xXkjuE8qQLdM8n9Qn47sG6XxPTjZ7ev62b2SdG/celpN+wMK88LFVixyELj v0zQ+4arwMepiEf4ovtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bW-00000002XJp-2YMT; Thu, 25 Jan 2024 23:57:54 +0000 Received: from mail-bn8nam11on20600.outbound.protection.outlook.com ([2a01:111:f400:7eae::600] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bJ-00000002X9f-0KTW for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fqBqsSbNBIDdFZ3FXgWjcPdJKGtCZRfCbI7Bg/EEPDXm7icWqHKP/wfcWnILedcCMwW2kJBh+cvuWiBunHlXd8P8zWE+F5I/nxgT4PhhbZpVPfbVDWiU6QILjuY8tMgcyy/qW2EzDzVX5GBP2ngY6hVpcQuwmt4gf6ww9QYcqr7KXcnEOfeomQsqypa9lJQ2QxeLV7A45zOdNo+hJ2rZ6gaRfwoCfNba1NuoIWQ7kclRPqLfTa/v0LI/pGLQi4ql0ls4Ugt1NobCM4UAD1PqH0ItkykSkYt/ka6yynpL4xEqD0s8nVCVnSqHXxxhXbSD8P/Ca+hp8uCsX5YT+8KbEg== 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=pXGeQI5buSb+MrqJunH7QfqXk/GRkxUdOsZKDbiVdKY=; b=AL+TwE6jONHXky/7w8QEZXV11ox0TJt/eBAYABDC/5hFxRPTzxVmc3F/LqC8PXtODATC8vh1ExPbG3JGYYv9sfa70Qlkky7q6T+/8+Qy6Dzlc384e+goxLV5oDKbrP7muQaNi83xaUlhSJmsV0NN18LHvHtwhlqwKM7hMeVAGrPMJNfk3vEigycbbaxfonWo836OOClVOjdlWnRi6wSUr/YsXkBqSkZzF7CnXeBu3nY1PXdxs6bcycRslIhtneI9+90t/X919VTyIv6mqVX8ZVMi35NaPzOGQR1BLHp1valZ9rX7/kEXAhN8HLhP8ICZGItHQ6pwgoFEkHAFy2rdwQ== 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=pXGeQI5buSb+MrqJunH7QfqXk/GRkxUdOsZKDbiVdKY=; b=B3suX4cHAqh8u5g2POgUJZahQloQXQ87mVS0eLwRo4z+aSIMsaS1Rd1Pk5QUCYsqrNAP2xnsroTEdcNMIPixTXHGFZNm4ZAedl4QS7H+SZT60M8KLeNg3k7kq/ADMLbq1B+FdnLDfnWYWtbgR/0OKurHsl7Ggi1ap/pk5Ix8vIyAroyPLvfr4YwpNBDscZSSj8bcRHeomICIycl+YjDDPQPaiLrEIRW3ZZ4dk6IngQH/7K/Sb5uxC+NzEjBK42PxMVZlBjsWgjB3W56XvEEdyZYtvZB1t9ExFDbrmDaenhA2HA0hVV71wKmSOuac2GoUgUqQ6sERu6APSTy2ZvnSJw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SA1PR12MB7038.namprd12.prod.outlook.com (2603:10b6:806:24d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Thu, 25 Jan 2024 23:57:29 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:29 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 05/16] iommu/arm-smmu-v3: Build the whole STE in arm_smmu_make_s2_domain_ste() Date: Thu, 25 Jan 2024 19:57:15 -0400 Message-ID: <5-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN4PR0501CA0064.namprd05.prod.outlook.com (2603:10b6:803:41::41) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SA1PR12MB7038:EE_ X-MS-Office365-Filtering-Correlation-Id: edbcea7f-332d-4139-4cc6-08dc1e0162e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +Do72n7+yZbBpAUT61QHsrITQ2u1r177HaFPsOoC0cp43wwC3pLlkUQM980NKC7V6sxbr47yhdXOpx7aU/2J0Q9iBrjveRUImtfmgJ5yP0Yf8IPej2vIDIMOk012/3Fbr6EMwB2xxZZkT6dyZAbl9DxRrouiRPD3k2eQHaVkwJxLqRQY4WPMryJuSH+NPwgnJYtyZ/JzAolRebDooFpN5msB+CW6AZtVn3oCsdqXRPP+0ajlZ71xOlU8xaP0QAgdoGvZ00gQ7tGO2/QY6IwHRTBava3Ggk9BlA+gE7JzUdQ8XEuvhUIbY1mor7k1IZfUayhieM5GR3RVbpRC4lofkJV0+wlQZrXX0sGPYeIZY2lssIa1Qnl2VkaxbclgOaeXEO0ClBMXs5JHB41os+r2yJ+1lW61LuEpxGcp6Y+4kPBwP8j65cH8yCqzN26YP+CdiNfDf/qlTinliNi4ddimiI6MBVmIcFa97eXfH8TJFpRInvJoFCukKWmx1ajtyOn/7jIivqP/cdOqTAVI0WrE50zbR9XDye4lB1IpejW5V7TKyAR4n+8fDU5BQonHwxAI91xCXkUuLlukm0Usj83ZKOP5q0mDvUbsNghJHgtBVkk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(66556008)(54906003)(66476007)(5660300002)(316002)(66946007)(8676002)(26005)(6666004)(4326008)(8936002)(2616005)(110136005)(7416002)(6512007)(83380400001)(2906002)(6506007)(478600001)(86362001)(36756003)(41300700001)(38100700002)(6486002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MKH9U1BIVlGoY2T+RHpeZncmuwjHCfn4gMh0ryhKVap0VpPgifTF0q3ec9WfLo1siE+z7CeSuR3JjmfyYhoqehSzpfOpeVO7DYR7qg2R1kOdpAQusoxDYTfGRA7/4kgxPlb5SRTWHFVER+EJ/frggF3rqdtgr9PhhfS2FlAAcRfukZAB11znVtfCoB5rEYzKxS9H9GTlnG7SohivsSjV19rsNsmYIhI84ou7FWucKQMhy7f4S2/5co/7igaT1JNpefa9JeGQ7EXgxc+2cWuy0YKYWf62foK5KZbMKeSztKgV0N2DIrgOp9ftrNJR++DAVBxyNBXfkOlCnhBECJr/EiK2G4EgTrBgZkiBYVNSY693KX/+7fJZ2C26kYJ0v/xU+V0TvXO/CTnAsNrhHjSraNZNO7mEaTb1p7oG0ZsIc4b9xCi8WwpnTD43Qukvpo9CJGBp6HHafDrX0GbluGtil2iiffOobaxzybUGHVG2CnkS4npK7hEy0v5fZuRl/7c/LmV5xe3OuJ/UTt69yAgt6HTORg1pqF80P8PQ52jsgxhQPRhjLuCAJN0LmtfVGJvNBt5a7V6CrTR4lRysq48+K9nhj6B1bdcAHi9t2FjRE0ZZIWi7UYVu96AijaALxkCOQa48FIw9cM64RNGkbZlHM/g3ON3sm7/YMB8nP3+oe7jRKf804FbM1e05s2hJR9mrUGLK2xGoryYQ5rBDTPcoS4VVMtyM8NZUrfKmpFw1A9lRfjz35wcUnZ5NjxWGJA58jDlAR+qqcVzwTFrdNsbSh2mIWded2b+P6wX5cX1iiQyY0I3u+/8P9XMNwXXvjVxJvksYWwPYTvjFMu7lXdvmxdAQPu36VMP93s5jz4f8kzyVkzPq7ze7GAclzDZlgFipAF1AYsXa6JTwcVZiZtyJu+NXYrZ9GtgvnYC8nmUymH2CgYCb8XyzKVQZ76rGUsKJZFUW8dabneM7H0KFpbw8kMlIRViCkq7Z6NMGZTVsptjWSNBzXe0QJGpQD0wvHER/YlXEn6WZmgRV//I0+u/hvarIuQ6Ry8k60bkomCupeh5arPZ9y3dg1Q+vgkPInVkyXSp18rEKlB1CJs+NJkSBtyOrBojJT/3QRQbsZvq6DdiytdaxEQnBxofsYJJT7Q2ViuhB+3R6GSQEJ9Jy41s+JVzq9v4TfTAzUN1/sfGFe49lwDer6E+FDNnaRcB6yxdo8bHr6EHaGu8D/I9ciaptyWmDaEC6mOH0ebpZ4wEgH2RKLnGM6pEK+5nKlQyRhqW0j2i/xhgK/G2P/wmAi78cgvcd7gStGD6sLzq+jkf6ez9FmklHPt3yO+If4YD/AhBYl2sB2IF5JeeVHCajymCRbzi0qyPLUv13SCyEOujMdqG/1xhdeHNQ4aIsme6pCsUedh+5nDdlgAfbfTNL3PdjV/nYVqWzubmqTkqPtRqmtzfz410/RS1oDhKfClktl3+sGk1zPfrXTGuAlnRKbuQfufLEelg/OA9JLeYGlxQK/M7dBDc9DDBfM3jlNW3RzFJYa6OU6N2/FoKJLLLYQngsBUbf0Az9ir1Xh1aFkAktBP+G1CnfSD8/N3OLi0uIpxIX X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: edbcea7f-332d-4139-4cc6-08dc1e0162e0 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.3207 (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: yK6k7sbiN2PA14C9MRy4FnDUn+H6GciWQOSbpA7YsmJL55DZY1tNwMNL02LoMXVP X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7038 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155741_311345_E7924CB5 X-CRM114-Status: GOOD ( 11.28 ) 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 Half the code was living in arm_smmu_domain_finalise_s2(), just move it here and take the values directly from the pgtbl_ops instead of storing copies. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 27 ++++++++++++--------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 -- 2 files changed, 15 insertions(+), 14 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 910156881423e0..9a95d0f1494223 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1552,6 +1552,11 @@ static void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, struct arm_smmu_domain *smmu_domain) { struct arm_smmu_s2_cfg *s2_cfg = &smmu_domain->s2_cfg; + const struct io_pgtable_cfg *pgtbl_cfg = + &io_pgtable_ops_to_pgtable(smmu_domain->pgtbl_ops)->cfg; + typeof(&pgtbl_cfg->arm_lpae_s2_cfg.vtcr) vtcr = + &pgtbl_cfg->arm_lpae_s2_cfg.vtcr; + u64 vtcr_val; memset(target, 0, sizeof(*target)); target->data[0] = cpu_to_le64( @@ -1562,9 +1567,16 @@ static void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, FIELD_PREP(STRTAB_STE_1_EATS, master->ats_enabled ? STRTAB_STE_1_EATS_TRANS : 0)); + vtcr_val = FIELD_PREP(STRTAB_STE_2_VTCR_S2T0SZ, vtcr->tsz) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2SL0, vtcr->sl) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2IR0, vtcr->irgn) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2OR0, vtcr->orgn) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2SH0, vtcr->sh) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2TG, vtcr->tg) | + FIELD_PREP(STRTAB_STE_2_VTCR_S2PS, vtcr->ps); target->data[2] = cpu_to_le64( FIELD_PREP(STRTAB_STE_2_S2VMID, s2_cfg->vmid) | - FIELD_PREP(STRTAB_STE_2_VTCR, s2_cfg->vtcr) | + FIELD_PREP(STRTAB_STE_2_VTCR, vtcr_val) | STRTAB_STE_2_S2AA64 | #ifdef __BIG_ENDIAN STRTAB_STE_2_S2ENDI | @@ -1572,7 +1584,8 @@ static void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2R); - target->data[3] = cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); + target->data[3] = cpu_to_le64(pgtbl_cfg->arm_lpae_s2_cfg.vttbr & + STRTAB_STE_3_S2TTB_MASK); } static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, @@ -2328,7 +2341,6 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, int vmid; struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; - typeof(&pgtbl_cfg->arm_lpae_s2_cfg.vtcr) vtcr; /* Reserve VMID 0 for stage-2 bypass STEs */ vmid = ida_alloc_range(&smmu->vmid_map, 1, (1 << smmu->vmid_bits) - 1, @@ -2336,16 +2348,7 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, if (vmid < 0) return vmid; - vtcr = &pgtbl_cfg->arm_lpae_s2_cfg.vtcr; cfg->vmid = (u16)vmid; - cfg->vttbr = pgtbl_cfg->arm_lpae_s2_cfg.vttbr; - cfg->vtcr = FIELD_PREP(STRTAB_STE_2_VTCR_S2T0SZ, vtcr->tsz) | - FIELD_PREP(STRTAB_STE_2_VTCR_S2SL0, vtcr->sl) | - FIELD_PREP(STRTAB_STE_2_VTCR_S2IR0, vtcr->irgn) | - FIELD_PREP(STRTAB_STE_2_VTCR_S2OR0, vtcr->orgn) | - FIELD_PREP(STRTAB_STE_2_VTCR_S2SH0, vtcr->sh) | - FIELD_PREP(STRTAB_STE_2_VTCR_S2TG, vtcr->tg) | - FIELD_PREP(STRTAB_STE_2_VTCR_S2PS, vtcr->ps); return 0; } 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 65fb388d51734d..eb669121f1954d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -609,8 +609,6 @@ struct arm_smmu_ctx_desc_cfg { struct arm_smmu_s2_cfg { u16 vmid; - u64 vttbr; - u64 vtcr; }; struct arm_smmu_strtab_cfg { From patchwork Thu Jan 25 23:57:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531899 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 29571C47258 for ; Thu, 25 Jan 2024 23:58:07 +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=6rVlvX4yXgUmZqaXLqifkC0C/H+75+LsBGPVCT6lIBw=; b=huptMplH6+z9+a hvrkgGEh6uCdpYbJQzKP9seVxPE8WUoAw5vPy9MIaMa2gfiLjOBEfcrenmB94Ilj1tNJMd1juqRtC gisn+99V6nxVOYJKhh7Xcb1muk+qJmZHaxMexXCxTLp2wHsHF05i4sQdziasTDUzTB23Z506M4Wne jxxhHnnGZFXfk7jYKTemPxPmrncInXqjtW4jnFDTBG0lvSY8aMZkTXRJ83WlA0NMbWzKKsDobvM47 bBzUf65wOwbkwBB4UedL1ctbG/PxQA5ERXWXzQjq/wTqnwHwI7mm1HUTUIynqbGt5IMG/CAVc8yCL MLrWpKK5RJYNcO4JCV2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bU-00000002XId-3DPn; Thu, 25 Jan 2024 23:57:52 +0000 Received: from mail-bn8nam11on20600.outbound.protection.outlook.com ([2a01:111:f400:7eae::600] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bH-00000002X9f-1Y8w for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZifyElMKBkAkz4bEzgNsbVgCcbQJRZ+gMeTel4PL1nsoWbE78i9DnZOvXheaX9q3YdmFx5Gg/Z0EdHaNVxlE8UliQfZE7pZwkgHw4xaYK9qlUFBD26qUWAS+NnNZkX31OSndsmZvzNWEu4y6zzxJu/FmAVYB168oLxZgzQE2tkHCfuOXI+tuU+RHohp/JQeVZXU1RieeOv8Ehg8sRzY0P7IVMeAVkAAmXnX/SL+UpmGFnI0fLLni0zAdiX/WFG7ECOiuB1vErhroU25H1LHziefXDu6sUzE3ABxsfDNb/08VpNQOzU8xtIeub2w7PQ5MtQmP/v78380njlQQJXVVSg== 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=i+5omMpixyrBaIH7vhWbxuQzj8eGJz9OdPtAPhuuySM=; b=cxRZgZg/v/CLdwyuHjRCEzvTFNejku9bw4Xj9471YIzsKZQQWOWe0hKOjpUF9qwYkBVrg2njH6tDwBvguL+TWWyPis+4q1vSdKUzVie0Dum8e23fDjORDxrtma8vAugFNT2xUvJngeXEePFpwwxwTqgSlTY7aqEn7HZrxX4cJz5MDP1Hmy+bEJkyelyR5gnvhgNBA46VUDy07xWEAcLipcSf2T6Mrr/oOqtlrULjtzdYNzQADfUjKBvexw1POoEi+3ayw703Xf4fWQQAFesOuaIzaYQ1NDH7Bzd3J4uVvelbOxhjyu5/w7RlITsKb423/7pu1pjNSLe2HNPj/f5b2g== 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=i+5omMpixyrBaIH7vhWbxuQzj8eGJz9OdPtAPhuuySM=; b=dcJGAghdmIYZfzuDmMj+9SrlSytKVfD+mqZSVpAzhDvoMAwcyetRcxVjRZBsUkF9pE/xxBzOAwQldLBnn3Gf9IX2nYRCrbtFRcuNECzqdZEM8WcOeoYp9FJBqlSGgGUIgcl8dqOa1x4lHysLBu+wb6NXWITG9QYdalIjdyZBNZL2e1mCCy23QI9Hh0wlOpuzWU80rLsGrmLhmhOoRbnT/I8PtmJWlP+RpGJx+mDR306UTvNSu/vKJPNpN8TInbuwlspkPxI8LKl4wPdZxhODg9q946mbE/K91SomnlSZGXnPdpxdUgijckg/qIl/RINqbn4B2hP7HuXuC6fnSC+XtQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SA1PR12MB7038.namprd12.prod.outlook.com (2603:10b6:806:24d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Thu, 25 Jan 2024 23:57:28 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:28 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 06/16] iommu/arm-smmu-v3: Hold arm_smmu_asid_lock during all of attach_dev Date: Thu, 25 Jan 2024 19:57:16 -0400 Message-ID: <6-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN7PR04CA0002.namprd04.prod.outlook.com (2603:10b6:806:f2::7) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SA1PR12MB7038:EE_ X-MS-Office365-Filtering-Correlation-Id: c8d252ee-c8f7-4143-b1e2-08dc1e0162d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ba0CxVJ69r6ziZVl0oHfZNIm8xDOC+tTkORlSOZfMgAuHMmF28t1pegwcvJy8mpf1oVQQXJfbwxQh4bIhQBcEVjhq9UTgF4nYCtFveVK+eo2W2+S7wV08i7mDlsOl8TDpYTmhoAJ6IYe+dPVK1nD9EuHPGIhSFu5r3WLLXSD83SyD0UHCFjgdrgtszT3VbDFjDEh1cAwBw0DTq7M4Wk2kUBLhvpMkKKdj03RpsBF2PpTVEo30d+LRAtpm1LswM4xNveQFDNQi4NzomWpgBI3dp7RnzG0Yp+cPhZM4Plt58CXgpnhg0N7a3Noe9W1xxfnuXGJdcQFi97c/cX1Oa0OF01WmDD9PlcAQiAxv7OxZ1u/1seBdb3f25VxSQdCCj029Bh8YiSmUH8jFgs3K9op68jn4yqApM/NHD8g7Z4e2U4RZgDl0njkCXekCxEdpYsvefBTzd2sqj2EOLNVXqrcQ/VXVP+EHO0C2WH2dxFBzFbzzqO3YCVNNMqJZlVwn6E3nxeaWZpf3lMZ9sOX/rtvNRR0a4HSoFatphZYcdCuPgqJpn5bfbulSIseQvpdpqdykHN8DL/RlLLeCr3M76klANeBzZrScRuiSqs29ZlA5h4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(66556008)(54906003)(66476007)(5660300002)(316002)(66946007)(8676002)(26005)(6666004)(4326008)(8936002)(2616005)(110136005)(7416002)(6512007)(83380400001)(2906002)(6506007)(478600001)(86362001)(36756003)(41300700001)(38100700002)(6486002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VyhXuag+Z6hyunrs3LkUMJL5JGKAuATTVIjTYLTSrT50QYdnIaGFpHq3Y1JCigouC2TWa3MwTzWWIx582RJZOe61vSwQVeR2hPfWbcWEHe/sSDP9liCMWOaitfjqkrspueSZ2MOac1tUopNAyEFT0UYUgvF1EihGnk2LyCdNBXSs9vtYyhyK1HrQqq+E2tO4OlWpZAeFjpv0ojjJ0i2s7eTVQRXd72Lgdr050Ne2C350b0MCpCfj/+1+ziyCiizLxxZ94iHI4vgB40Qf6Z/+9GwP7psPhmOAqW94j45AiR3DHgNBbTRsWWPfiOuabOevSjbWnUp7Xn4NL6HtZjbbau5eGcG95uqsikTrOpcaFSUTcRMQ7HUdkFoeyMObwgdk/X+rzNUkJmEnXTMdCYJHn95RcG0Go6DBSzmZBXYJJujXMj8ELm+9TYoFotawnDefk/90yJq0RTFiGCDWoGVICTKXEBVeuWszT2HMcpILjCt75BF8GQk36uX2ZO46te1fB17YNoCGhg9VsfoIENF3fGzbykiP0TqHteNalTtwDMQ2oFQIyLiDg7hF8Ho/Wqgt6MBLdMtTiHhT4yZ/0E35uo5bN5vQ8cXqlv0AOGRAg0uUpG93DTWlW07TV0/2JpxWFInrxLMFqXOskD61y0+288azu35+zKFez2IByd3KasvCtFBnzP5Fuv2PvIbZcC0c4xAvOIohsVlq4kesBRWfq8cKly/Uge5sIlmGGp2kPVlf7nq16yULoH52aDtm52aYO26pblPWA9R2lYuSu4jbuyAuPD3Ua6/TMoQn6GPD6Eo7i8qsCSPD1raBGgGcyAdj8gS0EzSuy4KjbgL96WYcEpd71uuC+szvsrRUJwD5msTrYy9lUaUC/PIGSV30hdxq1m0cDecj9zR7x4EyFM3zZg8UFvVm7TnOk0wW/XmsBvkwq4jIPpYDplFZ7Ply0PTlgD2a2Ma57Ifzasa0qX3zCQLism2sNdHKFNMD6NK3sesuifKVlmbKRVvIS6/WItwQuNgOiALU5c0LMZAnUSP9srlGjvLNyTeCy6OOdlF+cYh8bpjICKxgi23WYWCm+ejKqVYKnhEZbM80V83TrkHI3UMFcr2nlNtphICWItzv8brFHHDzShCDS+9wl3cYqAwO/BI0J01nPe5PG90lafKahMceKSk3wx0+pHhMiutYJCkEsRIN5uCPlKZWfnpHZkovxsyfWVAE0l9gElcqUuq72CUB/MpcvlG4layF09sYpSmhHJD8SqZGFRTSgzacCN0vXt5nQELwE1h4w8qHIcL0dQwOMxlpOFqSWWBV8kwszkAl+UOXs0g5jv2l6QWTiCdU5GdQNusvqKnvzpADB74hDuSbo5KH3lZoCqzSJGTluvupBxNTbCAdKX7wWC/xY+0DOpxZ64oF1SU3iQonspgzFkroQlYllBn8kraGs5rOkbwAl15IWNP3RzMMOzfvnd6ZqYevWcBMZq73n55GqWI3Jt2cNhgS2XBBX0VsRsYTCn7ym28yBfsqyNGHYESr48hc2Dqh3GW6hDveIHScTqN1hHsghU3KVLH9wq+KVeQ61Oy2RfMjH7sAbP6YPZ+ywMLZ X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8d252ee-c8f7-4143-b1e2-08dc1e0162d5 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.2966 (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: Lr1aZWC7yWbEyk/DtR5vgTb5jvfnt54M1BfRjqCs9HPdMT7r+up0zWeWS3hNV6wW X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7038 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155739_470869_1FC2FB41 X-CRM114-Status: GOOD ( 20.71 ) 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 The BTM support wants to be able to change the ASID of any smmu_domain. When it goes to do this it holds the arm_smmu_asid_lock and iterates over the target domain's devices list. During attach of a S1 domain we must ensure that the devices list and CD are in sync, otherwise we could miss CD updates or a parallel CD update could push an out of date CD. This is pretty complicated, and almost works today because arm_smmu_detach_dev() removes the master from the linked list before working on the CD entries, preventing parallel update of the CD. However, it does have an issue where the CD can remain programed while the domain appears to be unattached. arm_smmu_share_asid() will then not clear any CD entriess and install its own CD entry with the same ASID concurrently. This creates a small race window where the IOMMU can see two ASIDs pointing to different translations. Solve this by wrapping most of the attach flow in the arm_smmu_asid_lock. This locks more than strictly needed to prepare for the next patch which will reorganize the order of the linked list, STE and CD changes. Move arm_smmu_detach_dev() till after we have initialized the domain so the lock can be held for less time. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 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 9a95d0f1494223..539ef380f457fa 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2612,8 +2612,6 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) return -EBUSY; } - arm_smmu_detach_dev(master); - mutex_lock(&smmu_domain->init_mutex); if (!smmu_domain->smmu) { @@ -2628,6 +2626,16 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) if (ret) return ret; + /* + * Prevent arm_smmu_share_asid() from trying to change the ASID + * of either the old or new domain while we are working on it. + * This allows the STE and the smmu_domain->devices list to + * be inconsistent during this routine. + */ + mutex_lock(&arm_smmu_asid_lock); + + arm_smmu_detach_dev(master); + master->domain = smmu_domain; /* @@ -2653,13 +2661,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) } } - /* - * Prevent SVA from concurrently modifying the CD or writing to - * the CD entry - */ - mutex_lock(&arm_smmu_asid_lock); ret = arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, &smmu_domain->cd); - mutex_unlock(&arm_smmu_asid_lock); if (ret) { master->domain = NULL; goto out_list_del; @@ -2669,13 +2671,15 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) arm_smmu_install_ste_for_dev(master); arm_smmu_enable_ats(master); - return 0; + goto out_unlock; out_list_del: spin_lock_irqsave(&smmu_domain->devices_lock, flags); list_del(&master->domain_head); spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); +out_unlock: + mutex_unlock(&arm_smmu_asid_lock); return ret; } From patchwork Thu Jan 25 23:57:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531907 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 B15A9C47DDF for ; Thu, 25 Jan 2024 23:58:17 +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=1oObfLMghQppdX/uqCrqLBbdegmJ0Zi0bsG9rDkPptM=; b=sM/eL0psWfGOfd MHATh7oi1mCFwZ26X2rQ/pMX0SnMURljj7DWhP6rBMeru/zK3lhdROihGOF2Ea6NWjWfxiPpDWBL7 Ez3jGTV0cMTfZJue6qG2jAtzppqJrxY9SI9oVdNVtyihOCP1chHVVqCLDiLU2INP9ZDFRWxAPuJnW /52aVNsMrrU3eidA928OXqkZhUJ+9fSFsvL6FGOPqDDhOJ91M3tQhU2hyBrPDcxkw/v3ewjK14D87 ch8UczZ+ttSYL5avCdsZaS0OE8ec9tp6UDTpu8m4iRjW/rCSuAQbPQA3muEFkmcAySxI6Ca6HIx3+ X0c+WVIJlPpthJ9lj9iA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bf-00000002XQN-3bPG; Thu, 25 Jan 2024 23:58:03 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bP-00000002XA1-03hf for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GBeSfKJHsPtPn8/mFkz/OuG6/bYph0PmVJueykyuwv6PywVtwNnQlkvA+MhvDrZQx2Ku8acPM8Hfmdv0Gyne1rH80RL12RT5c14zuX3d68NQ6YVHY+iS/63bvIMCYqwDEcaM4kSfbdmeODU/LWLEIBfXvtfBSCwurovC1TyRqQVdwV8GR0s29EJsxUBKA0CgEgMbxGHhf5oUdBX9cam3nRU7qWPy3zf2ZqGVlaRve6G8N5WJRhz+uUQkU3XTaPXP/KUP+OZiDfzaL75EkaR6W23Opsq0GHPmcg3USkYxAjpvqqusoLBoY5QraYz88yxd9Jt9FgRvJxacwvT5dHSD+w== 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=WMZgSb7+n8/Hu/br6qPJ4+0r6DDayqoyl3uXL1TnWR0=; b=ZPDbKq79Rk33mdHsNVnmHxoS63J17lBsitSKnP2nvpLLTLQ2HVbjcFPmaVeky97mw0VRFZORSTBhnVSSzKK01v4QDZ7ip1z8txHemjEChLgVtC45Sq+xgT2BcMF9iWJmBRIR1aJZazGhIRoH3ZB37+dOGPq+atvXwLW01+q72K2BmcXAYSWggobL6dTzK76MskL0nwGXp9BR3I8pYN2Yvua1fOreA2o8MBBvuIiOXNBofBzCDH9DC1atbC8zZ17R6KjTzhZp/VrJE/fULyUh9qLjvvBzbMbeLGkYKPzOJp/ZlU+itAiGguqkj43oEOC2CwX/MUhUWYFdJ2pHKZdP/g== 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=WMZgSb7+n8/Hu/br6qPJ4+0r6DDayqoyl3uXL1TnWR0=; b=iKxlWjg0gD6AwKVfK0/47RFvmOocvIM1uAok8c3vGD9BbvPfM4ILVn84Injfp2imz0UVtXnX8mH4oYZO+y8agv1Ve/cUXlgzZRZp450bsSx3sbkz6vIi77Ekmk8k1Vp8/L6FPE6IcUk3EETvXaBz9319ZV7srXbdOK1fIG5DkkJwNCHtAEOwzo5/B43t/cCFSjcahJ30ihVYkXnbnx8c4r0lY/9BJOFIEViiuCTwGc1ge1+wK32op7cPox4PeTLVtgi1ia+4xMt442lOZOzj4XU2Uljo37hEII2lRW/ggaXjH+ffqV5z8EE4ZDUG7DhaEJweQ9WeXIxFiC5lawbb0g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:35 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:35 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 07/16] iommu/arm-smmu-v3: Compute the STE only once for each master Date: Thu, 25 Jan 2024 19:57:17 -0400 Message-ID: <7-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA9PR11CA0002.namprd11.prod.outlook.com (2603:10b6:806:6e::7) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: dd552bfa-fcc2-442d-123b-08dc1e016400 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4iSp/wSPxKTgVfnzU0DtANXlijLfaiQYW6vpB5n3b7m9qg7g3ofXwwmp8Rdmn1h8MqrY5KNwgBYrZUBbGP8opzdNq8ej+LhaBNnGnMe/h4vr3NDIx4qfaUn3edqV716n/wQ2Y57/cOr2yuzcYTVa7JqqFV9bdg2VvQPJKWkGiT2UDhcauiYQHeMNbVQC2VH1galN4lWvNOpqzipz3wuvugl6KTgmjhUI8g8Lu8wTwy06FYwWCRgedfK+aJ6mXN1soMBql/mOBWY7CzarHXDPUmFb7TPmswBXM18XqJNyUtvPc5qIJeGUmN6N8maajTdwVGdtj0FvZCns/IVLqOS8UGfzQ70E2dix4Ky5DesIMVC6zwvtjI7bGY8xxvj//YoZLfGh5kPaX3koTZaE2J9WcxHoE5Tce0msLwHlwqGQowd9NsV5XNkBgQ836lApwkgE9OMcOR7c/M9VCzB01odSBIWcY9ao4UIvYN//vYiI/q7j1B3s90I9ER1gg+JnEA14BckiZVtvLec63zQLoVz2I8ctO4mRh1CVgt2NwzIsrcHFcnauAdiujTzXL8mPfkG9a7q2G8+7NEafkF2pWTLC90F1k1XsNm8Ahxdfh7pbHcQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A0UJnk1iJF2adxcqkDNGGUiHxiO/vyON5h4vIiEBmSsPwZs2KjENduSWniQzGrXUXjKwn8vrI/FcOM39fwyvE5NHjBIo4hgnR22LYk+mKwcRDJkaUodmT+Lm0zfo++1LEtX4PSggWbqNbQA2bp37tRZOxOFpE8pHQfGHCKEBTCctiLOQ8aB1fW7j2fLPPIzJqOVb9JeyTU+w8TMbztYj0DQOhm2BmPhgyMVYThNYwQ8ByezcKHmNRdG8GdeXCTsip5WmMxDPQuvcIDGdN7yFfip3C9Jrtno9h3sMpAnEXMxqobW1NI13I7OH2h7VVjWsw2gD3YVEMKeR7EXci469eaAICKoahwtfTskAHsSpBny90rGAuacZRZxfGz7aUZVlc66hMfZi/O6xBR/pCOt3yO4qwQ/MrmYPJKhwrIzIGrLRQ0YmWIh9jeDhPhGBAfn02/c+m8lxRINXnIRgaToIgGur4iCyPFrPU3d5uISJzDLL3NjfKYqkBx33ix34hZAMmEIyu6YbmoiCDIDG+YDD8nT0MeyQz47mCSNA5PfRNizveM3PtzGmLRlfoSDJ3uVdUasdggufBu8HBx2+tInx7hG810mmC4nV3pgZDo4GTIXjyASbNiCvkzRrPTeD4Q4vepTvFGVcHpN0gzoUncf9smY4NdCBKd7HNvnoubotAhGquWn6fTko9iURX4dg6Gsk8ABxUnkrFspCEykhfPH9DXCenKyHQEzO+Pm1KSF9UnQBWPyHu1zmdWFlVQz//14vhQ5e2whXOmsmhGYn3HS5rJEHnnmjL9qN9oA2renu3+iQKCnwjiER5Jzx9Vi0hVRrMBYNlsHwOCfknlv+yeLupwtskV8QbQNVEMp+GJwVHUtSkwovWUpkKkjTkzkUm232nVTL/XPN1PhckPG5SYOTIellll7my99HDBnX33HnyKWDkvlJmZA+5Zy5OBqazm6psUifVWWX+4rSCH741t5LJ+2cWkx5at3qALbUQhCbFNMG82+rJec+DkkG3sdawCgFhsYmSaz/0rRrFwci9HFNyXtBZkMQLhNeEU8zu//03QpCWWWHCkHpLm5s3JewdMKirMAEv+H8TVfhdYaWtGoJsyS3xVHMJorsjusfBdN7Ac0a10NjG65t1bZ4EECH4zxsuCh1aJ6rUWXkoafc1kp2icKIWJOREI+qnO3oZLZTzAT441RVYMdsSpP/EPU4ykccaPFRmvSuOutqIBXeFje+vKq3dB22t/zpX/wX78NkSTfreoBj2ZIXLINU3xuR2ZEO8r8ZHTxVhjf/4iwlelfHR7KYURmw35lakg9O6aNSoGXbrF+0MxKwLjfrhE5kw/nhN/f7LqS9YyJ5J0OxEQjRI4iVJZUhhJBETFIeoQV1Lm0IdvS7Yw8v8IOdpf0ANr2aKnlJDu6s4/8Gi/zesSeNlknJ1RFOWAfYii5K3afChSZI4CRhbGhVHtgEiCpwTTlI1Ig6SZYbWIw9zP9Z2Qo7e/RuzJOsnd/1EnHkydofIJVBXjOuzPZAEeeo09Uwomz3GYvRRdzL9roBDBKw2Z3/dEohphj2gBLZpRzwW1MO39EEuOfLTIb+9lFmKnpAvjES X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd552bfa-fcc2-442d-123b-08dc1e016400 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:30.2240 (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: H90/RFowEa9RucR+ZkDqMNKaaOlgoE6qL7/996P3piIYfFxE1l8cpFs9eiw8LXom X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155747_156157_B129A7A5 X-CRM114-Status: GOOD ( 16.69 ) 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 Currently arm_smmu_install_ste_for_dev() iterates over every SID and computes from scratch an identical STE. Every SID should have the same STE contents. Turn this inside out so that the STE is supplied by the caller and arm_smmu_install_ste_for_dev() simply installs it to every SID. This is possible now that the STE generation does not inform what sequence should be used to program it. This allows splitting the STE calculation up according to the call site, which following patches will make use of, and removes the confusing NULL domain special case that only supported arm_smmu_detach_dev(). Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 57 ++++++++------------- 1 file changed, 22 insertions(+), 35 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 539ef380f457fa..cf3e348cb9abe1 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1588,35 +1588,6 @@ static void arm_smmu_make_s2_domain_ste(struct arm_smmu_ste *target, STRTAB_STE_3_S2TTB_MASK); } -static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, - struct arm_smmu_ste *dst) -{ - struct arm_smmu_domain *smmu_domain = master->domain; - struct arm_smmu_ste target = {}; - - if (!smmu_domain) { - if (disable_bypass) - arm_smmu_make_abort_ste(&target); - else - arm_smmu_make_bypass_ste(&target); - arm_smmu_write_ste(master, sid, dst, &target); - return; - } - - switch (smmu_domain->stage) { - case ARM_SMMU_DOMAIN_S1: - arm_smmu_make_cdtable_ste(&target, master, &master->cd_table); - break; - case ARM_SMMU_DOMAIN_S2: - arm_smmu_make_s2_domain_ste(&target, master, smmu_domain); - break; - case ARM_SMMU_DOMAIN_BYPASS: - arm_smmu_make_bypass_ste(&target); - break; - } - arm_smmu_write_ste(master, sid, dst, &target); -} - static void arm_smmu_init_bypass_stes(struct arm_smmu_ste *strtab, unsigned int nent) { @@ -2439,7 +2410,8 @@ arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid) } } -static void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master) +static void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master, + const struct arm_smmu_ste *target) { int i, j; struct arm_smmu_device *smmu = master->smmu; @@ -2456,7 +2428,7 @@ static void arm_smmu_install_ste_for_dev(struct arm_smmu_master *master) if (j < i) continue; - arm_smmu_write_strtab_ent(master, sid, step); + arm_smmu_write_ste(master, sid, step, target); } } @@ -2563,6 +2535,7 @@ static void arm_smmu_disable_pasid(struct arm_smmu_master *master) static void arm_smmu_detach_dev(struct arm_smmu_master *master) { unsigned long flags; + struct arm_smmu_ste target; struct arm_smmu_domain *smmu_domain = master->domain; if (!smmu_domain) @@ -2576,7 +2549,11 @@ static void arm_smmu_detach_dev(struct arm_smmu_master *master) master->domain = NULL; master->ats_enabled = false; - arm_smmu_install_ste_for_dev(master); + if (disable_bypass) + arm_smmu_make_abort_ste(&target); + else + arm_smmu_make_bypass_ste(&target); + arm_smmu_install_ste_for_dev(master, &target); /* * Clearing the CD entry isn't strictly required to detach the domain * since the table is uninstalled anyway, but it helps avoid confusion @@ -2591,6 +2568,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) { int ret = 0; unsigned long flags; + struct arm_smmu_ste target; struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); struct arm_smmu_device *smmu; struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); @@ -2652,7 +2630,8 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) list_add(&master->domain_head, &smmu_domain->devices); spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { + switch (smmu_domain->stage) { + case ARM_SMMU_DOMAIN_S1: if (!master->cd_table.cdtab) { ret = arm_smmu_alloc_cd_tables(master); if (ret) { @@ -2666,9 +2645,17 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) master->domain = NULL; goto out_list_del; } - } - arm_smmu_install_ste_for_dev(master); + arm_smmu_make_cdtable_ste(&target, master, &master->cd_table); + break; + case ARM_SMMU_DOMAIN_S2: + arm_smmu_make_s2_domain_ste(&target, master, smmu_domain); + break; + case ARM_SMMU_DOMAIN_BYPASS: + arm_smmu_make_bypass_ste(&target); + break; + } + arm_smmu_install_ste_for_dev(master, &target); arm_smmu_enable_ats(master); goto out_unlock; From patchwork Thu Jan 25 23:57:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531904 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 C9D5EC48285 for ; Thu, 25 Jan 2024 23:58:12 +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=T0fdKja+QvALg9zqyL7SYGeeGTIzq7bUAtiDEY5zio0=; b=YZJd+8RRkUziv3 XtozjIaESj/kuCyB4xzHEzwehGUTAl3rdcobulJw8rcy4MWKsDV8E32u++6fN+iBLT+KZGbLDSEfm ojjGAzWKyI9wrUcdgpwDcxgnCSLOe58E/+rRqzjMwIyKcYmRacKhuwiJL5JgFuR6L+x3GXYdXtrsQ Dt6A1RRUEe9+tKX+fKRBgksfLXF0rOJ8toZ272Ryc8NZX3vfcs8RybQvywwk1DJgSa0BM07y7kCfm gG8OOIvRCJj7ndsch3O4R94qGV4+MDTtyxuOmkrJrw0l81BAgKOvHQYS4z4/+UUFYA0knuixbRQQX fRQYpgSU0+h4jiz+tfmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bc-00000002XN1-00GF; Thu, 25 Jan 2024 23:58:00 +0000 Received: from mail-bn8nam11on20600.outbound.protection.outlook.com ([2a01:111:f400:7eae::600] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bN-00000002X9f-2EcR for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MXY4nykbNiPKEj5BbADN9rln6frw5ciH5JhaUKTyzsMCTT8WzxopmHh7B86Sgw242uZJ5uqfdB09aRSMaHIY6wc2FByxuM6t+YPO5l5ysito/GhP9COf9+qCh5IitQU8eiEhqGE/wCcyZ9FYs17PyMs8kYROJHNFV7zfFN0QIgoz4sDEt2tbJzzWqsiyNQmVJBO1mxhBNeTUGrI1pCLXOztldS+FswHKDEhMUDbD0uZqeOwp5uCeIZYv2bxZ/IOtEN+ZjbauXqm6gCUaJD4pBipzXFCinc9FUSVk6qDUG1q5dCiikuaWa0Zj35gVHo70jV9pRpUhFTL1rdxZmrG5kA== 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=qUIo70xMoe/CTlD43Aki+vweDYpRAfW5ag4DdmCUQUI=; b=e+HsScIMDu3bE8xSaKQaP9Nv/1qHcDaUVh04GAYfgUZ1CErm4zEbN7wLkE+1bEyQbe9ceKw5iT89FnBaFjca6hAnmVnjN2PJvF9nBE1YUqwncq7r2BRwCzKLfvBpuo0Zj7kWMgwUhbrd984yze4wxe+qz0bFB7Pgh0ykLZUUds+QVyOPn/gL+syOys/RF++nSSARnq1ZwPXzHrlXXUK9pN1/XC0fG0ArDHEjuW3t27snA2ZgfoDCC3LGI/qowwGL63T51J/AYE2jmbP+uGX43/7S/knaHcNjRXUM/muqbCBdlS21O3Eh3PvJJSUD/1G9jRIswfcGYTx2CcuPk5pqXw== 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=qUIo70xMoe/CTlD43Aki+vweDYpRAfW5ag4DdmCUQUI=; b=jS10kkm+ntaLhTok9A4+raIyv5AMgNhyerjix9XT6XsiBXfXPC5MtDNgeTdDi3FbUdjGGawICkM540ogObmpqvjIfVKZ+ieFLZFnmE0PxgkAZkb6ahKngNgaOa7ccvHdBCIT6DnqokjrFHh+80U+7gxVxJgjULwFzhFBL1y+ECAX6woxzbR5IWYamAPI007s2n0TCxnov3lsHdZ2UY0dgBAvTRfMMOIjOKpCoxaZObVEBP6Fy+hZ22v6MMBz4KAlTuVw3q9Bpv0jsl8ATYw9g/iYjXoAQ6tuLaR3Ei2vwdPPz4OxwgKMcnp7CNcSuEnxv3e4u56pruh6SY7h0YoJdg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SA1PR12MB7038.namprd12.prod.outlook.com (2603:10b6:806:24d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Thu, 25 Jan 2024 23:57:31 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:31 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 08/16] iommu/arm-smmu-v3: Do not change the STE twice during arm_smmu_attach_dev() Date: Thu, 25 Jan 2024 19:57:18 -0400 Message-ID: <8-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN4PR0501CA0049.namprd05.prod.outlook.com (2603:10b6:803:41::26) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SA1PR12MB7038:EE_ X-MS-Office365-Filtering-Correlation-Id: 5486c598-e209-49a1-103e-08dc1e0162f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q5ai+KuqoZJzrdxdwLbZeE6hD3TrF+uorhnswDOgk5AmRGTc1Vo9Fizm/6cW+sbTC/Afp721pkhxRR9t05xwQI8eP7qs0g+JWRQkoyZ8/h1bTgo3r7C1RMK/STT5WwU/wqzB34MFm6ZAMwTFBoFV9s1eL3Uw4HyPDnQUQzbN01PbEsn+sBfr4INdxR8VZDCakYX05s3+htlvdRmGK06XDtPdPStROKWR3m7AJf+cK7CChS1rp0/Z9slKUBRvXCA1CUE1Tvir8HeyfRWJUPTbtF0Dho4yJp6l101uy5cliGaJJNXwQqrB9wvaMVSv1Bl0XLvLmJ3tPRYOOhEHuXIRkxGyQBQDUh8Pq9dMHcLVnTgxCH1DY2QFWQb8OCov4BXl93DYhjsexgbp5C/5j6s8HAYZdKZIj1bIVs0XP4G2J7c+s6/HHniD9Bxj5LII/nsgGplxBnVjDkF3usdRo85NkTwCpDHL/q5JiDhIyRnmZ/dQazqZtKBL1DEP0RLg77nYvo55LGea2EsHhtkDw6Ogm30EgBTzQ3VLy9gym9DRtARQSG3v5t2HAjDMD5s8nl3YWkMx58bBONeIYA2Qx4Sa1icoHjPpzP8bLZ15Rm322+c= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(66556008)(54906003)(66476007)(5660300002)(316002)(66946007)(8676002)(26005)(6666004)(4326008)(8936002)(2616005)(110136005)(7416002)(6512007)(83380400001)(2906002)(6506007)(478600001)(86362001)(36756003)(41300700001)(38100700002)(6486002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ACEu1furYA2yvt527K2Q6cn3RhPekJOewn6hSw6cIcGWl3sB+unxHEZAhquS8u/AVndHcHtjK7uBZJ47NuFiBGt/R+RGpoYogF+MubWZ8YuPsaOrNUgDyXTnQfw5hHw2bWeMifPfcPc24Vys5e7Unu09Eb//WCclD7itQYx7XBA7SG/RH1OpIbxsHonKf9B/3wIFnW7ZzUF+GmfqPmPEYFe/YJY0TZxqnM9kd08D+3425Pqswm05uxyh2+EfNNLD9GRKHRj9XiGl4LNJ+sZyvcEtLYh/b+5JMf37I9cEO2VsSPJqzdi7CnaqLRB8IFx/oqEFEsr/TFSBmj2RRz30oyuuNjw69VVj20XhFcvh96na/nN+2WSwMxMjyu1Dsp+3CHLtuNzVII2mt5i8eICxBjlTxCIzztY8NB7jvnH6nE/I60NBvhOGFcP+xuwFSfS8wnA9YroMyn1f8mx31bp4I3F3cFMGn8ewyq0t99m1/Fh8FgTByFol++blKLG1zhSUGnUkJ9GqKl/V+6SSeozcvl5tZ4PZPzZrSnYUegvp9I1zEOLJVEgIipOYtlB1Y/fQgon+PepAVE3NwIPUeGFJ2GT63xt+MjDJtbHVoa36zDiCX6BF3ofIpJPJ8MTq26AXd3o9eef1ndHhZ/WiIyFagO069F96X9HKOeP2vDE4x8KEIZa3ANqnUEaSrne7ns2rI/6Cb4NbMXffQSaVFp0V/z2Pc59LRXn6x9O4wgANKsiXQEf9J0vy6sOq6T8Kb29ISKVpt5oHgvEHWEAPYE0z2cdpi+/gbZB1G6t9/p84gLINsstbdkNzQk5ktuYvOJq4Q9K/MUGKHqQiTAfurTp9wYOQRAoacUj3mHk+0mzmt98IXEwmmQwwX7aI4aplvPEqYnB/6cmowWbLwzjAmU5iOBmnMh+wkGLgrTTnNyR5yOrc9fQ4D5Sx6GQwlr7RkXkV8leGnZ4+zJT8FNcY4XczRkrLuT0pHbSvmQ7CEPTl7uy2b5ZdmiMUoDbqpJM6aFPX34k+cVqzDrYdHp0RxIqxbymOUFQE2sW1LGYDbU4rHYt3KczXzVuMR+YjgwSO7XweGzRwyrbqdKqNahklu16tBJ5luo8KsnDZ1Vs8eXnLzlfGGMc8CE92FSw/1trL2eSCkbqgTbDWm8Gln+/tvU7nlsSeXaWObm5YXqUYvo4/G2hqV1H2SXyr8OCzItswzepVPKuOpOoSSUDWYwdxvsjvW5JPNz9IVOtkJo5+xzWpChwDxTo5+1xl0voH/T7zket/Ppk/juv1hUkHsoC2By1xSfQHrIpszqFAXT2lqG9sGHa9vxoc3ljK5wza3zBqhQtXLWwf7/oGSnb8IJYedoCroLSBDBqK3iThcasRkw0SQTIDVNZuUj1nOWJx2dCG6+1t35jT80J9NMNjz0uyaseTwOaH4GeqNI2Wkxz2YKe81A7QwEgcCqCRuZ7hekSzsVXrTAiM+vKWYU7YLVBulnFy06DrbpUQjhQWwY2p2th2RqTDoaS1yALspEHdKKrOGgYJi2oV4jy/3j7zWEuPI03DTKvLadr+IL3noUQxkX+UHX25ZR+xtEcoozMIch8kw21T X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5486c598-e209-49a1-103e-08dc1e0162f6 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.4817 (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: cCHqHOUHdJJfOnjEru2d5ENOJnysoWe0cCOPQRUrZawtowOgV7NbKTXtUcrdp5aj X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7038 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155745_624035_17F48016 X-CRM114-Status: GOOD ( 16.18 ) 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 This was needed because the STE code required the STE to be in ABORT/BYPASS inorder to program a cdtable or S2 STE. Now that the STE code can automatically handle all transitions we can remove this step from the attach_dev flow. A few small bugs exist because of this: 1) If the core code does BLOCKED -> UNMANAGED with disable_bypass=false then there will be a moment where the STE points at BYPASS. Since this can be done by VFIO/IOMMUFD it is a small security race. 2) If the core code does IDENTITY -> DMA then any IOMMU_RESV_DIRECT regions will temporarily become BLOCKED. We'd like drivers to work in a way that allows IOMMU_RESV_DIRECT to be continuously functional during these transitions. Make arm_smmu_release_device() put the STE back to the correct ABORT/BYPASS setting. Fix a bug where a IOMMU_RESV_DIRECT was ignored on this path. As noted before the reordering of the linked list/STE/CD changes is OK against concurrent arm_smmu_share_asid() because of the arm_smmu_asid_lock. Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Reviewed-by: Nicolin Chen Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 cf3e348cb9abe1..bf5698643afc50 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2535,7 +2535,6 @@ static void arm_smmu_disable_pasid(struct arm_smmu_master *master) static void arm_smmu_detach_dev(struct arm_smmu_master *master) { unsigned long flags; - struct arm_smmu_ste target; struct arm_smmu_domain *smmu_domain = master->domain; if (!smmu_domain) @@ -2549,11 +2548,6 @@ static void arm_smmu_detach_dev(struct arm_smmu_master *master) master->domain = NULL; master->ats_enabled = false; - if (disable_bypass) - arm_smmu_make_abort_ste(&target); - else - arm_smmu_make_bypass_ste(&target); - arm_smmu_install_ste_for_dev(master, &target); /* * Clearing the CD entry isn't strictly required to detach the domain * since the table is uninstalled anyway, but it helps avoid confusion @@ -2901,9 +2895,18 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) static void arm_smmu_release_device(struct device *dev) { struct arm_smmu_master *master = dev_iommu_priv_get(dev); + struct arm_smmu_ste target; if (WARN_ON(arm_smmu_master_sva_enabled(master))) iopf_queue_remove_device(master->smmu->evtq.iopf, dev); + + /* Put the STE back to what arm_smmu_init_strtab() sets */ + if (disable_bypass && !dev->iommu->require_direct) + arm_smmu_make_abort_ste(&target); + else + arm_smmu_make_bypass_ste(&target); + arm_smmu_install_ste_for_dev(master, &target); + arm_smmu_detach_dev(master); arm_smmu_disable_pasid(master); arm_smmu_remove_master(master); From patchwork Thu Jan 25 23:57:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531924 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 AB0C2C47DDF for ; Fri, 26 Jan 2024 01:05:03 +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=Mo9Nhn9BpUkdcQvsH9eYkMjQ2Tye6Y59F06Fvq3YteQ=; b=qneUo/kp26pJTp v6ck9alBTVnl57eNmuSkFC9ypjJli9y79XHWtA0DnM0bMPqAkebdxHFmhkKzohNx8iR/xLGW1f02u EnZsq7I0cq2IHFcgZOnIr7HjinWUfEVLrZbDRls/uc8RKZvuuEotfK429ubizdfIxkbqevmYFkN/E UDV0OmfAerNZ6LRVNVuIRw6aaCKltViM1W8r5PM1rnKLfMw/F3iH4ZNubSs07uOXtl3DWnq4699Xt hHaS2QvHf1WKUQg4VZ8CRllD4evkKL9iuUC7ClvSeUB7Hvs0+e7KiMacaKm0TtvFxceLa//FwDFLE SSQdnPeS3kBtZiQFCpwg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTAeI-00000002hQe-2XHu; Fri, 26 Jan 2024 01:04:50 +0000 Received: from mail-mw2nam04on20601.outbound.protection.outlook.com ([2a01:111:f403:240a::601] helo=NAM04-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bP-00000002XEl-34zk for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SsDzhlcNeF2GPRI2Dhwy6+2zkOIFctG6+tlshNsf1G6hqCyz9FN+0v3/AW77WzQkKCmoEYduTaV3Aoj0n2TnTKXg365r5qGg7tDYGjtB8BH7zO2AW5/n9MdG+GrSrent92dN4GRUi5cpkSpMinAiYJU3jf1ll9AVkrwzN4gSRQsvF7x7woMTb3Z+ehoHMQRYbiplCgBppyYfo4CHGB1mtM0jNGZgC+fghJiwQjvXQaPSsSMKAJ68YvIhBtE67s+KE3sRuFC7kvBuxwPde71Q5g0pZ+XUPodHmlPZ3t89HI9uhIEJTu9+UbfPs8Z1N6QybydnMjmlTRVzKMJ/px8nZQ== 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=nay4gjr6wba5e2ti9n+Ho2HOVD6oZCV///UMW2Nm2sY=; b=mu59LPneSTrS/8SFvJuOuiAeK/EdU+KFFeHKVEAa371831GNesUjlKdgX0t3h7Z0uPp6S6J/tUX4x0PFkYltYCowMFINXbeEnlJ1d63bntRDL9OkDhPIY/ZrdCRGHsY2FMOS80PZy3cuusADlXLrGP9nNPEGwd/LojBA0SlHCo9KVURoBwIlRN102MawXH8crCjmxzZbVTit12FJljydeH2L8qBh1B/ylBitEwxZrzQ4WfUK/Vy0sah1q32kvm/m//yRm2TdwsNU7EoVq3Bj+SV9ES62n4UGzL23OUuB6k/9Gn5OHkISwv1gdiLFKy5Zlgz3PxQm07N9nfVBc8JkmQ== 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=nay4gjr6wba5e2ti9n+Ho2HOVD6oZCV///UMW2Nm2sY=; b=RmMai96XVEIAlTCy7ul87rk51CIE7kzdfKR0kV6DqWS63K7GxBdISXI2ESllY4/Ev08nNigb/6oC3eXYh6n/6PA5rp5xEkvcnNYUecA389UbKdBmDPlcXdiNIa4+yJFpnD5VLBRHLcZUTR0Pqkz4ecT589LvoWkPjFPUCCI9C3SURiPFGymx1NwenbyX38Ynk3iwu6C5HOBPoPM6sp3QBqNaBa5zjZM1PnSbudfZfs89Kz54LFeGeM/5JubPhBPLX+g5LCaa6rUN3PFkrtdlp+30VRM11ddJxItWqRgX70fYEhDMtQs97+XiZkWekCpkrJX6q+/mS5enSk23yUnQ0Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:34 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:34 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 09/16] iommu/arm-smmu-v3: Put writing the context descriptor in the right order Date: Thu, 25 Jan 2024 19:57:19 -0400 Message-ID: <9-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA9PR11CA0030.namprd11.prod.outlook.com (2603:10b6:806:6e::35) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: fe0b80df-bbf4-4184-1809-08dc1e0163e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8IDKs9i7Is/UNNW8kXHG5GB+bq8AiWH3+jqJv6Vh6JSA6QWKd4DyhjFtnQP+3yxbRlDxj2c9TuZY2TG0Az5wEk/CBxfWFw1009rZcD0R0rUTteatO9JNxMukPqpJSsEEIBvGjTTnbW8+CkgIMW009fpNZpUYlpJyqM65arWxlfPEyrXT+q57uaJVyYC52al2VT/UdUt7dDPRrIo+r8OPyc/blsVMOPmZ+km9Nguo7E/2PHp4z7Wrv+8oTvQjsqnW8jXHq/5ExExg891HAp6ts4A47Crbw2V2M1OIfGfHYGiOu4KwasbmYODUkWkndBVmIbx3KgABpwU+F02/1eblEVxPVumYHUOQKGsmiqh2LZs9Iv6FnS+BAmLyyFaM+ihuiM3WVKDxX/yy0E67ngmLrjeQhtWiD7a5/FoZBdnA8Q9Sr6nIB5/VwHNNjxZFM6tSE6TF1GqbJ9icVkrIawQNm3jWLKIcm73N2XEG9LqdgkYUSqm7jcqJBeg4mmM5sUP/kwpNCz5GKXLaI8xdh37UuhWyeIDM6w28O7fuTiOQv3puj++80b/JqxMvFYk2bUaOsscySrsXaSWwsgAEC1PDuKqdq3dRRiFsf6tq2vj01pI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(66899024)(316002)(8676002)(4326008)(8936002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kvvuxkt4f+ES4pfOFaqmgrfv2sPzokMl8U4pELWLD+01i0kO3+HMNujF01G082RooPIHLhUF2uxFA2J75fApzm1+F24WKTOYYa/6CzNcMc+iu36rv7djJnxLmbYKksUgV026es9DcUH9Dcs+cNfTxp3VZcxboCj+I8vDhLW3UcVpEYerr2olaPyUJQu+BsvdTlTYOCaiChGH8OdBsmWl2YiHE6V358MzKez1rzX/cgk7CTExXEhY6hSJ2fbE0GMV1b7fCj2sKx+CrnJPhFwtY1iH5ZPKvmhZfkyDEnRZ2bxbemurZFX3aVxyifVC6csHVoOJE3V6/73Zgp1RzRjap8I/f/FumyDLZB768O1j3kSrcuwGzgnvN/2IgUHpy5Ucz/zdRZWF9JpzRZS4sR1qNrFyYka3kaiuofJ7Vs4TQ8X8RwfZ2aDJAmYzk6ro1s37+haEcRpdrX0E+FfJuXcz0Ij2W1kvZIsOnck7Vi0UwNh92fzANwzXHCIu2De2Z8cNOcsTMyv3Cvx50xC4oZJGvnxQJMOrahfrju98mTveE0Rx0lQaYl4OZqVI3mTZsJfS7V6r4nqQ/gyAPC3yJdFbPzboLcavJsXBfIj/bKN4aHyUoOG4oh2UNelAFNO6usrvogVO/yL19RX9leQ/8BjcK0NxId7iXEdKAgETw4kjAeiFrtwHMP3rQHO8qRfFNK8A4/Gws2Ecb+i8ByhYGSYtMMn6S1gouXexdT6q6oO1VF3/6j0bPPDcYBVWM8/CuHtw78WUHdsdwqiLhDYSidsSnvUqHgBir0eE2YhpyEgjyjAHOjrn5haoYHckadTVMnE3rEEGXIj0l+CV+gYQEByP+PSAJB3es0JTm+gnGi7PHBYYxMYTQhydv/J/lj9rMBRSL4keCSsA/x92kY4XhrZqUm+uRxSWn2kI7G6dsDmGIke6Yogc+LIA2TZTJJ9uKZ/bcfQHNKrtJW0yqHCWCqXPXYEa2JTE32b9+CnD0FdJweQW2t+sECDFYW65Sy2CIEwDBzE1u8FC3O8JHNHWvRRTywQeh9tNmEGw9SztsFCvQD4y5961x1RT7f8y40p64jIeoxjdrAYmr0X3EbpnEY073XogEsGbETjA9K/a/6/Zb0xnhOZ9wXqMl6JTOVNbtekdNAxS+GsfbFsuvFzgf8TwXxCLnr6pzhhOdyQCvG3FeC904x75MFN/CKNQDP4Hj/w0gm1bkgQqsP0AHqaPA+sFHjeARPHgKKQBsDpt4YWgsihxtYZC71vIUh4974m1FdHnZVi1DkRSRO0oPiLt+S/JAjZlvSMVHvkDLjqsy0lTAVjddZZqc0xnTBvF2AkwK9R8lSIDtuqOWRCS1GsGQxwHT2QNSlB/xSAoDXnw9le/cINLKrWRKzDgSgxmPt8H01uy9pQDt+aOiQFyJkBtEqdtGFNV4J6IgJxnWxBspbyjMT5RfbBD1OKsHVTQFnO8PQ10pDjW3mHknvGmvX0Td0hM35BrWcGBmUoV5AL7XrWbFRz40EnkT32OIHXdvKea4IHlwdmWjs3kfq/6M4oaqlPIshS3YpuQqyGnCqF5fylK2S6UdyfLHKXgjHoYarjP1P2/ X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe0b80df-bbf4-4184-1809-08dc1e0163e0 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:30.0179 (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: NYnoiNrHuRto8qnwsPo9TVDK6sszWNj8BEP2PwamchVe4B/GLRjaoGZ/7sc1tTP6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155747_878808_626E18EE X-CRM114-Status: GOOD ( 20.40 ) 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 Get closer to the IOMMU API ideal that changes between domains can be hitless. The ordering for the CD table entry is not entirely clean from this perspective. When switching away from a STE with a CD table programmed in it we should write the new STE first, then clear any old data in the CD entry. If we are programming a CD table for the first time to a STE then the CD entry should be programmed before the STE is loaded. If we are replacing a CD table entry when the STE already points at the CD entry then we just need to do the make/break sequence. Lift this code out of arm_smmu_detach_dev() so it can all be sequenced properly. The only other caller is arm_smmu_release_device() and it is going to free the cdtable anyhow, so it doesn't matter what is in it. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 29 ++++++++++++++------- 1 file changed, 20 insertions(+), 9 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 bf5698643afc50..09b40ba35a9cee 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2548,14 +2548,6 @@ static void arm_smmu_detach_dev(struct arm_smmu_master *master) master->domain = NULL; master->ats_enabled = false; - /* - * Clearing the CD entry isn't strictly required to detach the domain - * since the table is uninstalled anyway, but it helps avoid confusion - * in the call to arm_smmu_write_ctx_desc on the next attach (which - * expects the entry to be empty). - */ - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 && master->cd_table.cdtab) - arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, NULL); } static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) @@ -2632,6 +2624,17 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) master->domain = NULL; goto out_list_del; } + } else { + /* + * arm_smmu_write_ctx_desc() relies on the entry being + * invalid to work, clear any existing entry. + */ + ret = arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, + NULL); + if (ret) { + master->domain = NULL; + goto out_list_del; + } } ret = arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, &smmu_domain->cd); @@ -2641,15 +2644,23 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) } arm_smmu_make_cdtable_ste(&target, master, &master->cd_table); + arm_smmu_install_ste_for_dev(master, &target); break; case ARM_SMMU_DOMAIN_S2: arm_smmu_make_s2_domain_ste(&target, master, smmu_domain); + arm_smmu_install_ste_for_dev(master, &target); + if (master->cd_table.cdtab) + arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, + NULL); break; case ARM_SMMU_DOMAIN_BYPASS: arm_smmu_make_bypass_ste(&target); + arm_smmu_install_ste_for_dev(master, &target); + if (master->cd_table.cdtab) + arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, + NULL); break; } - arm_smmu_install_ste_for_dev(master, &target); arm_smmu_enable_ats(master); goto out_unlock; From patchwork Thu Jan 25 23:57:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531903 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 0A634C47258 for ; Thu, 25 Jan 2024 23:58:11 +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=cBXz3hs7msB8ND/f9l4eZkMxqemo/A9zr18UIN1I55s=; b=a1+inj3kTly4PF rTXcteDYqJ8U2TRM/4wsFvgJaaGTpXkrY7wU4O4N+Lu948Le10J4TstjdVuuxXMeCh/CVbQOJW7OQ iajFs1UQFi92EC5vUYUaU5OGL0oGMdaFCj763JrIm6/2bNHAlWS+3tHzM0mor/xkl4j9x2B3xgXl9 1WhXpGAZjsGEYAS2i8PmieRtPjZpwKmxG+EuB8jEJ3qi38tPJu1GQON6ag+OPQJvE3jOnB0pwkUru VBOD4teSRj4IOMXK+OkUSKGDs/pgZSLHqjaz0zVA3WEo/CT8fAhr7wqm795J/9IAGR9mQcWNCaEDr 4wanBvkYyvqe2KA/q0GA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bY-00000002XKz-1UXh; Thu, 25 Jan 2024 23:57:56 +0000 Received: from mail-bn8nam11on20600.outbound.protection.outlook.com ([2a01:111:f400:7eae::600] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bM-00000002X9f-00Hl for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nxpcB+XbUgsWLjKWlYIYDGrx3cbyeeX0jWr1agn9KB/yiv3F/CVzdrHkx7U0dXri8Iia4GCgCtU2Lj19pDWc1r18JBVTpaAFtkP0nIH4cx2sioxrW88J5JyywxLomdwVpMk6t5zlqhNh1cXKpqfvBKbX8+P5JMEaftY0VweVz9BuC1eEiGztsUIlMu+rkFWt4Qk2l2o2I14Q2h7iMpPetUGLl6VJIMHlzmODqVCs5Wx1yszqkixoV/F9zn+h7WgtCN+TTlIeJNTE1N8Or2qmZY+p2h/MShMR1U5EPKXnpn8GY5i2qG/HwJkllb8438pexFG3ftll/9i2e5hvjdbogQ== 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=anlqyL/gBdlqrW8QW8ZJOtrF9u/+OhbwSx5t9+yl6cg=; b=DraLtI/7cIIAGWJru2uL07rspE6O9RCfmZ95ntt6m8yHJDY7vESBdVVMOsdXD2uc0r2HWlZjvud+vvJaEsnpl8w2+9+CzxfcNsbf55wr7YodyNfZhcrlKvPc4ORdc29zMMQWVaAZcIJLG1GKqAN1sS0ejM3giFqDRC2INJGFGUz01PVd4vSn1R/lAvimyI86Ib4bm64hwdtB4VClhs+JWPL8Tq4Pn2CGN0NvXpBNPZzngTipfPJHQ87BPW9k6zqReT23bh3F4j/MtCXuzoU8JwtfGmQcboSr7rhN438uFlDWMsnF02mUTvabmmxDlZ2NfrsueY6B/6027/h9ezVCzg== 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=anlqyL/gBdlqrW8QW8ZJOtrF9u/+OhbwSx5t9+yl6cg=; b=oesfzA1jJpFSOCFSXBM9dKLdvPVyLQEjdKWHH8U3c21dB/G8oxvTJBHWkEv8snGZMygO91/0qBxMHeUL5pjC4PPMH2A+E2ybJro5Xvvz0T8WpaRoT+YGAcsmfHC/GUtXTK9d6hvOUN70NkJId/l3zAFfA/WLJnvcpqolqk36t7nKWDVypT+Ap9Ah6bDcHm5TuuhHiL0cleaQMI/Xl4C3ech84nvmUak9xboDHZjZUOCI59dg2cV2lIE0eAuRZdi1AzTsnT6i+72K6fgKpKketlMd4Z+XpdVEE3GcqJUx6jgL5B0ZiEmwo7Uz5+LinBk61c6FyWPhvcgNNZ0M+Jp61A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SA1PR12MB7038.namprd12.prod.outlook.com (2603:10b6:806:24d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Thu, 25 Jan 2024 23:57:29 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:29 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 10/16] iommu/arm-smmu-v3: Pass smmu_domain to arm_enable/disable_ats() Date: Thu, 25 Jan 2024 19:57:20 -0400 Message-ID: <10-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN7PR04CA0002.namprd04.prod.outlook.com (2603:10b6:806:f2::7) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SA1PR12MB7038:EE_ X-MS-Office365-Filtering-Correlation-Id: fc9e6fed-180e-424a-709e-08dc1e0162e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l1wDlnF+LYVGrbJJrwp5XFfkjfAPJkazmMdrPXvuSQE9QNnPVfInfddLp/eyQuLfpkAzu02ZcA5aAyKnvy1hqFb8Jdmf+2eNqxOG1DZU/mamY5+emeyNLjMFHuIXEFFPU58CQ3fF6se8nCHa5bkl9F/ckfChnO/7OSJX/rUGKSA3qX1FpJ+qa69PW7uhWqNPIr+pACMJZ/Qj4jeUcPCqzva5LkE8wFqmJ5uOxKiqI3vSpr9c1WIO29KSCpLjbwzb4l/3wrAG8SQzs2HpvzSShL75ogXDfCEgd6kmLK/QBik8+s1AA8K3TWWXLkPhlzZhOT0tLAAQCeGwFtrFOkLBkIiZ55iX5B9ozteuO5zgHiUP52XuoHnT0LWYC0KD+l3XlWeiz1AszsoCIaJPw5V2kctoGrd0LkmQFPBX/PwoPLRtfCSApys1iJsXMRlsWKxg1SZhUHPkcseZ2aBT+XHKirK3PLyg2zqEp5vq2S/zId4dPBuqWWLKGodHUQW5IaXJyG7+uQ553UXF7fbh0I/40Fs1Ti7KlPQf5S64Kt+vYTvqTJSB+TOnngSDVKxeOwvs X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(66556008)(54906003)(66476007)(5660300002)(316002)(66946007)(8676002)(26005)(6666004)(4326008)(8936002)(2616005)(110136005)(7416002)(6512007)(83380400001)(2906002)(6506007)(478600001)(86362001)(36756003)(41300700001)(38100700002)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RD2O8+f0H7ZBLIYmRUFEXj/xYz/yfLqHSofj8V1p5+E2smTuCB0+qHfkd5JQa3CkZoti0vEAsTdWWzZn+5z5IYiFnVQPvmrecs91v4Y96BDMuichrAQ4YW+Ei2jg6q7FHH2jcVDP3UDuQcU4/Cxckklo1geJHodRlxZVty5T1lpCE28NNYUDUKOP+aNJEljZuBZ1SiepMMMH97zBSuuHH4ylMuX2+imlwfNbx7H7yHh5fD1jrlBGVhiyWmBXmrd9sLSNJPEtGZNCs4gF9hFL+RVnFtHpMf9wjcALP2iGk7/1b1htWGOyz1VmpvUa9+S0kaHniuM4R1pDOFPKyC7hIE9umWFr/cYR/Ebi3bdK53FSaECs3bdUuBXpJJQ5XnnBZyjnh52VbWFVDcyZDLqZCCwQF++IXM1vzr+Hu778o0hEAmWeiy0aq1s+DCzGO/j/2s+djAqdpgrjwm4nI+6nQ4605r2gSJk82xKmBdKUrbZwNWc5MfZFR8yfZXSSFkHSrDfRfN4KqfZrgVG8Cm/RB2ezq+fOKyVo7keO7LDZNkHt9UAxCAxKAxW2sRGObdz3UWGUvyjw4dID0nrpFazr88MG/P8dKaj8vnyr3V1A4kvg/6x9P+UObOy5WwWPZns06moFle1YETm9afZ0xIEpfKXsG2u8zOCvGfThXKvQ+G2nTvfBiYB3+/0MdvWBwJCGKhHIB9OLlib2wB0fbTuzXeye5E3jWEkfGllDzKwnFjFGIuGBKFsBxmKBcnjNbufOXxcdj+g2X4AkQSSukPA4DsBiag3iEOGZpBJG9rFIbCXoNoz7avwKF6HaKoCFi9kvWrC/Seui632vdlvoaH+pgEKDCvvbOABhjXjZYiP4QxWxuFFGBhLbT9KbsMJzy+AdJ0maQR03EqTK7w0hjo8yHSInRwCijifgOTMfNoA1V9fMOJxhvl4M/32gDqzHlWEEQ3f0lZRLbcugCkn8ny+sGGVvsvw+OduLbHS/Kzmc5ja7Xuu5jbzLCYYMwBnb8yyzrGs2+OcLNAMycwnpWinIqvspGMgedRsswi97R4tDdKK10qcAqXaB0xRD9lHgUgMlI7yYZf9PNXUM+9vKsogtT09ux5BMU7L2EqRzjShgdhNhO28WMxY4mbwqzY4XuvtmmFi3B6hye4mKPHfzCDOQ6sYkrxqLOTB4JmF9CgHXEi83mA/tkcepLkwzsemVgQ3k8xf4Pu3QNflwgwPvXY1R8oH4E9iSRR9Vsdml4Q7GOsNkXUWTmfcBRofpAGuyBD4SpAFOfrgCqHbG0UpEzYXSudVNnY2agl6nWep9tYgY/RJmY0TfYGMEKjCF7GHfs3lwJORUPHAufhZbDOjepzgT9O0T+ir6p3RSlhJO8BkgOrsV1qa+jGa7qunAhwzXrbaYItyKwiD864XLYzUH1ShgFeatRL+QgcY5tc+DOWFgjG4LVsUGkOgRfABFsoG60K/kv0oFK1x8Lq8XwR0QMHRDxgcUzYnkxhdGIbQIA7SgMbie0c1YhZaz3798yWfPHXahhTMLFCQkCwvzHFwcuJI+DTXMHbqguU8Vp8ORIjWTOOwaYvzSV0ITjzd2rjBUZbs5 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc9e6fed-180e-424a-709e-08dc1e0162e2 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.3646 (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: uiqFmpBjbSNCpJjlpDEBJ9HsAXLv+v5kS2KLkstR//UraWxkfPcmVcw8fJ2e2EzN X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7038 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155744_105083_DED97B5F X-CRM114-Status: GOOD ( 10.31 ) 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 The caller already has the domain, just pass it in. A following patch will remove master->domain. Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Reviewed-by: Nicolin Chen Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 09b40ba35a9cee..d7b0cea140f12b 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2447,12 +2447,12 @@ static bool arm_smmu_ats_supported(struct arm_smmu_master *master) return dev_is_pci(dev) && pci_ats_supported(to_pci_dev(dev)); } -static void arm_smmu_enable_ats(struct arm_smmu_master *master) +static void arm_smmu_enable_ats(struct arm_smmu_master *master, + struct arm_smmu_domain *smmu_domain) { size_t stu; struct pci_dev *pdev; struct arm_smmu_device *smmu = master->smmu; - struct arm_smmu_domain *smmu_domain = master->domain; /* Don't enable ATS at the endpoint if it's not enabled in the STE */ if (!master->ats_enabled) @@ -2468,10 +2468,9 @@ static void arm_smmu_enable_ats(struct arm_smmu_master *master) dev_err(master->dev, "Failed to enable ATS (STU %zu)\n", stu); } -static void arm_smmu_disable_ats(struct arm_smmu_master *master) +static void arm_smmu_disable_ats(struct arm_smmu_master *master, + struct arm_smmu_domain *smmu_domain) { - struct arm_smmu_domain *smmu_domain = master->domain; - if (!master->ats_enabled) return; @@ -2540,7 +2539,7 @@ static void arm_smmu_detach_dev(struct arm_smmu_master *master) if (!smmu_domain) return; - arm_smmu_disable_ats(master); + arm_smmu_disable_ats(master, smmu_domain); spin_lock_irqsave(&smmu_domain->devices_lock, flags); list_del(&master->domain_head); @@ -2662,7 +2661,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) break; } - arm_smmu_enable_ats(master); + arm_smmu_enable_ats(master, smmu_domain); goto out_unlock; out_list_del: From patchwork Thu Jan 25 23:57:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531908 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 0D39AC47DDF for ; Thu, 25 Jan 2024 23:58:27 +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=JOVgP7fnSPLzaKO4fnXZcdMj+2i6G/w85EK1aulLfh8=; b=D99i/E95TGzqHZ 6079Vc8hZaNrxRilbZPyhCsLgyuhxK9GkP+WCL2iSsVwT6qlEjqe3qVKrUZfbUCWJnFRJLToPvcAY 1DTDGIjMruunbqMK/SoTF3VCX+lKlOTEC1bOsqH/xQIMh4V7JmXHILxw+iW+6bPhasjDRZ69gJ6nX XphdE/IDdlLMewLCCe79gCK4EmjFBE0C62hUCEVyVcEfGzRVa7LIi//BST1stUzJ7B4HaaZy0E+o7 8KS4bNWVl5zJlzI51RvVxr3tB4Rd920NdBwVmHHglLEbHGMTRlbzAOFZXTE5FsZz8vHIBAFWbtXeG VqrN4kOli6moE6jYqivQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bl-00000002XUo-1Sij; Thu, 25 Jan 2024 23:58:09 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bP-00000002XD8-2BCT for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iseWeOiNkHs3iNLiYdjJc964I5xMXH2FLtiYXzrN0DOQK6nXpJ5sY5rT8JTLOt10/Hg0FvGVtu1yF47Sxk5Zv4iGAeqyBBzEIsxdgv8/Ya4ZcpPH6P2hj5+94szNO7C1YEn1f5yq+vtD53JLZBdX9Df8iLu9JGYRpqFelIqsHaPgSGRy4Ro31W9D190cESAom4QEaYl7Kf1Kh++I1GAytIUsijxZyydOf1VDi5/aeJnsJ+aIWRYo38TW+niaytjl61zvA6gVMCU11omd2dViXByL9iaIDYXLyBXiSMAMFYVx8RunQaDdTZZV4h1C5wrcXaIjM595afNE/YsTPaRNqg== 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=KZMw1NPFKTEUTo9sC8m2eNQIR+/60UgUWx7GPJrxl/8=; b=TFW4vLBhimPnohwnLVnLP0x1pjNmyLjNnBrC8acm5qZ432g1sQqJG/eu9M5zfPFNQA25U8ZqEzSNVsfP2H8jaEqNzHbIZjWHa/jAikdpiSt29KZaR44YQtWqVGCR5/LwGf30zXKA+4D7BECLq3iOFCqeZc/iEi3nax5XrrYW4cXGXBuicirctbuKeenBxyvvrOg2rcQKZOOdFY0xnh1JP0KX0gFbo0hl4slrXqDsgoyQSPn//Vih8bLt21zWthAyKby5czxhOuDG/B3OwLXhrroDTPXMcJcwLFyiUe9HHoP4M3Ad983L1T2IvkaiPRo7OKdP1Eu4DOuJteTByneycQ== 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=KZMw1NPFKTEUTo9sC8m2eNQIR+/60UgUWx7GPJrxl/8=; b=gQWSzOwZyUrFMRqSZVAXlV0+ZWlK9PUzg8/zHlQhS/OUaM+V7OdmcaH/2JSD5Dkzv0yy/ncZ1Orw087kFvhTmiaNiEszXoZBspQebwGuZIiQ6ldUmmZWxkYoJESf6fpPbwOJIx4mPJB8B4gdymRUYiSjEDGqbzfLFwcu0C0QjHqFJ7pRXhFOFBU9Zvyc3EINPAx/DzggsZdsc1AuxdvbxWK7jdQzAMIa+u+NfF4DuRT+CCxM2qsE5WQwFILLp1+c9SGNqbeOINqgPN78hp6obla21TBKEkj8opRa6Tw2BPAp2FSmwQTy/paf9HENFzq6S3DG+M1k85SoH2vmytmJkw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:35 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:35 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 11/16] iommu/arm-smmu-v3: Remove arm_smmu_master->domain Date: Thu, 25 Jan 2024 19:57:21 -0400 Message-ID: <11-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA0PR11CA0056.namprd11.prod.outlook.com (2603:10b6:806:d0::31) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 05609441-9ce1-4bd1-3a02-08dc1e016405 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2wu+vFoeFcWzCQAHXLyARlMcxvDHq42Crbj3O2GUj23btEfeHKpS/AQv2iu9heyUekr0Ivyy04PLDzXQMASd3CMpl9/8g0Ylg3oGTJLi01ht3m+4/LV+uJvv9kytif6hFmHcc7VAft+hma2lrT2yH8DQZ9vcc/9gYPgKUrsUG1UDRudllc5OfNnu/moTVLUTvWQ137+RO+IRboAzEPkOPdYNc3qlr5mBVURGPuJm+95bBJx/h7b7oGGyWdkco+aWPcBPsmorAFLbOw1++SJrSpLV3+VlXmN2PB49g8nb5HzlEWn3FbgAnYfm0FQenIxXTsKUz3ivVW4V4yu3ZTbhbfnOY7OWSjxW+07pBVLeplchKRn3YM1ROF/iIb2hA0DLiFYk8GzXOf4taJ8R2sfV80s8ZPmfhJ8AyzYoclGprhTTqYn6VWE5mghBeotHOc9sX4Usp1rgE15aJ79Daq9eXQzp2oQo10ryWLntXeeSSuaSeQo2b/vh7Ctl0lJuvrBmkVrcEWRoIpiapZGiZ0x/2IRDvh+lG5q1AJq6ZDTSqL64fBAojYPnvVQv+I4O45X3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 000sw2O9eSD1cN+kq2iM/n7liJDlfvgwU8xRN65g3HWdy9c6584E9PTCpdevPmw+FBePLd5UXcSE7ZqcRRGuquNleHz/sbA0DpuDe8GiVGMhwBtG7oSP1AV7DtM3Bmy/aFRckcs5WDzYtcCCmmmPQIILKZn78XxU1W/OWv5XEkZYSYpqxOqLI2DOBES//0VXxMSLGN+OxWCv0FkKyi5wJB93O/3J554tJzkPGywOnTAFKz75OVXXZfcPemt7ctpUouq1JeyQJpyZ8C/PpqChHo2Myhj459BIF5tSVv8SFFur28gUg5AnxRbxX9evKkjo9sZ21TnN9HHSdAMEOAs5s2D56XxKRrBQ5sn6x9hoXoRMUo4Ob2VO9Ojvzm0qGGkwwOU4HTayuVhAsJKNloMBaoSXHY1it4s4LlHVvEXLb9H+Hp1vbbpK4zT6MtueEAwNg+K5rEJsGqkVmpIYDua2giV/KovFWijsAeBBq4imw4nQpv4iugR7yH95i8cGsWEF4+h5pzNAyqt4aLKqPUdgCpx975fx+Hng1+imxnRlMRtxXUp+MKBBv8o8pvGohDV2J5JSyzHrPI21ycPFuDcSf0ZNk5wY2uhC5acweuFnjQjUdPqFRYXJDi+QxwLCtSklDCMCQQnTS6qkNrqb6yxNqImyrzkf2JhPD9dBZaIaJJWznm2fNCER3hdxBwX+KbgUZTWDi78QL7+Yka01v0idTKXImPdQdm+XSSWCP24WrW7ePlNCx34mUgQVyZ5jYJ30KnNu9+asUVPbATNlD+CNoFftRE1ogY/otOAwfG4ElCmcwJlrZdFdUdorg9AheXPbecXylrt+TJx7c89/zLcMtI6ObFaBOriAymGscIYXUn3mB5j9webbXnyIf20pvX0c4DMBOnSVRnQku89FdGETagXV/YWg8kjFfaQA+xN13S9sHXSDFtzscWmHmzPmsuaS1P+Smolm50lH+MY+2vmfg5lqD4FA5rCu6EQAaJJOdF6XPZZDqVVneNpga1d3WG51JrLbvIUESu9ZSu42RYfyuiKziFJ37kGvKuGW9CgbKdSConDFe1cRovYjOTMqb1PF0luomZI/eLF9dXcxghVpX3iXStT7BCS9l0fh6PYiH25BVZenBw54zXuihGmG7mBoaqGBq8b+wZst1/SuB/tV/YyHGoypbbrvfE2Tm2sWtQJ2YhNOEoJYjtnrhXGlx+htlzflCO9/kEcB02+u+R8GZaln+Ifq18fWwbBVYFIQp5/DAaLBzQFRkb4xsdFpo5UL2Goy7lJGeA4RC6wGZ/NBRlHSoA2zgs0Tx82+oB9CFgo1EBTZohpy4YVUEN+cqSH7M2UtKVCDpqWr0uMXdowEIGTBW1IgXORXpisHp3QKZo2QBCNBsfesJJQbZby9Ps9OHyM2vbJXMItoYKfbE2JknCJKLH19aGA9OHI8An4rlf5N1BBNgNWdQ5vUrddr0JTDHnjHZt5nJ7ey0KcREYJLxLaKyX0O/xZcNJoON9Cui4zBGhm1rmDyZGZW3lYbtu6BGVEjUiD5pXltLp4crO6LwfNWYtU/yOUB6KK2dQ7/jaQtzLhNbYPY/4sfKk84KkZL X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05609441-9ce1-4bd1-3a02-08dc1e016405 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:30.2676 (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: ShBlJCOuS8XOMndYTcONxdoCTKneUEvtMMwQ1DWkNNmtMXn3ovuzB+9oB06bd9oy X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155747_603502_7B728D37 X-CRM114-Status: GOOD ( 17.31 ) 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 Introducing global statics which are of type struct iommu_domain, not struct arm_smmu_domain makes it difficult to retain arm_smmu_master->domain, as it can no longer point to an IDENTITY or BLOCKED domain. The only place that uses the value is arm_smmu_detach_dev(). Change things to work like other drivers and call iommu_get_domain_for_dev() to obtain the current domain. The master->domain is subtly protecting the domain_head against being unused, change the domain_head to be INIT'd when the master is not attached to a domain instead of garbage/zero. Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Reviewed-by: Nicolin Chen Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 26 ++++++++------------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 - 2 files changed, 10 insertions(+), 17 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 d7b0cea140f12b..f08cfa9b90b3eb 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2533,19 +2533,20 @@ static void arm_smmu_disable_pasid(struct arm_smmu_master *master) static void arm_smmu_detach_dev(struct arm_smmu_master *master) { + struct iommu_domain *domain = iommu_get_domain_for_dev(master->dev); + struct arm_smmu_domain *smmu_domain; unsigned long flags; - struct arm_smmu_domain *smmu_domain = master->domain; - if (!smmu_domain) + if (!domain) return; + smmu_domain = to_smmu_domain(domain); arm_smmu_disable_ats(master, smmu_domain); spin_lock_irqsave(&smmu_domain->devices_lock, flags); - list_del(&master->domain_head); + list_del_init(&master->domain_head); spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); - master->domain = NULL; master->ats_enabled = false; } @@ -2599,8 +2600,6 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) arm_smmu_detach_dev(master); - master->domain = smmu_domain; - /* * The SMMU does not support enabling ATS with bypass. When the STE is * in bypass (STE.Config[2:0] == 0b100), ATS Translation Requests and @@ -2619,10 +2618,8 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) case ARM_SMMU_DOMAIN_S1: if (!master->cd_table.cdtab) { ret = arm_smmu_alloc_cd_tables(master); - if (ret) { - master->domain = NULL; + if (ret) goto out_list_del; - } } else { /* * arm_smmu_write_ctx_desc() relies on the entry being @@ -2630,17 +2627,13 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) */ ret = arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, NULL); - if (ret) { - master->domain = NULL; + if (ret) goto out_list_del; - } } ret = arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, &smmu_domain->cd); - if (ret) { - master->domain = NULL; + if (ret) goto out_list_del; - } arm_smmu_make_cdtable_ste(&target, master, &master->cd_table); arm_smmu_install_ste_for_dev(master, &target); @@ -2666,7 +2659,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) out_list_del: spin_lock_irqsave(&smmu_domain->devices_lock, flags); - list_del(&master->domain_head); + list_del_init(&master->domain_head); spin_unlock_irqrestore(&smmu_domain->devices_lock, flags); out_unlock: @@ -2867,6 +2860,7 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) master->dev = dev; master->smmu = smmu; INIT_LIST_HEAD(&master->bonds); + INIT_LIST_HEAD(&master->domain_head); dev_iommu_priv_set(dev, master); ret = arm_smmu_insert_master(smmu, master); 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 eb669121f1954d..6b63ea7dae72da 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -695,7 +695,6 @@ struct arm_smmu_stream { struct arm_smmu_master { struct arm_smmu_device *smmu; struct device *dev; - struct arm_smmu_domain *domain; struct list_head domain_head; struct arm_smmu_stream *streams; /* Locked by the iommu core using the group mutex */ From patchwork Thu Jan 25 23:57:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531922 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 10EE8C4828A for ; Fri, 26 Jan 2024 01:05:05 +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=1WJ7nHXxcb53P8Ki/rjBimNuPK8Q57QhWjPaFbjoWHA=; b=hzQmPiCABfZYNy XKprCWMdicdcEpDGda5H5ijB1JBLLIvK/Jrv2s+Zhkv36LL4z5/xmiYTuLxkTEN+uL7NtS5QrzzYb M/D0MTJnpdgdtrZA9+pNhLv4jstJNcexLjW4t7u6QEHJ1WNozwZHlBOkBLbsMLq/CxGRWsEbfr+HN FRfGzDjvcDlQcUvbRzkXtP/KBJXB69bXO6IAMMgdMkeUPf8BMxU8oHzTU5D8s7yftWLhcm+RRhscE U/70f91J22/nXdbIwtlsN6+VdOYxqazX1TGB+AHvWI1ZaxPBi8i8wxzf7+nN2dLo0GdTnniF43Twy rnd4O14mY5d3wFfRmkyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTAeM-00000002hSJ-1pEd; Fri, 26 Jan 2024 01:04:54 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bS-00000002XA1-2HbV for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KiBEAbWON+hxNGSoGyO3okFTjHSqzWMv3oxu9yjEHNKDjXxlcCJG9YVyKsXnG1FmhbNwGHKchwXFRVDODvdhF5Ic0re7BgQ6xlrqknJjEgm/2mqb37o8i7JG/Ni8uYoeJwUGVHZtRlIc5X5Y0Te440X9maH5Ykx5TyGSJUUbEMG+UJQ5XHt33tmDvSy47ZGVtRkAka3Fa9YjDsrD5KM9qcLf6RpFPcA3ozUcI0vWW0VO9dyG+kHyBgCXRGCz7i7tjaMWSSJ3brlqJ4JF/MRjadJ1fYDM+odwLs8FeahzWs+gs6+5kUuZYW+M0GVf+n0JnuC97vb5yqXAS3arQ8vsBA== 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=fQ2IgqEfUbEeZpD7csML9M4hGZnxzGF+SCh2UJRQq+8=; b=NeOsxYUKv0TKV1vw9XIwi538kJ1ODu6u5MC3sKowej8xg8pwRbq+UsnXk4of+9N9sEL+rb5/aT8LkbVMLIUY3J4bQWPRnfGG31GSX+tBPbjF55QoMzWAEx/5cByHAvUU7GvbBTSIsyzO5b6RF5uxiyLDJ2EM0yyxBIlqq4mXyHXZ15hUUThZZ5yfWhWw/sAwfgNsy70iKmlBmEb6IQqvMPGpfEeUzmPD0xdVG/f+qFHbEIhJvpAMvrl9qGKguLbpn+0vqNm2DIiHLrlgKvi8BCIIczQiY9MgCgkZ3/vwZyZM46VABNRVHVr8l+pOzuIo7mn0GQBTojKjXZO6IopAVw== 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=fQ2IgqEfUbEeZpD7csML9M4hGZnxzGF+SCh2UJRQq+8=; b=KZJETX60Dy/tuiiJ9Rh7cx0iSkrLNdxgiNXVc152TCGpi0ZPxGni7b5+sS/XTlI640fRacnJuyqT3BTxFlEdoGt3aPx5Rg60uWqWprMN6ITqEQT2aCZSzqT4y5sRXzmWvNt+Rb5btBjjdZ5K7z5kOzomA35Rj+5pdDNOxOaoTv4CPBv66JNpqtNOddPnrXGYlIrnooBtV+chgPD/HeaPwO88sQO/oXwPlDxpMLV3Hqz4Ag8ehl/BFGlsyH8TIZ+YJVG45+2hAQTw5eqwxvM+jLIdH5/Jk+ElR4AC43wickXGayOEagyicvNYgnO0GsQEC9v56yCL9+buntetKufkcg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:38 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:38 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 12/16] iommu/arm-smmu-v3: Add a global static IDENTITY domain Date: Thu, 25 Jan 2024 19:57:22 -0400 Message-ID: <12-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA0PR11CA0058.namprd11.prod.outlook.com (2603:10b6:806:d0::33) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 48d3396d-973b-4195-f9b6-08dc1e016508 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f2YqaRm7vJ+nULFOARFMS6qJt0Lt9gSiHCfPZVEx/8/hg8Iy5eIP8/XOsxuZpPQznhJuQWKaYIpZDwb6BJDQVqOnC19VbeIdq6ouxHvQSUjWil0wcjjesfee5duocnbNKfDtXzdBNs0Q42bzgOlHkk4hHzEccaWIaQDhZdSTawI8ZfEgOYHEV3Tp29jaxRovvEY6RB2Q+07DQr9mpQspeHXFF+JCsPSl29OFwJjekJVTzcqerKGUdI/fsZJki6TGYVFjZblRO72n7S7ycJedXpYgrdLQnmI/sNyUaXBMWQ0T7N0qXg8ThgO4WQHgLrD9Kq9fok8UFd/7zPZ5S4cCFNneeXZpoAB7VdJQcVkmMEc8SYjvQe4qDqzwRegEmDfeIf0gLcuH6IOkH/4lTGoQ49G39/OQrZU/pgeq2IIMOlPf4MRcq6XZNTPLaaNn8CZEqmx9eHb5wKZiIrZTpxDLvlJOF/5ygtChLx5k8rwCMkJjf3M5hE7+5z6g0+JEmdq511OfCaUy236NI5tZwYnrEXaH5HoyIHSoieN3JdVHrcywbLqDKk4XYPGC1G/0aaI9 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: f7WS8pr/FyfSfJwYSniuOpbs9sKQkpBaNVibH6oOzbbrJEgdregHj6RkJNpb0EAcsWIXHsEbpTaHonrWi1+e2dmgDhX6ex0bjrS4YUbLaHOrqDEdkWRwC/wuzqfR612XmBiX2negQzS7fioKu2lhgO0HeXDEnzOTvGh1kD2ZuzqaOs+bA4PEbCYjmHP509QCbpU4vw70zA6Xq7akd6xcRTNevD/MSm5Hqb55kX9/eQLe9QoM5LhhCXT6S7aRLIF3MmBeME5ES60PSqjblAj+18QxI0DcUCddgM6HGNySbrYO/eatQUBzTJpveBO/Mam2uLQv3gmVfKa/OH0kmWh1yl9bCe4p7lY+U7853xyjiNNaQthv3Kc8OqvUt0ih4pF0pykylOCdKxRrzTBZ+0O7Qamy9O1mJ12c55fUfx6V+8b3BzUeSsmfipm4EIFr2VedzuCEI8YOAsW+ltDujygKJlYlbrGwVEkN9G51nwe2U43c7Sd1yJLRNG4WYtcoHIWr6j7uGa/xpQShHsbhf6PmKOPZe7cQlV6qhw9OBhzLPt67SUqXIe5w1R5+Y98KkvQ3zXMKAYVmq1c1FAzL/CcIQsOf3HlQFl6L9f57ISkfBnc4KwaUUt5yCHJzYdmpUfIN6oR4UMwcBXaGf1tewRpMGexVttDXM9AnDgy6tUQladcRa/wJo0SsYcZlNS+j8HccWM0DhR9M3oR6PG5VSeDHCZCW/R6MY6CnkzUig1SVZyCp/WvEZI+Q3QVR8BcasdiAGxeWFeT3qvE0wfItOn4zlNcumOqnaeWkkVld14CwFWSP9loKz/m/bChnwCLbv6gUfZyTl7YJHkk9UTyyLZLgUAblxGn/sAHRGPplJju1GcehoBngtXto7+qsHcu8W4WlnMC1MhXNAwVWQl9j9FfkjxIglRBaAtRRp1wQTvdf+ZCpnZNDmrshQMoFoIR9Snof91Nb4EVAO4vxeHXGMqV/ooZ9YfT7I+EoeUHrCnUwlTXSZ/6aKkmU0TQZiagx8F7I3wdixgoybhY22rvMUH//zUTSCfWZCP5jHzAk5isjnWuv8c8b1ww1vZzvpeZ76+hU9aizLwnoUsIgWpXvQsDOKVxtrMCNjSLRtK2ck71uhXLB2PZKZtZMfRmoUSulK0oN9jm2o0kRvJZPOg1fKfqJM08URK7FATvqnibqdyntaxUMG374pX/aJiWqw7d76IPPfXOicePovrpG81865CE5OcW96IVO5CC9cq0o1bG6PrQNJffgccGVMF6gk5o3Wq1/ETdexvEntKOMYAItwL7Or109BjBkoUCotY9jLADqLe46J1cXTYOAdu9j3ZlVDssovChvhX5ty/r2oQceLn83sYUpNTR9tupI4cX2RzbfIzyBuhctAxSZPobu+nLf3pjFI9Mrqn8Bz8ikphnBtpSY9sY0Uxn019r4mm3Oj9E5UEMSbGuh4EpCb3Hj3VB8mlIhiBRlvPamn2j8+51ZdF/RjgbrZULXJxDDSexMuXBCPYBSXqIQm8yuPRyeNXRYaGNciA1AMWRuIfHjhqPc7IvYSN9Sdi3G7hws5lYHLI0Mfozya7seEr5fMn1b2WZLKgFN X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48d3396d-973b-4195-f9b6-08dc1e016508 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:31.9388 (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: wlpQ317SNlf4jQqFrg3x580ueGvk7ZPzxSxuoppcSGVXij9hQsni0V/nmUDRcVhB X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155750_691876_3937F101 X-CRM114-Status: GOOD ( 20.72 ) 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 Move to the new static global for identity domains. Move all the logic out of arm_smmu_attach_dev into an identity only function. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 82 +++++++++++++++------ drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 - 2 files changed, 58 insertions(+), 25 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 f08cfa9b90b3eb..d35bf9655c9b1b 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2226,8 +2226,7 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) return arm_smmu_sva_domain_alloc(); if (type != IOMMU_DOMAIN_UNMANAGED && - type != IOMMU_DOMAIN_DMA && - type != IOMMU_DOMAIN_IDENTITY) + type != IOMMU_DOMAIN_DMA) return NULL; /* @@ -2335,11 +2334,6 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct arm_smmu_device *smmu = smmu_domain->smmu; - if (domain->type == IOMMU_DOMAIN_IDENTITY) { - smmu_domain->stage = ARM_SMMU_DOMAIN_BYPASS; - return 0; - } - /* Restrict the stage to what we can actually support */ if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) smmu_domain->stage = ARM_SMMU_DOMAIN_S2; @@ -2537,7 +2531,7 @@ static void arm_smmu_detach_dev(struct arm_smmu_master *master) struct arm_smmu_domain *smmu_domain; unsigned long flags; - if (!domain) + if (!domain || !(domain->type & __IOMMU_DOMAIN_PAGING)) return; smmu_domain = to_smmu_domain(domain); @@ -2600,15 +2594,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) arm_smmu_detach_dev(master); - /* - * The SMMU does not support enabling ATS with bypass. When the STE is - * in bypass (STE.Config[2:0] == 0b100), ATS Translation Requests and - * Translated transactions are denied as though ATS is disabled for the - * stream (STE.EATS == 0b00), causing F_BAD_ATS_TREQ and - * F_TRANSL_FORBIDDEN events (IHI0070Ea 5.2 Stream Table Entry). - */ - if (smmu_domain->stage != ARM_SMMU_DOMAIN_BYPASS) - master->ats_enabled = arm_smmu_ats_supported(master); + master->ats_enabled = arm_smmu_ats_supported(master); spin_lock_irqsave(&smmu_domain->devices_lock, flags); list_add(&master->domain_head, &smmu_domain->devices); @@ -2645,13 +2631,6 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, NULL); break; - case ARM_SMMU_DOMAIN_BYPASS: - arm_smmu_make_bypass_ste(&target); - arm_smmu_install_ste_for_dev(master, &target); - if (master->cd_table.cdtab) - arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, - NULL); - break; } arm_smmu_enable_ats(master, smmu_domain); @@ -2667,6 +2646,60 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) return ret; } +static int arm_smmu_attach_dev_ste(struct device *dev, + struct arm_smmu_ste *ste) +{ + struct arm_smmu_master *master = dev_iommu_priv_get(dev); + + if (arm_smmu_master_sva_enabled(master)) + return -EBUSY; + + /* + * Do not allow any ASID to be changed while are working on the STE, + * otherwise we could miss invalidations. + */ + mutex_lock(&arm_smmu_asid_lock); + + /* + * The SMMU does not support enabling ATS with bypass/abort. When the + * STE is in bypass (STE.Config[2:0] == 0b100), ATS Translation Requests + * and Translated transactions are denied as though ATS is disabled for + * the stream (STE.EATS == 0b00), causing F_BAD_ATS_TREQ and + * F_TRANSL_FORBIDDEN events (IHI0070Ea 5.2 Stream Table Entry). + */ + arm_smmu_detach_dev(master); + + arm_smmu_install_ste_for_dev(master, ste); + mutex_unlock(&arm_smmu_asid_lock); + + /* + * This has to be done after removing the master from the + * arm_smmu_domain->devices to avoid races updating the same context + * descriptor from arm_smmu_share_asid(). + */ + if (master->cd_table.cdtab) + arm_smmu_write_ctx_desc(master, IOMMU_NO_PASID, NULL); + return 0; +} + +static int arm_smmu_attach_dev_identity(struct iommu_domain *domain, + struct device *dev) +{ + struct arm_smmu_ste ste; + + arm_smmu_make_bypass_ste(&ste); + return arm_smmu_attach_dev_ste(dev, &ste); +} + +static const struct iommu_domain_ops arm_smmu_identity_ops = { + .attach_dev = arm_smmu_attach_dev_identity, +}; + +static struct iommu_domain arm_smmu_identity_domain = { + .type = IOMMU_DOMAIN_IDENTITY, + .ops = &arm_smmu_identity_ops, +}; + static int arm_smmu_map_pages(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t pgsize, size_t pgcount, int prot, gfp_t gfp, size_t *mapped) @@ -3056,6 +3089,7 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid) } static struct iommu_ops arm_smmu_ops = { + .identity_domain = &arm_smmu_identity_domain, .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, .probe_device = arm_smmu_probe_device, 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 6b63ea7dae72da..23baf117e7e4b5 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -712,7 +712,6 @@ struct arm_smmu_master { enum arm_smmu_domain_stage { ARM_SMMU_DOMAIN_S1 = 0, ARM_SMMU_DOMAIN_S2, - ARM_SMMU_DOMAIN_BYPASS, }; struct arm_smmu_domain { From patchwork Thu Jan 25 23:57:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531906 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 C9BDDC48285 for ; Thu, 25 Jan 2024 23:58:16 +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=40h/mz5eZ5tAudJryQZRBjQtvti2CFOmXcn21/p5FmA=; b=eQtzBuMn2yQvkA j6erjBgDz9GNiT7yy3WE3cRxKn4Xfn2DZbK5cV0Y7CP9d/O/g6PEtdkC/B8o+H+xt9JRquymAT44K uTXZNCz6CyaV/QLUrlxRUBE1GcR6frhlVPWaSxtLdfgjWVZ67x64VLQo3ulLsQab6qIsI7XPy1mpu dovKS2ErV6JCnkCO3mhsArbXBty0/JyQo2Cr/Y5W0+/VevzTM/PPi/sAwR97LQyaUhW2XIaBZuJ/8 nEwJAeMbYVfkUAZPkpbGql1ReFz5wRndIf/HahimGEqZQzKCt+cz//JAq0DLLWoUvhjtDDT0UUz2D +VD/f5+XsNJnLcpagOdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bd-00000002XNe-0gwQ; Thu, 25 Jan 2024 23:58:01 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bN-00000002XD8-46j6 for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bV8R86F1Cn7glBQgg8xoC80KYYnJzD2d5i80q+5fMAgMfVsLvCLV5jm1FT7DSXpmo97f4dnVPC3c+a95jcM85TwKcmstKILUqZZPkDb5VhnzZ5CnLM5ShSLf4Ss68rPurODSpsCd/lrGlTZLs2QjGbkAvk7yYw6b/71dBGJ5ielS0whWLb0UXc8Qhrdrv8j5w41cH7rg09Wx2ONKCApTzIs6WOVuDHcJMCUCt2kCdGvo9vUFuB0+ItE7pLqg0KXVQ4LTaE0j5a+PfW+AXYoNzhCc66fJTVC1kXS6pTlDZNus9N+BIBhn8thMjgvybUctLZ1CzdjdukmXeAVxlTMuEg== 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=KuXIkzfRrb+78ZUNDbr4eYKFSZ+xKAgAmc2S9NqRU/Q=; b=ZYuOkZp43/LFMoiM4djsGgxayJaPPKgoN4h98bNFNgiKwan8zUddFrMv0TAN21dmgAVYQ7LEn8si/5ACsg16l0m763tJt8MmL4YZuSocsbaw30sK7bfywgKiG3sK7JIPJBvC3FgSYPm4aJ/kIPhiBrwuZxmOBUjcSFu5INOb6HYZKtfWNREK7MDoiuz/t1K4rshdUZSojpZgBaYgEIBwI5OhquB5CKby9mlbBxVwdCVXTWsD7XhYyLqWh032I14Xn9PDth84UhHVkSgroQbwTmuEIvPnG8T1IZJsXv2HaD3Lqe3dC27Jp8Z+MY46Piq++vIaW1qw0AHNENITCvTxDQ== 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=KuXIkzfRrb+78ZUNDbr4eYKFSZ+xKAgAmc2S9NqRU/Q=; b=uJS2X+Xm6jsZeg4ifEEUGsaiJhrLp+85L3QuB0kl1wmZ1jERAAI3gmriw2oe8tAb8vNCJf0tfw7ayag9NXKpYhiJa8qJp80Rtrjk/AdmoPhwIGZveOLFnDTigYUqA2vMIay6mOndMH7luxLl7NgschntIKkJ8Wbr50PLEkcljpLFaky1XQN2G2avJEiLZy0a5nsARO8cVAhyK91SedNZ3f3FmnL5LSw/PiiHkfMdJewfdpqx3mgSfoxm6Z7l2UgMAZAgCGdjc21AkDWeYdU2kRolEQ//3qcRu3UqCVdCWV4uB67+k5a6wrAq2HGaknhPnrwPmqNywuRN897yg/PmmA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:34 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:34 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 13/16] iommu/arm-smmu-v3: Add a global static BLOCKED domain Date: Thu, 25 Jan 2024 19:57:23 -0400 Message-ID: <13-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN7PR04CA0024.namprd04.prod.outlook.com (2603:10b6:806:f2::29) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d35176e-8269-4956-62e2-08dc1e0163f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0mtJEoUh9n/622e0FNB5dcg147qJtbhLHN8vCK+yasOvH3eaKVdjLxmMQVTqZd49Dfn0lefCiNo0uFgeuaKGdkqHtx27e9w2O3fSw72I4WANMDmdFExDv7Qn/9DRB6eld2BwKJvcq87ywHiIczelwmPCwBRnBLsuv7zZy5zkqMPWEb44GzwwVgBGswfl92qOjbYrv/rXd/7d+QeFuEensRlLi/ge5Xm+B2lPkH6i/auzowO9+OLBciDYTCrmofQn67TGZ+rCYbfzyqa1kAlRgXNbcSUFcWlnIP7SSTHVxGn92CcldkcxuJo+sKtBw5nIHjlOQleJb0OrAbqqRDpgRphtDIGiNnQT6QQfzEWh2jMsXU2bcBxUWNlx1BKrPdsQiorrEBxFYrZbhBasIw/NKPjW1vcdmRYZYl7z9j17IBRxwNT3D+RVluYqbkzNcQGLI+woBLZgbIIgK+zrbNtiRrWi1Dy8xBRP/PFmxlvNPjOm0EBIAyPIho0HPmM2KV9St0uwRRxsOJvBmOWhtBDg7w3Nio49Vle3xNDtaGXcITdVEZD0HrpOetGZI55gp+8a X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(15650500001)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RlQfh00jKmHlGWEpzxaBR9wsvXRptbP1fIb0Jb0Mj7GUNrqGpbvorIJXSfOhC8rRRaVQDctXCoE42/5wRTV3e/HJRINh0j0fMyTYHlamxjj+KQ4pB0aBhhd+jp8j3DLxGpoy6f6ngo+sUl70QxDz0jcSL392wuYfcDx8wMyUf9cy4EbWcv9RZkN+wMmBi9buhXXxfKPs+S6sUzQM8KzkyGErkPVl69hLtt+vdc6q5+lxDQeHTVbNe/h4kVqL//e/T8Z5KqkK/NtdVjIatWfWSgUG/si0xLwptoeyFaRBZ3ZrFEkPbEJdwOoqg1nDMJ10pHyEZUuormBuwDSMyYzHBU63Wl2NgtUQbdUHxgMo+xpmKohv2nUKmDR8pfxzy+mK4yUp6jZsKtqO3TXLUt5Hdo5t+EjVxVoSaKBD1poqwUwALn8XuTkZDuCBpR/XNfc3jNnw7vqK9LVIue0OJQVzwsUo9TxJq0208LGagfTS/+sbQfwAdOfZxREJY3RZXxSEN2e31gD/pq5gIoc5DffBhrhlGRsnULLwogUv2oZ1/yLUIETLkUWKytj2HkxUtkPc31H6b7c/txUSsovZtbdW3j2f5iycgQJpSc2N48+mFrEtKZT5Pg75kkd6Kf8XbBzlb2W7vumoErpYZFa2AHbHf6dnBQXDFc/XRLoPL83RkEKQufOwqdObm25GQi8bJBIZxlS+BhGquBNTBxqYm6PnuLzHPkKtzJ4wshhjtYj350GGNOEltuoIfHxf3qNi2W9YxuJwOTG/8UDb84ER6+EvvJMUwzuGNDlkF12TUk6CZCT81B/PP5HEnjLjyomIenbSjX7aD51LmugStc2sz6X+7bre4I7CC4CzOnUFsSEK1Wnda/6WDwxa/MEpQNfR2RV5YobLHC1JFJdodzcUrUGyXSasX1rnVkoBffE5c/OOrBuoTkmHOUwCkkFM7Pfjs5K3NuJo+kq12XIbAWSjGZIEIxnBM/wrqE3olF9i3YqmbO6MUz0A7F8HdYfmo+mZIeDcRecT/tUMw278y4hV/D04+UzqLnwtgEWxcdfnRG3plGavCHRGqb26YeqtSyazCq+k47nUrcxu7J8yWXJdogxMVfu1ty8FzkN6QUCrZiw0Vz3yo82A2MCc7S9iqhHP/TVZftnHzbDPI+zZEYAPHNhE2fBqeUpIGJv33I4pB0cYyInykcFSVscseeAb8wgrYo4ZJlXMWQ/j1ltv1CjhM322fpazEgFYwgGhj5TB5kdSBYAHicRdqMnv47hE6EvCXb+DhZ2OM6Q08Q2JnGJ7c8qG8jfVjn+mDyrKl6+jD5IPyneYj2RLdraw7UTJ1sDe2/jnHR7drCIf8nG1xoSJDZINWx7G+ENErFv9x/dlOHuTHJB1/2k2r+PIghTuAryl97UjbH/VafbQh+A7CEQ2haKywbyC72hFJ/G9lS+AeI90lHTJwvXwbmsXa3/v4FvNWXRVbiMpGYaejolvfbgebXWlrnUAu5tqAiYqnZ8RkFvRfw4tuJZxQ/qyhoGuni1Yb4mUsCKDatk/Y8KLrl1nG2ZM/JK6uLKkTA8oEbrwPbdYrP3Unsk3P4ZAygD4mPak54av X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d35176e-8269-4956-62e2-08dc1e0163f3 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:30.1639 (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: 4mGbzT0+TH/94I4+VdPDbONWmGiLeXE/JZlrVtc0abmOaP9INA8O2HCJnJ9xNBBZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155746_148122_534CAE06 X-CRM114-Status: UNSURE ( 9.53 ) X-CRM114-Notice: Please train this message. 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 Using the same design as the IDENTITY domain install an STRTAB_STE_0_CFG_ABORT STE. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 d35bf9655c9b1b..15e305253ddbb3 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2700,6 +2700,24 @@ static struct iommu_domain arm_smmu_identity_domain = { .ops = &arm_smmu_identity_ops, }; +static int arm_smmu_attach_dev_blocked(struct iommu_domain *domain, + struct device *dev) +{ + struct arm_smmu_ste ste; + + arm_smmu_make_abort_ste(&ste); + return arm_smmu_attach_dev_ste(dev, &ste); +} + +static const struct iommu_domain_ops arm_smmu_blocked_ops = { + .attach_dev = arm_smmu_attach_dev_blocked, +}; + +static struct iommu_domain arm_smmu_blocked_domain = { + .type = IOMMU_DOMAIN_BLOCKED, + .ops = &arm_smmu_blocked_ops, +}; + static int arm_smmu_map_pages(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t pgsize, size_t pgcount, int prot, gfp_t gfp, size_t *mapped) @@ -3090,6 +3108,7 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid) static struct iommu_ops arm_smmu_ops = { .identity_domain = &arm_smmu_identity_domain, + .blocked_domain = &arm_smmu_blocked_domain, .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, .probe_device = arm_smmu_probe_device, From patchwork Thu Jan 25 23:57:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531898 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 008E3C47DDF for ; Thu, 25 Jan 2024 23:58: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=tyQVRGck1mdlczbwfwMXlXDgQQ0bBu6coNcQMTNtpJs=; b=CUDJmMR1LOKorM sy8fLymot+sjKCJTJK9Kxj+00EAFQLQYGScSbHiYSRpZoyPNKLXZsEa9+zOcWg+sfnrvfFwlI4HVa wcxXCW1RGHVJ36FH0P8l7GABWST2Hz6aVEWTNi16hKzNxKyoE3aPqxkkANoFWSzp/XFR3T6grx6QJ j+blWGiNObFmMfBK6/Eq7XaMaVoNz7O39i0PNyvfnVG6joncbhKAdYVzlXO/CXUHyvrPQzU5JZ409 d3sWLFcaZAWDWbQqEzZr8o98YmrCGn9nV6XSrAfceBcf8UEFLfZwyN7NVUDR/B+0IGE8thhSMJ1SK ryEtpx966CW/oJiIPejQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bV-00000002XJD-3oFC; Thu, 25 Jan 2024 23:57:53 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bI-00000002XA1-0BPH for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jocpm+zsnbhW1SgiojyaZSM+x8BWYweZ8066oMEs/ixclspO0u9zfTDV0pn8Y1zBb6cXt7m3p+pYG7YSRe+4Fvcwv8DD6toEf2akEZIpMQu2nsdgGLHMuQ2oN4BPqsh7lQq8dB8cV6pEE6JDg7tYcqVoBci7izaNl5XCOjoJTEjLUlXA+nV0zEKMUWK75YnfJmRVhfOThWor6rYf78i+RFPKL3aKSGlbN9X/WgHFcQI8shBMuGO50EolPQZC0CPKMaurb9bTrFmqmq1syiq0CrIDh9rlqrUy7ZZNY9Tjwf/1HTE4Ug6CikmFsICRvK/p6OCpcaocZ5fsmMIFfasI0g== 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=QvR4Q4KPkqGBasrfNcco6yE+xMHkkdgAO+RTxEjyyQI=; b=hK4+jdV2e9HCIhI+TAmcfe+ByjQy1etY6gVAMHwUCSIlqcy/ytNZN1s/ju/tPPl88paESgzl7BG2sefBll3DIWJYwiu4yxB2KvXEh/A0YSRcFZ/X+cFcAtstFyQBgCxWuSvEg0qra7C2GwNDG7/7iTW/jUOwdtQL9T3lbcWh6ZQLPrY+6tSGFiIeQyu6Pq+r+2GgiB0/L38YD6PsvCYS+m3G8gfSyUvWPR0g5oWYo1N4jGaZ3HNgGSEYICCELZxnzcExF49kPFi7QjTlt/ZVWJJh1/jz6sKqinfACA29vrtAJRtHDfqjRaF2ODuRAiyowEpZSM9ZHKZuRHKdn4VIqg== 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=QvR4Q4KPkqGBasrfNcco6yE+xMHkkdgAO+RTxEjyyQI=; b=drVbSigi5KYTTLTYnGoVegpSewJFidjRpRo4Jke9oO2Kg5t/SekgjUbx5vpATz8bckvO5eUzACHAvBj1OtyxWoJubqnv+7VFj14hPnyXC2hr7N3fSnbCCCx6W+TpsLaMAm5odTCkBiqmptRze7fa5PNXWGkNsPWlrZzx6pB/F8Re3g6NdBjr+04/txUSWHHHnS+haEVhqbaMOrviWldANnFPMEs6clHyC89wkI1QBrTWKvXDhZFJPy1ROtF0vdV0FoQl0uVzm3JBHjdJWc1KqGzXFz+5fWv6+yuFkllukL38WhJvQhEL0dkemvtQynR3gTSZvX0bbpG5sQcAQzMWlw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:33 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:33 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 14/16] iommu/arm-smmu-v3: Use the identity/blocked domain during release Date: Thu, 25 Jan 2024 19:57:24 -0400 Message-ID: <14-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA9PR11CA0026.namprd11.prod.outlook.com (2603:10b6:806:6e::31) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c133fbc-f9fa-4c9a-54b9-08dc1e016312 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e+W//JuZDJxwEhZTOmfq7ImE39W9WhQtWTy/U+YAXT3pTVs/VYNoW8IcWn4W7cGyP5+2l+bKVLr6yQu6P4ybV4uLLtCZAYXXjdcaNFpz8mDGBUAILPSSytameHAcGZVN+fHFvfO35KV4NVb73q9WVDvEKTe3INnAUatwe0k6hK8gAlr7lChe1meOGw90Oc2qdeaUbA9rZeaa2PItWNMLaImkeSlmeHsjZPTuUELYjYjqrwCM9GGPaPkId0J71GLaLppefwOUTNt6UGuBDc+VP299BldWX2GCpYV/9M+rKEnky09wXnJrDabNZi6CcfDScNszRgPk6G5Pj/e2KPyZ+H1wfIgpU2XZArTwKToA0sd6C/qonaZOaDuWVTJ69zgfSc77YUIjUnvUrsE/g159g/m5rrQmE0FGtMmCFWzA/9T1NLMv3roNlwS+WRwDaVef03YvNewLJezBcfFPPvO2k7uylVGL13AeDUkEPN+zGgGgxyhomcXe4GMVPrgoAIYA0WuDRIRmVt8S1qJan+wPdJ0XunuxW5HPFZ7scqcS15Tw7a9ONuiUmgssYUe7pHo7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(15650500001)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WMwzQMrPy1FMXsaUZgJ61ni40Suu3hFfVQJJcSujVzhl9D2hsegBNWZawKJRRDrhZ91LNpTqZbg2KOFJE+qq0jc2xSS/PNnVILl8HR+B4HfGdoRVR738KNQ9cFARIUvcQNtcYKSObC1L4v0YVNqb+To1kTi0rACuurv0AONpjF16Qa6Y0Xx7vKS1J5hlAGuImlJAs6t6eAxmyJpX/H2fps4CA8g+5ng0wgX3/kPxNXMHUBdG1pJWb7XUPaDRsJaVPsoTRKLEbGxYPZcL7No1+Daes2U8OCrRHw051/UiGPzJk8geld8w8Ug81rIEXjWN20bURv0zoVewkt2zLib2ULLMdmypCqFALsc5kbM2g9xS/kxv/zB+U4rJcIdSWYxy/e37AA1iC3ooa3kpcJ2wnLH9UVpjIEoP306aemS8Jlq0SeIKSCVp4+DkYuSC+dgsHg2ngNADKx7clrynbtyMYx6l/25DbbTHDDrbMD8C8HQtYQxhZua5ugoRGfHTJ3xBTaScnGx/Yp9RlmUWimMY9wrnVqIma8iu9EE2Ncihv8XRPV+s6OAexqJMoHqJ8WuA4KfG9zYN866TPwbUvSRDhM6NTcRKKj4RZhayZd3HmMR1OoGb2FcIq46UufNlbBsLNlFXaDM4gCTXGzvx35tsiAFLT55vcl4Z6DkkZChy81w624LNi/wLNM1hhR2XDQtExPN1HtYQVmmH2X3WrsbAIdRe+Wt7WHLbWfF2qsmEph2kw0+ChUP8QxfC5M9q/qmW1pmPJyBQNCIJvRSjyKB0X4f1zWKAaRrUDb849qa5jw7nNwigdE8CJrb1RTpn65xl0myyqAxi665OiZ7bmQ5eGHTcOxjtAo4kCNxeIZmOszUjDpKz+UL0n4J5cbDSxUlAVHe980Dlg65/VZz/e4BOpQYl8oivSnpHZv3nUWicn1iwl9yTcXUHtXnFWhny6CM0GbHg7FtD79USn7t26uyrISO0cXRAvj/gwmwiebiIdvwxLap5tpFMffEmdWLZ0D58qT2Z3yMHw2ps1XFPVhB2Iz3WLw5t/9hdjjGMxX48q98xJQfEDJpRclwm9lARZSCATXG1Lby7uc1n1VckwVJ8d1Z0/NOaMw70wSjegzHY8cXWwNIqW4XRvkKD6Agqs07N6mvai3fWOgCsCW4Medql3WYi/GKiRkHd0yZJ0Hkvt0okDw4pruTpRhxJUGgvR/aWvo1FGlMyfeq+u0WZBcTblkTheVBdvRTeAlF0AHdBFlOw0mEQK/ZKluvoimwOLx0IkVbLIeA86mZj3EfASbCTY69CF6znUVrDTd8+vMWpKzSsvGeKvu8Ir1/I+8IKJBDNHyIzn1pK2+cFvMfhoAHQrAZPwzY237ZhVS+9l1UIGFQAJ2KzInObRSIS2XzlTshkzEa5o1ez1yKrB/rLMeTqX+woNJWacuOsOQs+3NIytWYvOm0Zut6UMrBWmTYBmtmeIvvXwC8Ma6gKFl9dmM8LbFRzjIQYlXxRMNjpdz8L/7P/7F4F3KIUxersDtLvIwRnCFCywXknceJUABi5P8ch/4lkvyniQ008iX020LXc3CbHCtI/TVumjgQRrIghUfn6 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c133fbc-f9fa-4c9a-54b9-08dc1e016312 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:28.6388 (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: tLCFYIl3zUCDYLt6ER4K8FU7iazQdlOLMYnx3PdYZOoDD52fWhNrANuWiwJojH3a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155740_116165_27794DEE X-CRM114-Status: UNSURE ( 9.59 ) X-CRM114-Notice: Please train this message. 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 Consolidate some more code by having release call arm_smmu_attach_dev_identity/blocked() instead of open coding this. Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 ++----- 1 file changed, 2 insertions(+), 5 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 15e305253ddbb3..92a72ec6ee974a 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2950,19 +2950,16 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) static void arm_smmu_release_device(struct device *dev) { struct arm_smmu_master *master = dev_iommu_priv_get(dev); - struct arm_smmu_ste target; if (WARN_ON(arm_smmu_master_sva_enabled(master))) iopf_queue_remove_device(master->smmu->evtq.iopf, dev); /* Put the STE back to what arm_smmu_init_strtab() sets */ if (disable_bypass && !dev->iommu->require_direct) - arm_smmu_make_abort_ste(&target); + arm_smmu_attach_dev_blocked(&arm_smmu_blocked_domain, dev); else - arm_smmu_make_bypass_ste(&target); - arm_smmu_install_ste_for_dev(master, &target); + arm_smmu_attach_dev_identity(&arm_smmu_identity_domain, dev); - arm_smmu_detach_dev(master); arm_smmu_disable_pasid(master); arm_smmu_remove_master(master); if (master->cd_table.cdtab) From patchwork Thu Jan 25 23:57:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531923 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 8025EC47258 for ; Fri, 26 Jan 2024 01:05:07 +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=6YYNPqizofdJCN1ltBwciZzaSWtgTV6SUd335GMMgt8=; b=iUb235JhbUaL1C uTiYUEHZSzwSjrXkrnYa3wZ+ilCndNcWhDpJAfjDcG6y0Kq2znFhPD2EUUNBTrO+5owQ1CFbE1hvG HwCrY++st9h0w35uRs4dpNSlhcJ2f3YvNvYg/Y4LChKl3KNseI+pZbTSPZMMG/GGwMdpK/FhT3XWz dq7FCdnDyOrpEydDAJ4bYhPYIe9/RwhfVw0h/8fATOISstOS/w+RDHiXLtz3CqHqEcReFvxLUOX+r dMwi28eqlf5vuqWeZPUeiSzkLe4GV2VAoAe5HfhpQf/1VeSJyxr6706esNgd6nGBiusQmcRE4of6o WLEzQXwlnbyBPoldIcxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTAeN-00000002hT7-3Rnw; Fri, 26 Jan 2024 01:04:55 +0000 Received: from mail-dm6nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2417::601] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bS-00000002XD8-3PfY for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G6dBBg8wHsiYTGGOVMvvJwPK4bkz39FCLROEaykaQKFTEhXNDLtLjKOgLcXKx1dtHMKb5gf3GsBAXIy7PjfAFD+e7G39mH2RO/IPQ44bm/awfnvkMT3wG4+f7H6t9/gLVK/Q4hyhY9d9k+vPomAP8VzsIMKZ/51IoGl+6ryN9Gt0ka744q6ryZRyiksQBtRylgj7LOCluwHnuX8ySAj5A6vF6tG3TIh8E8SWN7M4Bwyvx5+NZg0mg8pA2mqtKVs24DSOM8+SHvb88YIszdcPElyBQJ1DKEFBGZXlcNdT72QCA7ghR/q1C8BbBRu7h+DnTsxx8IdBUlEaoS+ShM52xA== 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=IRg1kVqXSznZdQhXxpifepmj1QxQckRVOnw0zHEnVFI=; b=JveWwVjd503chdcbYhDRtN701VlBs2jRmKWw7fmXaHCleAsrEQc7yvNkp2Ia7Bju0ugfXMzqlhQCVDzKQWtYHhpw7Jr5/PM5o2JkVwvv6ejDZtnrNIaYROtRYJpSWzSijb4fdO9T3hpsKg1/9slTSiyJ0rmaKjiCJt8dO4WgXgUsuFoYMhxayb1afQe8XdqM/a+5agJxqtQYf7vxbw0437dtaoHwU0HpnJcrjuMqAeKkjK/pvV8P2WjWHm8kXajHtQmoodoPmV7M92Vh2MsrFC3TNM1KTRI2yHdxt879PdDUuBUOk+ycvwf/xI1IzVOCGtIVCdYMsfqUHZ1dHbfUoQ== 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=IRg1kVqXSznZdQhXxpifepmj1QxQckRVOnw0zHEnVFI=; b=W2QJ1RDAVBgY2L4Z8VsR1y0Qn6cU/OodYFejG1otpzx1AKOYmgynaXFKq0P7cmP9tTO3BNvAOPJ4PcPqyQv/FLFB/zD1nFO8Fa1SgmuaQH/ZzLEmYJtAl6GRqMY51kmpkLdRg82l3/yW1q4vW2e1Z91JviBbXk7cRsViv9rjcykGexrA9rlOE1n/u4IM87bGqfu61PwpGinQJKgZcSEOcqvS19DeAQ86wsvqj2dIWO7X0QTVyje7yJExol4NjWlo/trB+fXAcPcyXcberMcOGUrkHe0QYs6kwABAv1ASPcuDHJWX9J8fJSoarQrVHhg05qe462A7Dp6STxF5R52KrQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:38 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:38 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 15/16] iommu/arm-smmu-v3: Pass arm_smmu_domain and arm_smmu_device to finalize Date: Thu, 25 Jan 2024 19:57:25 -0400 Message-ID: <15-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SA9PR11CA0003.namprd11.prod.outlook.com (2603:10b6:806:6e::8) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: c79019b0-4c2c-4e4d-7519-08dc1e016517 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XlgOjvy50Jyzz4v/3lws+fdkG/+l7dCVf/cJaBdjh5M48c8geFYs2CHkzvcCizzoD1IbPPdTMxuEqQPT3bAM45nCfE208sV337ldCTGNCNJpUyYUiacpox9jqrvz6npyjrQgotQ2KP0QU5zjBnq23QOnAqEPMrYsE6kHSY40s1MVM3W5T7jKyUY1ACFaRMKMVODWmC9GvSXk9Cg7Ysa8GdNbfQToNLDVym/P1KHIqDTW+b8RrDEpLzh1qPVFfoY+e03omAJPTfmfWv0rsQjxUBBgoRsW26qxo5i7SPSIxokmmE6M7NR3jBuc5KWPdyGXZVgUTtxo6gHalN0V+VXSNo8Otu0WKrGlvj3tU9idNP11HClt9kP43lWWfR6HEEGM8LMqQZqULLOvTBZEyrYE9MGCPxoynfKCAL/COjTKc3Z+o0AeaKqxULgB/yNf4xyFnjxsGtwdqcAEr3wxXpgRm9uD3JglwezAOypjve1SSnetKumU4LG9lOOXcoyMBwKt3kL6UMkTFDjE51002RC/Cyp0LsMBEpSHwlDenQIXjBlORSL7uYcIYb4Zo5uFq14P X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BNw9uydrMwOEAwGEQgyuTfk/O4g6t0OGoZjJKBRacy1i+MFtwT8+FOXbH8sJ90vF8oEDYEyrd4vCWFy7w1GhgwyYVviVIKAc9gXFu93bmJ4HcFas9cEqqAMgA4lrnDrx6V2IT3/hPtzkCUOTbY+ORM5B4hCSFUGw06l+DGDAKBKPtbDOXGLfHbPHW+nbzvLrrpwlPEg/4xoDw640FKNOZt5qzQjvVA+pjYK4D3XxBGzCub+QVRqSw026wIOPyP75K/oSHVEvUSzxVAziXP2mduCqtLg/07Pcv12840rJhu36Cl0/PiVRXkRermYKlNKbmt0150ZdtovA38LC9ifE7XBby2aIQuuESzJ8sxrZKH3kuzSvAd8h5WKX7bJLwHr3tjvVOCD5pqZ05F8stX6iEeE4ImqcoDNYnBEQSH+mroGCx6isSAQ9jPzewOFT5koWfk1few6vNA9cw4GdZNuqkc4dCCcyMEDMa1QmDaJG0othYBH4I307jv5Hh727t0y3VuFIAy6NN9EFmu4GxDKKh5DHf2gZZ4eue2A1qyRqcqPCISJFG1qgriO7d1nINyQFpf8grooy7SVsY+mVcxha4M3nSmWa81X8R5rzD8mLA1IggO5NGaaG5KN0U8NshSxSZfg0XheczFkyZfUGBJt/PGkE4CLH2F2n0rvzXYnz3Mp7RwhV5uvgRU7PryKeFLuM0W540DFStLaiyiTSDrpJ6hZm8F2DDlwbSO70liyBl+qZTOfXlfu8vrVvXFWAWkfJ41gtgKY+IeKjomWQmmk/7QfBu73o2ghBjDZlUq7S7B0g2x/Bn0bPtgv7VtJAet2kFea6hMCU9CWjXgLNZMrTgCQRXMYXOPnQUrEJxDNjPILJKYjS6T5ozgUSBujEg14oE8AGOMLkT0Z55AgTL8sL96IlR9+pZ3znEJWsgA241uoInJzS15bPWRk0zRmL809vIvhEfQICXd1WQVPXJPvQsWLNGKD+HDeq5cbzUiJiUYfCVD72UM+ionSDLi0lW8oE4shEJscY8sBwrvuxd8EaX+QnQ5E5qMEyTYef38PMvmPfjbzQYJvYMOu9W+FpAkNZIHnEfAxUOYVBY4xu204a+vdFkQ8KV9y5QQfOWpIld0Vp5xJ6v7sVyHDDo4s4PY3+JHhrQn4j3WOSXuq3xZUPN6biMPYtXwSdFXHrrs3vnY+et0ajT3DjNH5pw1X9O9Til9vlAyYbl0bTKgwsdHBjUYQhZv/ZK1qevftah+hyKOLV0Q9dM90J7KRSpt4vdHiTjOEtBUyTpEZzAjo0e7hwxm5j7jCWP5uIhDkjSbJN6mlZ2FxwbiUpM4P7lvrJ1kMGqfJOgn5z6VhrXQHfaOZVkwy1gw8SSwS4FfYzoynRpsxb+jopmMKBH1uBeZAY5AFPpJwx/rBSfbV3BDpLm4SSQ1tD9iAfGNPo0OVkiW7tFU/B3eJzkC+BoQEcoFaeB7T+uJLVUQ5Wvbodlp+EvbIZvoLqm+L+6OqFENXGP9C6kS0oDJle6DY/Pu5nkoPwyAKyA9URaMz3gyMVjqOS+hM88+1rJ63vVnuCK++wx4O8pZwR/uxqI39LQ5tNkn0sTyp+ X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c79019b0-4c2c-4e4d-7519-08dc1e016517 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:32.0549 (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: GY7CREKDxxL5DeT8/+uh4n+DOhMnZ4PxJIxRP2XwVJTcZDB3bu5wQx0O6ayJFXmA X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155750_950166_9BCDDC32 X-CRM114-Status: GOOD ( 16.07 ) 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 Instead of putting container_of() casts in the internals, use the proper type in this call chain. This makes it easier to check that the two global static domains are not leaking into call chains they should not. Passing the smmu avoids the only caller from having to set it and unset it in the error path. Reviewed-by: Michael Shavit Reviewed-by: Nicolin Chen Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 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 92a72ec6ee974a..f4543bf0c18a49 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -103,6 +103,8 @@ static struct arm_smmu_option_prop arm_smmu_options[] = { }; static void arm_smmu_rmr_install_bypass_ste(struct arm_smmu_device *smmu); +static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_device *smmu); static void parse_driver_options(struct arm_smmu_device *smmu) { @@ -2268,12 +2270,12 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) kfree(smmu_domain); } -static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, +static int arm_smmu_domain_finalise_s1(struct arm_smmu_device *smmu, + struct arm_smmu_domain *smmu_domain, struct io_pgtable_cfg *pgtbl_cfg) { int ret; u32 asid; - struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_ctx_desc *cd = &smmu_domain->cd; typeof(&pgtbl_cfg->arm_lpae_s1_cfg.tcr) tcr = &pgtbl_cfg->arm_lpae_s1_cfg.tcr; @@ -2305,11 +2307,11 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, return ret; } -static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, +static int arm_smmu_domain_finalise_s2(struct arm_smmu_device *smmu, + struct arm_smmu_domain *smmu_domain, struct io_pgtable_cfg *pgtbl_cfg) { int vmid; - struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; /* Reserve VMID 0 for stage-2 bypass STEs */ @@ -2322,17 +2324,17 @@ static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain, return 0; } -static int arm_smmu_domain_finalise(struct iommu_domain *domain) +static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain, + struct arm_smmu_device *smmu) { int ret; unsigned long ias, oas; enum io_pgtable_fmt fmt; struct io_pgtable_cfg pgtbl_cfg; struct io_pgtable_ops *pgtbl_ops; - int (*finalise_stage_fn)(struct arm_smmu_domain *, - struct io_pgtable_cfg *); - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - struct arm_smmu_device *smmu = smmu_domain->smmu; + int (*finalise_stage_fn)(struct arm_smmu_device *smmu, + struct arm_smmu_domain *smmu_domain, + struct io_pgtable_cfg *pgtbl_cfg); /* Restrict the stage to what we can actually support */ if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) @@ -2371,17 +2373,18 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) if (!pgtbl_ops) return -ENOMEM; - domain->pgsize_bitmap = pgtbl_cfg.pgsize_bitmap; - domain->geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1; - domain->geometry.force_aperture = true; + smmu_domain->domain.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap; + smmu_domain->domain.geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1; + smmu_domain->domain.geometry.force_aperture = true; - ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg); + ret = finalise_stage_fn(smmu, smmu_domain, &pgtbl_cfg); if (ret < 0) { free_io_pgtable_ops(pgtbl_ops); return ret; } smmu_domain->pgtbl_ops = pgtbl_ops; + smmu_domain->smmu = smmu; return 0; } @@ -2573,10 +2576,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) mutex_lock(&smmu_domain->init_mutex); if (!smmu_domain->smmu) { - smmu_domain->smmu = smmu; - ret = arm_smmu_domain_finalise(domain); - if (ret) - smmu_domain->smmu = NULL; + ret = arm_smmu_domain_finalise(smmu_domain, smmu); } else if (smmu_domain->smmu != smmu) ret = -EINVAL; From patchwork Thu Jan 25 23:57:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13531921 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 44D59C48286 for ; Fri, 26 Jan 2024 01:05: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=wr2XwUUPiIG8MQ1WWq4HcUKDnq0nLDvP/7ip0FKzYhg=; b=cZcy9SAo9fuBBI apfUr0pZdxvBlkcXa47Rn2S47spWxzsKMOgzd3Zl7AYsgmx2orZBq9TujC1YqS7lob8kBw1fxDdB6 oeKBecouOSPizrYb7M6XSfm2ALd9Mu2byP+XcBoK3sg4c11QL1Q8hjfyNm9buW/chpVUfGlmVWd9s g4z7NfRZkfKW0jiUH3tMphxQ/7gfr/gGriA+Rp4HAMVS+a4fXFTf7pihtGi/S60SV2KWZMVNNNt7v EgGrKPFLNfuW5ltrmPFIgXqHPM6im607GZC5jnheWTHGXyMsnLt/y/M1DiHIfr9ANgJz7MmFb7wvF AVRBiLlcT/mHoljzRVIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTAeK-00000002hRU-1eJQ; Fri, 26 Jan 2024 01:04:52 +0000 Received: from mail-mw2nam04on20601.outbound.protection.outlook.com ([2a01:111:f403:240a::601] helo=NAM04-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT9bR-00000002XEl-1cUv for linux-arm-kernel@lists.infradead.org; Thu, 25 Jan 2024 23:57:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jGRc94xt/e8FUJGyag5J3gaJ8IJeLzUQcZ82HnoFBUodkNrfjwliZzao6sZAZdb8KJD9JuVO001+Bdq/ohO0ccVP6ip5kbSDcAbptNBWS+XLH8kCpUpjnRiY+IBv0LzmEVpl0v2llAZphODjHZVXxSTla3HNwqOgx14cHtwqMzoSoY1DCWu9K8eZDpjrrcHJJ+gTUCm9Rdc7R/rpKEkMuhLziST8Wn9ENAej2B1rzC+hOFVHWP7ixDOBU+Wm0N84GYPQ+QCALerOXtur+Y5e40RU/v9qWSeBeLN94tc71tzNq6UYK2b/9ATNPBdqUS879KcFmVC0FeA8oaSiOSKNhg== 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=t0sjiFmQcOdhTZybnjaAJAn6dKmD6B1S8xkpM0HlFxQ=; b=HTyXT9oj+Q9nA6pCySTZQAWdNz6wMjGOue6fVA+mO+c34oDGpOEI9Ux2oBzGaNQlsR7jvHweBL1DPwCTa8ogVBelWs7Zl54m5CnoxNIMLNlpAnl4wv+Twlz5Q8WvuaIyvfl21FU6CI9QU3FGwgLSeW/Z7KSrk0MDtLvQQD0qxTHxROUZFQ7y3cJq0wvMmwIdr0AmMSC9Jg1beCV2wadL/gnZtsGEuU+BqZhE7PLA2NPnM5V3XnC2eRL6kN2gu5Ll3QTZa9AdPWVDtF9uXYdiDhZJi8I7l+5r7S2I/s2l7CwkepFtCAec+479weydscuze9NQyb6REJAqVwR/L/LkGg== 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=t0sjiFmQcOdhTZybnjaAJAn6dKmD6B1S8xkpM0HlFxQ=; b=dm/nLXw8hfZ/o7pnD0Hqc9cM4+ykeGjgXeaaL4T+yNxf6iPLrD/nfd70cQ7fNj32wzwvmb1uMxyYb9P0BV/eYEHr1lp/URCQp3gZw03/RZNXwB75+9c3FB1RAMvuLE9XWsSdkt6JB7mliXJzkm28FP5S8gQ/xnI1b6y7KH8cwEZCBK/ulgkR3WPF+D5/mLQQNG8nkW5Xh6WzTmzWNZwWAVil49s+04uH4dGajf83cBmbUrl8AAGCe9LOCS3+S5GTIDZIK0FjvpkIeqlO97t/WZpVM+HqxQDsV05tk+lRKzUmaXxAdI7vSUbOeDWHahg9hhy4NWJbUO2PWWTAGzfkDw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by SN7PR12MB7881.namprd12.prod.outlook.com (2603:10b6:806:34a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.24; Thu, 25 Jan 2024 23:57:37 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::96dd:1160:6472:9873%6]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 23:57:37 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum Subject: [PATCH v4 16/16] iommu/arm-smmu-v3: Convert to domain_alloc_paging() Date: Thu, 25 Jan 2024 19:57:26 -0400 Message-ID: <16-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: SN7PR04CA0027.namprd04.prod.outlook.com (2603:10b6:806:f2::32) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|SN7PR12MB7881:EE_ X-MS-Office365-Filtering-Correlation-Id: 1aedae19-ff85-4a0f-9337-08dc1e0164de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J3LHKOVCHhCQInVruJVO1n6Jp6NIQce/35rI+6p95k7V0aRoyEs4JK4JCTRvzffQ2GVDE4rVVe8spvrzmB/y0fO50mG0skNCwi1j9WZIBiT65TGoDFB/xP8xaHk9wxRESKEWKy8Dp4jl3L/XBlhuRBmYq98Fgk+FhKUVyB44EHPplphq+L9GQk651a1FxyE+feWSmrUgV5pg4n6gCpUN4qqfP3CE7T1gURS6ULSeiaFgQP1IDZWts8wPfoTyVYGgxo4Zsfy+WYmKBBNRllhY8lrvY1/onTWx1k035WVVwzbP+jPQ33I/lLNJGTeid9bentcgU3K5KK8HVWHzHEJ1I8CkTBmgjCzVY0bPmMdIu+m+qTCFmFVsL3s3irO+3aBpU3LerkCStmTXYHM9DoG9HtBBEzRO28eE0KHhJgJGcPsGhOgxE8+Tzdpyf2VFn9LlVWfJG9qVegWcGugrrcANKHUxoTZtCDM+rSq4O2lKtUGWgVV5S2VgqHojjR0DORgj2mx29o715eCNoaecsdEVO5fQOOTTjXBnMChxMiQVCVljAAjTYXOoRKH+Io8WjiCX X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(396003)(346002)(39860400002)(366004)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(83380400001)(36756003)(66556008)(86362001)(54906003)(110136005)(66946007)(66476007)(26005)(38100700002)(6512007)(2906002)(2616005)(7416002)(478600001)(6666004)(41300700001)(6506007)(6486002)(5660300002)(316002)(8676002)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aeDImkjH72kbDhBfQvPg/Tfjugjn+RsT57aZj2l3Su08IDAXYnCO1ThJA0AK6+b7zgaEY5Cevjq0mxUa5ca5Mnf/JkpO408ivzl3ge2fWT4TBQ5HwT7iPJh77uOZqCBjtHyb4mg5/jTCKaoIP1zUNzwQIJUuGe4VgD7JVJfzy8KA63jdgG4LUeeKnJ94Qyi/DFNfFia+hW5Gm92spOaPEMgGjQtvo5g8fbSBaaG8780bKR/5x/r8+8BZKTOD0t1iFC76J+EOKGDslNJXbFYiUmu+5gBDLdlbZgNTwRme7y63P0lJCztS82Kqaub9nWbBpOSiRAqUBtW6IQ/g0uPKW28GlT1hOl6RAhVyfaR/ApVG9tIgjpD2Q9VtkKBmHV/iV/2O7Y4Aco9lriEevAZxCdRQBoowI5djErZDj7ofFOCrjzMWJStHfKDu9dEg/aYST6JB3WSdUgE8WnT7vk3tCii9wxk+YRfoaMHtULduhU5mjjuvUKGRiIeeqUsORjoeckqrScNS1baoO7p4/fgjJxhgCzsS6xj1LoaPPIawpMlCk2C74dOy5JdO2zp6TkDN8QQSdpHB8Dkg6fbUVCzDdSCwwsPME/kQg0tAUlXR+vqTGfBa+9xOK3UuzJPDYhgjO5Y0yWyglMqte6MZq+mow/kU0DcgbN39+MNDG7zpyhZYdB38gHWKCTnMcpm7Xs/qWQKF1lZr/+kJYl9JU2TSQiF6qks5d0ehJlQbWeZdlxoDO1kRixpRn08XusQbkpYL8rngAP79UYjFTEK4w5kmy5/Jd9VWiH0NClFRJuwGZkCYLh8LdP/aSG18JyXIcN5qkEegPMpOVKkWRD0a16/KFJvR8n+wz+xyfkHQYqKGtALMEtKrmlPEomnH3B13EEzJ1Si6d7wRCIRuRP1jOvAK42rFTWxrvLY0wrv7sPU2aCHSVjk9FBpGvinRr+3GML9TDyvuqE67euJntr7DX/SIr0lBbLketGs4qhSG4+Ftaenj1XRPU3GyTKglife3s681ui5cXvJUt8YvBucLR5zGOy2JpQz0dXNARNUs8pv3DCg1W5CDHMGGxGYT8TnuCaVfSasRHNBuQlxH251uyIUs7nC1oRcKD33noev1hISQqgI+CLyZidme/oszemOgsb2AflbxWsl7pqPgU27lJ5bi1Dhd+2mxPWEcr67+ilIp6INICS1AhxHFpiGz3Y9djcqXxGRDrnw8gHMMODihpLCfNt37YGWIOc3usfv7gYZlSli5LFeIFS4I/Cl/ROnIHC4wM0JPvhqXxm1zyY9l/l+x3ywJAcIGhpkhVJQZTcFG0RjDVr6rrnd/CYrf8KrDjMobajc1LkB3ifY6A2433CB8GWOvsX4+vGqMa5/rfkTO12TEGoms7/3vEAzweDlmevDbjEy9DNsjByAnmKI3fZv6yIP3juQ+vNQQbFDvSlhgB4TZUOUF1fWQoTO9j2Qncgfcn4NUtCiAX/SF1Kich0pYQ9SF4GJhKSPy/6cD1MVXLtT6Rh9H4qcUBKPkoV9nHsuRq6GjyjcCaQhEBRKSQjoOJbq8DWM50iYhmk5FNhQf7gO9LgZ2d4TB0HJuk9XkL1Jt X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1aedae19-ff85-4a0f-9337-08dc1e0164de X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2024 23:57:31.6551 (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: 2B1j2l0BCkqDSuRKn75SFnqPvRUjabj38fZ27mZM71W4QBBsKmQLoMm3hdX9tBab X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7881 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240125_155749_554156_962444D4 X-CRM114-Status: GOOD ( 13.70 ) 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 Now that the BLOCKED and IDENTITY behaviors are managed with their own domains change to the domain_alloc_paging() op. For now SVA remains using the old interface, eventually it will get its own op that can pass in the device and mm_struct which will let us have a sane lifetime for the mmu_notifier. Call arm_smmu_domain_finalise() early if dev is available. Tested-by: Shameer Kolothum Tested-by: Nicolin Chen Tested-by: Moritz Fischer Reviewed-by: Nicolin Chen Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 22 ++++++++++++++++----- 1 file changed, 17 insertions(+), 5 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 f4543bf0c18a49..f890abe95e57f7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2222,14 +2222,15 @@ static bool arm_smmu_capable(struct device *dev, enum iommu_cap cap) static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) { - struct arm_smmu_domain *smmu_domain; if (type == IOMMU_DOMAIN_SVA) return arm_smmu_sva_domain_alloc(); + return ERR_PTR(-EOPNOTSUPP); +} - if (type != IOMMU_DOMAIN_UNMANAGED && - type != IOMMU_DOMAIN_DMA) - return NULL; +static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev) +{ + struct arm_smmu_domain *smmu_domain; /* * Allocate the domain and initialise some of its data structures. @@ -2238,13 +2239,23 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) */ smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL); if (!smmu_domain) - return NULL; + return ERR_PTR(-ENOMEM); mutex_init(&smmu_domain->init_mutex); INIT_LIST_HEAD(&smmu_domain->devices); spin_lock_init(&smmu_domain->devices_lock); INIT_LIST_HEAD(&smmu_domain->mmu_notifiers); + if (dev) { + struct arm_smmu_master *master = dev_iommu_priv_get(dev); + int ret; + + ret = arm_smmu_domain_finalise(smmu_domain, master->smmu); + if (ret) { + kfree(smmu_domain); + return ERR_PTR(ret); + } + } return &smmu_domain->domain; } @@ -3108,6 +3119,7 @@ static struct iommu_ops arm_smmu_ops = { .blocked_domain = &arm_smmu_blocked_domain, .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc, + .domain_alloc_paging = arm_smmu_domain_alloc_paging, .probe_device = arm_smmu_probe_device, .release_device = arm_smmu_release_device, .device_group = arm_smmu_device_group,