[PATCH rdma-next v3 12/19] RDMA/restrack: Prepare restrack_root to addition of extra fields per-type

[Leon Romanovsky <leon@xxxxxxxxxx>]

From: Leon Romanovsky <leonro@xxxxxxxxxxxx>

As a preparation to extension of rdma_restrack_root to provide
software IDs, which will be per-type too. We convert the
rdma_restrack_root from struct with arrays to array of structs.

Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
---
 drivers/infiniband/core/restrack.c | 35 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index 284d087d7785..bcd6fc9d3225 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -46,17 +46,13 @@ struct rdma_restrack_root {
 	 */
 	struct rw_semaphore	rwsem;
 	/**
-	 * @xa: Array of XArray structures to hold restrack entries.
-	 * We want to use array of XArrays because insertion is type
-	 * dependent. For types with xisiting unique ID (like QPN),
-	 * we will insert to that unique index. For other types,
-	 * we insert based on pointers and auto-allocate unique index.
+	 * @xa: Array of XArray structure to hold restrack entries.
 	 */
-	struct xarray xa[RDMA_RESTRACK_MAX];
+	struct xarray xa;
 	/**
 	 * #next_id: Next ID to support cyclic allocation
 	 */
-	u32 next_id[RDMA_RESTRACK_MAX];
+	u32 next_id;
 };
 
 /**
@@ -70,15 +66,16 @@ int rdma_restrack_init(struct ib_device *dev)
 	struct rdma_restrack_root *rt;
 	int i;
 
-	dev->res = kzalloc(sizeof(*rt), GFP_KERNEL);
+	dev->res = kcalloc(RDMA_RESTRACK_MAX, sizeof(*rt), GFP_KERNEL);
 	if (!dev->res)
 		return -ENOMEM;
 
 	rt = dev->res;
 
-	for (i = 0 ; i < RDMA_RESTRACK_MAX; i++)
-		xa_init_flags(&rt->xa[i], XA_FLAGS_ALLOC);
-	init_rwsem(&rt->rwsem);
+	for (i = 0 ; i < RDMA_RESTRACK_MAX; i++) {
+		init_rwsem(&rt[i].rwsem);
+		xa_init_flags(&rt[i].xa, XA_FLAGS_ALLOC);
+	}
 
 	return 0;
 }
@@ -107,7 +104,7 @@ static const char *type2str(enum rdma_restrack_type type)
 struct xarray *rdma_dev_to_xa(struct ib_device *dev,
 			      enum rdma_restrack_type type)
 {
-	return &dev->res->xa[type];
+	return &dev->res[type].xa;
 
 }
 EXPORT_SYMBOL(rdma_dev_to_xa);
@@ -120,7 +117,7 @@ EXPORT_SYMBOL(rdma_dev_to_xa);
  */
 void rdma_rt_read_lock(struct ib_device *dev, enum rdma_restrack_type type)
 {
-	down_read(&dev->res->rwsem);
+	down_read(&dev->res[type].rwsem);
 }
 EXPORT_SYMBOL(rdma_rt_read_lock);
 
@@ -132,7 +129,7 @@ EXPORT_SYMBOL(rdma_rt_read_lock);
  */
 void rdma_rt_read_unlock(struct ib_device *dev, enum rdma_restrack_type type)
 {
-	up_read(&dev->res->rwsem);
+	up_read(&dev->res[type].rwsem);
 }
 EXPORT_SYMBOL(rdma_rt_read_unlock);
 
@@ -286,7 +283,7 @@ static void rdma_restrack_add(struct rdma_restrack_entry *res)
 	if (!dev)
 		return;
 
-	rt = dev->res;
+	rt = &dev->res[res->type];
 	xa = rdma_dev_to_xa(dev, res->type);
 
 	if (res->type != RDMA_RESTRACK_CM_ID || rdma_is_kernel_res(res))
@@ -302,7 +299,7 @@ static void rdma_restrack_add(struct rdma_restrack_entry *res)
 
 	kref_init(&res->kref);
 	init_completion(&res->comp);
-	ret = rt_xa_alloc_cyclic(xa, &res->id, res, &rt->next_id[res->type]);
+	ret = rt_xa_alloc_cyclic(xa, &res->id, res, &rt->next_id);
 	if (!ret)
 		res->valid = true;
 }
@@ -374,6 +371,7 @@ EXPORT_SYMBOL(rdma_restrack_put);
 void rdma_restrack_del(struct rdma_restrack_entry *res)
 {
 	struct ib_device *dev = res_to_dev(res);
+	struct rdma_restrack_root *rt;
 	struct xarray *xa;
 
 	if (!res->valid)
@@ -396,6 +394,7 @@ void rdma_restrack_del(struct rdma_restrack_entry *res)
 		return;
 
 	xa = rdma_dev_to_xa(dev, res->type);
+	rt = &dev->res[res->type];
 
 	if (!xa_load(xa, res->id))
 		goto out;
@@ -404,10 +403,10 @@ void rdma_restrack_del(struct rdma_restrack_entry *res)
 
 	wait_for_completion(&res->comp);
 
-	down_write(&dev->res->rwsem);
+	down_write(&rt->rwsem);
 	xa_erase(xa, res->id);
 	res->valid = false;
-	up_write(&dev->res->rwsem);
+	up_write(&rt->rwsem);
 
 out:
 	if (res->task) {
-- 
2.19.1