RDMA/irdma: Remove use of kmap()
authorIra Weiny <ira.weiny@intel.com>
Tue, 22 Jun 2021 16:56:22 +0000 (09:56 -0700)
committerJason Gunthorpe <jgg@nvidia.com>
Thu, 24 Jun 2021 18:07:01 +0000 (15:07 -0300)
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: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/hw/irdma/cm.c

index 3d2bdb033a545f3e73bd0ce53d13a01ddb463293..6b62299abfbbbbb49d9539ec872f104b59e51adb 100644 (file)
@@ -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;