Skip to contentSkip to conversation

RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user

PATCH Superseded Guoqing Jiang 2 participants 5 messages Feb 1, 2024 – Feb 2, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user

This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
Use members of generic struct in rxe_mr").

---
 drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index 4d2a8ef52c85..746110898a0e 100644
@@ -59,7 +59,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
 /* rxe_mr.c */
 u8 rxe_get_next_key(u32 last_key);
 void rxe_mr_init_dma(int access, struct rxe_mr *mr);
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
 		     int access, struct rxe_mr *mr);
 int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr);
 int rxe_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int length);
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
index bc81fde696ee..da3dee520876 100644
@@ -126,7 +126,7 @@ static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
 	return xas_error(&xas);
 }
 
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
 		     int access, struct rxe_mr *mr)
 {
 	struct ib_umem *umem;
Signature · 1 line
2.35.3
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Guoqing Jiang

This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
Use members of generic struct in rxe_mr").

Thanks.

Zhu Yanjun

Quoted 35 lines
---
 drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index 4d2a8ef52c85..746110898a0e 100644
@@ -59,7 +59,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
 /* rxe_mr.c */
 u8 rxe_get_next_key(u32 last_key);
 void rxe_mr_init_dma(int access, struct rxe_mr *mr);
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                     int access, struct rxe_mr *mr);
 int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr);
 int rxe_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int length);
drivers/infiniband/sw/rxe/rxe_mr.c +1 -2
index bc81fde696ee..da3dee520876 100644
@@ -126,7 +126,7 @@ static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
        return xas_error(&xas);
 }
 
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                     int access, struct rxe_mr *mr)
 {
        struct ib_umem *umem;
--

2.35.3

maintainer
#2 lore raw
In reply to Guoqing Jiang
Quoted 28 lines · Guoqing Jiang

This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
Use members of generic struct in rxe_mr").

---
 drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index 4d2a8ef52c85..746110898a0e 100644
@@ -59,7 +59,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
 /* rxe_mr.c */
 u8 rxe_get_next_key(u32 last_key);
 void rxe_mr_init_dma(int access, struct rxe_mr *mr);
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                     int access, struct rxe_mr *mr);
 int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr);
 int rxe_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int length);
drivers/infiniband/sw/rxe/rxe_mr.c +0 -0
index bc81fde696ee..da3dee520876 100644

drivers/infiniband/sw/rxe/rxe_mr.c static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt) · line 132

Quoted 8 lines
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
@@ -126,7 +126,7 @@ static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
        return xas_error(&xas);
 }
 
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                     int access, struct rxe_mr *mr)
 {
        struct ib_umem *umem;
(quoted diff) +0 -0

b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 48f86839d36a..04427238fcab 100644

drivers/infiniband/sw/rxe/rxe_verbs.c +0 -0
@@ -1278,7 +1278,7 @@ static struct ib_mr *rxe_reg_user_mr(struct

ib_pd *ibpd, u64 start,

        mr->ibmr.pd = ibpd;
        mr->ibmr.device = ibpd->device;

- err = rxe_mr_init_user(rxe, start, length, iova, access, mr);
+ err = rxe_mr_init_user(rxe, start, length, access, mr);

        if (err) {
                rxe_dbg_mr(mr, "reg_user_mr failed, err = %d", err);
                goto err_cleanup;

Zhu Yanjun

Quoted 3 lines

--
2.35.3

maintainer
#3 lore raw
Quoted 53 lines · Zhu Yanjun
Quoted 36 lines · Guoqing Jiang

This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
Use members of generic struct in rxe_mr").

---
 drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index 4d2a8ef52c85..746110898a0e 100644
@@ -59,7 +59,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
 /* rxe_mr.c */
 u8 rxe_get_next_key(u32 last_key);
 void rxe_mr_init_dma(int access, struct rxe_mr *mr);
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                     int access, struct rxe_mr *mr);
 int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr);
 int rxe_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int length);
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
index bc81fde696ee..da3dee520876 100644
@@ -126,7 +126,7 @@ static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
        return xas_error(&xas);
 }
 
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                     int access, struct rxe_mr *mr)
 {
        struct ib_umem *umem;
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -1
index 48f86839d36a..04427238fcab 100644
@@ -1278,7 +1278,7 @@ static struct ib_mr *rxe_reg_user_mr(struct
 ib_pd *ibpd, u64 start,
        mr->ibmr.pd = ibpd;
        mr->ibmr.device = ibpd->device;
 
-       err = rxe_mr_init_user(rxe, start, length, iova, access, mr);
+       err = rxe_mr_init_user(rxe, start, length, access, mr);
        if (err) {
                rxe_dbg_mr(mr, "reg_user_mr failed, err = %d", err);
Quoted 2 lines
                goto err_cleanup;

Without the above, the following will appear.

drivers/infiniband/sw/rxe/rxe_verbs.c: In function ‘rxe_reg_user_mr’:
drivers/infiniband/sw/rxe/rxe_verbs.c:1281:58: warning: passing argument 5 of ‘rxe_mr_init_user’ makes pointer from integer without a cast [-Wint-conversion]

 1281 |         err = rxe_mr_init_user(rxe, start, length, iova, access, mr);
      |                                                          ^~~~~~
      |                                                          |
      |                                                          int

In file included from drivers/infiniband/sw/rxe/rxe.h:31,
from drivers/infiniband/sw/rxe/rxe_verbs.c:11:
drivers/infiniband/sw/rxe/rxe_loc.h:63:49: note: expected ‘struct rxe_mr *’ but argument is of type ‘int’

   63 |                      int access, struct rxe_mr *mr);
      |                                  ~~~~~~~~~~~~~~~^~
drivers/infiniband/sw/rxe/rxe_verbs.c:1281:15: error: too many
arguments to function ‘rxe_mr_init_user’
 1281 |         err = rxe_mr_init_user(rxe, start, length, iova, access, mr);
      |               ^~~~~~~~~~~~~~~~
drivers/infiniband/sw/rxe/rxe_loc.h:62:5: note: declared here
   62 | int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
      |     ^~~~~~~~~~~~~~~~

make[6]: *** [scripts/Makefile.build:243:
drivers/infiniband/sw/rxe/rxe_verbs.o] Error 1
make[6]: *** Waiting for unfinished jobs....
make[5]: *** [scripts/Makefile.build:480: drivers/infiniband/sw/rxe] Error 2 make[4]: *** [scripts/Makefile.build:480: drivers/infiniband/sw] Error 2 make[3]: *** [scripts/Makefile.build:480: drivers/infiniband] Error 2 make[3]: *** Waiting for unfinished jobs....
make[2]: *** [scripts/Makefile.build:480: drivers] Error 2 make[1]: *** [/images/upstream-linux/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2

Zhu Yanjun

Quoted 4 lines

Zhu Yanjun

Quoted 3 lines

--
2.35.3

#4 lore raw
In reply to Zhu Yanjun
Quoted 50 lines · Zhu Yanjun
Quoted 35 lines · Guoqing Jiang

This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
Use members of generic struct in rxe_mr").

---
  drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
  drivers/infiniband/sw/rxe/rxe_mr.c  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +1 -1
index 4d2a8ef52c85..746110898a0e 100644
@@ -59,7 +59,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
  /* rxe_mr.c */
  u8 rxe_get_next_key(u32 last_key);
  void rxe_mr_init_dma(int access, struct rxe_mr *mr);
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                      int access, struct rxe_mr *mr);
  int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr);
  int rxe_flush_pmem_iova(struct rxe_mr *mr, u64 iova, unsigned int length);
drivers/infiniband/sw/rxe/rxe_mr.c +1 -1
index bc81fde696ee..da3dee520876 100644
@@ -126,7 +126,7 @@ static int rxe_mr_fill_pages_from_sgt(struct rxe_mr *mr, struct sg_table *sgt)
         return xas_error(&xas);
  }
 
-int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length, u64 iova,
+int rxe_mr_init_user(struct rxe_dev *rxe, u64 start, u64 length,
                      int access, struct rxe_mr *mr)
  {
         struct ib_umem *umem;
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -1
index 48f86839d36a..04427238fcab 100644
@@ -1278,7 +1278,7 @@ static struct ib_mr *rxe_reg_user_mr(struct
 ib_pd *ibpd, u64 start,
         mr->ibmr.pd = ibpd;
         mr->ibmr.device = ibpd->device;
 
-       err = rxe_mr_init_user(rxe, start, length, iova, access, mr);
+       err = rxe_mr_init_user(rxe, start, length, access, mr);
         if (err) {
                 rxe_dbg_mr(mr, "reg_user_mr failed, err = %d", err);
Quoted 1 line
                 goto err_cleanup;

Oops, my mistake, will add above in v2.

Thanks,
Guoqing