Re: [PATCH v2 17/26] IB/iser: Inline ib_dma_map_*() functions

2017-01-13 Thread Sagi Grimberg 

Acked-by: Sagi Grimberg

Re: [PATCH v2 17/26] IB/iser: Inline ib_dma_map_*() functions

2017-01-13 Thread Sagi Grimberg 

Acked-by: Sagi Grimberg

[PATCH v2 17/26] IB/iser: Inline ib_dma_map_*() functions

2017-01-12 Thread Bart Van Assche 
Signed-off-by: Bart Van Assche 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Sagi Grimberg 
---
 drivers/infiniband/ulp/iser/iscsi_iser.c | 11 ++--
 drivers/infiniband/ulp/iser/iser_initiator.c | 88 +++-
 drivers/infiniband/ulp/iser/iser_memory.c| 13 ++--
 drivers/infiniband/ulp/iser/iser_verbs.c |  6 +-
 4 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c 
b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 9104e6b8cac9..08a6875711b2 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -198,9 +198,9 @@ iser_initialize_task_headers(struct iscsi_task *task,
goto out;
}
 
-   dma_addr = ib_dma_map_single(device->ib_device, (void *)tx_desc,
-   ISER_HEADERS_LEN, DMA_TO_DEVICE);
-   if (ib_dma_mapping_error(device->ib_device, dma_addr)) {
+   dma_addr = dma_map_single(device->ib_device->dma_device, tx_desc,
+ ISER_HEADERS_LEN, DMA_TO_DEVICE);
+   if (dma_mapping_error(device->ib_device->dma_device, dma_addr)) {
ret = -ENOMEM;
goto out;
}
@@ -375,8 +375,9 @@ static void iscsi_iser_cleanup_task(struct iscsi_task *task)
return;
 
if (likely(tx_desc->mapped)) {
-   ib_dma_unmap_single(device->ib_device, tx_desc->dma_addr,
-   ISER_HEADERS_LEN, DMA_TO_DEVICE);
+   dma_unmap_single(device->ib_device->dma_device,
+tx_desc->dma_addr, ISER_HEADERS_LEN,
+DMA_TO_DEVICE);
tx_desc->mapped = false;
}
 
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c 
b/drivers/infiniband/ulp/iser/iser_initiator.c
index 81ae2e30dd12..b3f01bb9a846 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -164,8 +164,9 @@ static void iser_create_send_desc(struct iser_conn  
*iser_conn,
 {
struct iser_device *device = iser_conn->ib_conn.device;
 
-   ib_dma_sync_single_for_cpu(device->ib_device,
-   tx_desc->dma_addr, ISER_HEADERS_LEN, DMA_TO_DEVICE);
+   dma_sync_single_for_cpu(device->ib_device->dma_device,
+   tx_desc->dma_addr, ISER_HEADERS_LEN,
+   DMA_TO_DEVICE);
 
memset(_desc->iser_header, 0, sizeof(struct iser_ctrl));
tx_desc->iser_header.flags = ISER_VER;
@@ -180,11 +181,11 @@ static void iser_free_login_buf(struct iser_conn 
*iser_conn)
if (!desc->req)
return;
 
-   ib_dma_unmap_single(device->ib_device, desc->req_dma,
-   ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
+   dma_unmap_single(device->ib_device->dma_device, desc->req_dma,
+ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
 
-   ib_dma_unmap_single(device->ib_device, desc->rsp_dma,
-   ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+   dma_unmap_single(device->ib_device->dma_device, desc->rsp_dma,
+ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
 
kfree(desc->req);
kfree(desc->rsp);
@@ -203,10 +204,10 @@ static int iser_alloc_login_buf(struct iser_conn 
*iser_conn)
if (!desc->req)
return -ENOMEM;
 
-   desc->req_dma = ib_dma_map_single(device->ib_device, desc->req,
- ISCSI_DEF_MAX_RECV_SEG_LEN,
- DMA_TO_DEVICE);
-   if (ib_dma_mapping_error(device->ib_device,
+   desc->req_dma = dma_map_single(device->ib_device->dma_device, desc->req,
+  ISCSI_DEF_MAX_RECV_SEG_LEN,
+  DMA_TO_DEVICE);
+   if (dma_mapping_error(device->ib_device->dma_device,
desc->req_dma))
goto free_req;
 
@@ -214,10 +215,9 @@ static int iser_alloc_login_buf(struct iser_conn 
*iser_conn)
if (!desc->rsp)
goto unmap_req;
 
-   desc->rsp_dma = ib_dma_map_single(device->ib_device, desc->rsp,
-  ISER_RX_LOGIN_SIZE,
-  DMA_FROM_DEVICE);
-   if (ib_dma_mapping_error(device->ib_device,
+   desc->rsp_dma = dma_map_single(device->ib_device->dma_device, desc->rsp,
+  ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+   if (dma_mapping_error(device->ib_device->dma_device,
desc->rsp_dma))
goto free_rsp;
 
@@ -226,9 +226,8 @@ static int iser_alloc_login_buf(struct iser_conn *iser_conn)
 free_rsp:
kfree(desc->rsp);
 unmap_req:
-   ib_dma_unmap_single(device->ib_device, desc->req_dma,
-

[PATCH v2 17/26] IB/iser: Inline ib_dma_map_*() functions

2017-01-12 Thread Bart Van Assche 
Signed-off-by: Bart Van Assche 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Sagi Grimberg 
---
 drivers/infiniband/ulp/iser/iscsi_iser.c | 11 ++--
 drivers/infiniband/ulp/iser/iser_initiator.c | 88 +++-
 drivers/infiniband/ulp/iser/iser_memory.c| 13 ++--
 drivers/infiniband/ulp/iser/iser_verbs.c |  6 +-
 4 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c 
b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 9104e6b8cac9..08a6875711b2 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -198,9 +198,9 @@ iser_initialize_task_headers(struct iscsi_task *task,
goto out;
}
 
-   dma_addr = ib_dma_map_single(device->ib_device, (void *)tx_desc,
-   ISER_HEADERS_LEN, DMA_TO_DEVICE);
-   if (ib_dma_mapping_error(device->ib_device, dma_addr)) {
+   dma_addr = dma_map_single(device->ib_device->dma_device, tx_desc,
+ ISER_HEADERS_LEN, DMA_TO_DEVICE);
+   if (dma_mapping_error(device->ib_device->dma_device, dma_addr)) {
ret = -ENOMEM;
goto out;
}
@@ -375,8 +375,9 @@ static void iscsi_iser_cleanup_task(struct iscsi_task *task)
return;
 
if (likely(tx_desc->mapped)) {
-   ib_dma_unmap_single(device->ib_device, tx_desc->dma_addr,
-   ISER_HEADERS_LEN, DMA_TO_DEVICE);
+   dma_unmap_single(device->ib_device->dma_device,
+tx_desc->dma_addr, ISER_HEADERS_LEN,
+DMA_TO_DEVICE);
tx_desc->mapped = false;
}
 
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c 
b/drivers/infiniband/ulp/iser/iser_initiator.c
index 81ae2e30dd12..b3f01bb9a846 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -164,8 +164,9 @@ static void iser_create_send_desc(struct iser_conn  
*iser_conn,
 {
struct iser_device *device = iser_conn->ib_conn.device;
 
-   ib_dma_sync_single_for_cpu(device->ib_device,
-   tx_desc->dma_addr, ISER_HEADERS_LEN, DMA_TO_DEVICE);
+   dma_sync_single_for_cpu(device->ib_device->dma_device,
+   tx_desc->dma_addr, ISER_HEADERS_LEN,
+   DMA_TO_DEVICE);
 
memset(_desc->iser_header, 0, sizeof(struct iser_ctrl));
tx_desc->iser_header.flags = ISER_VER;
@@ -180,11 +181,11 @@ static void iser_free_login_buf(struct iser_conn 
*iser_conn)
if (!desc->req)
return;
 
-   ib_dma_unmap_single(device->ib_device, desc->req_dma,
-   ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
+   dma_unmap_single(device->ib_device->dma_device, desc->req_dma,
+ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);
 
-   ib_dma_unmap_single(device->ib_device, desc->rsp_dma,
-   ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+   dma_unmap_single(device->ib_device->dma_device, desc->rsp_dma,
+ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
 
kfree(desc->req);
kfree(desc->rsp);
@@ -203,10 +204,10 @@ static int iser_alloc_login_buf(struct iser_conn 
*iser_conn)
if (!desc->req)
return -ENOMEM;
 
-   desc->req_dma = ib_dma_map_single(device->ib_device, desc->req,
- ISCSI_DEF_MAX_RECV_SEG_LEN,
- DMA_TO_DEVICE);
-   if (ib_dma_mapping_error(device->ib_device,
+   desc->req_dma = dma_map_single(device->ib_device->dma_device, desc->req,
+  ISCSI_DEF_MAX_RECV_SEG_LEN,
+  DMA_TO_DEVICE);
+   if (dma_mapping_error(device->ib_device->dma_device,
desc->req_dma))
goto free_req;
 
@@ -214,10 +215,9 @@ static int iser_alloc_login_buf(struct iser_conn 
*iser_conn)
if (!desc->rsp)
goto unmap_req;
 
-   desc->rsp_dma = ib_dma_map_single(device->ib_device, desc->rsp,
-  ISER_RX_LOGIN_SIZE,
-  DMA_FROM_DEVICE);
-   if (ib_dma_mapping_error(device->ib_device,
+   desc->rsp_dma = dma_map_single(device->ib_device->dma_device, desc->rsp,
+  ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);
+   if (dma_mapping_error(device->ib_device->dma_device,
desc->rsp_dma))
goto free_rsp;
 
@@ -226,9 +226,8 @@ static int iser_alloc_login_buf(struct iser_conn *iser_conn)
 free_rsp:
kfree(desc->rsp);
 unmap_req:
-   ib_dma_unmap_single(device->ib_device, desc->req_dma,
-   ISCSI_DEF_MAX_RECV_SEG_LEN,
-