From patchwork Wed Aug 16 13:18:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Shavit X-Patchwork-Id: 13355169 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 26197C001E0 for ; Wed, 16 Aug 2023 13:20:01 +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=qtZH94MVBPGOAVsUYKZTAqJaChPnuK7IA1JC3NaIn3A=; b=vaq zFR42qNpIutK7FnaWqhfrRYuSbTBkpvKtl9LDQUHAS/mLEuShVW/xxT0FmSM+l5naZ6dqbcvHiYiM HXlVIZgVvd2x/h+iKCSVLw7n8pgSJF6oXGlI31M92XJQxeCtac/n8ycJl5RZphVdTUkY3pHB3KnFG TN2c8v2AEbF0Dx97iT3V/5zGP2Vgy4vZ6UG8hYDWn71901su0bpnJD2D9C4xw3/c4+vV550tG3NKv vo4zniPCGFRBUQFsxVcmhhsFk/0Hjn4vrb1K9CM+FUkc8C+eLGFsadFdgKv43F72Hz61W4T3k3tyk 8bcMAkBoYEFFxgp7ObEEFoBC0Zwe7pQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWGQz-004FKG-1k; Wed, 16 Aug 2023 13:19:37 +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 1qWGQw-004FIk-0I for linux-arm-kernel@lists.infradead.org; Wed, 16 Aug 2023 13:19:35 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-583312344e7so88464847b3.1 for ; Wed, 16 Aug 2023 06:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692191971; x=1692796771; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=cFp68mVNc3zD0WpZGdDicdW6hVzQCXNZQbBR0zKXsLo=; b=Hi1romN5rhySt7t1khPi6B/g9cHisWG75w+xtAmc/6GQh5sQVP/7ezcz5rUK41jisg omDnuJB32WQZKOkIMEYw8GDIxGHujDUCGAYKfo2f8V4BRwUOr9VWKBtKY38/gI3dzfYn szaofXi4/nDcKsWlDqvfN+QoMz32cAs6NaOij+wnOU4LmtA0VQffSXQj/Tu1mQPLBWj8 r9eIBpkOl3lhwNC//zQa+Ngx1nTsdekgRaLzhd9VW7JR3l4CKjGj5SicLIFsqu8QAwjo SnN+UOgrzRzR/bc/Mj5tc4dboCURc3BRPd7f3+F55HdewtpxPl7RRTsWIoctG41GQ7zF JBsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692191971; x=1692796771; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cFp68mVNc3zD0WpZGdDicdW6hVzQCXNZQbBR0zKXsLo=; b=J40MULAD1HSahvutr+cXZ2eFhHAA1u95sPTGQNycu2I9jUHQIpbVFm2TSTRUleaaTc Nm4egwpp84hFMiMSmCAZTaRgQ306jLvGSy+YAp5J89xRvvZXcdVxC33Ip49uNWvm8ke3 yVILWM7KiC1Rzu39bPJZc3XtgROHxg1ytMn/7gnKYm+CRhy/GVAH+Xl9AzeJIvzZ0DXm MW3qlsiZEXmsZam1QX2mjGYUjjnY369b+YdOmaoyivzfhAGnTN1gpRsh3iSelTYUGu9+ Y8k/YNF6TQVCREcHH2lxUrIk2Gfdk2uE4SEm9LCJqQmVbXno3RUA0ykYtcjpz+Ok/Cti TICA== X-Gm-Message-State: AOJu0YzQXnv1ebCUo2jJJyc629kXO9/xT2IZNZg9KJR6GgozYczHy5aU 4f9jehbA7gDHCakYX/9VFpdoKJnb29B3 X-Google-Smtp-Source: AGHT+IFptDPVwuTKLjZZfmu+XC50egRaTONZ0DqUxp3ayBws3zvg5ys8Ai8bqzxd9fFitLfwCGXj+NLBCw2w X-Received: from mshavit.ntc.corp.google.com ([2401:fa00:95:20c:ae98:2006:2abd:3434]) (user=mshavit job=sendgmr) by 2002:a81:4524:0:b0:58c:b8c4:2b4a with SMTP id s36-20020a814524000000b0058cb8c42b4amr21884ywa.4.1692191971662; Wed, 16 Aug 2023 06:19:31 -0700 (PDT) Date: Wed, 16 Aug 2023 21:18:40 +0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.694.ge786442a9b-goog Message-ID: <20230816131925.2521220-1-mshavit@google.com> Subject: [PATCH v6 00/10] 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-20230816_061934_152879_54833FD1 X-CRM114-Status: GOOD ( 18.63 ) 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/+/24770/9 Thanks, Michael Shavit Changes in v6: - Undo removal of s1fmt and renaming of s1cdmax - Unwind the loop in amr_smmu_write_ctx_desc_devices to NULL out the CD entries we succesfully wrote on failure. - Add a comment clarifying the different usages of amr_smmu_write_ctx_desc_devices - Grab the asid lock while writing the RID CD to prevent a race with SVA. - Add the device to the devices list before writing the CD to the table and installing the CD table. - Link to v5: https://lore.kernel.org/all/20230808171446.2187795-1-mshavit@google.com/ 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 (10): 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: Update comment about STE liveness 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 | 40 ++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 259 +++++++++--------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 19 +- 3 files changed, 176 insertions(+), 142 deletions(-) base-commit: 6eaae198076080886b9e7d57f4ae06fa782f90ef Tested-by: Nicolin Chen