From patchwork Wed Dec 6 17:28:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13482109 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 E93EFC4167B for ; Wed, 6 Dec 2023 17:29:54 +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=+orfktqBiFiBFMVqFJXw7hY481A+SIwVL4qd5bGGFA4=; b=nMybQhr7lBU7Mu 5tqKXgOnFASpPuwxnoCO+b0FmZIyxFGdEJVOR7SUyMwlDV405sVoL82sDhRuwj29cqpGI3njlt2Vh AWSUG9v68UpOyIkLQiWwRCbgrYB892DBCx0V6Obh2Yjb5K5zvIwZENnohKFvnYF+XLO3WMFmXaeZ4 Vt0NkS5oiEfR6E07hliW34Q19BnHTWdoOUGfRPoBOv/UNdOdUae28azay9Y8RjnmsV3PZzpgVuGsY wWqgf001wXx5N3nnEQs+u+AukQWgWTJwy2BmO+/jO4usDH30H+9hoZKsD5KS3KU9FT3yTcxzIz5fz JxrGkOA429EB0hh84TIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rAvi6-00Atta-2C; Wed, 06 Dec 2023 17:29:22 +0000 Received: from mail-dm6nam11on20615.outbound.protection.outlook.com ([2a01:111:f400:7eaa::615] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rAvhd-00AtKY-2D for linux-arm-kernel@lists.infradead.org; Wed, 06 Dec 2023 17:28:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H2dNAWpUrM5T0J49BYecQIk5134YDBogTUXrqBN1UadjaY0FKiol9+MZh0NMCxSJibPpzGDu/dmgOE65zYRrPtq94AICSor6+AErYwFPJplNxhBZkEsrI3ioXUXEx0rKRIKaur5UzHYRKYNzhBdHFg0sitpQ4Dlm6f6DbyndIQF7GczpvEv1dR5ygNx/wNRvHRI4h+3W+GNsfDRsAryNVeTdCbBkew6bAxs/UBfTib3thZbzKN1hGUneQis5HLzRIwJPlTmD5Bw7L1cbmX6zrrXjSShHxStgGYTeHotBmoXFthrwBr+t8hQ4eRaAXbims1mG+66lS1M6W5YZGMaXSA== 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=9sjhrtrMLRm8dbYksvZfGbyaQVx7b30tXACD03u1ajc=; b=hnQWhNZJpW8rJqOaFgPscP7Rh4fAQI78gNt5j1DOC10Q8825dPLnvzwlwn55Hm+MRMqmc09VJoMZKXOOrMfjyl3fp31EzeFtl1Vr82JekUHDAnFsbJRUGjCj0ihfcKcRv31QQXAMD4qjeVcJNMPXNgidtIp5UrYSQM57kBnVj3eqZtS7suvnHZWTpxEKxqgiM2/iEmWOx4diZ7MJ1waYAEtYzF7IWJmgAMTBaV+ZBY4esy8MSt7FoerfL/BWS92zPH8qATGF6KObJjSA9MjhBtc8UhLkAYtkBKkzsdO/y77+XFLEflC8jUtJvlpL0vPP/oAZETKovRZQ/o9w6UO/pA== 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=9sjhrtrMLRm8dbYksvZfGbyaQVx7b30tXACD03u1ajc=; b=CZMHOntumtRcrYWQV20libssDW3QtO5+VXNOxktxajfqRq3Y0mnc65RZ8hRFW+f3eESUe+jN5FpiPn7KTgTzYdDK60TE+uH2ivznLvbXv6VG/7JuQZiNPlrvG2W67xmGbrSBiYsW9Grb8gkTj0uRGxG2CtRN3l96ZVP/THMuzlMPBIdKvuIhpHvtcGspfhaMM+M8I6x4LvYZnZ8nI/lPbNxtQbNFhKT9ht1Dpxx3oNO3KLjRqoWMvwQcLNplVMcKtxlDBuakBGmjfg7J96dmBSwr1mhFCda4B5+6NasXiXTcS3epKqjme3Acr+75lo5Urou3skYtkphYc5ok6ijVXA== 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 IA1PR12MB8360.namprd12.prod.outlook.com (2603:10b6:208:3d8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 17:28:42 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::60d4:c1e3:e1aa:8f93]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::60d4:c1e3:e1aa:8f93%4]) with mapi id 15.20.7046.034; Wed, 6 Dec 2023 17:28:42 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Eric Auger , Jean-Philippe Brucker , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameerali Kolothum Thodi Subject: [PATCH v3 19/27] iommu/arm-smmu-v3: Keep track of arm_smmu_master_domain for SVA Date: Wed, 6 Dec 2023 13:28:25 -0400 Message-ID: <19-v3-9083a9368a5c+23fb-smmuv3_newapi_p2_jgg@nvidia.com> In-Reply-To: <0-v3-9083a9368a5c+23fb-smmuv3_newapi_p2_jgg@nvidia.com> References: X-ClientProxiedBy: BL0PR1501CA0026.namprd15.prod.outlook.com (2603:10b6:207:17::39) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|IA1PR12MB8360:EE_ X-MS-Office365-Filtering-Correlation-Id: 688ca31d-d696-4777-cd16-08dbf680c692 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Y1xJIXs4nY7rMnDz+4DeLCaw9LrsmCjMHZCPiOXqrBS+4djbwfH48dccPwGVdJnW+f3K4+09K3KQJwNx4dPbjWoLa7dfZAGPBZKKvD85saQc+Xm+I1WSZvS3YSEC4Xn/rZzZggthYTiIj95nmn4UlRooBRSyXRj3eK5kxD84IyOXIbv5v2mwPX2KgtlHh0kx4dlDbvWFNqqESRcsVeO4Ief9DmHodlVRlJNWNCYwXvLAzwUdnhC/4d34rBx/5KtBm8zGElHrJZ65TExFHeaUdCIsPgcKP1BdAFvwS9IqDekFhdWnHFgjHtD6dINfabZrjC1tOUG8c+6dllXb+hLm+3IQp5y28BKo0PnGYVi+Aq9lDmgxPahu8POT0PKoAYo7vuRObseF4OhRnYPv5gM9Gf8JjpfNBODwWWvgUa5RLa9lEJ5QpCZ23eGrhMNcR57OOwWjoU2t129IUDHT5K9/EsZX2YEvDqBA4dgYWTKVr1wvmR5jAaQuEre4iDSJJhXBwXkDjI/QnN7rItivfyrrhMoUH54ZaITyUf4CIPk3g+JRCPhkwY1sEd9HRBrjm50 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)(39860400002)(346002)(376002)(136003)(366004)(396003)(230922051799003)(186009)(64100799003)(1800799012)(451199024)(6666004)(6486002)(478600001)(38100700002)(83380400001)(66946007)(6512007)(2616005)(66476007)(6506007)(8676002)(2906002)(4326008)(54906003)(7416002)(5660300002)(86362001)(36756003)(41300700001)(66556008)(8936002)(316002)(110136005)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /1TSTdvP01GRDCWUYfogrcfxL0T6A0s8EOvJ0MdqL6P+RTz4ThgwiRd+R53PuGc8tGAvF4AevjiZ+MvuM8/dQJdV3IXeDLN8Qlxt47smxZsDpEOABF8vAkGJ2g2mVOsGJPgwOHBdQkJyC5012XbX9XdzN0Wxf1nK98eRu5gjkL6A9xUT21ybISiJM0UD/1NsUXTbt8Cwf1zi4X4MQbfaLb4gHkGIyhMnHpBRpIRxm9CPmeRnrPsw+WqN+/H7/a0WTSoU0CjeoT+wN8kG9cv4GgC7groIedcQ2U3p7FDCimb4yzfjwqKGnChMrRZq0yRvWqNZVrNAEKRLMOQqW6Vs5LdNEE24ayuWyqpWkaIFmtVHWFwHFGUmkwa48TeE39gnHgPp9g8W2VbM1GdTtXHu7FZjkESi0xF4LN5MQJvivmxbqfg6oaSOyBYzOuNzJ5TCkh9lhBvxfpgz2aiNMpk43ZI5LPUsweYLwQYkKEBF0vJWgxoRsMzJUKED93K4O8wIHsGj7Em6tBZweuLyqU2/wj39VhXKmm4VV0sN3nVLdDj7qsb7IZdTWHy/xb5oSG2p1MXWS4IR5Y15p8UQCa/Kpgf4QuFMyXDFeHpdnZFqswEQ0Hrl6US3CUpaLD8zj7sm/AaprByn+dsYIQp4GjTegTuT5e3PN+PHggVhNYyVkKJ668yWx0m3tfQtOT1C72JbJHQE2Pe3pVAjOMzKMinrLhUQUfNYedY2cs+aUpPK6nWgbd/uayWr33avCfT3DtIQ3rG6PsePMX14k9oHmx+CiR/cmLJ/BmQNiracT8QVrKpPiVKqFqaiMHjd/Mg4kuraM5RHCX9Ztnkkzp/a6X4DHIeK41Q0dVyzyc9bILc8XXxqhbDv4Q7eH4TUuuiqDC3sqvw1nxuo/TAoh4NMt+a9P1iQkBGqr6jC2UzWoOA5h4ipHPHgR2ikG2Al4KwtA3k1T4YMCMGVGn3pjsE+SIaFP313SCG5mfEapjeVGiNqJg1sWKCMASQbkWN2YcYr9v+we0Fh5sEbUknlNCFRvFXgaR/0cBHQ0DsQajxg5G4SsdabaFhla2ffa93eXxBOava/yopYMa7tSS/EWb9GzSUZBUc4af6TKimlS5AJPDdejakGPf+7nicY0YZEnChi1aFLF8acyL3/LZZfKSsuj1O/gvB/3YavCiQPWmP9NXy742ZvMXsNgL+s0AwNkqAQRFMkO6p+T4s2hknu7iLwoHWZdYjXg2A48mG7drAyDXj8woQkvkehDSlUT7juBeUVQkBfmqHB41ZBQiyiaZidurwVcdC5TH3K8KBZvYfEtd5S22cHtRFrJJPrk2+fnOlC8Dp0eWV3g/KkMgL3BudB64n9y1TXW3kGopblujxdGn5DE6GyE6ODMmueWkjYoXV9E7EEmC4GZeA0OlKWsmAgn7Imfzhrkn+WnZ4QJ3poA1r074ySPIznF52+IQPBWx9DL8oZEY6Und3ekY9pvnxBVdeyoAOxKRwAd7MVWTJzjY/+I/bmSqPrrZx6MoKovl3JN5LeUVIyQhDG9ASqD83OMmSm5GZNHcKrnQ1GxCN1BgM4Pw5gyo2ze3ZPYj2ywwvKW473 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 688ca31d-d696-4777-cd16-08dbf680c692 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 17:28:35.2055 (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: Djhak9lsDLU+h9aKhRqOJxctTrhYSHaJPa4xqQE+CWGiMKul4web2Vpo2FPxHAeb X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8360 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231206_092853_728855_C4A3F551 X-CRM114-Status: GOOD ( 10.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 Currently the smmu_domain->devices list is unused for SVA domains. Fill it in with the SSID and master of every arm_smmu_set_pasid() using the same logic as the RID attach. Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) 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 5db78e6e03dcfd..10dc7edd40e1b1 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2712,6 +2712,8 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master, struct arm_smmu_domain *sid_smmu_domain = to_smmu_domain_safe(iommu_get_domain_for_dev(master->dev)); struct arm_smmu_cd *cdptr; + struct attach_state state; + int ret; if (!sid_smmu_domain || sid_smmu_domain->stage != ARM_SMMU_DOMAIN_S1) return -ENODEV; @@ -2719,14 +2721,30 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master, cdptr = arm_smmu_get_cd_ptr(master, pasid); if (!cdptr) return -ENOMEM; + + mutex_lock(&arm_smmu_asid_lock); + ret = arm_smmu_attach_prepare(master, smmu_domain, pasid, &state); + if (ret) + goto out_unlock; + arm_smmu_write_cd_entry(master, pasid, cdptr, cd); - return 0; + + arm_smmu_attach_commit(master, pasid, &state); + +out_unlock: + mutex_unlock(&arm_smmu_asid_lock); + return ret; } void arm_smmu_remove_pasid(struct arm_smmu_master *master, struct arm_smmu_domain *smmu_domain, ioasid_t pasid) { + mutex_lock(&arm_smmu_asid_lock); arm_smmu_clear_cd(master, pasid); + if (master->ats_enabled) + arm_smmu_atc_inv_master(master, pasid); + arm_smmu_remove_master_domain(master, smmu_domain, pasid); + mutex_unlock(&arm_smmu_asid_lock); } static int arm_smmu_attach_dev_ste(struct device *dev,