Skip to contentSkip to conversation

RDMA: Remove unused parameter udata

PATCH Applied Weihang Li 4 participants 11 messages May 12, 2021 – May 20, 2021

Subsystems (5)
lore
Share & tools
lore

Weihang Li

author
#0 lore raw

cover RDMA: Remove unused parameter udata

The first parameter of ib_umem_get() has been changed from udata to device, but some of its callers retain 'udata' as a parameter without using it.

Lang Cheng (4):
RDMA/hns: Remove unused parameter udata
RDMA/mlx4: Remove unused parameter udata
RDMA/mlx5: Remove unused parameter udata
RDMA/rxe: Remove unused parameter udata

 drivers/infiniband/hw/hns/hns_roce_cq.c     | 3 +--
 drivers/infiniband/hw/hns/hns_roce_db.c     | 3 +--
 drivers/infiniband/hw/hns/hns_roce_device.h | 3 +--
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 4 ++--
 drivers/infiniband/hw/mlx4/cq.c             | 8 ++++----
 drivers/infiniband/hw/mlx5/cq.c             | 2 +-
 drivers/infiniband/hw/mlx5/doorbell.c       | 3 +--
 drivers/infiniband/hw/mlx5/mlx5_ib.h        | 4 +---
 drivers/infiniband/hw/mlx5/mr.c             | 2 +-
 drivers/infiniband/hw/mlx5/odp.c            | 1 -
 drivers/infiniband/hw/mlx5/qp.c             | 4 ++--
 drivers/infiniband/hw/mlx5/srq.c            | 2 +-
 drivers/infiniband/sw/rxe/rxe_loc.h         | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c          | 2 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c       | 2 +-
 15 files changed, 19 insertions(+), 26 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/4 RDMA/hns: Remove unused parameter udata

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
---
 drivers/infiniband/hw/hns/hns_roce_cq.c     | 3 +--
 drivers/infiniband/hw/hns/hns_roce_db.c     | 3 +--
 drivers/infiniband/hw/hns/hns_roce_device.h | 3 +--
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)
drivers/infiniband/hw/hns/hns_roce_cq.c +1 -2
index 800884b..488d86b 100644
@@ -234,8 +234,7 @@ static int alloc_cq_db(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq,
 		    udata->outlen >= offsetofend(typeof(*resp), cap_flags)) {
 			uctx = rdma_udata_to_drv_context(udata,
 					struct hns_roce_ucontext, ibucontext);
-			err = hns_roce_db_map_user(uctx, udata, addr,
-						   &hr_cq->db);
+			err = hns_roce_db_map_user(uctx, addr, &hr_cq->db);
 			if (err)
 				return err;
 			hr_cq->flags |= HNS_ROCE_CQ_FLAG_RECORD_DB;
drivers/infiniband/hw/hns/hns_roce_db.c +1 -2
index 5cb7376c..d40ea3d 100644
@@ -8,8 +8,7 @@
 #include <rdma/ib_umem.h>
 #include "hns_roce_device.h"
 
-int hns_roce_db_map_user(struct hns_roce_ucontext *context,
-			 struct ib_udata *udata, unsigned long virt,
+int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt,
 			 struct hns_roce_db *db)
 {
 	unsigned long page_addr = virt & PAGE_MASK;
drivers/infiniband/hw/hns/hns_roce_device.h +1 -2
index 97800d2..d93dfba 100644
@@ -1248,8 +1248,7 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,
 		       struct ib_udata *udata);
 
 int hns_roce_destroy_cq(struct ib_cq *ib_cq, struct ib_udata *udata);
-int hns_roce_db_map_user(struct hns_roce_ucontext *context,
-			 struct ib_udata *udata, unsigned long virt,
+int hns_roce_db_map_user(struct hns_roce_ucontext *context, unsigned long virt,
 			 struct hns_roce_db *db);
 void hns_roce_db_unmap_user(struct hns_roce_ucontext *context,
 			    struct hns_roce_db *db);
drivers/infiniband/hw/hns/hns_roce_qp.c +2 -2
index 230a909..c6e120e 100644
@@ -826,7 +826,7 @@ static int alloc_qp_db(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,
 
 	if (udata) {
 		if (user_qp_has_sdb(hr_dev, init_attr, udata, resp, ucmd)) {
-			ret = hns_roce_db_map_user(uctx, udata, ucmd->sdb_addr,
+			ret = hns_roce_db_map_user(uctx, ucmd->sdb_addr,
 						   &hr_qp->sdb);
 			if (ret) {
 				ibdev_err(ibdev,
@@ -839,7 +839,7 @@ static int alloc_qp_db(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp,
 		}
 
 		if (user_qp_has_rdb(hr_dev, init_attr, udata, resp)) {
-			ret = hns_roce_db_map_user(uctx, udata, ucmd->db_addr,
+			ret = hns_roce_db_map_user(uctx, ucmd->db_addr,
 						   &hr_qp->rdb);
 			if (ret) {
 				ibdev_err(ibdev,
Signature · 1 line
2.7.4
Reviewed-by on v1 1/4
#2 lore raw

Re: [PATCH for-next 1/4] RDMA/hns: Remove unused parameter udata

Quoted 8 lines · Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Quoted 7 lines
---
 drivers/infiniband/hw/hns/hns_roce_cq.c     | 3 +--
 drivers/infiniband/hw/hns/hns_roce_db.c     | 3 +--
 drivers/infiniband/hw/hns/hns_roce_device.h | 3 +--
 drivers/infiniband/hw/hns/hns_roce_qp.c     | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

Thanks,

author
#3 lore raw

PATCH 2/4 RDMA/mlx4: Remove unused parameter udata

In reply to Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Yishai Hadas <[email protected]>
---
 drivers/infiniband/hw/mlx4/cq.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/hw/mlx4/cq.c +4 -4
index e9b5a4d..4cd738a 100644
@@ -135,7 +135,7 @@ static void mlx4_ib_free_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf *
 	mlx4_buf_free(dev->dev, (cqe + 1) * buf->entry_size, &buf->buf);
 }
 
-static int mlx4_ib_get_cq_umem(struct mlx4_ib_dev *dev, struct ib_udata *udata,
+static int mlx4_ib_get_cq_umem(struct mlx4_ib_dev *dev,
 			       struct mlx4_ib_cq_buf *buf,
 			       struct ib_umem **umem, u64 buf_addr, int cqe)
 {
@@ -210,7 +210,7 @@ int mlx4_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 		}
 
 		buf_addr = (void *)(unsigned long)ucmd.buf_addr;
-		err = mlx4_ib_get_cq_umem(dev, udata, &cq->buf, &cq->umem,
+		err = mlx4_ib_get_cq_umem(dev, &cq->buf, &cq->umem,
 					  ucmd.buf_addr, entries);
 		if (err)
 			goto err_cq;
@@ -327,8 +327,8 @@ static int mlx4_alloc_resize_umem(struct mlx4_ib_dev *dev, struct mlx4_ib_cq *cq
 	if (!cq->resize_buf)
 		return -ENOMEM;
 
-	err = mlx4_ib_get_cq_umem(dev, udata, &cq->resize_buf->buf,
-				  &cq->resize_umem, ucmd.buf_addr, entries);
+	err = mlx4_ib_get_cq_umem(dev, &cq->resize_buf->buf, &cq->resize_umem,
+				  ucmd.buf_addr, entries);
 	if (err) {
 		kfree(cq->resize_buf);
 		cq->resize_buf = NULL;
Signature · 1 line
2.7.4
Reviewed-by on v1 2/4
#4 lore raw

Re: [PATCH for-next 2/4] RDMA/mlx4: Remove unused parameter udata

Quoted 5 lines · Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Quoted 8 lines
Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Yishai Hadas <[email protected]>
---
 drivers/infiniband/hw/mlx4/cq.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Thanks,

author
#5 lore raw

PATCH 3/4 RDMA/mlx5: Remove unused parameter udata

In reply to Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Leon Romanovsky <[email protected]>
---
 drivers/infiniband/hw/mlx5/cq.c       | 2 +-
 drivers/infiniband/hw/mlx5/doorbell.c | 3 +--
 drivers/infiniband/hw/mlx5/mlx5_ib.h  | 4 +---
 drivers/infiniband/hw/mlx5/mr.c       | 2 +-
 drivers/infiniband/hw/mlx5/odp.c      | 1 -
 drivers/infiniband/hw/mlx5/qp.c       | 4 ++--
 drivers/infiniband/hw/mlx5/srq.c      | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)
drivers/infiniband/hw/mlx5/cq.c +1 -1
index eb92ceff..7beb3e2 100644
@@ -750,7 +750,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
 		goto err_umem;
 	}
 
-	err = mlx5_ib_db_map_user(context, udata, ucmd.db_addr, &cq->db);
+	err = mlx5_ib_db_map_user(context, ucmd.db_addr, &cq->db);
 	if (err)
 		goto err_umem;
 
drivers/infiniband/hw/mlx5/doorbell.c +1 -2
index 61475b5..913af75 100644
@@ -43,8 +43,7 @@ struct mlx5_ib_user_db_page {
 	int			refcnt;
 };
 
-int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context,
-			struct ib_udata *udata, unsigned long virt,
+int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context, unsigned long virt,
 			struct mlx5_db *db)
 {
 	struct mlx5_ib_user_db_page *page;
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 -3
index e9a3f34..7378cd3 100644
@@ -1198,8 +1198,7 @@ to_mmmap(struct rdma_user_mmap_entry *rdma_entry)
 		struct mlx5_user_mmap_entry, rdma_entry);
 }
 
-int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context,
-			struct ib_udata *udata, unsigned long virt,
+int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context, unsigned long virt,
 			struct mlx5_db *db);
 void mlx5_ib_db_unmap_user(struct mlx5_ib_ucontext *context, struct mlx5_db *db);
 void __mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq);
@@ -1265,7 +1264,6 @@ int mlx5_ib_update_xlt(struct mlx5_ib_mr *mr, u64 idx, int npages,
 		       int page_shift, int flags);
 int mlx5_ib_update_mr_pas(struct mlx5_ib_mr *mr, unsigned int flags);
 struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd,
-					     struct ib_udata *udata,
 					     int access_flags);
 void mlx5_ib_free_implicit_mr(struct mlx5_ib_mr *mr);
 void mlx5_ib_free_odp_mr(struct mlx5_ib_mr *mr);
drivers/infiniband/hw/mlx5/mr.c +1 -1
index 4388afe..383c0c6 100644
@@ -1510,7 +1510,7 @@ static struct ib_mr *create_user_odp_mr(struct ib_pd *pd, u64 start, u64 length,
 		if (!(dev->odp_caps.general_caps & IB_ODP_SUPPORT_IMPLICIT))
 			return ERR_PTR(-EINVAL);
 
-		mr = mlx5_ib_alloc_implicit_mr(to_mpd(pd), udata, access_flags);
+		mr = mlx5_ib_alloc_implicit_mr(to_mpd(pd), access_flags);
 		if (IS_ERR(mr))
 			return ERR_CAST(mr);
 		return &mr->ibmr;
drivers/infiniband/hw/mlx5/odp.c +0 -1
index 87fa0b2..0415e53 100644
@@ -478,7 +478,6 @@ static struct mlx5_ib_mr *implicit_get_child_mr(struct mlx5_ib_mr *imr,
 }
 
 struct mlx5_ib_mr *mlx5_ib_alloc_implicit_mr(struct mlx5_ib_pd *pd,
-					     struct ib_udata *udata,
 					     int access_flags)
 {
 	struct mlx5_ib_dev *dev = to_mdev(pd->ibpd.device);
drivers/infiniband/hw/mlx5/qp.c +2 -2
index 9282eb1..67da125 100644
@@ -835,7 +835,7 @@ static int create_user_rq(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 		ib_umem_num_pages(rwq->umem), page_size, rwq->rq_num_pas,
 		offset);
 
-	err = mlx5_ib_db_map_user(ucontext, udata, ucmd->db_addr, &rwq->db);
+	err = mlx5_ib_db_map_user(ucontext, ucmd->db_addr, &rwq->db);
 	if (err) {
 		mlx5_ib_dbg(dev, "map failed\n");
 		goto err_umem;
@@ -961,7 +961,7 @@ static int _create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 		resp->bfreg_index = MLX5_IB_INVALID_BFREG;
 	qp->bfregn = bfregn;
 
-	err = mlx5_ib_db_map_user(context, udata, ucmd->db_addr, &qp->db);
+	err = mlx5_ib_db_map_user(context, ucmd->db_addr, &qp->db);
 	if (err) {
 		mlx5_ib_dbg(dev, "map failed\n");
 		goto err_free;
drivers/infiniband/hw/mlx5/srq.c +1 -1
index fab6736..191c4ee 100644
@@ -84,7 +84,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
 	}
 	in->umem = srq->umem;
 
-	err = mlx5_ib_db_map_user(ucontext, udata, ucmd.db_addr, &srq->db);
+	err = mlx5_ib_db_map_user(ucontext, ucmd.db_addr, &srq->db);
 	if (err) {
 		mlx5_ib_dbg(dev, "map doorbell failed\n");
 		goto err_umem;
Signature · 1 line
2.7.4
Acked-by on v1 3/4
#6 lore raw

Re: [PATCH for-next 3/4] RDMA/mlx5: Remove unused parameter udata

Quoted 9 lines · Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Leon Romanovsky <[email protected]>
Quoted 10 lines
---
 drivers/infiniband/hw/mlx5/cq.c       | 2 +-
 drivers/infiniband/hw/mlx5/doorbell.c | 3 +--
 drivers/infiniband/hw/mlx5/mlx5_ib.h  | 4 +---
 drivers/infiniband/hw/mlx5/mr.c       | 2 +-
 drivers/infiniband/hw/mlx5/odp.c      | 1 -
 drivers/infiniband/hw/mlx5/qp.c       | 4 ++--
 drivers/infiniband/hw/mlx5/srq.c      | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

Thanks,

author
#7 lore raw

PATCH 4/4 RDMA/rxe: Remove unused parameter udata

In reply to Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Zhu Yanjun <[email protected]>
---
 drivers/infiniband/sw/rxe/rxe_loc.h   | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c    | 2 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index ef8061d..b21038c 100644
@@ -79,7 +79,7 @@ enum copy_direction {
 void rxe_mr_init_dma(struct rxe_pd *pd, int access, struct rxe_mr *mr);
 
 int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
-		     int access, struct ib_udata *udata, struct rxe_mr *mr);
+		     int access, struct rxe_mr *mr);
 
 int rxe_mr_init_fast(struct rxe_pd *pd, int max_pages, struct rxe_mr *mr);
 
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
index 9f63947..373b46aa 100644
@@ -121,7 +121,7 @@ void rxe_mr_init_dma(struct rxe_pd *pd, int access, struct rxe_mr *mr)
 }
 
 int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
-		     int access, struct ib_udata *udata, struct rxe_mr *mr)
+		     int access, struct rxe_mr *mr)
 {
 	struct rxe_map		**map;
 	struct rxe_phys_buf	*buf = NULL;
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -1
index aeb5e23..86a0965 100644
@@ -899,7 +899,7 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
 
 	rxe_add_ref(pd);
 
-	err = rxe_mr_init_user(pd, start, length, iova, access, udata, mr);
+	err = rxe_mr_init_user(pd, start, length, iova, access, mr);
 	if (err)
 		goto err3;
 
Signature · 1 line
2.7.4
maintainer Reviewed-by on v1 4/4
#8 lore raw

Re: [PATCH for-next 4/4] RDMA/rxe: Remove unused parameter udata

Quoted 8 lines · Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Zhu Yanjun <[email protected]>

Thanks. I am fine with this.

Zhu Yanjun

Quoted 50 lines
---
 drivers/infiniband/sw/rxe/rxe_loc.h   | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c    | 2 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index ef8061d..b21038c 100644
@@ -79,7 +79,7 @@ enum copy_direction {
 void rxe_mr_init_dma(struct rxe_pd *pd, int access, struct rxe_mr *mr);
 
 int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
-                    int access, struct ib_udata *udata, struct rxe_mr *mr);
+                    int access, struct rxe_mr *mr);
 
 int rxe_mr_init_fast(struct rxe_pd *pd, int max_pages, struct rxe_mr *mr);
 
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
index 9f63947..373b46aa 100644
@@ -121,7 +121,7 @@ void rxe_mr_init_dma(struct rxe_pd *pd, int access, struct rxe_mr *mr)
 }
 
 int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
-                    int access, struct ib_udata *udata, struct rxe_mr *mr)
+                    int access, struct rxe_mr *mr)
 {
        struct rxe_map          **map;
        struct rxe_phys_buf     *buf = NULL;
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -2
index aeb5e23..86a0965 100644
@@ -899,7 +899,7 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
 
        rxe_add_ref(pd);
 
-       err = rxe_mr_init_user(pd, start, length, iova, access, udata, mr);
+       err = rxe_mr_init_user(pd, start, length, iova, access, mr);
        if (err)
                goto err3;
 
--

2.7.4

Reviewed-by on v1 4/4
#9 lore raw

Re: [PATCH for-next 4/4] RDMA/rxe: Remove unused parameter udata

In reply to Weihang Li
Quoted 9 lines · Weihang Li

From: Lang Cheng <[email protected]>

The old version of ib_umem_get() need these udata as a parameter but now they are unnecessary.

Fixes c320e527e154 ("IB: Allow calls to ib_umem_get from kernel ULPs")
Cc Zhu Yanjun <[email protected]>
Quoted 6 lines
---
 drivers/infiniband/sw/rxe/rxe_loc.h   | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c    | 2 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Thanks,

maintainer Applied
#10 lore raw
In reply to Weihang Li
Quoted 9 lines · Weihang Li

The first parameter of ib_umem_get() has been changed from udata to device, but some of its callers retain 'udata' as a parameter without using it.

Lang Cheng (4):
RDMA/hns: Remove unused parameter udata
RDMA/mlx4: Remove unused parameter udata
RDMA/mlx5: Remove unused parameter udata
RDMA/rxe: Remove unused parameter udata

Applied to for-next, thanks

Jason