Commit 3a179fe3 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Leon Romanovsky

RDMA/siw: Introduce siw_get_page

Add the wrapper function to get either pbl page or umem page.
Acked-by: default avatarBernard Metzler <bmt@zurich.ibm.com>
Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@linux.dev>
Link: https://lore.kernel.org/r/20231113115726.12762-2-guoqing.jiang@linux.devSigned-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent b9a85e5e
...@@ -34,6 +34,15 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx) ...@@ -34,6 +34,15 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx)
return NULL; return NULL;
} }
static struct page *siw_get_page(struct siw_mem *mem, struct siw_sge *sge,
unsigned long offset, int *pbl_idx)
{
if (!mem->is_pbl)
return siw_get_upage(mem->umem, sge->laddr + offset);
else
return siw_get_pblpage(mem, sge->laddr + offset, pbl_idx);
}
/* /*
* Copy short payload at provided destination payload address * Copy short payload at provided destination payload address
*/ */
...@@ -67,11 +76,7 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, void *paddr) ...@@ -67,11 +76,7 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, void *paddr)
char *buffer; char *buffer;
int pbl_idx = 0; int pbl_idx = 0;
if (!mem->is_pbl) p = siw_get_page(mem, sge, 0, &pbl_idx);
p = siw_get_upage(mem->umem, sge->laddr);
else
p = siw_get_pblpage(mem, sge->laddr, &pbl_idx);
if (unlikely(!p)) if (unlikely(!p))
return -EFAULT; return -EFAULT;
...@@ -85,13 +90,7 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, void *paddr) ...@@ -85,13 +90,7 @@ static int siw_try_1seg(struct siw_iwarp_tx *c_tx, void *paddr)
memcpy(paddr, buffer + off, part); memcpy(paddr, buffer + off, part);
kunmap_local(buffer); kunmap_local(buffer);
if (!mem->is_pbl) p = siw_get_page(mem, sge, part, &pbl_idx);
p = siw_get_upage(mem->umem,
sge->laddr + part);
else
p = siw_get_pblpage(mem,
sge->laddr + part,
&pbl_idx);
if (unlikely(!p)) if (unlikely(!p))
return -EFAULT; return -EFAULT;
...@@ -498,13 +497,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s) ...@@ -498,13 +497,7 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s)
if (!is_kva) { if (!is_kva) {
struct page *p; struct page *p;
if (mem->is_pbl) p = siw_get_page(mem, sge, sge_off, &pbl_idx);
p = siw_get_pblpage(
mem, sge->laddr + sge_off,
&pbl_idx);
else
p = siw_get_upage(mem->umem,
sge->laddr + sge_off);
if (unlikely(!p)) { if (unlikely(!p)) {
siw_unmap_pages(iov, kmap_mask, seg); siw_unmap_pages(iov, kmap_mask, seg);
wqe->processed -= c_tx->bytes_unsent; wqe->processed -= c_tx->bytes_unsent;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment