From: Li Zhijian <lizhijian@fujitsu.com>
To: Zhu Yanjun <zyjzyj2000@gmail.com>, Jason Gunthorpe <jgg@ziepe.ca>,
"Leon Romanovsky" <leon@kernel.org>, <linux-rdma@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, Li Zhijian <lizhijian@fujitsu.com>
Subject: [for-next PATCH 3/5] RDMA/rxe: iova_to_vaddr cleanup
Date: Fri, 11 Nov 2022 04:30:28 +0000 [thread overview]
Message-ID: <1668141030-2-4-git-send-email-lizhijian@fujitsu.com> (raw)
In-Reply-To: <1668141030-2-1-git-send-email-lizhijian@fujitsu.com>
No functional change, do cleanup for refactoring it easily later.
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
---
drivers/infiniband/sw/rxe/rxe_mr.c | 37 ++++++++++++++----------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index cf3ce8d293b3..a4e786b657b7 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -246,41 +246,38 @@ static void lookup_iova(struct rxe_mr *mr, u64 iova, int *m_out, int *n_out,
}
}
-void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length)
+static void *__iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length)
{
size_t offset;
int m, n;
- void *addr;
+ lookup_iova(mr, iova, &m, &n, &offset);
+
+ if (offset + length > mr->ibmr.page_size) {
+ pr_warn("crosses page boundary\n");
+ return NULL;
+ }
+
+ return (void *)(uintptr_t)mr->map[m]->buf[n].addr + offset;
+}
+
+void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length)
+{
if (mr->state != RXE_MR_STATE_VALID) {
pr_warn("mr not in valid state\n");
- addr = NULL;
- goto out;
+ return NULL;
}
if (!mr->map) {
- addr = (void *)(uintptr_t)iova;
- goto out;
+ return (void *)(uintptr_t)iova;
}
if (mr_check_range(mr, iova, length)) {
pr_warn("range violation\n");
- addr = NULL;
- goto out;
- }
-
- lookup_iova(mr, iova, &m, &n, &offset);
-
- if (offset + length > mr->ibmr.page_size) {
- pr_warn("crosses page boundary\n");
- addr = NULL;
- goto out;
+ return NULL;
}
- addr = (void *)(uintptr_t)mr->map[m]->buf[n].addr + offset;
-
-out:
- return addr;
+ return __iova_to_vaddr(mr, iova, length);
}
/* copy data from a range (vaddr, vaddr+length-1) to or from
--
2.31.1
next prev parent reply other threads:[~2022-11-11 4:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 4:30 [for-next PATCH 0/5] iova_to_vaddr refactor Li Zhijian
2022-11-11 4:30 ` [for-next PATCH 1/5] RDMA/rxe: Remove rxe_phys_buf.size Li Zhijian
2022-11-18 16:38 ` Jason Gunthorpe
2022-11-11 4:30 ` [for-next PATCH 2/5] RDMA/rxe: use iova_to_vaddr to transform iova for rxe_mr_copy Li Zhijian
2022-11-18 16:41 ` Jason Gunthorpe
2022-11-11 4:30 ` Li Zhijian [this message]
2022-11-11 4:30 ` [for-next PATCH 4/5] RDMA/rxe: refactor iova_to_vaddr Li Zhijian
2022-11-16 12:37 ` Fabio M. De Francesco
2022-11-18 1:32 ` lizhijian
2022-11-21 18:53 ` Jason Gunthorpe
2022-11-22 23:24 ` Fabio M. De Francesco
2022-11-22 23:55 ` Fabio M. De Francesco
2022-11-16 12:49 ` Fabio M. De Francesco
2022-11-18 17:33 ` Jason Gunthorpe
2022-11-11 4:32 ` [for-next PATCH 5/5] RDMA/rxe: Rename iova_to_vaddr to rxe_map_iova Li Zhijian
2022-11-11 6:13 ` [for-next PATCH 0/5] iova_to_vaddr refactor lizhijian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1668141030-2-4-git-send-email-lizhijian@fujitsu.com \
--to=lizhijian@fujitsu.com \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=zyjzyj2000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®