IB/iser: add unlikely checks in the fast path

ib_post_send, ib_post_recv and ib_dma_map_sg  operations should succeed
unless something unusual happened to the ib device.

Link: https://lore.kernel.org/r/1569274369-29217-1-git-send-email-maxg@mellanox.com
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Acked-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 2cc89a9b9e9bb48ee8e924bc1381d50b60ec6cc9..3a26e5be171719b5c4dac7a17b5c9abecfee4999 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -170,7 +170,7 @@ int iser_dma_map_task_data(struct iscsi_iser_task *iser_task,
        dev = iser_task->iser_conn->ib_conn.device->ib_device;
 
        data->dma_nents = ib_dma_map_sg(dev, data->sg, data->size, dma_dir);
-       if (data->dma_nents == 0) {
+       if (unlikely(data->dma_nents == 0)) {
                iser_err("dma_map_sg failed!!!\n");
                return -EINVAL;
        }

diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index a6548de0e218618395c75d36dc4a4f63be2b9740..94b50112cdb282edc7239942971029bf93edc86d 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -1019,7 +1019,7 @@ int iser_post_recvm(struct iser_conn *iser_conn, int count)
 
        ib_conn->post_recv_buf_count += count;
        ib_ret = ib_post_recv(ib_conn->qp, ib_conn->rx_wr, NULL);
-       if (ib_ret) {
+       if (unlikely(ib_ret)) {
                iser_err("ib_post_recv failed ret=%d\n", ib_ret);
                ib_conn->post_recv_buf_count -= count;
        } else
@@ -1060,7 +1060,7 @@ int iser_post_send(struct ib_conn *ib_conn, struct iser_tx_desc *tx_desc,
                first_wr = wr;
 
        ib_ret = ib_post_send(ib_conn->qp, first_wr, NULL);
-       if (ib_ret)
+       if (unlikely(ib_ret))
                iser_err("ib_post_send failed, ret:%d opcode:%d\n",
                         ib_ret, wr->opcode);