* [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user
@ 2024-02-01 12:57 Guoqing Jiang
2024-02-02 8:00 ` Zhu Yanjun
2024-02-02 11:49 ` Zhu Yanjun
0 siblings, 2 replies; 5+ messages in thread
From: Guoqing Jiang @ 2024-02-01 12:57 UTC (permalink / raw)
To: zyjzyj2000, jgg, leon; +Cc: linux-rdma
This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
Use members of generic struct in rxe_mr").
Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
---
drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index 4d2a8ef52c85..746110898a0e 100644
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -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);
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index bc81fde696ee..da3dee520876 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user
2024-02-01 12:57 [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user Guoqing Jiang
@ 2024-02-02 8:00 ` Zhu Yanjun
2024-02-02 11:49 ` Zhu Yanjun
1 sibling, 0 replies; 5+ messages in thread
From: Zhu Yanjun @ 2024-02-02 8:00 UTC (permalink / raw)
To: Guoqing Jiang; +Cc: jgg, leon, linux-rdma
On Thu, Feb 1, 2024 at 8:58 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote:
>
> This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
> Use members of generic struct in rxe_mr").
>
Thanks.
Acked-by: Zhu Yanjun <zyjzyj2000@gmail.com>
Zhu Yanjun
> Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
> ---
> drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
> drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
> index 4d2a8ef52c85..746110898a0e 100644
> --- a/drivers/infiniband/sw/rxe/rxe_loc.h
> +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
> @@ -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);
> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
> index bc81fde696ee..da3dee520876 100644
> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
> @@ -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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user
2024-02-01 12:57 [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user Guoqing Jiang
2024-02-02 8:00 ` Zhu Yanjun
@ 2024-02-02 11:49 ` Zhu Yanjun
2024-02-02 12:12 ` Zhu Yanjun
2024-02-02 12:24 ` Guoqing Jiang
1 sibling, 2 replies; 5+ messages in thread
From: Zhu Yanjun @ 2024-02-02 11:49 UTC (permalink / raw)
To: Guoqing Jiang; +Cc: jgg, leon, linux-rdma
On Thu, Feb 1, 2024 at 8:58 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote:
>
> This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
> Use members of generic struct in rxe_mr").
>
> Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
> ---
> drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
> drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
> index 4d2a8ef52c85..746110898a0e 100644
> --- a/drivers/infiniband/sw/rxe/rxe_loc.h
> +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
> @@ -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);
> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
> index bc81fde696ee..da3dee520876 100644
> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
> @@ -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;
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c
b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 48f86839d36a..04427238fcab 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -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
> --
> 2.35.3
>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user
2024-02-02 11:49 ` Zhu Yanjun
@ 2024-02-02 12:12 ` Zhu Yanjun
2024-02-02 12:24 ` Guoqing Jiang
1 sibling, 0 replies; 5+ messages in thread
From: Zhu Yanjun @ 2024-02-02 12:12 UTC (permalink / raw)
To: Guoqing Jiang; +Cc: jgg, leon, linux-rdma
On Fri, Feb 2, 2024 at 7:49 PM Zhu Yanjun <zyjzyj2000@gmail.com> wrote:
>
> On Thu, Feb 1, 2024 at 8:58 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote:
> >
> > This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
> > Use members of generic struct in rxe_mr").
> >
> > Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
> > ---
> > drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
> > drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
> > index 4d2a8ef52c85..746110898a0e 100644
> > --- a/drivers/infiniband/sw/rxe/rxe_loc.h
> > +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
> > @@ -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);
> > diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
> > index bc81fde696ee..da3dee520876 100644
> > --- a/drivers/infiniband/sw/rxe/rxe_mr.c
> > +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
> > @@ -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;
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c
> b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index 48f86839d36a..04427238fcab 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -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;
>
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
> Zhu Yanjun
> > --
> > 2.35.3
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user
2024-02-02 11:49 ` Zhu Yanjun
2024-02-02 12:12 ` Zhu Yanjun
@ 2024-02-02 12:24 ` Guoqing Jiang
1 sibling, 0 replies; 5+ messages in thread
From: Guoqing Jiang @ 2024-02-02 12:24 UTC (permalink / raw)
To: Zhu Yanjun; +Cc: jgg, leon, linux-rdma
On 2/2/24 19:49, Zhu Yanjun wrote:
> On Thu, Feb 1, 2024 at 8:58 PM Guoqing Jiang <guoqing.jiang@linux.dev> wrote:
>> This one is not needed since commit 954afc5a8fd8 ("RDMA/rxe:
>> Use members of generic struct in rxe_mr").
>>
>> Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
>> ---
>> drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
>> drivers/infiniband/sw/rxe/rxe_mr.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
>> index 4d2a8ef52c85..746110898a0e 100644
>> --- a/drivers/infiniband/sw/rxe/rxe_loc.h
>> +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
>> @@ -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);
>> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
>> index bc81fde696ee..da3dee520876 100644
>> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
>> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
>> @@ -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;
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c
> b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index 48f86839d36a..04427238fcab 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -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;
Oops, my mistake, will add above in v2.
Thanks,
Guoqing
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-02 12:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-01 12:57 [PATCH] RDMA/rxe: Remove unused 'iova' parameter from rxe_mr_init_user Guoqing Jiang
2024-02-02 8:00 ` Zhu Yanjun
2024-02-02 11:49 ` Zhu Yanjun
2024-02-02 12:12 ` Zhu Yanjun
2024-02-02 12:24 ` Guoqing Jiang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox