From patchwork Tue Jun 6 12:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Shavit X-Patchwork-Id: 13269065 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 41068C7EE24 for ; Tue, 6 Jun 2023 12:11:51 +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: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8LgdqqrVyVtPrOMlk/KXYvZVlFss9V3C4G8hobELxO8=; b=x2/BDz1mG4ohySg32NK5/3KxPj iBzvPRvDWgEVyRw7o0ljH9PgcWaas3D/7SwPbDDQHkIaGWwTotR/ttvKswdawszOKZb3hvy9Ta2B2 BjAC/sRzBWJv4I5BoE0vzIHXTRYP4hAhflvcGdrpRt5iCQyJwS4/PxcYG5G/6qmw3++dEG5mq2I4+ TTCYhJPpOc7c9rJRZWe2HvqVFR2063cuHrphETwgcosIptHMsclDsEGGVWpIwM9XpEIrjBO19r2TF 7W/8CShDribIooxn86QqZ4/Oi6i5phwl2BQpoLpwe5/3YKXnlMs9qNhMHMnqOP8ZRqwzVgeWYTqJF dzoHE/ww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6VX4-001ZwP-25; Tue, 06 Jun 2023 12:11:26 +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 1q6VWy-001Zr3-2p for linux-arm-kernel@lists.infradead.org; Tue, 06 Jun 2023 12:11:22 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-564fb1018bcso98283097b3.0 for ; Tue, 06 Jun 2023 05:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686053479; x=1688645479; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=t4Hj/7++tZGwCPYZCwYpw7ebOJKZDYQm/8wAZtGxvBQ=; b=tvcKBuXmjcLSD6iUqEdjKkd3pjcW4Bgh2u7k7FhSOJ9MGZTQnIaSWKko/P99xTYVVN iQnaTLb8zj7e/VoY15bc6Mw1W9iPTt0hZMjbPFyPEYnptWJCScPiJPt4tWdXsyXHsO+P gp36FkV0kxNfBjzogTXR9DDW9oucqrdXHcWBZLfDLsvddtSL990dMhINvFRRLE7S0+MX ZynWgj6jxtuOzKbhLTqSqz3k6XpUEVduVIFfHenqn5whjfD/DaqykP3VEdW3yujAx8OO aoDD2uEAol7D8se7oYPQAf+WTlEmk3xSuhFYNAY0mS+9pV4pFZDuvyzqmGrDYSDktahz d0/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686053479; x=1688645479; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t4Hj/7++tZGwCPYZCwYpw7ebOJKZDYQm/8wAZtGxvBQ=; b=aIteysg82ojCJ980N3fXrGDlIVHRMGEBGgzwOynYpUSkTSSUFf6CfIqoWqIqrNcA8c nxvMSw8aizL0+NCmFtrVFnTS3T6zhUpUJDLNCfvPQmIvSqNNjBr13bKIdAjAVDQjdH/l nUBdQxI9PzbDksAuBgm+P4uHMOut1B3bQgFZPyPRKKgOlsp0BQ/YVvzossXTKK1ywspB QYwE7D/joiS/NArYZv72LqqRBCiGX1JWKyXl0udxAGT+bS1yYLFyPJbJWCErTNxpMnTz nlu7Iv4dxhQBdBSGMAchdejGymS1Vgasvc8UH4V1fla72d4NwPTLHwLO0HuOyXzuhRFM PnAw== X-Gm-Message-State: AC+VfDx6jyGJY2bP5+bkYF8yASBgzox0WIKbvys6Gu4hIzSHqh/SG8H+ +2orQ/SADrezX/dhKTbS1Ks6V5P6OuJb X-Google-Smtp-Source: ACHHUZ5K9xZ7uAxAugHtHkCI/mVJfPep/YguDaCB7GWP0kSNToN9Vq9i1EmKFOq+y4/UV6U9gPdF7J95aSTk X-Received: from mshavit.ntc.corp.google.com ([2401:fa00:95:20c:a615:63d5:b54e:6919]) (user=mshavit job=sendgmr) by 2002:a81:aa12:0:b0:55a:3133:86fa with SMTP id i18-20020a81aa12000000b0055a313386famr966118ywh.3.1686053479602; Tue, 06 Jun 2023 05:11:19 -0700 (PDT) Date: Tue, 6 Jun 2023 20:07:53 +0800 In-Reply-To: <20230606120854.4170244-1-mshavit@google.com> Mime-Version: 1.0 References: <20230606120854.4170244-1-mshavit@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Message-ID: <20230606120854.4170244-18-mshavit@google.com> Subject: [PATCH v2 17/18] iommu/arm-smmu-v3-sva: Alloc notifier for {smmu,mn} From: Michael Shavit To: Will Deacon , Robin Murphy , Joerg Roedel Cc: Michael Shavit , jean-philippe@linaro.org, nicolinc@nvidia.com, jgg@nvidia.com, baolu.lu@linux.intel.com, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230606_051120_914891_49073639 X-CRM114-Status: GOOD ( 16.56 ) 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 The arm_smmu_nofitier for an mn can be shared across all devices with the same upstream smmu. This breaks the last remaining explicit dependency on the device's primary domain in arm-smmu-v3-sva. Signed-off-by: Michael Shavit --- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 18 +++++++----------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 4 ++-- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c index 9a2da579c3563..3e49838e4f55c 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c @@ -258,17 +258,16 @@ static const struct mmu_notifier_ops arm_smmu_mmu_notifier_ops = { .free_notifier = arm_smmu_mmu_notifier_free, }; -/* Allocate or get existing MMU notifier for this {domain, mm} pair */ +/* Allocate or get existing MMU notifier for this {smmu, mm} pair */ static struct arm_smmu_mmu_notifier * arm_smmu_mmu_notifier_get(struct arm_smmu_device *smmu, - struct arm_smmu_domain *smmu_domain, struct mm_struct *mm) { int ret; struct arm_smmu_ctx_desc *cd; struct arm_smmu_mmu_notifier *smmu_mn; - list_for_each_entry(smmu_mn, &smmu_domain->mmu_notifiers, list) { + list_for_each_entry(smmu_mn, &smmu->mmu_notifiers, list) { if (smmu_mn->mn.mm == mm) { refcount_inc(&smmu_mn->refs); return smmu_mn; @@ -296,9 +295,8 @@ arm_smmu_mmu_notifier_get(struct arm_smmu_device *smmu, } arm_smmu_init_shared_cd_domain(smmu, &smmu_mn->domain, cd); - list_add(&smmu_mn->list, &smmu_domain->mmu_notifiers); + list_add(&smmu_mn->list, &smmu->mmu_notifiers); return smmu_mn; - err_free_cd: arm_smmu_free_shared_cd(cd); return ERR_PTR(ret); @@ -314,7 +312,6 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn) return; list_del(&smmu_mn->list); - /* * If we went through clear(), we've already invalidated, and no * new TLB entry can have been formed. @@ -331,18 +328,17 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn) static int __arm_smmu_sva_bind(struct device *dev, struct arm_smmu_sva_domain *sva_domain, - struct mm_struct *mm) + struct mm_struct *mm, + ioasid_t id) { struct arm_smmu_master *master = dev_iommu_priv_get(dev); - struct iommu_domain *domain = iommu_get_domain_for_dev(dev); - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct arm_smmu_domain *smmu_domain; int ret; if (!master || !master->sva_enabled) return -ENODEV; sva_domain->smmu_mn = arm_smmu_mmu_notifier_get(master->smmu, - smmu_domain, mm); if (IS_ERR(sva_domain->smmu_mn)) { sva_domain->smmu_mn = NULL; @@ -533,7 +529,7 @@ static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain, struct mm_struct *mm = domain->mm; mutex_lock(&sva_lock); - ret = __arm_smmu_sva_bind(dev, to_sva_domain(domain), mm); + ret = __arm_smmu_sva_bind(dev, to_sva_domain(domain), mm, id); mutex_unlock(&sva_lock); return ret; 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 3c5ff4f58934a..e68c5264c6171 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2058,7 +2058,6 @@ static void arm_smmu_init_smmu_domain(struct arm_smmu_domain *smmu_domain) mutex_init(&smmu_domain->init_mutex); INIT_LIST_HEAD(&smmu_domain->attached_domains); spin_lock_init(&smmu_domain->attached_domains_lock); - INIT_LIST_HEAD(&smmu_domain->mmu_notifiers); } static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) @@ -2859,6 +2858,7 @@ static struct iommu_device *arm_smmu_probe_device(struct device *dev) goto err_free_master; } + INIT_LIST_HEAD(&smmu->mmu_notifiers); return &smmu->iommu; err_free_master: diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index 2c33c0461036d..041b0e532ac3d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -674,6 +674,8 @@ struct arm_smmu_device { struct rb_root streams; struct mutex streams_mutex; + + struct list_head mmu_notifiers; }; struct arm_smmu_stream { @@ -737,8 +739,6 @@ struct arm_smmu_domain { struct list_head attached_domains; spinlock_t attached_domains_lock; - - struct list_head mmu_notifiers; }; static inline struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom)