2021-06-22 06:15:38

by Ira Weiny

Subject: [PATCH 1/4] RDMA/hfi1: Remove use of kmap()

From: Ira Weiny <[email protected]>

kmap() is being deprecated and will break uses of device dax after PKS
protection is introduced.[1]

The kmap() used in sdma does not need to be global. Use the new
kmap_local_page() which works with PKS and may provide better
performance for this thread local mapping anyway.

[1] https://lore.kernel.org/lkml/[email protected]/

Signed-off-by: Ira Weiny <[email protected]>
---
drivers/infiniband/hw/hfi1/sdma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c
index 46b5290b2839..af43dcbb0928 100644
--- a/drivers/infiniband/hw/hfi1/sdma.c
+++ b/drivers/infiniband/hw/hfi1/sdma.c
@@ -3130,7 +3130,7 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,
}

if (type == SDMA_MAP_PAGE) {
- kvaddr = kmap(page);
+ kvaddr = kmap_local_page(page);
kvaddr += offset;
} else if (WARN_ON(!kvaddr)) {
__sdma_txclean(dd, tx);
@@ -3140,7 +3140,7 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,
memcpy(tx->coalesce_buf + tx->coalesce_idx, kvaddr, len);
tx->coalesce_idx += len;
if (type == SDMA_MAP_PAGE)
- kunmap(page);
+ kunmap_local(kvaddr);

/* If there is more data, return */
if (tx->tlen - tx->coalesce_idx)
--
2.28.0.rc0.12.gb6a658bd00c9

2021-06-24 18:14:51

by Jason Gunthorpe

Subject: Re: [PATCH 1/4] RDMA/hfi1: Remove use of kmap()

On Mon, Jun 21, 2021 at 11:14:19PM -0700, [email protected] wrote:
> From: Ira Weiny <[email protected]>
>
> kmap() is being deprecated and will break uses of device dax after PKS
> protection is introduced.[1]
>
> The kmap() used in sdma does not need to be global. Use the new
> kmap_local_page() which works with PKS and may provide better
> performance for this thread local mapping anyway.
>
> [1] https://lore.kernel.org/lkml/[email protected]/
>
> Signed-off-by: Ira Weiny <[email protected]>
> ---
> drivers/infiniband/hw/hfi1/sdma.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to for-next, thanks

Jason