* [PATCH for-next 1/4] RDMA/hns: Remove unused parameter udata
2021-05-12 8:12 [PATCH for-next 0/4] RDMA: Remove unused parameter udata Weihang Li
@ 2021-05-12 8:12 ` Weihang Li
2021-05-19 10:49 ` Leon Romanovsky
2021-05-12 8:12 ` [PATCH for-next 2/4] RDMA/mlx4: " Weihang Li
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Weihang Li @ 2021-05-12 8:12 UTC (permalink / raw)
To: dledford, jgg; +Cc: leon, linux-rdma, linuxarm, Lang Cheng, Weihang Li
From: Lang Cheng <chenglang@huawei.com>
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")
Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
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(-)
diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c b/drivers/infiniband/hw/hns/hns_roce_cq.c
index 800884b..488d86b 100644
--- a/drivers/infiniband/hw/hns/hns_roce_cq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_cq.c
@@ -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;
diff --git a/drivers/infiniband/hw/hns/hns_roce_db.c b/drivers/infiniband/hw/hns/hns_roce_db.c
index 5cb7376c..d40ea3d 100644
--- a/drivers/infiniband/hw/hns/hns_roce_db.c
+++ b/drivers/infiniband/hw/hns/hns_roce_db.c
@@ -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;
diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 97800d2..d93dfba 100644
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -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);
diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index 230a909..c6e120e 100644
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -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,
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH for-next 1/4] RDMA/hns: Remove unused parameter udata
2021-05-12 8:12 ` [PATCH for-next 1/4] RDMA/hns: " Weihang Li
@ 2021-05-19 10:49 ` Leon Romanovsky
0 siblings, 0 replies; 11+ messages in thread
From: Leon Romanovsky @ 2021-05-19 10:49 UTC (permalink / raw)
To: Weihang Li; +Cc: dledford, jgg, linux-rdma, linuxarm, Lang Cheng
On Wed, May 12, 2021 at 04:12:19PM +0800, Weihang Li wrote:
> From: Lang Cheng <chenglang@huawei.com>
>
> 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")
> Signed-off-by: Lang Cheng <chenglang@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
> ---
> 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,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH for-next 2/4] RDMA/mlx4: Remove unused parameter udata
2021-05-12 8:12 [PATCH for-next 0/4] RDMA: Remove unused parameter udata Weihang Li
2021-05-12 8:12 ` [PATCH for-next 1/4] RDMA/hns: " Weihang Li
@ 2021-05-12 8:12 ` Weihang Li
2021-05-19 10:49 ` Leon Romanovsky
2021-05-12 8:12 ` [PATCH for-next 3/4] RDMA/mlx5: " Weihang Li
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Weihang Li @ 2021-05-12 8:12 UTC (permalink / raw)
To: dledford, jgg
Cc: leon, linux-rdma, linuxarm, Lang Cheng, Yishai Hadas, Weihang Li
From: Lang Cheng <chenglang@huawei.com>
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 <yishaih@nvidia.com>
Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/infiniband/hw/mlx4/cq.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index e9b5a4d..4cd738a 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -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;
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH for-next 2/4] RDMA/mlx4: Remove unused parameter udata
2021-05-12 8:12 ` [PATCH for-next 2/4] RDMA/mlx4: " Weihang Li
@ 2021-05-19 10:49 ` Leon Romanovsky
0 siblings, 0 replies; 11+ messages in thread
From: Leon Romanovsky @ 2021-05-19 10:49 UTC (permalink / raw)
To: Weihang Li; +Cc: dledford, jgg, linux-rdma, linuxarm, Lang Cheng, Yishai Hadas
On Wed, May 12, 2021 at 04:12:20PM +0800, Weihang Li wrote:
> From: Lang Cheng <chenglang@huawei.com>
>
> 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 <yishaih@nvidia.com>
> Signed-off-by: Lang Cheng <chenglang@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
> ---
> drivers/infiniband/hw/mlx4/cq.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH for-next 3/4] RDMA/mlx5: Remove unused parameter udata
2021-05-12 8:12 [PATCH for-next 0/4] RDMA: Remove unused parameter udata Weihang Li
2021-05-12 8:12 ` [PATCH for-next 1/4] RDMA/hns: " Weihang Li
2021-05-12 8:12 ` [PATCH for-next 2/4] RDMA/mlx4: " Weihang Li
@ 2021-05-12 8:12 ` Weihang Li
2021-05-19 10:50 ` Leon Romanovsky
2021-05-12 8:12 ` [PATCH for-next 4/4] RDMA/rxe: " Weihang Li
2021-05-20 15:02 ` [PATCH for-next 0/4] RDMA: " Jason Gunthorpe
4 siblings, 1 reply; 11+ messages in thread
From: Weihang Li @ 2021-05-12 8:12 UTC (permalink / raw)
To: dledford, jgg; +Cc: leon, linux-rdma, linuxarm, Lang Cheng, Weihang Li
From: Lang Cheng <chenglang@huawei.com>
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 <leon@kernel.org>
Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
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(-)
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index eb92ceff..7beb3e2 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx5/doorbell.c b/drivers/infiniband/hw/mlx5/doorbell.c
index 61475b5..913af75 100644
--- a/drivers/infiniband/hw/mlx5/doorbell.c
+++ b/drivers/infiniband/hw/mlx5/doorbell.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index e9a3f34..7378cd3 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -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);
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 4388afe..383c0c6 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index 87fa0b2..0415e53 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -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);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 9282eb1..67da125 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -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;
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index fab6736..191c4ee 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -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;
--
2.7.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH for-next 3/4] RDMA/mlx5: Remove unused parameter udata
2021-05-12 8:12 ` [PATCH for-next 3/4] RDMA/mlx5: " Weihang Li
@ 2021-05-19 10:50 ` Leon Romanovsky
0 siblings, 0 replies; 11+ messages in thread
From: Leon Romanovsky @ 2021-05-19 10:50 UTC (permalink / raw)
To: Weihang Li; +Cc: dledford, jgg, linux-rdma, linuxarm, Lang Cheng
On Wed, May 12, 2021 at 04:12:21PM +0800, Weihang Li wrote:
> From: Lang Cheng <chenglang@huawei.com>
>
> 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 <leon@kernel.org>
> Signed-off-by: Lang Cheng <chenglang@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
> ---
> 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,
Acked-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH for-next 4/4] RDMA/rxe: Remove unused parameter udata
2021-05-12 8:12 [PATCH for-next 0/4] RDMA: Remove unused parameter udata Weihang Li
` (2 preceding siblings ...)
2021-05-12 8:12 ` [PATCH for-next 3/4] RDMA/mlx5: " Weihang Li
@ 2021-05-12 8:12 ` Weihang Li
2021-05-13 0:38 ` Zhu Yanjun
2021-05-19 10:50 ` Leon Romanovsky
2021-05-20 15:02 ` [PATCH for-next 0/4] RDMA: " Jason Gunthorpe
4 siblings, 2 replies; 11+ messages in thread
From: Weihang Li @ 2021-05-12 8:12 UTC (permalink / raw)
To: dledford, jgg
Cc: leon, linux-rdma, linuxarm, Lang Cheng, Zhu Yanjun, Weihang Li
From: Lang Cheng <chenglang@huawei.com>
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 <zyjzyj2000@gmail.com>
Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
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(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index ef8061d..b21038c 100644
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -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);
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index 9f63947..373b46aa 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -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;
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index aeb5e23..86a0965 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -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
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH for-next 4/4] RDMA/rxe: Remove unused parameter udata
2021-05-12 8:12 ` [PATCH for-next 4/4] RDMA/rxe: " Weihang Li
@ 2021-05-13 0:38 ` Zhu Yanjun
2021-05-19 10:50 ` Leon Romanovsky
1 sibling, 0 replies; 11+ messages in thread
From: Zhu Yanjun @ 2021-05-13 0:38 UTC (permalink / raw)
To: Weihang Li
Cc: Doug Ledford, Jason Gunthorpe, Leon Romanovsky, RDMA mailing list,
linuxarm, Lang Cheng
On Wed, May 12, 2021 at 4:14 PM Weihang Li <liweihang@huawei.com> wrote:
>
> From: Lang Cheng <chenglang@huawei.com>
>
> 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 <zyjzyj2000@gmail.com>
Thanks. I am fine with this.
Reviewed-by: Zhu Yanjun <zyjzyj2000@gmail.com>
Zhu Yanjun
> Signed-off-by: Lang Cheng <chenglang@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
> ---
> 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(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
> index ef8061d..b21038c 100644
> --- a/drivers/infiniband/sw/rxe/rxe_loc.h
> +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
> @@ -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);
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
> index 9f63947..373b46aa 100644
> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
> @@ -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;
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index aeb5e23..86a0965 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -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
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH for-next 4/4] RDMA/rxe: Remove unused parameter udata
2021-05-12 8:12 ` [PATCH for-next 4/4] RDMA/rxe: " Weihang Li
2021-05-13 0:38 ` Zhu Yanjun
@ 2021-05-19 10:50 ` Leon Romanovsky
1 sibling, 0 replies; 11+ messages in thread
From: Leon Romanovsky @ 2021-05-19 10:50 UTC (permalink / raw)
To: Weihang Li; +Cc: dledford, jgg, linux-rdma, linuxarm, Lang Cheng, Zhu Yanjun
On Wed, May 12, 2021 at 04:12:22PM +0800, Weihang Li wrote:
> From: Lang Cheng <chenglang@huawei.com>
>
> 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 <zyjzyj2000@gmail.com>
> Signed-off-by: Lang Cheng <chenglang@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
> ---
> 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,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH for-next 0/4] RDMA: Remove unused parameter udata
2021-05-12 8:12 [PATCH for-next 0/4] RDMA: Remove unused parameter udata Weihang Li
` (3 preceding siblings ...)
2021-05-12 8:12 ` [PATCH for-next 4/4] RDMA/rxe: " Weihang Li
@ 2021-05-20 15:02 ` Jason Gunthorpe
4 siblings, 0 replies; 11+ messages in thread
From: Jason Gunthorpe @ 2021-05-20 15:02 UTC (permalink / raw)
To: Weihang Li; +Cc: dledford, leon, linux-rdma, linuxarm
On Wed, May 12, 2021 at 04:12:18PM +0800, Weihang Li wrote:
> 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
^ permalink raw reply [flat|nested] 11+ messages in thread