[PATCH v6 97/99] xen: Convert pvcalls-back to XArray

From: Matthew Wilcox
Date: Wed Jan 17 2018 - 15:24:56 EST


From: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>

This is a straightforward conversion.

Signed-off-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
---
drivers/xen/pvcalls-back.c | 51 ++++++++++++++--------------------------------
1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c
index c7822d8078b9..e059d2e777e1 100644
--- a/drivers/xen/pvcalls-back.c
+++ b/drivers/xen/pvcalls-back.c
@@ -15,10 +15,10 @@
#include <linux/inet.h>
#include <linux/kthread.h>
#include <linux/list.h>
-#include <linux/radix-tree.h>
#include <linux/module.h>
#include <linux/semaphore.h>
#include <linux/wait.h>
+#include <linux/xarray.h>
#include <net/sock.h>
#include <net/inet_common.h>
#include <net/inet_connection_sock.h>
@@ -50,7 +50,7 @@ struct pvcalls_fedata {
struct xen_pvcalls_back_ring ring;
int irq;
struct list_head socket_mappings;
- struct radix_tree_root socketpass_mappings;
+ struct xarray socketpass_mappings;
struct semaphore socket_lock;
};

@@ -492,10 +492,9 @@ static int pvcalls_back_release(struct xenbus_device *dev,
goto out;
}
}
- mappass = radix_tree_lookup(&fedata->socketpass_mappings,
- req->u.release.id);
+ mappass = xa_load(&fedata->socketpass_mappings, req->u.release.id);
if (mappass != NULL) {
- radix_tree_delete(&fedata->socketpass_mappings, mappass->id);
+ xa_erase(&fedata->socketpass_mappings, mappass->id);
up(&fedata->socket_lock);
ret = pvcalls_back_release_passive(dev, fedata, mappass);
} else
@@ -650,10 +649,8 @@ static int pvcalls_back_bind(struct xenbus_device *dev,
map->fedata = fedata;
map->id = req->u.bind.id;

- down(&fedata->socket_lock);
- ret = radix_tree_insert(&fedata->socketpass_mappings, map->id,
- map);
- up(&fedata->socket_lock);
+ ret = xa_err(xa_store(&fedata->socketpass_mappings, map->id, map,
+ GFP_KERNEL));
if (ret)
goto out;

@@ -689,9 +686,7 @@ static int pvcalls_back_listen(struct xenbus_device *dev,

fedata = dev_get_drvdata(&dev->dev);

- down(&fedata->socket_lock);
- map = radix_tree_lookup(&fedata->socketpass_mappings, req->u.listen.id);
- up(&fedata->socket_lock);
+ map = xa_load(&fedata->socketpass_mappings, req->u.listen.id);
if (map == NULL)
goto out;

@@ -717,10 +712,7 @@ static int pvcalls_back_accept(struct xenbus_device *dev,

fedata = dev_get_drvdata(&dev->dev);

- down(&fedata->socket_lock);
- mappass = radix_tree_lookup(&fedata->socketpass_mappings,
- req->u.accept.id);
- up(&fedata->socket_lock);
+ mappass = xa_load(&fedata->socketpass_mappings, req->u.accept.id);
if (mappass == NULL)
goto out_error;

@@ -765,10 +757,7 @@ static int pvcalls_back_poll(struct xenbus_device *dev,

fedata = dev_get_drvdata(&dev->dev);

- down(&fedata->socket_lock);
- mappass = radix_tree_lookup(&fedata->socketpass_mappings,
- req->u.poll.id);
- up(&fedata->socket_lock);
+ mappass = xa_load(&fedata->socketpass_mappings, req->u.poll.id);
if (mappass == NULL)
return -EINVAL;

@@ -960,7 +949,7 @@ static int backend_connect(struct xenbus_device *dev)
fedata->dev = dev;

INIT_LIST_HEAD(&fedata->socket_mappings);
- INIT_RADIX_TREE(&fedata->socketpass_mappings, GFP_KERNEL);
+ xa_init(&fedata->socketpass_mappings);
sema_init(&fedata->socket_lock, 1);
dev_set_drvdata(&dev->dev, fedata);

@@ -984,9 +973,7 @@ static int backend_disconnect(struct xenbus_device *dev)
struct pvcalls_fedata *fedata;
struct sock_mapping *map, *n;
struct sockpass_mapping *mappass;
- struct radix_tree_iter iter;
- void **slot;
-
+ unsigned long index = 0;

fedata = dev_get_drvdata(&dev->dev);

@@ -996,18 +983,10 @@ static int backend_disconnect(struct xenbus_device *dev)
pvcalls_back_release_active(dev, fedata, map);
}

- radix_tree_for_each_slot(slot, &fedata->socketpass_mappings, &iter, 0) {
- mappass = radix_tree_deref_slot(slot);
- if (!mappass)
- continue;
- if (radix_tree_exception(mappass)) {
- if (radix_tree_deref_retry(mappass))
- slot = radix_tree_iter_retry(&iter);
- } else {
- radix_tree_delete(&fedata->socketpass_mappings,
- mappass->id);
- pvcalls_back_release_passive(dev, fedata, mappass);
- }
+ xa_for_each(&fedata->socketpass_mappings, mappass, index, ULONG_MAX,
+ XA_PRESENT) {
+ xa_erase(&fedata->socketpass_mappings, index);
+ pvcalls_back_release_passive(dev, fedata, mappass);
}
up(&fedata->socket_lock);

--
2.15.1