From nobody Fri Sep 12 03:07:59 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78AA3EB64DD for ; Wed, 9 Aug 2023 12:50:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232664AbjHIMui (ORCPT ); Wed, 9 Aug 2023 08:50:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232596AbjHIMuc (ORCPT ); Wed, 9 Aug 2023 08:50:32 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BB271FD4 for ; Wed, 9 Aug 2023 05:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691585432; x=1723121432; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DYxnh/kP9R8JBvFnqsi/X/T1RmcQV+dkPJCY2p+HqgM=; b=IY1PsioQTbd2OM5Pk/Pbong5lEIn5vBxaOoMJ0LTUI7EG851z+JNiptk 9XP3NkP0bRoPcRY/FBNTmKPQBKDJcG5xyJu/sDc9vP8tCYUUTEVS/27ke vGhfVEZkaeVi6g/aC27CMHyy4vl6cQE3OtEWC2zuQt/QIRPdBJog73hPm hHKwrlUV0TUl1lWIUkKIu9dY1SQVRJ9K7hnWbPqdUtrMfvqljzcFx+y9C URIS1yFlc8Y/8/F5XXiy+L7tq/gsJNH9+INenEHu7Uxqx5P8mSt4Cqbas +2ALMJ0MBSB+kmBLqndeTN+mb71raffW59JCDEMP1TA0P9RavvNzgK4mG Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="374821699" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="374821699" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2023 05:50:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="855521711" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="855521711" Received: from allen-box.sh.intel.com ([10.239.159.127]) by orsmga004.jf.intel.com with ESMTP; 09 Aug 2023 05:50:30 -0700 From: Lu Baolu To: Joerg Roedel Cc: YueHaibing , Yanfei Xu , Jacob Pan , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/13] iommu/vt-d: Remove pasid_mutex Date: Wed, 9 Aug 2023 20:47:57 +0800 Message-Id: <20230809124806.45516-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230809124806.45516-1-baolu.lu@linux.intel.com> References: <20230809124806.45516-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The pasid_mutex was used to protect the paths of set/remove_dev_pasid(). It's duplicate with iommu_sva_lock. Remove it to avoid duplicate code. Signed-off-by: Lu Baolu Signed-off-by: Jacob Pan Reviewed-by: Kevin Tian Link: https://lore.kernel.org/r/20230802212427.1497170-5-jacob.jun.pan@linu= x.intel.com --- drivers/iommu/intel/svm.c | 45 +++++---------------------------------- 1 file changed, 5 insertions(+), 40 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index e95b339e9cdc..2a82864e9d57 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -259,8 +259,6 @@ static const struct mmu_notifier_ops intel_mmuops =3D { .invalidate_range =3D intel_invalidate_range, }; =20 -static DEFINE_MUTEX(pasid_mutex); - static int pasid_to_svm_sdev(struct device *dev, unsigned int pasid, struct intel_svm **rsvm, struct intel_svm_dev **rsdev) @@ -268,10 +266,6 @@ static int pasid_to_svm_sdev(struct device *dev, unsig= ned int pasid, struct intel_svm_dev *sdev =3D NULL; struct intel_svm *svm; =20 - /* The caller should hold the pasid_mutex lock */ - if (WARN_ON(!mutex_is_locked(&pasid_mutex))) - return -EINVAL; - if (pasid =3D=3D IOMMU_PASID_INVALID || pasid >=3D PASID_MAX) return -EINVAL; =20 @@ -371,22 +365,19 @@ static int intel_svm_bind_mm(struct intel_iommu *iomm= u, struct device *dev, return ret; } =20 -/* Caller must hold pasid_mutex */ -static int intel_svm_unbind_mm(struct device *dev, u32 pasid) +void intel_svm_remove_dev_pasid(struct device *dev, u32 pasid) { struct intel_svm_dev *sdev; struct intel_iommu *iommu; struct intel_svm *svm; struct mm_struct *mm; - int ret =3D -EINVAL; =20 iommu =3D device_to_iommu(dev, NULL, NULL); if (!iommu) - goto out; + return; =20 - ret =3D pasid_to_svm_sdev(dev, pasid, &svm, &sdev); - if (ret) - goto out; + if (pasid_to_svm_sdev(dev, pasid, &svm, &sdev)) + return; mm =3D svm->mm; =20 if (sdev) { @@ -418,8 +409,6 @@ static int intel_svm_unbind_mm(struct device *dev, u32 = pasid) kfree(svm); } } -out: - return ret; } =20 /* Page request queue descriptor */ @@ -520,19 +509,7 @@ static void intel_svm_drain_prq(struct device *dev, u3= 2 pasid) goto prq_retry; } =20 - /* - * A work in IO page fault workqueue may try to lock pasid_mutex now. - * Holding pasid_mutex while waiting in iopf_queue_flush_dev() for - * all works in the workqueue to finish may cause deadlock. - * - * It's unnecessary to hold pasid_mutex in iopf_queue_flush_dev(). - * Unlock it to allow the works to be handled while waiting for - * them to finish. - */ - lockdep_assert_held(&pasid_mutex); - mutex_unlock(&pasid_mutex); iopf_queue_flush_dev(dev); - mutex_lock(&pasid_mutex); =20 /* * Perform steps described in VT-d spec CH7.10 to drain page @@ -827,26 +804,14 @@ int intel_svm_page_response(struct device *dev, return ret; } =20 -void intel_svm_remove_dev_pasid(struct device *dev, ioasid_t pasid) -{ - mutex_lock(&pasid_mutex); - intel_svm_unbind_mm(dev, pasid); - mutex_unlock(&pasid_mutex); -} - static int intel_svm_set_dev_pasid(struct iommu_domain *domain, struct device *dev, ioasid_t pasid) { struct device_domain_info *info =3D dev_iommu_priv_get(dev); struct intel_iommu *iommu =3D info->iommu; struct mm_struct *mm =3D domain->mm; - int ret; =20 - mutex_lock(&pasid_mutex); - ret =3D intel_svm_bind_mm(iommu, dev, mm); - mutex_unlock(&pasid_mutex); - - return ret; + return intel_svm_bind_mm(iommu, dev, mm); } =20 static void intel_svm_domain_free(struct iommu_domain *domain) --=20 2.34.1