From patchwork Tue Sep 5 11:49:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Shavit X-Patchwork-Id: 13374443 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 246BDC83F3E for ; Tue, 5 Sep 2023 11:51:15 +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=LdLDMXNZducbgnKp6A5TQMPTPbWI7BYpq+Lmj6AkcXU=; b=ml3YQFDw9pRiySIV+bSiVp4/Iz 3iFcHGD/s3wWGt0uX3R367svBv/Ru1myh9ZF0fEv7qzKbVt6ti7iurTpe5uze/3lP1PEqIktL4+ZH BzuyAvONxqp5UI+0yXhrpdQFkjNFCDmlU04GqfsAVOBwT3bF/y462WJM4JlxHm0cjNMaE0e8uloQN JWx9Lqiy13/h3bh8fcqhm6DIE24/v5DmW11HUj5XxsIm1xIWl0d0DZ3KniPlmALGF8icjy7k0Wiw7 mFrJnR8UvUb4H6iTUVcEr5x/aqSWxwQGSsFH5MRDBGMhPTMA/nfZubHt9O9Cnp6SgUWQZvLNaatYM OhR6MpGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qdUa1-005wig-0G; Tue, 05 Sep 2023 11:50:49 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qdUZw-005wgy-14 for linux-arm-kernel@lists.infradead.org; Tue, 05 Sep 2023 11:50:45 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d7b9a334ccfso3961755276.0 for ; Tue, 05 Sep 2023 04:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693914643; x=1694519443; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=7YfE4KQ/9gmtzN9iZMl6VnrHqz0Jm4lc2KvR4R04sGA=; b=MWl/uHCU1iUPUCifWuZoiPur15JKEgSUHCMey8aFVVHsQhsIKIH8kH6cYHFqPMQC/O 829mWjUvvOs2idE49QaZVD7hCeoD0Bc2Syj1aKPIjC+0NG1MPYLEBdfb0hI/q3+7QTcp rvRIEpkKNXWbSMZYpfP9YMiZ02Vm29gOkZePVsdtQk7cux33j2hW9a2tM083FUfr8hbj n6yI+LKZgcfdKW07gBuj1eHPqOfC11YDXHq7h2C8rv3QBOAcCRNBiJz/a57X1otuDq6d T/Zzd9lAC69Za78HkWaJgLV2JWbiIz3Ui5A6gPrHFFO8OCMZDUtkzAz/QmuoozTir8lh Fiww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693914643; x=1694519443; 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=7YfE4KQ/9gmtzN9iZMl6VnrHqz0Jm4lc2KvR4R04sGA=; b=Vt20BO6qEgzF/nDQ5X8iRmROuXJoREO4K0ch8+bTXosW+3ZNCL5g44qf+GMBbZLbV6 cEmw73Kra7JvXzxxp+i6MLTZeq990DeNA6dEcb8Mnc/iNmAA0dfhrNk3zzhHXZ7cozhv 0nJl2IAuRGG8FuB44Q+gYgQdUj9MF13hWa+KjpYWig8gkgCyp9rRm1Ybn492Rwq4Czf4 d5U2K8YKRUE/UxDGwUg1PQj+7Q02PvtD17o7w4tFhaQi04WlZJReWlZeCCUVj6yqdZ6V 9mKPRk7B7pGkWYLe/nCKA6VbEl5fMqA8JwlmQfgtVlNqgNABUBL02RHV7WSYSz+eIu1G P/4Q== X-Gm-Message-State: AOJu0Yw2dV3opaZZHSR4SGhMMlUXJ/ZuVob1vOkgbkQ4clmmt7NN+v7K 4WcRwquQeBxmgA9t5ZoL+UB72Q4b+Z6G X-Google-Smtp-Source: AGHT+IFMJMhyDh+Mk2ZERpecJKF5C6idpkbhpOKinywWmUZVBJ+h6wHJCjYqmxx/sEbPLpU9spECoGysuOhb X-Received: from mshavit.ntc.corp.google.com ([2401:fa00:95:20c:c4a8:fdce:d8d3:7b02]) (user=mshavit job=sendgmr) by 2002:a25:ad03:0:b0:d7b:b648:f0da with SMTP id y3-20020a25ad03000000b00d7bb648f0damr403350ybi.6.1693914643302; Tue, 05 Sep 2023 04:50:43 -0700 (PDT) Date: Tue, 5 Sep 2023 19:49:12 +0800 In-Reply-To: <20230905115013.1572240-1-mshavit@google.com> Mime-Version: 1.0 References: <20230905115013.1572240-1-mshavit@google.com> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230905194849.v1.1.Ib483f67c9e2ad90ea2254b4b5ac696e4b68aa638@changeid> Subject: [PATCH v1 1/3] iommu/arm-smmu-v3-sva: Remove unused iommu_sva handle 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, jean-philippe@linaro.org, jgg@nvidia.com, tina.zhang@intel.com, Michael Shavit , Jason Gunthorpe , Joerg Roedel , Kevin Tian , "Kirill A. Shutemov" , Lu Baolu , Mark Brown , Tomas Krcka , Yicong Yang X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230905_045044_369723_4594EC58 X-CRM114-Status: GOOD ( 14.33 ) 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_sva_bind function returned an unused iommu_sva handle that can be removed. Signed-off-by: Michael Shavit Reviewed-by: Jason Gunthorpe --- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 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 a5a63b1c947eb..32784758ccce6 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 @@ -25,7 +25,6 @@ struct arm_smmu_mmu_notifier { #define mn_to_smmu(mn) container_of(mn, struct arm_smmu_mmu_notifier, mn) struct arm_smmu_bond { - struct iommu_sva sva; struct mm_struct *mm; struct arm_smmu_mmu_notifier *smmu_mn; struct list_head list; @@ -320,8 +319,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_mmu_notifier *smmu_mn) arm_smmu_free_shared_cd(cd); } -static struct iommu_sva * -__arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) +static int __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) { int ret; struct arm_smmu_bond *bond; @@ -330,7 +328,7 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); if (!master || !master->sva_enabled) - return ERR_PTR(-ENODEV); + return -ENODEV; /* If bind() was already called for this {dev, mm} pair, reuse it. */ list_for_each_entry(bond, &master->bonds, list) { @@ -342,10 +340,9 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) bond = kzalloc(sizeof(*bond), GFP_KERNEL); if (!bond) - return ERR_PTR(-ENOMEM); + return -ENOMEM; bond->mm = mm; - bond->sva.dev = dev; refcount_set(&bond->refs, 1); bond->smmu_mn = arm_smmu_mmu_notifier_get(smmu_domain, mm); @@ -355,11 +352,11 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) } list_add(&bond->list, &master->bonds); - return &bond->sva; + return 0; err_free_bond: kfree(bond); - return ERR_PTR(ret); + return ret; } bool arm_smmu_sva_supported(struct arm_smmu_device *smmu) @@ -537,13 +534,10 @@ static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain, struct device *dev, ioasid_t id) { int ret = 0; - struct iommu_sva *handle; struct mm_struct *mm = domain->mm; mutex_lock(&sva_lock); - handle = __arm_smmu_sva_bind(dev, mm); - if (IS_ERR(handle)) - ret = PTR_ERR(handle); + ret = __arm_smmu_sva_bind(dev, mm); mutex_unlock(&sva_lock); return ret;