Commit 36f5625a authored by Ira Weiny's avatar Ira Weiny Committed by Jason Gunthorpe
Browse files

RDMA/hfi1: Remove use of kmap() 

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/20201009195033.3208459-59-ira.weiny@intel.com/

Link: https://lore.kernel.org/r/20210622061422.2633501-2-ira.weiny@intel.com


Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 7364e74d

drivers/infiniband/hw/hfi1/sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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)