* [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range
@ 2019-01-11 15:08 Souptick Joarder
2019-01-25 6:24 ` Souptick Joarder
0 siblings, 1 reply; 5+ messages in thread
From: Souptick Joarder @ 2019-01-11 15:08 UTC (permalink / raw)
To: akpm, willy, mhocko, linux, robin.murphy, iamjoonsoo.kim,
treding, keescook, m.szyprowski
Cc: linux-kernel, linux-mm, linux-arm-kernel
Convert to use vm_insert_range() to map range of kernel
memory to user vma.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
arch/arm/mm/dma-mapping.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 78de138..5334391 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1582,31 +1582,21 @@ static int __arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma
void *cpu_addr, dma_addr_t dma_addr, size_t size,
unsigned long attrs)
{
- unsigned long uaddr = vma->vm_start;
- unsigned long usize = vma->vm_end - vma->vm_start;
struct page **pages = __iommu_get_pages(cpu_addr, attrs);
unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
- unsigned long off = vma->vm_pgoff;
+ int err;
if (!pages)
return -ENXIO;
- if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
+ if (vma->vm_pgoff >= nr_pages)
return -ENXIO;
- pages += off;
-
- do {
- int ret = vm_insert_page(vma, uaddr, *pages++);
- if (ret) {
- pr_err("Remapping memory failed: %d\n", ret);
- return ret;
- }
- uaddr += PAGE_SIZE;
- usize -= PAGE_SIZE;
- } while (usize > 0);
+ err = vm_insert_range(vma, pages, nr_pages);
+ if (err)
+ pr_err("Remapping memory failed: %d\n", err);
- return 0;
+ return err;
}
static int arm_iommu_mmap_attrs(struct device *dev,
struct vm_area_struct *vma, void *cpu_addr,
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range
2019-01-11 15:08 [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range Souptick Joarder
@ 2019-01-25 6:24 ` Souptick Joarder
2019-01-30 9:59 ` Souptick Joarder
0 siblings, 1 reply; 5+ messages in thread
From: Souptick Joarder @ 2019-01-25 6:24 UTC (permalink / raw)
To: Andrew Morton, Matthew Wilcox, Michal Hocko,
Russell King - ARM Linux, robin.murphy, iamjoonsoo.kim, treding,
Kees Cook, Marek Szyprowski
Cc: linux-kernel, Linux-MM, linux-arm-kernel
On Fri, Jan 11, 2019 at 8:33 PM Souptick Joarder <jrdr.linux@gmail.com> wrote:
>
> Convert to use vm_insert_range() to map range of kernel
> memory to user vma.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Any comment on this patch ?
> ---
> arch/arm/mm/dma-mapping.c | 22 ++++++----------------
> 1 file changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 78de138..5334391 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -1582,31 +1582,21 @@ static int __arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma
> void *cpu_addr, dma_addr_t dma_addr, size_t size,
> unsigned long attrs)
> {
> - unsigned long uaddr = vma->vm_start;
> - unsigned long usize = vma->vm_end - vma->vm_start;
> struct page **pages = __iommu_get_pages(cpu_addr, attrs);
> unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
> - unsigned long off = vma->vm_pgoff;
> + int err;
>
> if (!pages)
> return -ENXIO;
>
> - if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
> + if (vma->vm_pgoff >= nr_pages)
> return -ENXIO;
>
> - pages += off;
> -
> - do {
> - int ret = vm_insert_page(vma, uaddr, *pages++);
> - if (ret) {
> - pr_err("Remapping memory failed: %d\n", ret);
> - return ret;
> - }
> - uaddr += PAGE_SIZE;
> - usize -= PAGE_SIZE;
> - } while (usize > 0);
> + err = vm_insert_range(vma, pages, nr_pages);
> + if (err)
> + pr_err("Remapping memory failed: %d\n", err);
>
> - return 0;
> + return err;
> }
> static int arm_iommu_mmap_attrs(struct device *dev,
> struct vm_area_struct *vma, void *cpu_addr,
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range
2019-01-25 6:24 ` Souptick Joarder
@ 2019-01-30 9:59 ` Souptick Joarder
0 siblings, 0 replies; 5+ messages in thread
From: Souptick Joarder @ 2019-01-30 9:59 UTC (permalink / raw)
To: Andrew Morton, Matthew Wilcox, Michal Hocko,
Russell King - ARM Linux, robin.murphy, iamjoonsoo.kim, treding,
Kees Cook, Marek Szyprowski
Cc: linux-kernel, Linux-MM, linux-arm-kernel
On Fri, Jan 25, 2019 at 11:54 AM Souptick Joarder <jrdr.linux@gmail.com> wrote:
>
> On Fri, Jan 11, 2019 at 8:33 PM Souptick Joarder <jrdr.linux@gmail.com> wrote:
> >
> > Convert to use vm_insert_range() to map range of kernel
> > memory to user vma.
> >
> > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
>
> Any comment on this patch ?
Any comment on this patch ?
>
> > ---
> > arch/arm/mm/dma-mapping.c | 22 ++++++----------------
> > 1 file changed, 6 insertions(+), 16 deletions(-)
> >
> > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> > index 78de138..5334391 100644
> > --- a/arch/arm/mm/dma-mapping.c
> > +++ b/arch/arm/mm/dma-mapping.c
> > @@ -1582,31 +1582,21 @@ static int __arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma
> > void *cpu_addr, dma_addr_t dma_addr, size_t size,
> > unsigned long attrs)
> > {
> > - unsigned long uaddr = vma->vm_start;
> > - unsigned long usize = vma->vm_end - vma->vm_start;
> > struct page **pages = __iommu_get_pages(cpu_addr, attrs);
> > unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
> > - unsigned long off = vma->vm_pgoff;
> > + int err;
> >
> > if (!pages)
> > return -ENXIO;
> >
> > - if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
> > + if (vma->vm_pgoff >= nr_pages)
> > return -ENXIO;
> >
> > - pages += off;
> > -
> > - do {
> > - int ret = vm_insert_page(vma, uaddr, *pages++);
> > - if (ret) {
> > - pr_err("Remapping memory failed: %d\n", ret);
> > - return ret;
> > - }
> > - uaddr += PAGE_SIZE;
> > - usize -= PAGE_SIZE;
> > - } while (usize > 0);
> > + err = vm_insert_range(vma, pages, nr_pages);
> > + if (err)
> > + pr_err("Remapping memory failed: %d\n", err);
> >
> > - return 0;
> > + return err;
> > }
> > static int arm_iommu_mmap_attrs(struct device *dev,
> > struct vm_area_struct *vma, void *cpu_addr,
> > --
> > 1.9.1
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range
2018-11-15 15:46 Souptick Joarder
@ 2018-11-26 5:37 ` Souptick Joarder
0 siblings, 0 replies; 5+ messages in thread
From: Souptick Joarder @ 2018-11-26 5:37 UTC (permalink / raw)
To: Andrew Morton, Matthew Wilcox, Michal Hocko,
Russell King - ARM Linux, robin.murphy, iamjoonsoo.kim, treding,
Kees Cook, Marek Szyprowski
Cc: linux-kernel, Linux-MM, linux-arm-kernel
Hi Russell,
On Thu, Nov 15, 2018 at 9:13 PM Souptick Joarder <jrdr.linux@gmail.com> wrote:
>
> Convert to use vm_insert_range() to map range of kernel
> memory to user vma.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Any comment on this patch ?
> ---
> arch/arm/mm/dma-mapping.c | 21 +++++++--------------
> 1 file changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 661fe48..4eec323 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -1582,31 +1582,24 @@ static int __arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma
> void *cpu_addr, dma_addr_t dma_addr, size_t size,
> unsigned long attrs)
> {
> - unsigned long uaddr = vma->vm_start;
> - unsigned long usize = vma->vm_end - vma->vm_start;
> + unsigned long page_count = vma_pages(vma);
> struct page **pages = __iommu_get_pages(cpu_addr, attrs);
> unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
> unsigned long off = vma->vm_pgoff;
> + int err;
>
> if (!pages)
> return -ENXIO;
>
> - if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
> + if (off >= nr_pages || page_count > nr_pages - off)
> return -ENXIO;
>
> pages += off;
> + err = vm_insert_range(vma, vma->vm_start, pages, page_count);
> + if (err)
> + pr_err("Remapping memory failed: %d\n", err);
>
> - do {
> - int ret = vm_insert_page(vma, uaddr, *pages++);
> - if (ret) {
> - pr_err("Remapping memory failed: %d\n", ret);
> - return ret;
> - }
> - uaddr += PAGE_SIZE;
> - usize -= PAGE_SIZE;
> - } while (usize > 0);
> -
> - return 0;
> + return err;
> }
> static int arm_iommu_mmap_attrs(struct device *dev,
> struct vm_area_struct *vma, void *cpu_addr,
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range
@ 2018-11-15 15:46 Souptick Joarder
2018-11-26 5:37 ` Souptick Joarder
0 siblings, 1 reply; 5+ messages in thread
From: Souptick Joarder @ 2018-11-15 15:46 UTC (permalink / raw)
To: akpm, willy, mhocko, linux, robin.murphy, iamjoonsoo.kim,
treding, keescook, m.szyprowski
Cc: linux-kernel, linux-mm, linux-arm-kernel
Convert to use vm_insert_range() to map range of kernel
memory to user vma.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
arch/arm/mm/dma-mapping.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 661fe48..4eec323 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1582,31 +1582,24 @@ static int __arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma
void *cpu_addr, dma_addr_t dma_addr, size_t size,
unsigned long attrs)
{
- unsigned long uaddr = vma->vm_start;
- unsigned long usize = vma->vm_end - vma->vm_start;
+ unsigned long page_count = vma_pages(vma);
struct page **pages = __iommu_get_pages(cpu_addr, attrs);
unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;
unsigned long off = vma->vm_pgoff;
+ int err;
if (!pages)
return -ENXIO;
- if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off)
+ if (off >= nr_pages || page_count > nr_pages - off)
return -ENXIO;
pages += off;
+ err = vm_insert_range(vma, vma->vm_start, pages, page_count);
+ if (err)
+ pr_err("Remapping memory failed: %d\n", err);
- do {
- int ret = vm_insert_page(vma, uaddr, *pages++);
- if (ret) {
- pr_err("Remapping memory failed: %d\n", ret);
- return ret;
- }
- uaddr += PAGE_SIZE;
- usize -= PAGE_SIZE;
- } while (usize > 0);
-
- return 0;
+ return err;
}
static int arm_iommu_mmap_attrs(struct device *dev,
struct vm_area_struct *vma, void *cpu_addr,
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-30 10:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-11 15:08 [PATCH 2/9] arch/arm/mm/dma-mapping.c: Convert to use vm_insert_range Souptick Joarder
2019-01-25 6:24 ` Souptick Joarder
2019-01-30 9:59 ` Souptick Joarder
-- strict thread matches above, loose matches on Subject: below --
2018-11-15 15:46 Souptick Joarder
2018-11-26 5:37 ` Souptick Joarder
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).