From: Will Deacon <will@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: kernel-team@android.com, iommu@lists.linux.dev,
Christoph Hellwig <hch@lst.de>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
Petr Tesarik <petr.tesarik1@huawei-partners.com>,
Dexuan Cui <decui@microsoft.com>
Subject: Re: [PATCH v2 1/3] swiotlb: Fix allocation alignment requirement when searching slots
Date: Wed, 31 Jan 2024 17:45:17 +0000 [thread overview]
Message-ID: <20240131174516.GA14943@willie-the-truck> (raw)
In-Reply-To: <20240131122543.14791-2-will@kernel.org>
On Wed, Jan 31, 2024 at 12:25:41PM +0000, Will Deacon wrote:
> @@ -1015,14 +1014,16 @@ static int swiotlb_search_pool_area(struct device *dev, struct io_tlb_pool *pool
> index = area->index;
>
> for (slots_checked = 0; slots_checked < pool->area_nslabs; ) {
> - slot_index = slot_base + index;
> + phys_addr_t tlb_addr;
>
> - if (orig_addr &&
> - (slot_addr(tbl_dma_addr, slot_index) &
> - iotlb_align_mask) != (orig_addr & iotlb_align_mask)) {
> + slot_index = slot_base + index;
> + tlb_addr = slot_addr(tbl_dma_addr, slot_index);
> +
> + if ((tlb_addr & alloc_align_mask) ||
> + (orig_addr && (tlb_addr & iotlb_align_mask) !=
> + (orig_addr & iotlb_align_mask))) {
> index = wrap_area_index(pool, index + 1);
> slots_checked++;
> - continue;
Bah, I accidentally dropped this 'continue' when addressing the review
comments, so I'll add it back in v3.
Will
next prev parent reply other threads:[~2024-01-31 17:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-31 12:25 [PATCH v2 0/3] Fix double allocation in swiotlb_alloc() Will Deacon
2024-01-31 12:25 ` [PATCH v2 1/3] swiotlb: Fix allocation alignment requirement when searching slots Will Deacon
2024-01-31 15:54 ` Robin Murphy
2024-02-01 12:46 ` Will Deacon
2024-02-01 13:30 ` Robin Murphy
2024-02-01 14:12 ` Will Deacon
2024-01-31 17:45 ` Will Deacon [this message]
2024-01-31 12:25 ` [PATCH v2 2/3] swiotlb: Enforce page alignment in swiotlb_alloc() Will Deacon
2024-01-31 15:14 ` Robin Murphy
2024-02-01 12:48 ` Will Deacon
2024-02-01 13:53 ` Robin Murphy
2024-01-31 12:25 ` [PATCH v2 3/3] swiotlb: Honour dma_alloc_coherent() " Will Deacon
2024-01-31 16:03 ` Robin Murphy
2024-02-01 12:52 ` Will Deacon
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=20240131174516.GA14943@willie-the-truck \
--to=will@kernel.org \
--cc=decui@microsoft.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux.dev \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=petr.tesarik1@huawei-partners.com \
--cc=robin.murphy@arm.com \
/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
all inboxes | Powered by JetHome®