From: Roman Skakun <rm.skakun@gmail.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
Stefano Stabellini <sstabellini@kernel.org>,
xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>,
Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>,
Volodymyr Babchuk <volodymyr_babchuk@epam.com>,
Roman Skakun <rm.skakun@gmail.com>,
Roman Skakun <roman_skakun@epam.com>,
Andrii Anisov <andrii_anisov@epam.com>
Subject: [PATCH v2] dma-mapping: use vmalloc_to_page for vmalloc addresses
Date: Tue, 22 Jun 2021 16:34:14 +0300 [thread overview]
Message-ID: <20210622133414.132754-1-rm.skakun@gmail.com> (raw)
In-Reply-To: <20210616154436.GA7619@lst.de>
This commit is dedicated to fix incorrect conversion from
cpu_addr to page address in cases when we get virtual
address which allocated in the vmalloc range.
As the result, virt_to_page() cannot convert this address
properly and return incorrect page address.
Need to detect such cases and obtains the page address using
vmalloc_to_page() instead.
Signed-off-by: Roman Skakun <roman_skakun@epam.com>
Reviewed-by: Andrii Anisov <andrii_anisov@epam.com>
---
Hey!
Thanks for suggestions, Christoph!
I updated the patch according to your advice.
But, I'm so surprised because nobody catches this problem
in the common code before. It looks a bit strange as for me.
kernel/dma/ops_helpers.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/kernel/dma/ops_helpers.c b/kernel/dma/ops_helpers.c
index 910ae69cae77..782728d8a393 100644
--- a/kernel/dma/ops_helpers.c
+++ b/kernel/dma/ops_helpers.c
@@ -5,6 +5,14 @@
*/
#include <linux/dma-map-ops.h>
+static struct page *cpu_addr_to_page(void *cpu_addr)
+{
+ if (is_vmalloc_addr(cpu_addr))
+ return vmalloc_to_page(cpu_addr);
+ else
+ return virt_to_page(cpu_addr);
+}
+
/*
* Create scatter-list for the already allocated DMA buffer.
*/
@@ -12,7 +20,7 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
void *cpu_addr, dma_addr_t dma_addr, size_t size,
unsigned long attrs)
{
- struct page *page = virt_to_page(cpu_addr);
+ struct page *page = cpu_addr_to_page(cpu_addr);
int ret;
ret = sg_alloc_table(sgt, 1, GFP_KERNEL);
@@ -43,7 +51,7 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
return -ENXIO;
return remap_pfn_range(vma, vma->vm_start,
- page_to_pfn(virt_to_page(cpu_addr)) + vma->vm_pgoff,
+ page_to_pfn(cpu_addr_to_page(cpu_addr)) + vma->vm_pgoff,
user_count << PAGE_SHIFT, vma->vm_page_prot);
#else
return -ENXIO;
--
2.25.1
next prev parent reply other threads:[~2021-06-22 13:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 9:55 [PATCH] swiotlb-xen: override common mmap and get_sgtable dma ops Roman Skakun
2021-06-11 15:19 ` Boris Ostrovsky
2021-06-14 12:47 ` Roman Skakun
2021-06-14 15:45 ` Boris Ostrovsky
2021-06-16 11:45 ` Roman Skakun
2021-06-16 11:42 ` [PATCH 1/2] Revert "swiotlb-xen: remove xen_swiotlb_dma_mmap and xen_swiotlb_dma_get_sgtable" Roman Skakun
2021-06-16 11:42 ` [PATCH 2/2] swiotlb-xen: override common mmap and get_sgtable dma ops Roman Skakun
2021-06-16 14:12 ` Boris Ostrovsky
2021-06-16 14:21 ` Christoph Hellwig
2021-06-16 15:33 ` Boris Ostrovsky
2021-06-16 15:35 ` Christoph Hellwig
2021-06-16 15:39 ` Boris Ostrovsky
2021-06-16 15:44 ` Christoph Hellwig
2021-06-22 13:34 ` Roman Skakun [this message]
2021-07-14 0:15 ` [PATCH v2] dma-mapping: use vmalloc_to_page for vmalloc addresses Konrad Rzeszutek Wilk
2021-07-15 7:39 ` Roman Skakun
2021-07-15 16:58 ` Boris Ostrovsky
2021-07-15 17:00 ` Christoph Hellwig
2021-07-16 8:39 ` Roman Skakun
2021-07-16 9:35 ` Christoph Hellwig
2021-07-16 12:53 ` Roman Skakun
2021-07-16 15:29 ` Stefano Stabellini
2021-07-17 8:39 ` Roman Skakun
2021-07-19 9:22 ` Christoph Hellwig
2021-07-21 18:39 ` Roman Skakun
2021-07-14 1:23 ` Stefano Stabellini
2021-07-15 7:31 ` Roman Skakun
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=20210622133414.132754-1-rm.skakun@gmail.com \
--to=rm.skakun@gmail.com \
--cc=andrii_anisov@epam.com \
--cc=boris.ostrovsky@oracle.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleksandr_andrushchenko@epam.com \
--cc=oleksandr_tyshchenko@epam.com \
--cc=roman_skakun@epam.com \
--cc=sstabellini@kernel.org \
--cc=volodymyr_babchuk@epam.com \
--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).