[v8,11/12] SIW debugging

Message ID	20190426131852.30142-12-bmt@zurich.ibm.com (mailing list archive)
State	Changes Requested
Delegated to:	Jason Gunthorpe
Headers	show Return-Path: <linux-rdma-owner@kernel.org> Gateway: Authorized Use Only! Violators will be prosecuted for <linux-rdma@vger.kernel.org> from <bmt@zurich.ibm.com>; Fri, 26 Apr 2019 14:19:01 +0100 Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 26 Apr 2019 14:18:58 +0100 From: Bernard Metzler <bmt@zurich.ibm.com> To: linux-rdma@vger.kernel.org Cc: Bernard Metzler <bmt@rims.zurich.ibm.com>, Bernard Metzler <bmt@zurich.ibm.com> Subject: [PATCH v8 11/12] SIW debugging Date: Fri, 26 Apr 2019 15:18:51 +0200 In-Reply-To: <20190426131852.30142-1-bmt@zurich.ibm.com> References: <20190426131852.30142-1-bmt@zurich.ibm.com> Message-Id: <20190426131852.30142-12-bmt@zurich.ibm.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk
Series	SIW: Request for Comments \| expand [v8,00/12] SIW: Request for Comments [v8,01/12] iWarp wire packet format [v8,02/12] SIW main include file [v8,03/12] SIW network and RDMA core interface [v8,04/12] SIW connection management [v8,05/12] SIW application interface [v8,06/12] SIW application buffer management [v8,07/12] SIW queue pair methods [v8,08/12] SIW transmit path [v8,09/12] SIW receive path [v8,10/12] SIW completion queue methods [v8,11/12] SIW debugging [v8,12/12] SIW addition to kernel build environment

Message ID

20190426131852.30142-12-bmt@zurich.ibm.com (mailing list archive)

State

Changes Requested

Delegated to:

Jason Gunthorpe

Headers

From: Bernard Metzler <bmt@zurich.ibm.com>
To: linux-rdma@vger.kernel.org
Cc: Bernard Metzler <bmt@rims.zurich.ibm.com>,
        Bernard Metzler <bmt@zurich.ibm.com>
Subject: [PATCH v8 11/12] SIW debugging
Date: Fri, 26 Apr 2019 15:18:51 +0200
In-Reply-To: <20190426131852.30142-1-bmt@zurich.ibm.com>
References: <20190426131852.30142-1-bmt@zurich.ibm.com>
Message-Id: <20190426131852.30142-12-bmt@zurich.ibm.com>
Sender: linux-rdma-owner@vger.kernel.org
Precedence: bulk

Series

SIW: Request for Comments | expand

Commit Message

Bernard Metzler April 26, 2019, 1:18 p.m. UTC

From: Bernard Metzler <bmt@rims.zurich.ibm.com>

Signed-off-by: Bernard Metzler <bmt@zurich.ibm.com>
---
 drivers/infiniband/sw/siw/siw_debug.c | 91 +++++++++++++++++++++++++++
 drivers/infiniband/sw/siw/siw_debug.h | 40 ++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 drivers/infiniband/sw/siw/siw_debug.c
 create mode 100644 drivers/infiniband/sw/siw/siw_debug.h

Comments

Leon Romanovsky April 27, 2019, 5:39 a.m. UTC | #1

On Fri, Apr 26, 2019 at 03:18:51PM +0200, Bernard Metzler wrote:
> From: Bernard Metzler <bmt@rims.zurich.ibm.com>
>
> Signed-off-by: Bernard Metzler <bmt@zurich.ibm.com>
> ---
>  drivers/infiniband/sw/siw/siw_debug.c | 91 +++++++++++++++++++++++++++
>  drivers/infiniband/sw/siw/siw_debug.h | 40 ++++++++++++
>  2 files changed, 131 insertions(+)
>  create mode 100644 drivers/infiniband/sw/siw/siw_debug.c
>  create mode 100644 drivers/infiniband/sw/siw/siw_debug.h
>
> diff --git a/drivers/infiniband/sw/siw/siw_debug.c b/drivers/infiniband/sw/siw/siw_debug.c
> new file mode 100644
> index 000000000000..86460d370333
> --- /dev/null
> +++ b/drivers/infiniband/sw/siw/siw_debug.c
> @@ -0,0 +1,91 @@
> +// SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause
> +
> +/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
> +/* Copyright (c) 2008-2019, IBM Corporation */
> +
> +#include <linux/types.h>
> +#include <linux/printk.h>
> +
> +#include "siw.h"
> +
> +#define ddp_data_len(op, mpa_len)                                              \
> +	(mpa_len - (iwarp_pktinfo[op].hdr_len - MPA_HDR_SIZE))
> +
> +void siw_print_hdr(union iwarp_hdr *hdr, int qp_id, char *string)
> +{
> +	enum rdma_opcode op = __rdmap_get_opcode(&hdr->ctrl);
> +	u16 mpa_len = be16_to_cpu(hdr->ctrl.mpa_len);
> +
> +	switch (op) {
> +	case RDMAP_RDMA_WRITE:
> +		pr_info("siw: [QP %u]: %s(WRITE, DDP len %d): %08x %016llx\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			hdr->rwrite.sink_stag, hdr->rwrite.sink_to);
> +		break;
> +
> +	case RDMAP_RDMA_READ_REQ:
> +		pr_info("siw: [QP %u]: %s(RREQ, DDP len %d): %08x %08x %08x %08x %016llx %08x %08x %016llx\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			be32_to_cpu(hdr->rreq.ddp_qn),
> +			be32_to_cpu(hdr->rreq.ddp_msn),
> +			be32_to_cpu(hdr->rreq.ddp_mo),
> +			be32_to_cpu(hdr->rreq.sink_stag),
> +			be64_to_cpu(hdr->rreq.sink_to),
> +			be32_to_cpu(hdr->rreq.read_size),
> +			be32_to_cpu(hdr->rreq.source_stag),
> +			be64_to_cpu(hdr->rreq.source_to));
> +
> +		break;
> +
> +	case RDMAP_RDMA_READ_RESP:
> +		pr_info("siw: [QP %u]: %s(RRESP, DDP len %d): %08x %016llx\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			be32_to_cpu(hdr->rresp.sink_stag),
> +			be64_to_cpu(hdr->rresp.sink_to));
> +		break;
> +
> +	case RDMAP_SEND:
> +		pr_info("siw: [QP %u]: %s(SEND, DDP len %d): %08x %08x %08x\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			be32_to_cpu(hdr->send.ddp_qn),
> +			be32_to_cpu(hdr->send.ddp_msn),
> +			be32_to_cpu(hdr->send.ddp_mo));
> +		break;
> +
> +	case RDMAP_SEND_INVAL:
> +		pr_info("siw: [QP %u]: %s(S_INV, DDP len %d): %08x %08x %08x %08x\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			be32_to_cpu(hdr->send_inv.inval_stag),
> +			be32_to_cpu(hdr->send_inv.ddp_qn),
> +			be32_to_cpu(hdr->send_inv.ddp_msn),
> +			be32_to_cpu(hdr->send_inv.ddp_mo));
> +		break;
> +
> +	case RDMAP_SEND_SE:
> +		pr_info("siw: [QP %u]: %s(S_SE, DDP len %d): %08x %08x %08x\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			be32_to_cpu(hdr->send.ddp_qn),
> +			be32_to_cpu(hdr->send.ddp_msn),
> +			be32_to_cpu(hdr->send.ddp_mo));
> +		break;
> +
> +	case RDMAP_SEND_SE_INVAL:
> +		pr_info("siw: [QP %u]: %s(S_SE_INV, DDP len %d): %08x %08x %08x %08x\n",
> +			qp_id, string, ddp_data_len(op, mpa_len),
> +			be32_to_cpu(hdr->send_inv.inval_stag),
> +			be32_to_cpu(hdr->send_inv.ddp_qn),
> +			be32_to_cpu(hdr->send_inv.ddp_msn),
> +			be32_to_cpu(hdr->send_inv.ddp_mo));
> +		break;
> +
> +	case RDMAP_TERMINATE:
> +		pr_info("siw: [QP %u]: %s(TERM, DDP len %d):\n", qp_id, string,
> +			ddp_data_len(op, mpa_len));
> +		break;
> +
> +	default:
> +		pr_info("siw: [QP %u]: %s (undefined opcode %d)", qp_id, string,
> +			op);
> +		break;
> +	}
> +}
> diff --git a/drivers/infiniband/sw/siw/siw_debug.h b/drivers/infiniband/sw/siw/siw_debug.h
> new file mode 100644
> index 000000000000..2cfe7ce68428
> --- /dev/null
> +++ b/drivers/infiniband/sw/siw/siw_debug.h
> @@ -0,0 +1,40 @@
> +/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
> +
> +/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
> +/* Copyright (c) 2008-2019, IBM Corporation */
> +
> +#ifndef _SIW_DEBUG_H
> +#define _SIW_DEBUG_H
> +
> +#define siw_dbg(ddev, fmt, ...)                                                \
> +	dev_dbg(&(ddev)->base_dev.dev, "cpu%2d %s: " fmt, smp_processor_id(),  \
> +		__func__, ##__VA_ARGS__)
> +
> +#define siw_dbg_qp(qp, fmt, ...)                                               \
> +	siw_dbg(qp->sdev, "[QP %u]: " fmt, qp->id, ##__VA_ARGS__)
> +
> +#define siw_dbg_cq(cq, fmt, ...)                                               \
> +	siw_dbg(cq->sdev, "[CQ %u]: " fmt, cq->id, ##__VA_ARGS__)
> +
> +#define siw_dbg_pd(pd, fmt, ...)                                               \
> +	siw_dbg(pd->sdev, "[PD %u]: " fmt, pd->base_pd.res.id, ##__VA_ARGS__)
> +
> +#define siw_dbg_mem(mem, fmt, ...)                                             \
> +	siw_dbg(mem->sdev, "[MEM 0x%08x]: " fmt, mem->stag, ##__VA_ARGS__)
> +
> +#define siw_dbg_cep(cep, fmt, ...)                                             \
> +	siw_dbg(cep->sdev, "[CEP 0x%p]: " fmt, cep, ##__VA_ARGS__)
> +
> +#ifdef DEBUG_HDR

We already talked about it, this DEBUG_HDR is not set and
siw_dprint_hdr() is unreachable.

> +
> +#define siw_dprint_hdr(hdr, qpn, msg) siw_print_hdr(hdr, qpn, msg)
> +
> +#else
> +
> +#define siw_dprint_hdr(hdr, qpn, msg)                                          \
> +	do {                                                                   \
> +	} while (0)
> +
> +#endif
> +
> +#endif
> --
> 2.17.2
>

Gal Pressman May 6, 2019, 8:20 a.m. UTC | #2

On 26-Apr-19 16:18, Bernard Metzler wrote:
> diff --git a/drivers/infiniband/sw/siw/siw_debug.h b/drivers/infiniband/sw/siw/siw_debug.h
> new file mode 100644
> index 000000000000..2cfe7ce68428
> --- /dev/null
> +++ b/drivers/infiniband/sw/siw/siw_debug.h
> @@ -0,0 +1,40 @@
> +/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
> +
> +/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
> +/* Copyright (c) 2008-2019, IBM Corporation */
> +
> +#ifndef _SIW_DEBUG_H
> +#define _SIW_DEBUG_H
> +
> +#define siw_dbg(ddev, fmt, ...)                                                \
> +	dev_dbg(&(ddev)->base_dev.dev, "cpu%2d %s: " fmt, smp_processor_id(),  \
> +		__func__, ##__VA_ARGS__)
> +

The ibdev_* print functions are now merged, you can start using them instead of
dev_* prints.

Bernard Metzler May 7, 2019, 2:57 p.m. UTC | #3

-----"Leon Romanovsky" <leon@kernel.org> wrote: -----

>To: "Bernard Metzler" <bmt@zurich.ibm.com>
>From: "Leon Romanovsky" <leon@kernel.org>
>Date: 04/27/2019 07:39AM
>Cc: linux-rdma@vger.kernel.org, "Bernard Metzler"
><bmt@rims.zurich.ibm.com>
>Subject: Re: [PATCH v8 11/12] SIW debugging
>
>On Fri, Apr 26, 2019 at 03:18:51PM +0200, Bernard Metzler wrote:
>> From: Bernard Metzler <bmt@rims.zurich.ibm.com>
>>
>> Signed-off-by: Bernard Metzler <bmt@zurich.ibm.com>
>> ---
>>  drivers/infiniband/sw/siw/siw_debug.c | 91
>+++++++++++++++++++++++++++
>>  drivers/infiniband/sw/siw/siw_debug.h | 40 ++++++++++++
>>  2 files changed, 131 insertions(+)
>>  create mode 100644 drivers/infiniband/sw/siw/siw_debug.c
>>  create mode 100644 drivers/infiniband/sw/siw/siw_debug.h
>>
>> diff --git a/drivers/infiniband/sw/siw/siw_debug.c
>b/drivers/infiniband/sw/siw/siw_debug.c
>> new file mode 100644
>> index 000000000000..86460d370333
>> --- /dev/null
>> +++ b/drivers/infiniband/sw/siw/siw_debug.c
>> @@ -0,0 +1,91 @@
>> +// SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause
>> +
>> +/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
>> +/* Copyright (c) 2008-2019, IBM Corporation */
>> +
>> +#include <linux/types.h>
>> +#include <linux/printk.h>
>> +
>> +#include "siw.h"
>> +
>> +#define ddp_data_len(op, mpa_len)
>            \
>> +	(mpa_len - (iwarp_pktinfo[op].hdr_len - MPA_HDR_SIZE))
>> +
>> +void siw_print_hdr(union iwarp_hdr *hdr, int qp_id, char *string)
>> +{
>> +	enum rdma_opcode op = __rdmap_get_opcode(&hdr->ctrl);
>> +	u16 mpa_len = be16_to_cpu(hdr->ctrl.mpa_len);
>> +
>> +	switch (op) {
>> +	case RDMAP_RDMA_WRITE:
>> +		pr_info("siw: [QP %u]: %s(WRITE, DDP len %d): %08x %016llx\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			hdr->rwrite.sink_stag, hdr->rwrite.sink_to);
>> +		break;
>> +
>> +	case RDMAP_RDMA_READ_REQ:
>> +		pr_info("siw: [QP %u]: %s(RREQ, DDP len %d): %08x %08x %08x %08x
>%016llx %08x %08x %016llx\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			be32_to_cpu(hdr->rreq.ddp_qn),
>> +			be32_to_cpu(hdr->rreq.ddp_msn),
>> +			be32_to_cpu(hdr->rreq.ddp_mo),
>> +			be32_to_cpu(hdr->rreq.sink_stag),
>> +			be64_to_cpu(hdr->rreq.sink_to),
>> +			be32_to_cpu(hdr->rreq.read_size),
>> +			be32_to_cpu(hdr->rreq.source_stag),
>> +			be64_to_cpu(hdr->rreq.source_to));
>> +
>> +		break;
>> +
>> +	case RDMAP_RDMA_READ_RESP:
>> +		pr_info("siw: [QP %u]: %s(RRESP, DDP len %d): %08x %016llx\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			be32_to_cpu(hdr->rresp.sink_stag),
>> +			be64_to_cpu(hdr->rresp.sink_to));
>> +		break;
>> +
>> +	case RDMAP_SEND:
>> +		pr_info("siw: [QP %u]: %s(SEND, DDP len %d): %08x %08x %08x\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			be32_to_cpu(hdr->send.ddp_qn),
>> +			be32_to_cpu(hdr->send.ddp_msn),
>> +			be32_to_cpu(hdr->send.ddp_mo));
>> +		break;
>> +
>> +	case RDMAP_SEND_INVAL:
>> +		pr_info("siw: [QP %u]: %s(S_INV, DDP len %d): %08x %08x %08x
>%08x\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			be32_to_cpu(hdr->send_inv.inval_stag),
>> +			be32_to_cpu(hdr->send_inv.ddp_qn),
>> +			be32_to_cpu(hdr->send_inv.ddp_msn),
>> +			be32_to_cpu(hdr->send_inv.ddp_mo));
>> +		break;
>> +
>> +	case RDMAP_SEND_SE:
>> +		pr_info("siw: [QP %u]: %s(S_SE, DDP len %d): %08x %08x %08x\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			be32_to_cpu(hdr->send.ddp_qn),
>> +			be32_to_cpu(hdr->send.ddp_msn),
>> +			be32_to_cpu(hdr->send.ddp_mo));
>> +		break;
>> +
>> +	case RDMAP_SEND_SE_INVAL:
>> +		pr_info("siw: [QP %u]: %s(S_SE_INV, DDP len %d): %08x %08x %08x
>%08x\n",
>> +			qp_id, string, ddp_data_len(op, mpa_len),
>> +			be32_to_cpu(hdr->send_inv.inval_stag),
>> +			be32_to_cpu(hdr->send_inv.ddp_qn),
>> +			be32_to_cpu(hdr->send_inv.ddp_msn),
>> +			be32_to_cpu(hdr->send_inv.ddp_mo));
>> +		break;
>> +
>> +	case RDMAP_TERMINATE:
>> +		pr_info("siw: [QP %u]: %s(TERM, DDP len %d):\n", qp_id, string,
>> +			ddp_data_len(op, mpa_len));
>> +		break;
>> +
>> +	default:
>> +		pr_info("siw: [QP %u]: %s (undefined opcode %d)", qp_id, string,
>> +			op);
>> +		break;
>> +	}
>> +}
>> diff --git a/drivers/infiniband/sw/siw/siw_debug.h
>b/drivers/infiniband/sw/siw/siw_debug.h
>> new file mode 100644
>> index 000000000000..2cfe7ce68428
>> --- /dev/null
>> +++ b/drivers/infiniband/sw/siw/siw_debug.h
>> @@ -0,0 +1,40 @@
>> +/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
>> +
>> +/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
>> +/* Copyright (c) 2008-2019, IBM Corporation */
>> +
>> +#ifndef _SIW_DEBUG_H
>> +#define _SIW_DEBUG_H
>> +
>> +#define siw_dbg(ddev, fmt, ...)
>            \
>> +	dev_dbg(&(ddev)->base_dev.dev, "cpu%2d %s: " fmt,
>smp_processor_id(),  \
>> +		__func__, ##__VA_ARGS__)
>> +
>> +#define siw_dbg_qp(qp, fmt, ...)
>            \
>> +	siw_dbg(qp->sdev, "[QP %u]: " fmt, qp->id, ##__VA_ARGS__)
>> +
>> +#define siw_dbg_cq(cq, fmt, ...)
>            \
>> +	siw_dbg(cq->sdev, "[CQ %u]: " fmt, cq->id, ##__VA_ARGS__)
>> +
>> +#define siw_dbg_pd(pd, fmt, ...)
>            \
>> +	siw_dbg(pd->sdev, "[PD %u]: " fmt, pd->base_pd.res.id,
>##__VA_ARGS__)
>> +
>> +#define siw_dbg_mem(mem, fmt, ...)
>            \
>> +	siw_dbg(mem->sdev, "[MEM 0x%08x]: " fmt, mem->stag,
>##__VA_ARGS__)
>> +
>> +#define siw_dbg_cep(cep, fmt, ...)
>            \
>> +	siw_dbg(cep->sdev, "[CEP 0x%p]: " fmt, cep, ##__VA_ARGS__)
>> +
>> +#ifdef DEBUG_HDR
>
>We already talked about it, this DEBUG_HDR is not set and
>siw_dprint_hdr() is unreachable.

I agree. That code gets only compiled in if DEBUG_HDR is #defined.
Any better idea than this ugly thing for a compile time switch is
highly appreciated...


>
>> +
>> +#define siw_dprint_hdr(hdr, qpn, msg) siw_print_hdr(hdr, qpn, msg)
>> +
>> +#else
>> +
>> +#define siw_dprint_hdr(hdr, qpn, msg)
>            \
>> +	do {
>     \
>> +	} while (0)
>> +
>> +#endif
>> +
>> +#endif
>> --
>> 2.17.2
>>
>
>

diff --git a/drivers/infiniband/sw/siw/siw_debug.c b/drivers/infiniband/sw/siw/siw_debug.c
new file mode 100644
index 000000000000..86460d370333
--- /dev/null
+++ b/drivers/infiniband/sw/siw/siw_debug.c
@@ -0,0 +1,91 @@ 
+// SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause
+
+/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
+/* Copyright (c) 2008-2019, IBM Corporation */
+
+#include <linux/types.h>
+#include <linux/printk.h>
+
+#include "siw.h"
+
+#define ddp_data_len(op, mpa_len)                                              \
+	(mpa_len - (iwarp_pktinfo[op].hdr_len - MPA_HDR_SIZE))
+
+void siw_print_hdr(union iwarp_hdr *hdr, int qp_id, char *string)
+{
+	enum rdma_opcode op = __rdmap_get_opcode(&hdr->ctrl);
+	u16 mpa_len = be16_to_cpu(hdr->ctrl.mpa_len);
+
+	switch (op) {
+	case RDMAP_RDMA_WRITE:
+		pr_info("siw: [QP %u]: %s(WRITE, DDP len %d): %08x %016llx\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			hdr->rwrite.sink_stag, hdr->rwrite.sink_to);
+		break;
+
+	case RDMAP_RDMA_READ_REQ:
+		pr_info("siw: [QP %u]: %s(RREQ, DDP len %d): %08x %08x %08x %08x %016llx %08x %08x %016llx\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			be32_to_cpu(hdr->rreq.ddp_qn),
+			be32_to_cpu(hdr->rreq.ddp_msn),
+			be32_to_cpu(hdr->rreq.ddp_mo),
+			be32_to_cpu(hdr->rreq.sink_stag),
+			be64_to_cpu(hdr->rreq.sink_to),
+			be32_to_cpu(hdr->rreq.read_size),
+			be32_to_cpu(hdr->rreq.source_stag),
+			be64_to_cpu(hdr->rreq.source_to));
+
+		break;
+
+	case RDMAP_RDMA_READ_RESP:
+		pr_info("siw: [QP %u]: %s(RRESP, DDP len %d): %08x %016llx\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			be32_to_cpu(hdr->rresp.sink_stag),
+			be64_to_cpu(hdr->rresp.sink_to));
+		break;
+
+	case RDMAP_SEND:
+		pr_info("siw: [QP %u]: %s(SEND, DDP len %d): %08x %08x %08x\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			be32_to_cpu(hdr->send.ddp_qn),
+			be32_to_cpu(hdr->send.ddp_msn),
+			be32_to_cpu(hdr->send.ddp_mo));
+		break;
+
+	case RDMAP_SEND_INVAL:
+		pr_info("siw: [QP %u]: %s(S_INV, DDP len %d): %08x %08x %08x %08x\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			be32_to_cpu(hdr->send_inv.inval_stag),
+			be32_to_cpu(hdr->send_inv.ddp_qn),
+			be32_to_cpu(hdr->send_inv.ddp_msn),
+			be32_to_cpu(hdr->send_inv.ddp_mo));
+		break;
+
+	case RDMAP_SEND_SE:
+		pr_info("siw: [QP %u]: %s(S_SE, DDP len %d): %08x %08x %08x\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			be32_to_cpu(hdr->send.ddp_qn),
+			be32_to_cpu(hdr->send.ddp_msn),
+			be32_to_cpu(hdr->send.ddp_mo));
+		break;
+
+	case RDMAP_SEND_SE_INVAL:
+		pr_info("siw: [QP %u]: %s(S_SE_INV, DDP len %d): %08x %08x %08x %08x\n",
+			qp_id, string, ddp_data_len(op, mpa_len),
+			be32_to_cpu(hdr->send_inv.inval_stag),
+			be32_to_cpu(hdr->send_inv.ddp_qn),
+			be32_to_cpu(hdr->send_inv.ddp_msn),
+			be32_to_cpu(hdr->send_inv.ddp_mo));
+		break;
+
+	case RDMAP_TERMINATE:
+		pr_info("siw: [QP %u]: %s(TERM, DDP len %d):\n", qp_id, string,
+			ddp_data_len(op, mpa_len));
+		break;
+
+	default:
+		pr_info("siw: [QP %u]: %s (undefined opcode %d)", qp_id, string,
+			op);
+		break;
+	}
+}
diff --git a/drivers/infiniband/sw/siw/siw_debug.h b/drivers/infiniband/sw/siw/siw_debug.h
new file mode 100644
index 000000000000..2cfe7ce68428
--- /dev/null
+++ b/drivers/infiniband/sw/siw/siw_debug.h
@@ -0,0 +1,40 @@ 
+/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
+
+/* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
+/* Copyright (c) 2008-2019, IBM Corporation */
+
+#ifndef _SIW_DEBUG_H
+#define _SIW_DEBUG_H
+
+#define siw_dbg(ddev, fmt, ...)                                                \
+	dev_dbg(&(ddev)->base_dev.dev, "cpu%2d %s: " fmt, smp_processor_id(),  \
+		__func__, ##__VA_ARGS__)
+
+#define siw_dbg_qp(qp, fmt, ...)                                               \
+	siw_dbg(qp->sdev, "[QP %u]: " fmt, qp->id, ##__VA_ARGS__)
+
+#define siw_dbg_cq(cq, fmt, ...)                                               \
+	siw_dbg(cq->sdev, "[CQ %u]: " fmt, cq->id, ##__VA_ARGS__)
+
+#define siw_dbg_pd(pd, fmt, ...)                                               \
+	siw_dbg(pd->sdev, "[PD %u]: " fmt, pd->base_pd.res.id, ##__VA_ARGS__)
+
+#define siw_dbg_mem(mem, fmt, ...)                                             \
+	siw_dbg(mem->sdev, "[MEM 0x%08x]: " fmt, mem->stag, ##__VA_ARGS__)
+
+#define siw_dbg_cep(cep, fmt, ...)                                             \
+	siw_dbg(cep->sdev, "[CEP 0x%p]: " fmt, cep, ##__VA_ARGS__)
+
+#ifdef DEBUG_HDR
+
+#define siw_dprint_hdr(hdr, qpn, msg) siw_print_hdr(hdr, qpn, msg)
+
+#else
+
+#define siw_dprint_hdr(hdr, qpn, msg)                                          \
+	do {                                                                   \
+	} while (0)
+
+#endif
+
+#endif

[v8,11/12] SIW debugging

Commit Message

Comments

Patch