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

Commit cca76985 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

RDMA/srpt: Make debug output more detailed 

[ Upstream commit d4ee7f3a4445ec1b0b88af216f4032c4d30abf5a ]

Since the session name by itself is not sufficient to uniquely identify a
queue pair, include the queue pair number. Show the ASCII channel state
name instead of the numeric value. This change makes the ib_srpt debug
output more consistent.

Link: https://lore.kernel.org/r/20200525172212.14413-3-bvanassche@acm.org


Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Stable-dep-of: eb5c7465c324 ("RDMA/srpt: fix function pointer cast warnings")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cf9853fe

drivers/infiniband/ulp/srpt/ib_srpt.c

+5 −4
Original line number Diff line number Diff line
@@ -225,8 +225,9 @@ static const char *get_ch_state_name(enum rdma_ch_state s) 
 */

static void srpt_qp_event(struct ib_event *event, struct srpt_rdma_ch *ch)

{

	pr_debug("QP event %d on ch=%p sess_name=%s state=%d\n",

		 event->event, ch, ch->sess_name, ch->state);

	pr_debug("QP event %d on ch=%p sess_name=%s-%d state=%s\n",

		 event->event, ch, ch->sess_name, ch->qp->qp_num,

		 get_ch_state_name(ch->state));



	switch (event->event) {

	case IB_EVENT_COMM_EST:
@@ -1967,8 +1968,8 @@ static void __srpt_close_all_ch(struct srpt_port *sport) 
	list_for_each_entry(nexus, &sport->nexus_list, entry) {

		list_for_each_entry(ch, &nexus->ch_list, list) {

			if (srpt_disconnect_ch(ch) >= 0)

				pr_info("Closing channel %s because target %s_%d has been disabled\n",

					ch->sess_name,

				pr_info("Closing channel %s-%d because target %s_%d has been disabled\n",

					ch->sess_name, ch->qp->qp_num,

					dev_name(&sport->sdev->device->dev),

					sport->port);

			srpt_close_ch(ch);