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

Commit 871e00af authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

IB/iser: Align to generic logging helpers 



Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 57363d98

drivers/infiniband/ulp/iser/iser_verbs.c

+18 −10
Original line number Diff line number Diff line
@@ -51,18 +51,21 @@ static void iser_cq_callback(struct ib_cq *cq, void *cq_context); 


static void iser_cq_event_callback(struct ib_event *cause, void *context)

{

	iser_err("got cq event %d \n", cause->event);

	iser_err("cq event %s (%d)\n",

		 ib_event_msg(cause->event), cause->event);

}



static void iser_qp_event_callback(struct ib_event *cause, void *context)

{

	iser_err("got qp event %d\n",cause->event);

	iser_err("qp event %s (%d)\n",

		 ib_event_msg(cause->event), cause->event);

}



static void iser_event_handler(struct ib_event_handler *handler,

				struct ib_event *event)

{

	iser_err("async event %d on device %s port %d\n", event->event,

	iser_err("async event %s (%d) on device %s port %d\n",

		 ib_event_msg(event->event), event->event,

		 event->device->name, event->element.port_num);

}
@@ -873,8 +876,9 @@ static int iser_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *eve 
	int ret = 0;



	iser_conn = (struct iser_conn *)cma_id->context;

	iser_info("event %d status %d conn %p id %p\n",

		  event->event, event->status, cma_id->context, cma_id);

	iser_info("%s (%d): status %d conn %p id %p\n",

		  rdma_event_msg(event->event), event->event,

		  event->status, cma_id->context, cma_id);



	mutex_lock(&iser_conn->state_mutex);

	switch (event->event) {
@@ -913,7 +917,8 @@ static int iser_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *eve 
		}

		break;

	default:

		iser_err("Unexpected RDMA CM event (%d)\n", event->event);

		iser_err("Unexpected RDMA CM event: %s (%d)\n",

			 rdma_event_msg(event->event), event->event);

		break;

	}

	mutex_unlock(&iser_conn->state_mutex);
@@ -1173,10 +1178,13 @@ static void iser_handle_wc(struct ib_wc *wc) 
		}

	} else {

		if (wc->status != IB_WC_WR_FLUSH_ERR)

			iser_err("wr id %llx status %d vend_err %x\n",

				 wc->wr_id, wc->status, wc->vendor_err);

			iser_err("%s (%d): wr id %llx vend_err %x\n",

				 ib_wc_status_msg(wc->status), wc->status,

				 wc->wr_id, wc->vendor_err);

		else

			iser_dbg("flush error: wr id %llx\n", wc->wr_id);

			iser_dbg("%s (%d): wr id %llx\n",

				 ib_wc_status_msg(wc->status), wc->status,

				 wc->wr_id);



		if (wc->wr_id == ISER_BEACON_WRID)

			/* all flush errors were consumed */