iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: kevin.tian@intel.com, ashok.raj@intel.com,
	linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	jacob.jun.pan@intel.com, David Woodhouse <dwmw2@infradead.org>
Subject: Re: [PATCH 1/2] iommu/vt-d: Detach domain before using a private one
Date: Fri, 9 Aug 2019 08:48:36 +0800	[thread overview]
Message-ID: <d7431e18-a999-51db-2a3a-1f633e81c309@linux.intel.com> (raw)
In-Reply-To: <20190808141030.323b4a0a@x1.home>

Hi Alex,

On 8/9/19 4:10 AM, Alex Williamson wrote:
> On Tue,  6 Aug 2019 08:14:08 +0800
> Lu Baolu <baolu.lu@linux.intel.com> 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 <ashok.raj@intel.com>
>> Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
>> Cc: Kevin Tian <kevin.tian@intel.com>
>> Cc: Alex Williamson <alex.williamson@redhat.com>
>> Fixes: 942067f1b6b97 ("iommu/vt-d: Identify default domains replaced with private")
>> Reported-by: Alex Williamson <alex.williamson@redhat.com>
>> Link: https://lkml.org/lkml/2019/8/2/1379
>> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
>> ---
> 
> Tested-by: Alex Williamson <alex.williamson@redhat.com>
> 
> 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,
> 
> 
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  reply	other threads:[~2019-08-09  0:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-06  0:14 [PATCH 1/2] iommu/vt-d: Detach domain before using a private one Lu Baolu
2019-08-06  0:14 ` [PATCH 2/2] iommu/vt-d: Fix possible use-after-free of private domain Lu Baolu
2019-08-08 20:10   ` Alex Williamson
2019-08-08 20:10 ` [PATCH 1/2] iommu/vt-d: Detach domain before using a private one Alex Williamson
2019-08-09  0:48   ` Lu Baolu [this message]
2019-08-09 15:35 ` Joerg Roedel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d7431e18-a999-51db-2a3a-1f633e81c309@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=ashok.raj@intel.com \
    --cc=dwmw2@infradead.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jacob.jun.pan@intel.com \
    --cc=kevin.tian@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).