WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 4/7] xen-gntdev: Use find_vma rather than iterating o

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 4/7] xen-gntdev: Use find_vma rather than iterating our vma list manually
From: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
Date: Thu, 16 Dec 2010 19:17:40 -0500
Cc: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>, jeremy@xxxxxxxx, Ian.Campbell@xxxxxxxxxx
Delivery-date: Thu, 16 Dec 2010 16:22:18 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1292545063-32107-1-git-send-email-dgdegra@xxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <1292545063-32107-1-git-send-email-dgdegra@xxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
This should be faster if many mappings exist, and also removes
the only user of map->vma not related to PTE modification.

Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
---
 drivers/xen/gntdev.c |   32 ++++++++------------------------
 1 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 3778b85..6a3c9e4 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -165,23 +165,6 @@ static struct grant_map *gntdev_find_map_index(struct 
gntdev_priv *priv, int ind
        return NULL;
 }
 
-static struct grant_map *gntdev_find_map_vaddr(struct gntdev_priv *priv,
-                                              unsigned long vaddr)
-{
-       struct grant_map *map;
-
-       list_for_each_entry(map, &priv->maps, next) {
-               if (!map->vma)
-                       continue;
-               if (vaddr < map->vma->vm_start)
-                       continue;
-               if (vaddr >= map->vma->vm_end)
-                       continue;
-               return map;
-       }
-       return NULL;
-}
-
 static int gntdev_del_map(struct grant_map *map)
 {
        int i;
@@ -546,6 +529,7 @@ static long gntdev_ioctl_get_offset_for_vaddr(struct 
gntdev_priv *priv,
                                              struct 
ioctl_gntdev_get_offset_for_vaddr __user *u)
 {
        struct ioctl_gntdev_get_offset_for_vaddr op;
+       struct vm_area_struct *vma;
        struct grant_map *map;
 
        if (copy_from_user(&op, u, sizeof(op)) != 0)
@@ -554,16 +538,16 @@ static long gntdev_ioctl_get_offset_for_vaddr(struct 
gntdev_priv *priv,
                printk("%s: priv %p, offset for vaddr %lx\n", __FUNCTION__, 
priv,
                       (unsigned long)op.vaddr);
 
-       spin_lock(&priv->lock);
-       map = gntdev_find_map_vaddr(priv, op.vaddr);
-       if (map == NULL ||
-           map->vma->vm_start != op.vaddr) {
-               spin_unlock(&priv->lock);
+       vma = find_vma(current->mm, op.vaddr);
+       if (!vma || vma->vm_ops != &gntdev_vmops)
                return -EINVAL;
-       }
+
+       map = vma->vm_private_data;
+       if (!map)
+               return -EINVAL;
+
        op.offset = map->index << PAGE_SHIFT;
        op.count = map->count;
-       spin_unlock(&priv->lock);
 
        if (copy_to_user(u, &op, sizeof(op)) != 0)
                return -EFAULT;
-- 
1.7.2.3


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel