mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

qla2x00t-32gbit: Add ring buffer for tracing debug logs

Browse Source 
Having this log in a ring buffer helps to diagnose qla2xxx driver and
firmware issues instead of having to reproduce the problem with
extended_logging enabled. This saves cycles and helps when it is hard
to reproduce problem.
    
Link: https://lore.kernel.org/r/1581557368-32080-1-git-send-email-rajan.shanmugavelu@oracle.com
Reviewed-by: Joe Jin <joe.jin@oracle.com>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Rajan Shanmugavelu <rajan.shanmugavelu@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

[ commit 598a90f2002c4c4daee24d76d24e8270c7075eef upstream ]


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8868 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2020-05-06 16:01:42 +00:00
parent afc46c6053
commit 2286974744
4 changed files with 69 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qla2x00t-32gbit/Makefile
View File

@@ -46,7 +46,7 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
ifneq ($(PATCHLEVEL),)
ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \
-Wno-missing-field-initializers -I$(src)/../scst/include\
-Wno-missing-field-initializers -I$(src)/../scst/include -I$(src)\
-DDEFAULT_SYMBOL_NAMESPACE=QLA32GB
ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),)

23
qla2x00t-32gbit/qla_dbg.c
View File

@@ -73,6 +73,8 @@
#include "qla_def.h"
#include <linux/delay.h>
#define CREATE_TRACE_POINTS
#include <trace/events/qla.h>
static uint32_t ql_dbg_offset = 0x800;
@@ -2537,15 +2539,30 @@ ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...)
{
va_list va;
struct va_format vaf;
if (!ql_mask_match(level))
return;
char pbuf[64];
va_start(va, fmt);
vaf.fmt = fmt;
vaf.va = &va;
if (!ql_mask_match(level)) {
if (vha != NULL) {
const struct pci_dev *pdev = vha->hw->pdev;
/* <module-name> <msg-id>:<host> Message */
snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x:%ld: ",
QL_MSGHDR, dev_name(&(pdev->dev)), id,
vha->host_no);
} else {
snprintf(pbuf, sizeof(pbuf), "%s [%s]-%04x: : ",
QL_MSGHDR, "0000:00:00.0", id);
}
pbuf[sizeof(pbuf) - 1] = 0;
trace_ql_dbg_log(pbuf, &vaf);
va_end(va);
return;
}
if (vha != NULL) {
const struct pci_dev *pdev = vha->hw->pdev;
/* <module-name> <pci-name> <msg-id>:<host> Message */

7
qla2x00t-32gbit/qla_nvme.c
View File

@@ -621,11 +621,12 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)
}
static struct nvme_fc_port_template qla_nvme_fc_transport = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && \
LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0)
#if 0
/*
* See also commit 863fbae929c7 ("nvme_fc: add module to ops template
* to allow module references").
* to allow module references"). See also commit 8c5c66052920
* ("nvme-fc: Revert "add module to ops template to allow module
* references"") # v5.7-rc1.
*/
.module = THIS_MODULE,
#endif

44
qla2x00t-32gbit/trace/events/qla.h Normal file
View File

@@ -0,0 +1,44 @@
/* SPDX-License-Identifier: GPL-2.0 */
#if !defined(_TRACE_QLA_H_) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_QLA_H_
#include <linux/tracepoint.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM qla
#define QLA_MSG_MAX 256
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
DECLARE_EVENT_CLASS(qla_log_event,
TP_PROTO(const char *buf,
struct va_format *vaf),
TP_ARGS(buf, vaf),
TP_STRUCT__entry(
__string(buf, buf)
__dynamic_array(char, msg, QLA_MSG_MAX)
),
TP_fast_assign(
__assign_str(buf, buf);
vsnprintf(__get_str(msg), QLA_MSG_MAX, vaf->fmt, *vaf->va);
),
TP_printk("%s %s", __get_str(buf), __get_str(msg))
);
DEFINE_EVENT(qla_log_event, ql_dbg_log,
TP_PROTO(const char *buf, struct va_format *vaf),
TP_ARGS(buf, vaf)
);
#pragma GCC diagnostic pop
#endif /* _TRACE_QLA_H */
#define TRACE_INCLUDE_FILE qla
#include <trace/define_trace.h>