Commit 7364e74d authored by Ira Weiny's avatar Ira Weiny Committed by Jason Gunthorpe
Browse files

RDMA/irdma: 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 the irdma CM driver is thread local.  Therefore
kmap_local_page() is sufficient to use and may provide performance
benefits as well.  kmap_local_page() will work with device dax and pgmap
protected pages.

Use kmap_local_page() instead of kmap().

[1] https://lore.kernel.org/lkml/20201009195033.3208459-59-ira.weiny@intel.com/

Link: https://lore.kernel.org/r/20210622165622.2638628-1-ira.weiny@intel.com


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

drivers/infiniband/hw/irdma/cm.c

+4 −4
Original line number Diff line number Diff line
@@ -3675,14 +3675,14 @@ int irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
	ibmr->device = iwpd->ibpd.device;

	iwqp->lsmm_mr = ibmr;

	if (iwqp->page)

		iwqp->sc_qp.qp_uk.sq_base = kmap(iwqp->page);

		iwqp->sc_qp.qp_uk.sq_base = kmap_local_page(iwqp->page);



	cm_node->lsmm_size = accept.size + conn_param->private_data_len;

	irdma_sc_send_lsmm(&iwqp->sc_qp, iwqp->ietf_mem.va, cm_node->lsmm_size,

			   ibmr->lkey);



	if (iwqp->page)

		kunmap(iwqp->page);

		kunmap_local(iwqp->sc_qp.qp_uk.sq_base);



	iwqp->cm_id = cm_id;

	cm_node->cm_id = cm_id;
@@ -4093,10 +4093,10 @@ static void irdma_cm_event_connected(struct irdma_cm_event *event) 
	irdma_cm_init_tsa_conn(iwqp, cm_node);

	read0 = (cm_node->send_rdma0_op == SEND_RDMA_READ_ZERO);

	if (iwqp->page)

		iwqp->sc_qp.qp_uk.sq_base = kmap(iwqp->page);

		iwqp->sc_qp.qp_uk.sq_base = kmap_local_page(iwqp->page);

	irdma_sc_send_rtt(&iwqp->sc_qp, read0);

	if (iwqp->page)

		kunmap(iwqp->page);

		kunmap_local(iwqp->sc_qp.qp_uk.sq_base);



	attr.qp_state = IB_QPS_RTS;

	cm_node->qhash_set = false;