From patchwork Tue Aug 1 18:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Shavit X-Patchwork-Id: 13337158 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 679B7C04A6A for ; Tue, 1 Aug 2023 18:39:21 +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:Cc:To:From:Subject:Message-ID: Mime-Version:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=bklB1/J0pO9BzIwY3olL1WpAp418mL121qo6sPE7Gt8=; b=v4C WcS2U3VuroPidbG4VKBcDsOrJH8C0vhHAodJ7Eqf8IsXO27Mf6VF+fJTxS81TawLYcBHZzAu15ftW C/Ax4zpbtP5gbKZqFVkd66zW8EvxfAQdGVpDGMkF1pkifmzKmI/Hqpvk4TcGt3a4KqccuqKOPzIkx bSknUzhq0Q4u2FKLG2fjSlgJXZgXazfak8urEweZ/+2Ji43uC9bI6+dvv5cP7Ev6X/1lii1W1Sz1Z FF+a7HXqSI4a9NsFt9t1F7zidDgj6tLlTMHX/b1C4j2V2y+HSZkWU+PPxfN/zz193vQ/LY5cTIxrr 8AwXQpQ3b3UTz7bLsPWRLFnlOs8viQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qQuGo-0032n4-27; Tue, 01 Aug 2023 18:38:58 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQuGm-0032m2-0c for linux-arm-kernel@lists.infradead.org; Tue, 01 Aug 2023 18:38:57 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-584341f9cb3so1971637b3.0 for ; Tue, 01 Aug 2023 11:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690915132; x=1691519932; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ZKmg+CBz4TGm3r8jvwoY5Ho1uNwN27lHQV4gjuCiVEY=; b=WN9JtxmSArmKBsGxfpIM9wVLy9+C6iQuScP8JgRAPyYIsjB1QhSS6REc4sx85JNdat wTqfJP8iKE7mtxK3C1609C1ha546DHUEqnB6DeVj5dqsenNNsYUxStXjncy6z283IYMV 0kfuAiBZUiHireumid0OFqFQd7Rxr101ZuM1SgKNRGN7gaPKQZHtbCWZBgDfE/OL3MoS i7eAMbs6tLq6lTnlccfVNlptKum7sZixicEVJEBeg39vZbD0MlFVEhTNH0tYiBTtASu1 AcMJwWH5Bkye55mOl9tFLnGJtx7EaJCssZj/tFp7CPU+tdMYIZ5vtuNk/VvOtBKwbk4w 6m6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690915132; x=1691519932; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ZKmg+CBz4TGm3r8jvwoY5Ho1uNwN27lHQV4gjuCiVEY=; b=WzQU3LGAzR+/ToXBwOen3ZBM8UKbRDWbquykU+98DrX4HskKRDzEKdiBxln8STMes+ GkYFlmqjEQQlA+VlkhGmGTlZ9dQXcAkj3IVkUWeLdtlQyBc0Nicap+MPldL82gWeB11g 5Er1QjUyYbrWVgRaYzVV4k61ADf0h0+l0GKno21bjXbRaRT4FehkbIIIo9eqc0A9DCte MrpRfD3dBBWN/+ZE5cNW2egnQAVxgzso6KIsq7xnhKdAOvluRfKi7pdKCq/vaGIGUxru UUqquItDCFjHiEW5s2VQ+cjO68rpYd3zI5HrBeo485+H7a9B2bUTwSlagRdw2qPdNmno 9eHg== X-Gm-Message-State: ABy/qLaNaArw0D3Gjfk12JyxyScQRI8QaRyvzxxT6dswij1c6m7bMZzH uYMJkfs5AnOnQA3jiCKA6PaGve+zBqZV X-Google-Smtp-Source: APBJJlFDRod3DJ+lSa5o4srOuFHgar/AXipUr4WoI/zCNUj0ZKIooFMM936vlc3PkZZ94um3k1jNJWxotc0W X-Received: from mshavit.ntc.corp.google.com ([2401:fa00:95:20c:a54:d53d:50e4:b5b8]) (user=mshavit job=sendgmr) by 2002:a05:690c:3504:b0:57a:6bb:c027 with SMTP id fq4-20020a05690c350400b0057a06bbc027mr186493ywb.1.1690915132183; Tue, 01 Aug 2023 11:38:52 -0700 (PDT) Date: Wed, 2 Aug 2023 02:35:17 +0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230801183845.4026101-1-mshavit@google.com> Subject: [PATCH v3 0/8] Refactor the SMMU's CD table ownership From: Michael Shavit To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: robin.murphy@arm.com, will@kernel.org, jean-philippe@linaro.org, jgg@nvidia.com, nicolinc@nvidia.com, Michael Shavit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230801_113856_229014_93445228 X-CRM114-Status: GOOD ( 15.32 ) 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 Hi all, This series refactors stage 1 domains so that they describe a single CD entry. These entries are now inserted into a CD table that is owned by the arm_smmu_master instead of the domain. This is conceptually cleaner and unblocks other features, such as attaching domains with PASID (for unmanaged/dma domains). This patch series was originally part of a larger patch series that implemented the set_dev_pasid callback for non-SVA domains but is now split into a distinct series. This patch series is also available on gerrit with Jean's SMMU test engine patches cherry-picked on top for testing: https://linux-review.googlesource.com/c/linux/kernel/git/torvalds/linux/+/24742/3 Thanks, Michael Shavit Changes in v3: - Add a helper to write a CD to all masters that a domain is attached to. - Fixed an issue where an arm_smmu_write_ctx_desc error return wasn't correctly handled by its caller. - Flip the cd_table.installed bit back off when table is detached - re-order the commit later in the series since flipping the installed bit to off isn't obvious when the cd_table is still shared by multiple masters. - Link to v2: https://lore.kernel.org/all/20230731104833.800114-1-mshavit@google.com/ Changes in v2: - Allocate CD table when it's first needed instead of on probe. - Minor changes - Added commit to rename remaining usages of cdcfg to cd_table - Link to v1: https://lore.kernel.org/all/20230727182647.4106140-1-mshavit@google.com/ Changes in v1: - Replace s1_cfg with arm_smmu_ctx_desc_cfg representing the CD table - Assume that the CD table is owned by the SMMU master for most operations. This is forward-compatible with the nested patch series as these operations wouldn't be called when the installed CD table comes from nested domains. - Split off as a distinct patch series from https://lore.kernel.org/all/20230621063825.268890-1-mshavit@google.com/ Michael Shavit (8): iommu/arm-smmu-v3: Move ctx_desc out of s1_cfg iommu/arm-smmu-v3: Replace s1_cfg with cdtab_cfg iommu/arm-smmu-v3: Encapsulate ctx_desc_cfg init in alloc_cd_tables iommu/arm-smmu-v3: move stall_enabled to the cd table iommu/arm-smmu-v3: Refactor write_ctx_desc iommu/arm-smmu-v3: Move CD table to arm_smmu_master iommu/arm-smmu-v3: Skip cd sync if CD table isn't active iommu/arm-smmu-v3: Rename cdcfg to cd_table .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 33 ++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 217 ++++++++---------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 21 +- 3 files changed, 139 insertions(+), 132 deletions(-) base-commit: 57012c57536f8814dec92e74197ee96c3498d24e