IB/iser: Use proper debug level value for info prints

Commit 4f363882612 ("IB/iser: Move informational messages from error
to info level") set info prints to be emitted at a lower debug level
than warning prints, which is a bit odd.  Fix that.

Also move the prints on unaligned SG from warning to debug level.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 4f069c0d4c04371be4a156cfac59f24e23fbac02..d694bcd479fe21350db2d176db70fc3197f192d2 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -78,14 +78,14 @@
 
 #define iser_warn(fmt, arg...)                         \
        do {                                            \
-               if (iser_debug_level > 1)               \
+               if (iser_debug_level > 0)               \
                        pr_warn(PFX "%s:" fmt,          \
                                __func__ , ## arg);     \
        } while (0)
 
 #define iser_info(fmt, arg...)                         \
        do {                                            \
-               if (iser_debug_level > 0)               \
+               if (iser_debug_level > 1)               \
                        pr_info(PFX "%s:" fmt,          \
                                __func__ , ## arg);     \
        } while (0)

diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 7827baf455a1f45fa4fa20495fcf01dd370914ff..797e49ff7f8ed475b9c45d40efa698acf8d0891d 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -267,11 +267,8 @@ static void iser_data_buf_dump(struct iser_data_buf *data,
        struct scatterlist *sg;
        int i;
 
-       if (iser_debug_level == 0)
-               return;
-
        for_each_sg(sgl, sg, data->dma_nents, i)
-               iser_warn("sg[%d] dma_addr:0x%lX page:0x%p "
+               iser_dbg("sg[%d] dma_addr:0x%lX page:0x%p "
                         "off:0x%x sz:0x%x dma_len:0x%x\n",
                         i, (unsigned long)ib_sg_dma_address(ibdev, sg),
                         sg_page(sg), sg->offset,
@@ -373,9 +370,11 @@ int iser_reg_rdma_mem(struct iscsi_iser_task *iser_task,
        if (aligned_len != mem->dma_nents ||
            (!ib_conn->fmr_pool && mem->dma_nents > 1)) {
                iscsi_conn->fmr_unalign_cnt++;
-               iser_warn("rdma alignment violation (%d/%d aligned) or FMR not supported\n",
-                         aligned_len, mem->size);
-               iser_data_buf_dump(mem, ibdev);
+               iser_dbg("rdma alignment violation (%d/%d aligned) or FMR not supported\n",
+                        aligned_len, mem->size);
+
+               if (iser_debug_level > 0)
+                       iser_data_buf_dump(mem, ibdev);
 
                /* unmap the command data before accessing it */
                iser_dma_unmap_task_data(iser_task);