linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Souptick Joarder <jrdr.linux@gmail.com>
To: akpm@linux-foundation.org, willy@infradead.org, mhocko@suse.com,
	boris.ostrovsky@oracle.com, jgross@suse.com,
	linux@armlinux.org.uk, robin.murphy@arm.com
Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org
Subject: [RESEND PATCH v4 8/9] xen/gntdev.c: Convert to use vm_map_pages()
Date: Tue, 19 Mar 2019 08:00:07 +0530	[thread overview]
Message-ID: <88e56e82d2db98705c2d842e9c9806c00b366d67.1552921225.git.jrdr.linux@gmail.com> (raw)
In-Reply-To: <cover.1552921225.git.jrdr.linux@gmail.com>

Convert to use vm_map_pages() to map range of kernel
memory to user vma.

map->count is passed to vm_map_pages() and internal API
verify map->count against count ( count = vma_pages(vma))
for page array boundary overrun condition.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
 drivers/xen/gntdev.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 5efc5ee..5d64262 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -1084,7 +1084,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 	int index = vma->vm_pgoff;
 	int count = vma_pages(vma);
 	struct gntdev_grant_map *map;
-	int i, err = -EINVAL;
+	int err = -EINVAL;
 
 	if ((vma->vm_flags & VM_WRITE) && !(vma->vm_flags & VM_SHARED))
 		return -EINVAL;
@@ -1145,12 +1145,9 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 		goto out_put_map;
 
 	if (!use_ptemod) {
-		for (i = 0; i < count; i++) {
-			err = vm_insert_page(vma, vma->vm_start + i*PAGE_SIZE,
-				map->pages[i]);
-			if (err)
-				goto out_put_map;
-		}
+		err = vm_map_pages(vma, map->pages, map->count);
+		if (err)
+			goto out_put_map;
 	} else {
 #ifdef CONFIG_X86
 		/*
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: Souptick Joarder <jrdr.linux@gmail.com>
To: akpm@linux-foundation.org, willy@infradead.org, mhocko@suse.com,
	kirill.shutemov@linux.intel.com, vbabka@suse.cz,
	riel@surriel.com, sfr@canb.auug.org.au, rppt@linux.vnet.ibm.com,
	peterz@infradead.org, linux@armlinux.org.uk,
	robin.murphy@arm.com, iamjoonsoo.kim@lge.com, treding@nvidia.com,
	keescook@chromium.org, m.szyprowski@samsung.com,
	stefanr@s5r6.in-berlin.de, hjc@rock-chips.com, heiko@sntech.de,
	airlied@linux.ie, oleksandr_andrushchenko@epam.com,
	joro@8bytes.org, pawel@osciak.com, kyungmin.park@samsung.com,
	mchehab@kernel.org, boris.ostrovsky@oracle.com, jgross@suse.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	linux-arm-kernel@lists.infradead.org,
	linux1394-devel@lists.sourceforge.net,
	dri-devel@lists.freedesktop.org,
	linux-rockchip@lists.infradead.org, xen-devel@lists.xen.org,
	iommu@lists.linux-foundation.org, linux-media@vger.kernel.org,
	Souptick Joarder <jrdr.linux@gmail.com>
Subject: [REBASE PATCH v5 8/9] xen/gntdev.c: Convert to use vm_map_pages()
Date: Tue, 16 Apr 2019 17:19:49 +0530	[thread overview]
Message-ID: <88e56e82d2db98705c2d842e9c9806c00b366d67.1552921225.git.jrdr.linux@gmail.com> (raw)
Message-ID: <20190416114949.IriRKxpAeJXsUkH7hIQA6h6wH62Kqd6458itbcZ0JXk@z> (raw)
In-Reply-To: <cover.1552921225.git.jrdr.linux@gmail.com>
In-Reply-To: <cover.1552921225.git.jrdr.linux@gmail.com>

Convert to use vm_map_pages() to map range of kernel
memory to user vma.

map->count is passed to vm_map_pages() and internal API
verify map->count against count ( count = vma_pages(vma))
for page array boundary overrun condition.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
 drivers/xen/gntdev.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 5efc5ee..5d64262 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -1084,7 +1084,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 	int index = vma->vm_pgoff;
 	int count = vma_pages(vma);
 	struct gntdev_grant_map *map;
-	int i, err = -EINVAL;
+	int err = -EINVAL;
 
 	if ((vma->vm_flags & VM_WRITE) && !(vma->vm_flags & VM_SHARED))
 		return -EINVAL;
@@ -1145,12 +1145,9 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 		goto out_put_map;
 
 	if (!use_ptemod) {
-		for (i = 0; i < count; i++) {
-			err = vm_insert_page(vma, vma->vm_start + i*PAGE_SIZE,
-				map->pages[i]);
-			if (err)
-				goto out_put_map;
-		}
+		err = vm_map_pages(vma, map->pages, map->count);
+		if (err)
+			goto out_put_map;
 	} else {
 #ifdef CONFIG_X86
 		/*
-- 
1.9.1


  parent reply	other threads:[~2019-03-19  2:25 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-19  2:22 [RESEND PATCH v4 0/9] mm: Use vm_map_pages() and vm_map_pages_zero() API Souptick Joarder
2019-03-19  2:23 ` [RESEND PATCH v4 1/9] mm: Introduce new " Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:24 ` [RESEND PATCH v4 2/9] arm: mm: dma-mapping: Convert to use vm_map_pages() Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:25 ` [RESEND PATCH v4 3/9] drivers/firewire/core-iso.c: Convert to use vm_map_pages_zero() Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:26 ` [RESEND PATCH v4 4/9] drm/rockchip/rockchip_drm_gem.c: Convert to use vm_map_pages() Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:27 ` [RESEND PATCH v4 5/9] drm/xen/xen_drm_front_gem.c: " Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:28 ` [RESEND PATCH v4 6/9] iommu/dma-iommu.c: " Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:29 ` [RESEND PATCH v4 7/9] videobuf2/videobuf2-dma-sg.c: " Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-03-19  2:30 ` Souptick Joarder [this message]
2019-04-16 11:49   ` [REBASE PATCH v5 8/9] xen/gntdev.c: " Souptick Joarder
2019-03-19  2:30 ` [RESEND PATCH v4 9/9] xen/privcmd-buf.c: Convert to use vm_map_pages_zero() Souptick Joarder
2019-04-16 11:49   ` [REBASE PATCH v5 " Souptick Joarder
2019-04-01  5:26 ` [RESEND PATCH v4 0/9] mm: Use vm_map_pages() and vm_map_pages_zero() API Souptick Joarder
2019-04-09  6:17   ` Souptick Joarder
2019-04-16 11:49 ` [REBASE PATCH v5 " Souptick Joarder

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=88e56e82d2db98705c2d842e9c9806c00b366d67.1552921225.git.jrdr.linux@gmail.com \
    --to=jrdr.linux@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=boris.ostrovsky@oracle.com \
    --cc=jgross@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@armlinux.org.uk \
    --cc=mhocko@suse.com \
    --cc=robin.murphy@arm.com \
    --cc=willy@infradead.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).