From mboxrd@z Thu Jan 1 00:00:00 1970 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 0E550C43334 for ; Tue, 14 Jun 2022 07:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239222AbiFNHod (ORCPT ); Tue, 14 Jun 2022 03:44:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231326AbiFNHo1 (ORCPT ); Tue, 14 Jun 2022 03:44:27 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDF2625E9F for ; Tue, 14 Jun 2022 00:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655192666; x=1686728666; h=message-id:date:mime-version:cc:subject:to:references: from:in-reply-to:content-transfer-encoding; bh=WehaGt8hJaU+Ma/bzE5/Cn87XrAOis5/aygzc+ECE0w=; b=BA+bv549wRi23SDSqwagbh1t9puYERGmdT57GXbYvGMSNS11rXB2feqQ mA/xeYC9BNNA+XECGesXnLn0mb6lruXFTQ5DtXFKBAM1VMOKlEfr7Q95X nsZjJ+YOMt637Zk5GLpum+FD++Lov958dOyMFYkPjo/H3GaNWBHiPs5nW u/+3/UAPvQcmd9F76lLa/tX5u7ZDyiiaG8PomjLfpO5Y8taG6k7P5WYYM 0e+hwpAF+/1pIaaUA1gXOnRfdghOLoS4QRQH1Of7KjO9rsV+U65LJBaBI xZEyfMOPE3MA4NIeZFc1Sayf736vFfIvvFLZK1KsIJNfV0S7sWtebXkG2 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10377"; a="278577559" X-IronPort-AV: E=Sophos;i="5.91,299,1647327600"; d="scan'208";a="278577559" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2022 00:44:26 -0700 X-IronPort-AV: E=Sophos;i="5.91,299,1647327600"; d="scan'208";a="910847959" Received: from gren5-mobl1.ccr.corp.intel.com (HELO [10.255.29.39]) ([10.255.29.39]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2022 00:44:23 -0700 Message-ID: <1e19074b-0f8d-b897-585c-582ff3e63367@linux.intel.com> Date: Tue, 14 Jun 2022 15:44:21 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Cc: baolu.lu@linux.intel.com, Will Deacon , Robin Murphy , "Liu, Yi L" , "Pan, Jacob jun" , "iommu@lists.linux-foundation.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH v2 10/12] iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller Content-Language: en-US To: "Tian, Kevin" , Joerg Roedel , "Raj, Ashok" , Christoph Hellwig , Jason Gunthorpe References: <20220614025137.1632762-1-baolu.lu@linux.intel.com> <20220614025137.1632762-11-baolu.lu@linux.intel.com> From: Baolu Lu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/6/14 15:07, Tian, Kevin wrote: >> From: Lu Baolu >> Sent: Tuesday, June 14, 2022 10:52 AM >> >> Fold __dmar_remove_one_dev_info() into dmar_remove_one_dev_info() >> which >> is its only caller. Make the spin lock critical range only cover the >> device list change code and remove some unnecessary checks. >> >> Signed-off-by: Lu Baolu >> --- >> drivers/iommu/intel/iommu.c | 34 +++++++++------------------------- >> 1 file changed, 9 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c >> index af22690f44c8..8345e0c0824c 100644 >> --- a/drivers/iommu/intel/iommu.c >> +++ b/drivers/iommu/intel/iommu.c >> @@ -295,7 +295,6 @@ static LIST_HEAD(dmar_satc_units); >> static int g_num_of_iommus; >> >> static void dmar_remove_one_dev_info(struct device *dev); >> -static void __dmar_remove_one_dev_info(struct device_domain_info *info); >> >> int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); >> int intel_iommu_sm = >> IS_ENABLED(CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON); >> @@ -4141,20 +4140,14 @@ static void domain_context_clear(struct >> device_domain_info *info) >> &domain_context_clear_one_cb, info); >> } >> >> -static void __dmar_remove_one_dev_info(struct device_domain_info *info) >> +static void dmar_remove_one_dev_info(struct device *dev) >> { >> - struct dmar_domain *domain; >> - struct intel_iommu *iommu; >> - >> - assert_spin_locked(&device_domain_lock); >> - >> - if (WARN_ON(!info)) >> - return; >> - >> - iommu = info->iommu; >> - domain = info->domain; >> + struct device_domain_info *info = dev_iommu_priv_get(dev); >> + struct dmar_domain *domain = info->domain; > this local variable is not required as there is just one reference > to info->domain. Yes. It could be removed and use info->domain directly. > > btw I didn't see info->domain is cleared in this path. Is it correct? > It's better to clear here. I will make this change in my in-process blocking domain series. But it doesn't cause any real problems because the Intel IOMMU driver supports default domain, hence the logic here is info->domain is replaced, but not cleared. Best regards, baolu