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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E66AFC0650F for ; Fri, 9 Aug 2019 00:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C556A2171F for ; Fri, 9 Aug 2019 00:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405144AbfHIAtc (ORCPT ); Thu, 8 Aug 2019 20:49:32 -0400 Received: from mga17.intel.com ([192.55.52.151]:41567 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729418AbfHIAtc (ORCPT ); Thu, 8 Aug 2019 20:49:32 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Aug 2019 17:49:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,363,1559545200"; d="scan'208";a="169164465" Received: from allen-box.sh.intel.com (HELO [10.239.159.136]) ([10.239.159.136]) by orsmga008.jf.intel.com with ESMTP; 08 Aug 2019 17:49:29 -0700 Cc: baolu.lu@linux.intel.com, Joerg Roedel , David Woodhouse , ashok.raj@intel.com, jacob.jun.pan@intel.com, kevin.tian@intel.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Jacob Pan Subject: Re: [PATCH 1/2] iommu/vt-d: Detach domain before using a private one To: Alex Williamson References: <20190806001409.3293-1-baolu.lu@linux.intel.com> <20190808141030.323b4a0a@x1.home> From: Lu Baolu Message-ID: Date: Fri, 9 Aug 2019 08:48:36 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190808141030.323b4a0a@x1.home> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Alex, On 8/9/19 4:10 AM, Alex Williamson wrote: > On Tue, 6 Aug 2019 08:14:08 +0800 > Lu Baolu wrote: > >> When the default domain of a group doesn't work for a device, >> the iommu driver will try to use a private domain. The domain >> which was previously attached to the device must be detached. >> >> Cc: Ashok Raj >> Cc: Jacob Pan >> Cc: Kevin Tian >> Cc: Alex Williamson >> Fixes: 942067f1b6b97 ("iommu/vt-d: Identify default domains replaced with private") >> Reported-by: Alex Williamson >> Link: https://lkml.org/lkml/2019/8/2/1379 >> Signed-off-by: Lu Baolu >> --- > > Tested-by: Alex Williamson > > This series resolves the issue I reported against: > iommu/vt-d: Cleanup get_valid_domain_for_dev() Thank you for testing it. Best regards, Baolu > > Thanks, > Alex > >> drivers/iommu/intel-iommu.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c >> index 3e22fa6ae8c8..37259b7f95a7 100644 >> --- a/drivers/iommu/intel-iommu.c >> +++ b/drivers/iommu/intel-iommu.c >> @@ -3449,6 +3449,7 @@ static bool iommu_need_mapping(struct device *dev) >> dmar_domain = to_dmar_domain(domain); >> dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN; >> } >> + dmar_remove_one_dev_info(dev); >> get_private_domain_for_dev(dev); >> } >> >> @@ -4803,7 +4804,8 @@ static void dmar_remove_one_dev_info(struct device *dev) >> >> spin_lock_irqsave(&device_domain_lock, flags); >> info = dev->archdata.iommu; >> - __dmar_remove_one_dev_info(info); >> + if (info) >> + __dmar_remove_one_dev_info(info); >> spin_unlock_irqrestore(&device_domain_lock, flags); >> } >> >> @@ -5281,6 +5283,7 @@ static int intel_iommu_add_device(struct device *dev) >> if (device_def_domain_type(dev) == IOMMU_DOMAIN_IDENTITY) { >> ret = iommu_request_dm_for_dev(dev); >> if (ret) { >> + dmar_remove_one_dev_info(dev); >> dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN; >> domain_add_dev_info(si_domain, dev); >> dev_info(dev, >> @@ -5291,6 +5294,7 @@ static int intel_iommu_add_device(struct device *dev) >> if (device_def_domain_type(dev) == IOMMU_DOMAIN_DMA) { >> ret = iommu_request_dma_domain_for_dev(dev); >> if (ret) { >> + dmar_remove_one_dev_info(dev); >> dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN; >> if (!get_private_domain_for_dev(dev)) { >> dev_warn(dev, > >