Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: "Convert the AMD iommu driver to the dma-iommu api" is buggy
To:     Joerg Roedel <jroedel@suse.de>, Qian Cai <cai@lca.pw>
Cc:     iommu@lists.linux-foundation.org, Christoph Hellwig <hch@lst.de>,
        Tom Murphy <murphyt7@tcd.ie>, linux-kernel@vger.kernel.org,
        Julien Grall <julien.grall@arm.com>,
        Marc Zyngier <maz@kernel.org>
References: <1571237707.5937.58.camel@lca.pw>
 <1571237982.5937.60.camel@lca.pw> <20191016153112.GF4695@suse.de>
 <1571241213.5937.64.camel@lca.pw> <20191016160314.GH4695@suse.de>
From:   Robin Murphy <robin.murphy@arm.com>
Message-ID: <a85f264c-3b74-b92b-ac03-aeba3a56946f@arm.com>
Date:   Wed, 16 Oct 2019 17:09:20 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <20191016160314.GH4695@suse.de>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-GB
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 16/10/2019 17:03, Joerg Roedel wrote:
> On Wed, Oct 16, 2019 at 11:53:33AM -0400, Qian Cai wrote:
>> On Wed, 2019-10-16 at 17:31 +0200, Joerg Roedel wrote:
> 
>> The x86 one might just be a mistake.
>>
>> diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
>> index ad05484d0c80..63c4b894751d 100644
>> --- a/drivers/iommu/amd_iommu.c
>> +++ b/drivers/iommu/amd_iommu.c
>> @@ -2542,7 +2542,7 @@ static int amd_iommu_map(struct iommu_domain *dom,
>> unsigned long iova,
>>          if (iommu_prot & IOMMU_WRITE)
>>                  prot |= IOMMU_PROT_IW;
>>   
>> -       ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);
>> +       ret = iommu_map_page(domain, iova, paddr, page_size, prot, gfp);
> 
> Yeah, that is a bug, I spotted that too.
> 
>> @@ -1185,7 +1185,7 @@ static struct iommu_dma_msi_page
>> *iommu_dma_get_msi_page(struct device *dev,
>>          if (!iova)
>>                  goto out_free_page;
>>   
>> -       if (iommu_map(domain, iova, msi_addr, size, prot))
>> +       if (iommu_map_atomic(domain, iova, msi_addr, size, prot))
>>                  goto out_free_iova;
> 
> Not so sure this is a bug, this code is only about setting up MSIs on
> ARM. It probably doesn't need to be atomic.
Right, since the iommu_dma_prepare_msi() operation was broken out to 
happen at MSI domain setup time, I don't think the comment in there 
applies any more, so we can probably stop disabling irqs around the 
iommu_dma_get_msi_page() call.

Robin.