Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: hxiFsbBspTLbtAxBx5gDo8kbF26WEZi/V8Mk40QGDS2Xpq8/mAnfAbYsmicL62vRwkjFCIg2Sj
 3e5vFHswATcQ==
IronPort-SDR: uUAhuuDLymk4X95ffRIh+ONYkxifRwV2tVicLnk/PS+AlHXVaC4CQSGCTalMfaqxhe/zyR0GFA
 ZJLcTzPAivuQ==
Cc:     baolu.lu@linux.intel.com, Christoph Hellwig <hch@infradead.org>,
        Joerg Roedel <joro@8bytes.org>, Tom Murphy <murphyt7@tcd.ie>,
        David Woodhouse <dwmw2@infradead.org>,
        Ashok Raj <ashok.raj@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
        Logan Gunthorpe <logang@deltatee.com>
Subject: Re: [PATCH v5 3/7] iommu: Allow the dma-iommu api to use bounce
 buffers
To:     Will Deacon <will@kernel.org>
References: <20201120101719.3172693-1-baolu.lu@linux.intel.com>
 <20201120101719.3172693-4-baolu.lu@linux.intel.com>
 <20201123100816.GA26619@infradead.org>
 <73ac6a6b-ede9-b306-6d8f-c73f22e1e8e3@linux.intel.com>
 <20201123114705.GA10233@willie-the-truck>
From:   Lu Baolu <baolu.lu@linux.intel.com>
Message-ID: <fe4bed62-b056-07ef-1a1f-b68e92305e26@linux.intel.com>
Date:   Mon, 23 Nov 2020 19:56:53 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.5.0
MIME-Version: 1.0
In-Reply-To: <20201123114705.GA10233@willie-the-truck>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi Will,

On 2020/11/23 19:47, Will Deacon wrote:
> On Mon, Nov 23, 2020 at 07:40:57PM +0800, Lu Baolu wrote:
>> On 2020/11/23 18:08, Christoph Hellwig wrote:
>>>> +	/*
>>>> +	 * If both the physical buffer start address and size are
>>>> +	 * page aligned, we don't need to use a bounce page.
>>>> +	 */
>>>> +	if (IS_ENABLED(CONFIG_SWIOTLB) && dev_is_untrusted(dev) &&
>>>> +	    iova_offset(iovad, phys | org_size)) {
>>>> +		aligned_size = iova_align(iovad, org_size);
>>>> +		phys = swiotlb_tbl_map_single(dev,
>>>> +				phys_to_dma(dev, io_tlb_start),
>>>> +				phys, org_size, aligned_size, dir, attrs);
>>>
>>> swiotlb_tbl_map_single takes one less argument in 5.10-rc now.
>>>
>>
>> Yes. But Will's iommu/next branch is based on 5.10-rc3. I synced with
>> him, we agreed to keep it 5.10-rc3 and resolve this conflict when
>> merging it.
> 
> That's right, although I failed to appreciate the conflict was due to a
> change in function prototype rather than just a context collision. So
> I've updated the vt-d branch to contain the stuff fron Konrad:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/iommu/vt-d
> 
> Sorry for messing you around!

It's okay. I will re-base the patch series later.

Best regards,
baolu