RDMA/rtrs: Remove unnecessary argument dir of rtrs_iu_free

The direction of DMA operation is already in the rtrs_iu

Link: https://lore.kernel.org/r/20201023074353.21946-8-jinpu.wang@cloud.ionos.com
Signed-off-by: Gioh Kim <gi-oh.kim@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index ffca004625bba2b8d8846be362660fc300fd6b62..4e5da834034a63a7fe8debe2660f060056b07bf2 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -1236,8 +1236,7 @@ static void free_sess_reqs(struct rtrs_clt_sess *sess)
                if (req->mr)
                        ib_dereg_mr(req->mr);
                kfree(req->sge);
-               rtrs_iu_free(req->iu, DMA_TO_DEVICE,
-                             sess->s.dev->ib_dev, 1);
+               rtrs_iu_free(req->iu, sess->s.dev->ib_dev, 1);
        }
        kfree(sess->reqs);
        sess->reqs = NULL;
@@ -1599,8 +1598,7 @@ static void destroy_con_cq_qp(struct rtrs_clt_con *con)
        lockdep_assert_held(&con->con_mutex);
        rtrs_cq_qp_destroy(&con->c);
        if (con->rsp_ius) {
-               rtrs_iu_free(con->rsp_ius, DMA_FROM_DEVICE,
-                             sess->s.dev->ib_dev, con->queue_size);
+               rtrs_iu_free(con->rsp_ius, sess->s.dev->ib_dev, con->queue_size);
                con->rsp_ius = NULL;
                con->queue_size = 0;
        }
@@ -2245,7 +2243,7 @@ static void rtrs_clt_info_req_done(struct ib_cq *cq, struct ib_wc *wc)
        struct rtrs_iu *iu;
 
        iu = container_of(wc->wr_cqe, struct rtrs_iu, cqe);
-       rtrs_iu_free(iu, DMA_TO_DEVICE, sess->s.dev->ib_dev, 1);
+       rtrs_iu_free(iu, sess->s.dev->ib_dev, 1);
 
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
                rtrs_err(sess->clt, "Sess info request send failed: %s\n",
@@ -2374,7 +2372,7 @@ static void rtrs_clt_info_rsp_done(struct ib_cq *cq, struct ib_wc *wc)
 
 out:
        rtrs_clt_update_wc_stats(con);
-       rtrs_iu_free(iu, DMA_FROM_DEVICE, sess->s.dev->ib_dev, 1);
+       rtrs_iu_free(iu, sess->s.dev->ib_dev, 1);
        rtrs_clt_change_state(sess, state);
 }
 
@@ -2436,9 +2434,9 @@ static int rtrs_send_sess_info(struct rtrs_clt_sess *sess)
 
 out:
        if (tx_iu)
-               rtrs_iu_free(tx_iu, DMA_TO_DEVICE, sess->s.dev->ib_dev, 1);
+               rtrs_iu_free(tx_iu, sess->s.dev->ib_dev, 1);
        if (rx_iu)
-               rtrs_iu_free(rx_iu, DMA_FROM_DEVICE, sess->s.dev->ib_dev, 1);
+               rtrs_iu_free(rx_iu, sess->s.dev->ib_dev, 1);
        if (unlikely(err))
                /* If we've never taken async path because of malloc problems */
                rtrs_clt_change_state(sess, RTRS_CLT_CONNECTING_ERR);

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-pri.h b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
index b8e43dc4d95abd4c7baf6d88a91da44c80093359..3f2918671dbedf2a6495a483cd3e2f7036930f4c 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-pri.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs-pri.h
@@ -287,8 +287,7 @@ struct rtrs_msg_rdma_hdr {
 struct rtrs_iu *rtrs_iu_alloc(u32 queue_size, size_t size, gfp_t t,
                              struct ib_device *dev, enum dma_data_direction,
                              void (*done)(struct ib_cq *cq, struct ib_wc *wc));
-void rtrs_iu_free(struct rtrs_iu *iu, enum dma_data_direction dir,
-                 struct ib_device *dev, u32 queue_size);
+void rtrs_iu_free(struct rtrs_iu *iu, struct ib_device *dev, u32 queue_size);
 int rtrs_iu_post_recv(struct rtrs_con *con, struct rtrs_iu *iu);
 int rtrs_iu_post_send(struct rtrs_con *con, struct rtrs_iu *iu, size_t size,
                      struct ib_send_wr *head);

diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index 1cb778aff3c59ab1f901a94d77cf8ebb6ab515ce..42ee3bf7dc521c8e8ec99d7c88e545764c84f00b 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -577,8 +577,7 @@ static void unmap_cont_bufs(struct rtrs_srv_sess *sess)
                struct rtrs_srv_mr *srv_mr;
 
                srv_mr = &sess->mrs[i];
-               rtrs_iu_free(srv_mr->iu, DMA_TO_DEVICE,
-                             sess->s.dev->ib_dev, 1);
+               rtrs_iu_free(srv_mr->iu, sess->s.dev->ib_dev, 1);
                ib_dereg_mr(srv_mr->mr);
                ib_dma_unmap_sg(sess->s.dev->ib_dev, srv_mr->sgt.sgl,
                                srv_mr->sgt.nents, DMA_BIDIRECTIONAL);
@@ -682,8 +681,7 @@ err:
                        sgt = &srv_mr->sgt;
                        mr = srv_mr->mr;
 free_iu:
-                       rtrs_iu_free(srv_mr->iu, DMA_TO_DEVICE,
-                                     sess->s.dev->ib_dev, 1);
+                       rtrs_iu_free(srv_mr->iu, sess->s.dev->ib_dev, 1);
 dereg_mr:
                        ib_dereg_mr(mr);
 unmap_sg:
@@ -735,7 +733,7 @@ static void rtrs_srv_info_rsp_done(struct ib_cq *cq, struct ib_wc *wc)
        struct rtrs_iu *iu;
 
        iu = container_of(wc->wr_cqe, struct rtrs_iu, cqe);
-       rtrs_iu_free(iu, DMA_TO_DEVICE, sess->s.dev->ib_dev, 1);
+       rtrs_iu_free(iu, sess->s.dev->ib_dev, 1);
 
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
                rtrs_err(s, "Sess info response send failed: %s\n",
@@ -861,7 +859,7 @@ static int process_info_req(struct rtrs_srv_con *con,
        if (unlikely(err)) {
                rtrs_err(s, "rtrs_iu_post_send(), err: %d\n", err);
 iu_free:
-               rtrs_iu_free(tx_iu, DMA_TO_DEVICE, sess->s.dev->ib_dev, 1);
+               rtrs_iu_free(tx_iu, sess->s.dev->ib_dev, 1);
        }
 rwr_free:
        kfree(rwr);
@@ -906,7 +904,7 @@ static void rtrs_srv_info_req_done(struct ib_cq *cq, struct ib_wc *wc)
                goto close;
 
 out:
-       rtrs_iu_free(iu, DMA_FROM_DEVICE, sess->s.dev->ib_dev, 1);
+       rtrs_iu_free(iu, sess->s.dev->ib_dev, 1);
        return;
 close:
        close_sess(sess);
@@ -929,7 +927,7 @@ static int post_recv_info_req(struct rtrs_srv_con *con)
        err = rtrs_iu_post_recv(&con->c, rx_iu);
        if (unlikely(err)) {
                rtrs_err(s, "rtrs_iu_post_recv(), err: %d\n", err);
-               rtrs_iu_free(rx_iu, DMA_FROM_DEVICE, sess->s.dev->ib_dev, 1);
+               rtrs_iu_free(rx_iu, sess->s.dev->ib_dev, 1);
                return err;
        }
 

diff --git a/drivers/infiniband/ulp/rtrs/rtrs.c b/drivers/infiniband/ulp/rtrs/rtrs.c
index ff1093d6e4bc9a6d109b887478f8f17f52008f6a..48f648f573b6f68e5d248ca892aeac0fe1799f65 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs.c
@@ -31,6 +31,7 @@ struct rtrs_iu *rtrs_iu_alloc(u32 queue_size, size_t size, gfp_t gfp_mask,
                return NULL;
        for (i = 0; i < queue_size; i++) {
                iu = &ius[i];
+               iu->direction = dir;
                iu->buf = kzalloc(size, gfp_mask);
                if (!iu->buf)
                        goto err;
@@ -41,17 +42,15 @@ struct rtrs_iu *rtrs_iu_alloc(u32 queue_size, size_t size, gfp_t gfp_mask,
 
                iu->cqe.done  = done;
                iu->size      = size;
-               iu->direction = dir;
        }
        return ius;
 err:
-       rtrs_iu_free(ius, dir, dma_dev, i);
+       rtrs_iu_free(ius, dma_dev, i);
        return NULL;
 }
 EXPORT_SYMBOL_GPL(rtrs_iu_alloc);
 
-void rtrs_iu_free(struct rtrs_iu *ius, enum dma_data_direction dir,
-                  struct ib_device *ibdev, u32 queue_size)
+void rtrs_iu_free(struct rtrs_iu *ius, struct ib_device *ibdev, u32 queue_size)
 {
        struct rtrs_iu *iu;
        int i;
@@ -61,7 +60,7 @@ void rtrs_iu_free(struct rtrs_iu *ius, enum dma_data_direction dir,
 
        for (i = 0; i < queue_size; i++) {
                iu = &ius[i];
-               ib_dma_unmap_single(ibdev, iu->dma_addr, iu->size, dir);
+               ib_dma_unmap_single(ibdev, iu->dma_addr, iu->size, iu->direction);
                kfree(iu->buf);
        }
        kfree(ius);