Message ID | 19-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> 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 31510CD98E0 for <linux-arm-kernel@archiver.kernel.org>; Wed, 11 Oct 2023 00:34: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=KVTaLbRisKuegNDvDgZJPIfL9Iu8AjHzB7Q7/cpJeSA=; b=yUfPhlrtE0J4E+ cJjwmXkr9+zWlGv2I5L8dZoIUvHjX6HOK+FmpPkofVic1O+m411SDKtsKv7M8R9enDk40tKeMw+V1 DUXVnp9dye0Z/77FPtLMeazEJyLUHl37KE8/GwwznOd8pNh1sJRRHBYoJUV6w4fNLfggzdrtUFijT pYnno0/5SyFo2JNYm+m+Q3MBn6a4PPGO/pFsmD+Qvsz6OVTBEeIHDYLSX7K6OtYnJWU3ysaOs6WDc sdThorbKaUfKSizMefJsvaPFi1p7Viz5mk+tA4KMUkOvhEM3TS/XfwZcHYBw1MU6VMFaSPO8qmbb5 KawdJQd4JVbRQ0t8YaWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqNAs-00ERLX-06; Wed, 11 Oct 2023 00:34:06 +0000 Received: from mail-mw2nam12on20610.outbound.protection.outlook.com ([2a01:111:f400:fe5a::610] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqNAd-00EQyX-0w for linux-arm-kernel@lists.infradead.org; Wed, 11 Oct 2023 00:33:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=geSvKlWoOC/boGhXoXJl5OxESpNz77ArStQVuRrDp4Bc3mlFBBugoOduX+0wM396DlEq9QXFvb+DcFcHkoiwFyB2uGqeIyf6eK/0k7lFQSRhR9sWH9PCjJi4ZDPAtVDArNTTxKeJn++GH9rYqOJink6ndSGWn9XD5f8GzhBNwZSQ6LTmUB/7ODCT0uhbDXlyfWu7iekdLQ1um+lbijXRHHp3vo3kACz9RNtBbysU4Ymp9tQXTSd/xyS82h2a5XGY5ESBzAdYDok90hdZM7RyO7GZu1tKSIK0qZp3/9lNgpPmYhSZB44WS4VNRxpWj3MZEX6ddgHVmUrKmxz+UZzpDw== 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=eN5pXfHl1wjjBYDfP8PKaLCqsrVUbnIEedeq1lfBfMc=; b=Vm3N9C2+2K9I1/oQvW7tqKH4omNmwomyJ2c6lc9PSM30KLt8nTVo1tLOVXJ4Gxujr6Se28VcRpt6ANtbht4ocO77fVkwGzgjGtBu6JEMf5+MBADrZ1h0SKGThk0hv3vtvfkiZ8qchBu5qd+u0cYmE+ciVgo2F9u/S+uYO4y3SwcQyXDvCaTxp+Qo0XWR3d2TeITZLRusZ97adQmatFmFxMxsKjVLWL1oCOeXNS2rRPTOV0zoEy8nJyu4x7r4j+aLnnPky8uGFT+s6EJ9KPScPhwI1mD1eihOS9FeR6OsHFx7g72PnKRp06mS53NoqRIENQ3HUq2yqcB9KjSrHxJA9g== 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=eN5pXfHl1wjjBYDfP8PKaLCqsrVUbnIEedeq1lfBfMc=; b=HDYCoJvHGoJA9+qQXtmCWlom9L/Bnh0XHX+0v07HN9efs9kIxU1/UmuJ5UndAbfda2CkR6eCHMfdpowqBKpiTPX9YKCjo8NbX2p8tfTiutOH4+ha9EijD76VTRjup18aJjPjHzCMQuiongUNQ9NeUGmqN/MI6p6664wru2hdLJ7cNYh3hoanBFk3rxp5zMWDsd58zCfKCDZ5+PIwE2LV9M/QzPy5Yamrddmzh3o2gc2j1EpWo5eATfdvR+xH0HX5sf5h/3mqpXxOwUEvVzyGtKjJIsOS/al8JK8wkq5mP1hvwujOIyXJd6pNt2VHVtUjBb66IEk5FhzdUxd2Mv8bmQ== 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 IA1PR12MB6625.namprd12.prod.outlook.com (2603:10b6:208:3a3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.42; Wed, 11 Oct 2023 00:33:31 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::3f66:c2b6:59eb:78c2]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::3f66:c2b6:59eb:78c2%6]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 00:33:31 +0000 From: Jason Gunthorpe <jgg@nvidia.com> To: iommu@lists.linux.dev, Joerg Roedel <joro@8bytes.org>, linux-arm-kernel@lists.infradead.org, Robin Murphy <robin.murphy@arm.com>, Will Deacon <will@kernel.org> Cc: Michael Shavit <mshavit@google.com>, Nicolin Chen <nicolinc@nvidia.com> Subject: [PATCH 19/19] iommu/arm-smmu-v3: Convert to domain_alloc_paging() Date: Tue, 10 Oct 2023 21:33:25 -0300 Message-ID: <19-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: MN2PR16CA0062.namprd16.prod.outlook.com (2603:10b6:208:234::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_|IA1PR12MB6625:EE_ X-MS-Office365-Filtering-Correlation-Id: ee5cf119-9772-4706-e0aa-08dbc9f1af83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v+7vxvO/cvRXlVxHp7oS6ZijXymKCVcuvrj7o4QLl0Og/i0SExjnZIB/lcZam8eIVsixDEC7gz7YAP4ONQ3HimG13TGhTzWHp0ZwCp3PQFpe5w7UHonEO0j7QsyX+NHB7d1ux/tRABBDYQ1Cp4AhLgSxFek8NI7lWuTwSlDWVBeE0rMOrpoS4+ELcR15NUnGjNCjx64yqFRMi4RPgaxmBSdQWzhh3+AORIPewHDkPzN7dv7zKLc2VfSU/YfvMKp1dEZM3EtvqATnn/CDt3ZBVmxSBqSlo9ruCOnrrm7UGsV89wxwJyxQavDpmXy2PbUxg14kvIexzRtodze3eEUtL3mJvtDHe1Ik/mCQ+xv3XSG28Y4NJHm7WjXBPtMnRfqJ0vHdiRj6Sx34U/lpgaToBzoRUqTbB+rI3Dqd+ehYK3z8uR3Q4n6+qOo25DaUzliJLKV2f9BWMKyRP98L/4tRoy4lUsRP3IYEDB2qYYzapIEUDQjwB6bfH2HiKt4H25KjRvKufgkJxTn/3LZCx3tMn1NC5Hnh7IbsOJXLTjKOlZzlyYHXKKg0CA0cNJ2RHRaB 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)(396003)(366004)(376002)(346002)(39860400002)(136003)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(107886003)(6512007)(36756003)(38100700002)(86362001)(26005)(83380400001)(2906002)(6666004)(2616005)(6506007)(478600001)(6486002)(8936002)(8676002)(4326008)(316002)(41300700001)(110136005)(66946007)(66556008)(66476007)(54906003)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d/1shM3gQiwgovdILfixt5wEA9QhRS4Vz3YVYdYVmB16A/BZLq5DF/8P4SGYR9oqH8w3noKCFuKv571PuB7YGfuPIFWgspZyS0kvZfPVysxJurL6DY3mIh+xIL9bf/vJzC/2H6IX3j2uwqJukjV+it2EbIqJibDmX0auwr+t+dxLq/OYc3gbH6rqug5Ao2VgS0xYejr9gXxkfEhT8eRqYqAvZlZM/QAspLH/zPZ5IEsMWKwHEIxl69qUazOgVKasjSGVlOkunURJQGfNcCYwJSQKH9APHzoiWdkr4yIQz0WMHkhUA6avFROxAagnnR5/U/rX03ww/XwecoRuTdpohV1mlm3Q0OKlzyH9ZnI+xPO8vAfEgkFSujPQickI3KrJeso63n7pCtaun/vTfkqBFHHdfSJZ1aNluiaIELnf+HMh+GkBWs5vU/IthlLCbz9PrZdbBtj3kdkMEsFLgg7sihcKJs/NQ+OM+Hf0lOreaeXoGoBPST/eM7WGWq8Cg1HrVYbeTfvCT1iR86EO/EF5eebAjDz4g0OvPyXtslSDFaqc4rLFt6o5AoctLMpwJuhr2jvPptoT9kLna6GK0ARYrBuhShhDPLXU7G943Dwo4AfN14K//5tcAw99gi/9gxLfFAwEsXOo/wfhQUxilirHxdQgF7NKmd6UDEVVGCQW/SgQudW0Pz6UUD712IFRJYxO9atWANMTrLKDbCKlG36erPzYu0yzeRgWw7AYB4jEEpiyOI63HZ+PNRJCynj7HB4m488Q9Obb0uMqH2mvUJA0FwzJufMX2lzH2uPJaZ0QCKLp9kTbc9x95bLSIFrsN4WEf4+JKjT63FqdTg4j4kMAKX2rbixrSVSGsfNdPf/es0SyY8FQZZKjB0AGkyoEiopraJ49PtEtajUUveoFUktWEnhqvlqvt7Z8q2aKM6Z1S+zlrR4GDq4O7BgT9kHh/8JNBVPdwHy/EeRxuhn5fdXMqQYdkBc8jkBEjMW31z1gl9aFDpF5DPpSW+2rCIGCJ2SBCvIc2BqQbZkGAPhKQ2V9t2BfKcc/beAhjbp5NFiQdTmk6kf40eVXyRWkz42RkHNkMCn9O5PGNkMqZYxVS2WaeK93rq40lGPbe55SVXeXQzKg9zAz5L4ZkWJq3XY+W6iiCGlMAcHPENAqIe8JiOGXC+kgHHXC/IxiIjhJxJ/4hpkbu2WYhrAeY6AihxTkhk4Bhx+4uEadny121iXuYUjJH80BH3VpXXUBwLgfAYba+2B7R6NCes17yTNkBKmNGbT0UfJtlLgMS5Ke4KMzs14loKxfBnhKQPJZygWFkpYrDfM2mveLyJleC/6pDYS6PXtNre28NWMQpAIGKsoGJx8+u/CAt0XOLbZJGtXWf82BGlOtZGvA97olkYrypVKmBzAcHrB3OEoU9NVkwhKPNFvzaeiVgisE4dIkksRTLThxwIeFxRP0i570ug4R5p9jCyPZOU2NvP4OzzmcegwAa0a8FUL9GP/p2h86diYCTkKpx9tjfLbZ5Ap4bEYiSZLHCPPh5BZWcAPkB8rwI+8/oyXaRpzKSr20II90woCDTX66kvCfdAuJQT9FrxzU77X5gGfV X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee5cf119-9772-4706-e0aa-08dbc9f1af83 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 00:33:27.3330 (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: +0E2aBYQrweHkf0YiMBmmAKowCnN53Q235WY4xguc+tKe+7KZlDOyG6UlKqIx7ny X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6625 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231010_173351_369538_419A1580 X-CRM114-Status: GOOD ( 12.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
Update SMMUv3 to the modern iommu API (part 1/2)
|
expand
|
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 6a4b6d23590e8f..7c1dc96aa75d92 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2145,14 +2145,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 NULL; +} - 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. @@ -2168,6 +2169,14 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) 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); + + if (arm_smmu_domain_finalise(smmu_domain, master->smmu)) { + kfree(smmu_domain); + return NULL; + } + } return &smmu_domain->domain; } @@ -3033,6 +3042,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,
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. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)