From patchwork Tue Aug 8 17:11:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Shavit X-Patchwork-Id: 13346506 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 36091C04A6A for ; Tue, 8 Aug 2023 17:15:35 +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=qrv+nNXHFcfW0oPmbHY6HzSJzeOqOOL4GvaBNYC9TyE=; b=KGc caTx8AP+ZUxcp5scGG9XbdVSDH1YmmpVofbR8XsYd22E6b/5hNNvzWCgNisAHMIKfJNlwx0AL9xPY fuxwnJbWo4d+ODrQUudEzxvZCI/m2C2p2tSctMmpkdvvAyVrvMatn0i/vGMFXB+CpgYlCNWTyZ5E6 VKHEvarRbRsIjaJIWwR+Yu754aqRPPojzatdr0lAxfjs6q8xpzPwnlbcD/O4g2a/vzMTq+4IuLUdZ lp2M1g8BtSJVnXL2uFqi31sMQoQE5YqtTlvGoJFkkq++0A1ibRa914VGqypKzPcA+te4wsLhujgtE VCAH2QCfpd6WMU5ENPv1OlDEAWM/Lvw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qTQIQ-00360g-06; Tue, 08 Aug 2023 17:15:02 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qTQIN-0035zR-2g for linux-arm-kernel@lists.infradead.org; Tue, 08 Aug 2023 17:15:01 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5734d919156so53643057b3.3 for ; Tue, 08 Aug 2023 10:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691514896; x=1692119696; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=aqkrOktIR1lETMTWBm5xIeJf9PjPMAED8VAbt11S0ko=; b=BjxXsVQyq6Kk7NLHxPXlJbIvmoLKGSzDyrShyA9qqwn54c59rPrH7AFMhL3vdhmF4Z +sB/FGUncUE2UOvlXj3gD8siD3LAaqDGz8TAupKaqIx9lBAgrtHCjc5BeByGnQdycknS p88EnfxIHxRaqwGPZheoLXnSbF5J7w76/2LzDJ4zGt+hQzh48vbcWarMqC03lnHX3CcK +1+KNwRzb/DtolH7b2Vh0mVTZxFFQPcnx3LotvA/zGxjxsrXgHkTEj2AyY2XIGM1EPT6 tGx3Rk+qP3m7LYdH65s2GPxaiq6425qBuITd0q4sP0dgJxDN4bQuC49+my6ckvIcJEQ4 k4VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691514896; x=1692119696; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aqkrOktIR1lETMTWBm5xIeJf9PjPMAED8VAbt11S0ko=; b=WlEB9YxnA0DyR7WN7ZNCMmYiDbISf2ul2N4Fu+RkqyJxE9dDOq5tIT+7RH5VNRJRsq EMxNZq1S7i9TtgfJko1LkY4Noz2NoLAIsgSL8sjKy+OsahHe21Xy/lOiL4tAbpkcy22Z WCm22gBOsqgJjPZxX6GXx0jZYOU0iArN14+0EGvayyAq0rUj4DWz4B3YPnibLLs9DBZe ML7/Yn1pBbBFH43L+qipluJ4W6mrXHVVAwp+RSgOu1xsSiW3WALkfaQGuvjTA4Daty5i aI2+TKY5M5k3XqP2hKx+IjApXPtpS1LT0EI4+8CIPTVqIEW7259Bct+56TdT2YSrP6mt y3lA== X-Gm-Message-State: AOJu0YzDhJJtZod6gBkFf3vPfKE1AoYeEQXqiuM4956/f2DAfy63gvUO ew/MGQU+262Es0Vrrmasdca7VeE8p+bp X-Google-Smtp-Source: AGHT+IHTdnoNRIRWWu8AlkQ0wSc0RDHpXiBAyp6iP3lVobNNN6cJwX8hzYT6lhshrprEzNrxkfmKQGmpHiBW X-Received: from mshavit.ntc.corp.google.com ([2401:fa00:95:20c:986a:71d7:3b1e:ac1d]) (user=mshavit job=sendgmr) by 2002:a81:ad4e:0:b0:576:8cb6:62a9 with SMTP id l14-20020a81ad4e000000b005768cb662a9mr4750ywk.6.1691514895956; Tue, 08 Aug 2023 10:14:55 -0700 (PDT) Date: Wed, 9 Aug 2023 01:11:56 +0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.640.ga95def55d0-goog Message-ID: <20230808171446.2187795-1-mshavit@google.com> Subject: [PATCH v5 0/9] 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: will@kernel.org, robin.murphy@arm.com, nicolinc@nvidia.com, jgg@nvidia.com, jean-philippe@linaro.org, Michael Shavit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230808_101459_868910_9CB3E854 X-CRM114-Status: GOOD ( 17.06 ) 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/8 Thanks, Michael Shavit Changes in v5: - Clear the 0th CD entry when the domain is detached. Not clearing it caused a bug in arm_smmu_write_ctx_desc which doesn't expect the entry to already be set. - Fix an issue where cd_table.installed wasn't correctly updated. - Added commit to clean-up now unused master parameter in arm_smmu_domain_finalise - Link to v4: https://lore.kernel.org/all/20230802163328.2623773-1-mshavit@google.com/ Changes in v4: - Added comment about the cd_table's dependency on the iommu core's group mutex. - Narrowed the range of code for which the domain's init_mutex is held on attach since it now only protects the arm_smmu_domain_finalise call. - Link to v3: https://lore.kernel.org/all/20230801183845.4026101-1-mshavit@google.com/ 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/#r 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 (9): 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: Cleanup arm_smmu_domain_finalise 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 | 255 +++++++++--------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 22 +- 3 files changed, 161 insertions(+), 149 deletions(-) base-commit: 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4