Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f91424cf authored by Or Gerlitz's avatar Or Gerlitz Committed by Roland Dreier
Browse files

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



Commit 4f363882 ("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: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent c095ba72

drivers/infiniband/ulp/iser/iscsi_iser.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/infiniband/ulp/iser/iser_memory.c

+6 −7
Original line number Diff line number Diff line
@@ -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,8 +370,10 @@ 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",

		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 */