From: Christoph Hellwig <hch@infradead.org>
To: peng.fan@nxp.com
Cc: jgross@suse.com, sstabellini@kernel.org, konrad.wilk@oracle.com,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-imx@nxp.com, xen-devel@lists.xenproject.org,
boris.ostrovsky@oracle.com
Subject: Re: [PATCH] xen/swiotlb: correct the check for xen_destroy_contiguous_region
Date: Tue, 28 Apr 2020 01:02:10 -0700 [thread overview]
Message-ID: <20200428080210.GA25643@infradead.org> (raw)
In-Reply-To: <1588059225-11245-1-git-send-email-peng.fan@nxp.com>
On Tue, Apr 28, 2020 at 03:33:45PM +0800, peng.fan@nxp.com wrote:
>
> In xen_swiotlb_alloc_coherent, if !(dev_addr + size - 1 <= dma_mask) or
> range_straddles_page_boundary(phys, size) are true, it will
> create contiguous region. So when free, we need to free contiguous
> region use upper check condition.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> drivers/xen/swiotlb-xen.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
> index b6d27762c6f8..ab96e468584f 100644
> --- a/drivers/xen/swiotlb-xen.c
> +++ b/drivers/xen/swiotlb-xen.c
> @@ -346,8 +346,8 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
> /* Convert the size to actually allocated. */
> size = 1UL << (order + XEN_PAGE_SHIFT);
>
> - if (!WARN_ON((dev_addr + size - 1 > dma_mask) ||
> - range_straddles_page_boundary(phys, size)) &&
> + if (((dev_addr + size - 1 > dma_mask) ||
> + range_straddles_page_boundary(phys, size)) &&
> TestClearPageXenRemapped(virt_to_page(vaddr)))
No need for the inner braces.
But more importantly please factor our a helper that can be used by
alloc and free to make sure that they always stay in sync. Something
like:
static inline bool xen_swiotlb_need_contiguous_region(struct device *dev,
phys_addr_t phys, size_t size)
{
return xen_phys_to_bus(phys) + size - 1 > dev->coherent_dma_mask ||
range_straddles_page_boundary(phys, size))
}
next prev parent reply other threads:[~2020-04-28 8:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 7:33 [PATCH] xen/swiotlb: correct the check for xen_destroy_contiguous_region peng.fan
2020-04-28 8:02 ` Christoph Hellwig [this message]
2020-04-28 8:21 ` Peng Fan
2020-04-28 8:09 ` Jürgen Groß
2020-04-28 8:25 ` Peng Fan
2020-04-28 10:19 ` Jürgen Groß
2020-04-28 17:25 ` Konrad Rzeszutek Wilk
2020-04-28 18:37 ` Joe Jin
2020-04-28 18:46 ` Stefano Stabellini
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=20200428080210.GA25643@infradead.org \
--to=hch@infradead.org \
--cc=boris.ostrovsky@oracle.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.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).