* [PATCH v2 1/1] remoteproc: qcom: Add remoteproc tracing
@ 2023-03-03 3:54 Gokul krishna Krishnakumar
2023-03-06 12:17 ` Mukesh Ojha
0 siblings, 1 reply; 4+ messages in thread
From: Gokul krishna Krishnakumar @ 2023-03-03 3:54 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Mathieu Poirier
Cc: linux-arm-msm, linux-remoteproc, linux-kernel, Trilok Soni,
Satya Durga Srinivasu Prabhala, Rajendra Nayak, Elliot Berman,
Guru Das Srinagesh, Sibi Sankar, linux-trace-kernel,
Gokul krishna Krishnakumar
This change attempts to add traces for start, stop, crash
subsystem/subdevice event these will serve as standard checkpoints in
code and could help in debugging the failures in subdevice/subsystem
prepare, start, stop and unprepare functions. This will also breakdown
the time taken for each step in remoteproc bootup/shutdown process.
Change-Id: I202814452192ca0733f134daf7c99201881e2c9c
Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
---
drivers/remoteproc/Makefile | 1 +
drivers/remoteproc/qcom_common.c | 37 ++++++++
drivers/remoteproc/qcom_q6v5.c | 9 ++
drivers/remoteproc/qcom_tracepoints.c | 12 +++
drivers/remoteproc/remoteproc_core.c | 8 ++
include/trace/events/rproc_qcom.h | 128 ++++++++++++++++++++++++++
6 files changed, 195 insertions(+)
create mode 100644 drivers/remoteproc/qcom_tracepoints.c
create mode 100644 include/trace/events/rproc_qcom.h
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
index 91314a9b43ce..3399fcaba39b 100644
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@ -10,6 +10,7 @@ remoteproc-y += remoteproc_debugfs.o
remoteproc-y += remoteproc_sysfs.o
remoteproc-y += remoteproc_virtio.o
remoteproc-y += remoteproc_elf_loader.o
+remoteproc-y += qcom_tracepoints.o
obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o
obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o
obj-$(CONFIG_IMX_DSP_REMOTEPROC) += imx_dsp_rproc.o
diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
index 020349f8979d..09b79f39ccd6 100644
--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
@@ -18,6 +18,7 @@
#include <linux/slab.h>
#include <linux/soc/qcom/mdt_loader.h>
#include <linux/soc/qcom/smem.h>
+#include <trace/events/rproc_qcom.h>
#include "remoteproc_internal.h"
#include "qcom_common.h"
@@ -186,6 +187,10 @@ static int glink_subdev_start(struct rproc_subdev *subdev)
glink->edge = qcom_glink_smem_register(glink->dev, glink->node);
+ trace_rproc_subdev_event(dev_name(glink->dev->parent),
+ "glink", "start",
+ PTR_ERR_OR_ZERO(glink->edge));
+
return PTR_ERR_OR_ZERO(glink->edge);
}
@@ -194,6 +199,11 @@ static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)
struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
qcom_glink_smem_unregister(glink->edge);
+
+ trace_rproc_subdev_event(dev_name(glink->dev->parent),
+ "glink", "stop",
+ PTR_ERR_OR_ZERO(glink->edge));
+
glink->edge = NULL;
}
@@ -201,6 +211,10 @@ static void glink_subdev_unprepare(struct rproc_subdev *subdev)
{
struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
+ trace_rproc_subdev_event(dev_name(glink->dev->parent),
+ "glink", "unprepare",
+ PTR_ERR_OR_ZERO(glink->edge));
+
qcom_glink_ssr_notify(glink->ssr_name);
}
@@ -295,6 +309,10 @@ static int smd_subdev_start(struct rproc_subdev *subdev)
{
struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
+ trace_rproc_subdev_event(dev_name(smd->dev->parent),
+ "smd", "start",
+ PTR_ERR_OR_ZERO(smd->edge));
+
smd->edge = qcom_smd_register_edge(smd->dev, smd->node);
return PTR_ERR_OR_ZERO(smd->edge);
@@ -304,6 +322,10 @@ static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)
{
struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
+ trace_rproc_subdev_event(dev_name(smd->dev->parent),
+ "smd", "stop",
+ PTR_ERR_OR_ZERO(smd->edge));
+
qcom_smd_unregister_edge(smd->edge);
smd->edge = NULL;
}
@@ -420,6 +442,10 @@ static int ssr_notify_prepare(struct rproc_subdev *subdev)
.crashed = false,
};
+ trace_rproc_subdev_event(ssr->info->name,
+ "ssr", "QCOM_SSR_BEFORE_POWERUP",
+ data.crashed);
+
srcu_notifier_call_chain(&ssr->info->notifier_list,
QCOM_SSR_BEFORE_POWERUP, &data);
return 0;
@@ -432,6 +458,9 @@ static int ssr_notify_start(struct rproc_subdev *subdev)
.name = ssr->info->name,
.crashed = false,
};
+ trace_rproc_subdev_event(ssr->info->name,
+ "ssr", "QCOM_SSR_AFTER_POWERUP",
+ data.crashed);
srcu_notifier_call_chain(&ssr->info->notifier_list,
QCOM_SSR_AFTER_POWERUP, &data);
@@ -446,6 +475,10 @@ static void ssr_notify_stop(struct rproc_subdev *subdev, bool crashed)
.crashed = crashed,
};
+ trace_rproc_subdev_event(ssr->info->name,
+ "ssr", "QCOM_SSR_BEFORE_SHUTDOWN",
+ data.crashed);
+
srcu_notifier_call_chain(&ssr->info->notifier_list,
QCOM_SSR_BEFORE_SHUTDOWN, &data);
}
@@ -458,6 +491,10 @@ static void ssr_notify_unprepare(struct rproc_subdev *subdev)
.crashed = false,
};
+ trace_rproc_subdev_event(ssr->info->name,
+ "ssr", "QCOM_SSR_AFTER_SHUTDOWN",
+ data.crashed);
+
srcu_notifier_call_chain(&ssr->info->notifier_list,
QCOM_SSR_AFTER_SHUTDOWN, &data);
}
diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
index 497acfb33f8f..aff91de3cea0 100644
--- a/drivers/remoteproc/qcom_q6v5.c
+++ b/drivers/remoteproc/qcom_q6v5.c
@@ -15,6 +15,7 @@
#include <linux/soc/qcom/smem.h>
#include <linux/soc/qcom/smem_state.h>
#include <linux/remoteproc.h>
+#include <trace/events/rproc_qcom.h>
#include "qcom_common.h"
#include "qcom_q6v5.h"
@@ -113,6 +114,7 @@ static irqreturn_t q6v5_wdog_interrupt(int irq, void *data)
dev_err(q6v5->dev, "watchdog without message\n");
q6v5->running = false;
+ trace_rproc_interrupt_event(q6v5->rproc, "q6v5_wdog", msg);
rproc_report_crash(q6v5->rproc, RPROC_WATCHDOG);
return IRQ_HANDLED;
@@ -134,6 +136,7 @@ static irqreturn_t q6v5_fatal_interrupt(int irq, void *data)
dev_err(q6v5->dev, "fatal error without message\n");
q6v5->running = false;
+ trace_rproc_interrupt_event(q6v5->rproc, "fatal", msg);
rproc_report_crash(q6v5->rproc, RPROC_FATAL_ERROR);
return IRQ_HANDLED;
@@ -165,6 +168,8 @@ int qcom_q6v5_wait_for_start(struct qcom_q6v5 *q6v5, int timeout)
if (!ret)
disable_irq(q6v5->handover_irq);
+ trace_rproc_interrupt_event(q6v5->rproc, "Ready", !ret? "-ETIMEDOUT":"done");
+
return !ret ? -ETIMEDOUT : 0;
}
EXPORT_SYMBOL_GPL(qcom_q6v5_wait_for_start);
@@ -180,6 +185,8 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *data)
q6v5->handover_issued = true;
+ trace_rproc_interrupt_event(q6v5->rproc, "handover", "Proxy votes removed");
+
return IRQ_HANDLED;
}
@@ -216,6 +223,8 @@ int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5, struct qcom_sysmon *sysmon)
qcom_smem_state_update_bits(q6v5->state, BIT(q6v5->stop_bit), 0);
+ trace_rproc_interrupt_event(q6v5->rproc, "Stop", ret? "done":"-EETIMEDOUT");
+
return ret == 0 ? -ETIMEDOUT : 0;
}
EXPORT_SYMBOL_GPL(qcom_q6v5_request_stop);
diff --git a/drivers/remoteproc/qcom_tracepoints.c b/drivers/remoteproc/qcom_tracepoints.c
new file mode 100644
index 000000000000..1b587ef54aa7
--- /dev/null
+++ b/drivers/remoteproc/qcom_tracepoints.c
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/rproc_qcom.h>
+EXPORT_TRACEPOINT_SYMBOL(rproc_load_event);
+EXPORT_TRACEPOINT_SYMBOL(rproc_start_event);
+EXPORT_TRACEPOINT_SYMBOL(rproc_stop_event);
+EXPORT_TRACEPOINT_SYMBOL(rproc_interrupt_event);
+EXPORT_TRACEPOINT_SYMBOL(rproc_subdev_event);
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1cd4815a6dd1..6def868f0a98 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -38,6 +38,7 @@
#include <linux/virtio_ring.h>
#include <asm/byteorder.h>
#include <linux/platform_device.h>
+#include <trace/events/rproc_qcom.h>
#include "remoteproc_internal.h"
@@ -1270,6 +1271,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
/* load the ELF segments to memory */
ret = rproc_load_segments(rproc, fw);
+ trace_rproc_load_event(rproc, ret);
if (ret) {
dev_err(dev, "Failed to load program segments: %d\n", ret);
return ret;
@@ -1305,6 +1307,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
/* Start any subdevices for the remote processor */
ret = rproc_start_subdevices(rproc);
+
if (ret) {
dev_err(dev, "failed to probe subdevices for %s: %d\n",
rproc->name, ret);
@@ -1729,6 +1732,8 @@ static int rproc_stop(struct rproc *rproc, bool crashed)
return ret;
}
+ trace_rproc_stop_event(rproc, crashed ? "crash stop" : "stop");
+
rproc_unprepare_subdevices(rproc);
rproc->state = RPROC_OFFLINE;
@@ -1939,6 +1944,8 @@ int rproc_boot(struct rproc *rproc)
dev_info(dev, "attaching to %s\n", rproc->name);
ret = rproc_attach(rproc);
+ trace_rproc_start_event(rproc, ret);
+
} else {
dev_info(dev, "powering up %s\n", rproc->name);
@@ -1950,6 +1957,7 @@ int rproc_boot(struct rproc *rproc)
}
ret = rproc_fw_boot(rproc, firmware_p);
+ trace_rproc_start_event(rproc, ret);
release_firmware(firmware_p);
}
diff --git a/include/trace/events/rproc_qcom.h b/include/trace/events/rproc_qcom.h
new file mode 100644
index 000000000000..66b10cb17965
--- /dev/null
+++ b/include/trace/events/rproc_qcom.h
@@ -0,0 +1,128 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM rproc_qcom
+
+#if !defined(_TRACE_RPROC_QCOM_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_RPROC_QCOM_H
+#include <linux/tracepoint.h>
+#include <linux/remoteproc.h>
+
+/*
+ * Tracepoints for remoteproc and subdevice events
+ */
+TRACE_EVENT(rproc_load_event,
+
+ TP_PROTO(struct rproc *rproc, int ret),
+
+ TP_ARGS(rproc, ret),
+
+ TP_STRUCT__entry(
+ __string(name, rproc->name)
+ __string(firmware, rproc->firmware)
+ __field(int,ret)
+ ),
+
+ TP_fast_assign(
+ __assign_str(name, rproc->name);
+ __assign_str(firmware, rproc->firmware);
+ __entry->ret = ret;
+ ),
+
+ TP_printk("%s loading firmware %s returned %d",
+ __get_str(name), __get_str(firmware),
+ __entry->ret)
+);
+
+TRACE_EVENT(rproc_start_event,
+
+ TP_PROTO(struct rproc *rproc, int ret),
+
+ TP_ARGS(rproc, ret),
+
+ TP_STRUCT__entry(
+ __string(name, rproc->name)
+ __field(int, ret)
+ ),
+
+ TP_fast_assign(
+ __assign_str(name, rproc->name);
+ __entry->ret = ret;
+ ),
+
+ TP_printk("%s %d", __get_str(name), __entry->ret)
+);
+
+TRACE_EVENT(rproc_stop_event,
+
+ TP_PROTO(struct rproc *rproc, char* crash_msg),
+
+ TP_ARGS(rproc, crash_msg),
+
+ TP_STRUCT__entry(
+ __string(name, rproc->name)
+ __string(crash_msg, crash_msg)
+ ),
+
+ TP_fast_assign(
+ __assign_str(name, rproc->name);
+ __assign_str(crash_msg, crash_msg)
+ ),
+
+ TP_printk("%s %s", __get_str(name), __get_str(crash_msg))
+);
+
+TRACE_EVENT(rproc_interrupt_event,
+
+ TP_PROTO(struct rproc *rproc, const char* event,
+ const char* msg),
+
+ TP_ARGS(rproc, event, msg),
+
+ TP_STRUCT__entry(
+ __string(name, rproc->name)
+ __string(event, event)
+ __string(msg, msg)
+ ),
+
+ TP_fast_assign(
+ __assign_str(name, rproc->name);
+ __assign_str(event, event);
+ __assign_str(msg, msg);
+ ),
+
+ TP_printk("%s %s returned %s", __get_str(name),
+ __get_str(event), __get_str(msg))
+);
+
+TRACE_EVENT(rproc_subdev_event,
+
+ TP_PROTO(const char* rproc, const char* subdev,
+ const char* event, int ret),
+
+ TP_ARGS(rproc, subdev, event, ret),
+
+ TP_STRUCT__entry(
+ __string(rproc, rproc)
+ __string(subdev, subdev)
+ __string(event, event)
+ __field(int, ret)
+ ),
+
+ TP_fast_assign(
+ __assign_str(rproc, rproc);
+ __assign_str(subdev, subdev);
+ __assign_str(event, event);
+ __entry->ret = ret;
+ ),
+
+ TP_printk("%s %s %s %d", __get_str(rproc), __get_str(subdev),
+ __get_str(event), __entry->ret)
+);
+#endif /* _TRACE_RPROC_QCOM_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] remoteproc: qcom: Add remoteproc tracing
@ 2023-03-05 8:28 kernel test robot
0 siblings, 0 replies; 4+ messages in thread
From: kernel test robot @ 2023-03-05 8:28 UTC (permalink / raw)
To: oe-kbuild; +Cc: lkp
::::::
:::::: Manual check reason: "low confidence static check warning: include/trace/events/rproc_qcom.h:17:1: warning: Dereference of null pointer [clang-analyzer-core.NullDereference]"
::::::
BCC: lkp@intel.com
CC: llvm@lists.linux.dev
CC: oe-kbuild-all@lists.linux.dev
In-Reply-To: <20230303035453.19034-1-quic_gokukris@quicinc.com>
References: <20230303035453.19034-1-quic_gokukris@quicinc.com>
TO: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
TO: Andy Gross <agross@kernel.org>
TO: Bjorn Andersson <andersson@kernel.org>
TO: Konrad Dybcio <konrad.dybcio@somainline.org>
TO: Mathieu Poirier <mathieu.poirier@linaro.org>
CC: linux-arm-msm@vger.kernel.org
CC: linux-remoteproc@vger.kernel.org
CC: linux-kernel@vger.kernel.org
CC: Trilok Soni <quic_tsoni@quicinc.com>
CC: Satya Durga Srinivasu Prabhala <quic_satyap@quicinc.com>
CC: Rajendra Nayak <quic_rjendra@quicinc.com>
CC: Elliot Berman <quic_eberman@quicinc.com>
CC: Guru Das Srinagesh <quic_gurus@quicinc.com>
CC: Sibi Sankar <quic_sibis@quicinc.com>
CC: linux-trace-kernel@vger.kernel.org
CC: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
Hi Gokul,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on remoteproc/rproc-next]
[also build test WARNING on linus/master v6.2 next-20230303]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Gokul-krishna-Krishnakumar/remoteproc-qcom-Add-remoteproc-tracing/20230303-115704
base: git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rproc-next
patch link: https://lore.kernel.org/r/20230303035453.19034-1-quic_gokukris%40quicinc.com
patch subject: [PATCH v2 1/1] remoteproc: qcom: Add remoteproc tracing
:::::: branch date: 2 days ago
:::::: commit date: 2 days ago
config: s390-randconfig-c005-20230302 (https://download.01.org/0day-ci/archive/20230305/202303051608.4ZM5bvyb-lkp@intel.com/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 67409911353323ca5edf2049ef0df54132fa1ca7)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install s390 cross compiling tool for clang build
# apt-get install binutils-s390x-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/89ccf0f9143e4482677179b637b6f507f4208838
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Gokul-krishna-Krishnakumar/remoteproc-qcom-Add-remoteproc-tracing/20230303-115704
git checkout 89ccf0f9143e4482677179b637b6f507f4208838
# save the config file
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=s390 clang-analyzer olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=s390 clang-analyzer
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/r/202303051608.4ZM5bvyb-lkp@intel.com/
clang_analyzer warnings: (new ones prefixed by >>)
^
include/linux/compiler_types.h:338:3: note: expanded from macro '__compiletime_assert'
if (!(condition)) \
^
drivers/s390/char/sclp_early_core.c:38:2: note: Loop condition is false. Exiting loop
__ctl_load(cr0_new.val, 0, 0);
^
arch/s390/include/asm/ctl_reg.h:41:2: note: expanded from macro '__ctl_load'
BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
^
include/linux/build_bug.h:50:2: note: expanded from macro 'BUILD_BUG_ON'
BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
^
include/linux/build_bug.h:39:37: note: expanded from macro 'BUILD_BUG_ON_MSG'
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
^
include/linux/compiler_types.h:358:2: note: expanded from macro 'compiletime_assert'
_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
^
include/linux/compiler_types.h:346:2: note: expanded from macro '_compiletime_assert'
__compiletime_assert(condition, msg, prefix, suffix)
^
include/linux/compiler_types.h:330:2: note: expanded from macro '__compiletime_assert'
do { \
^
drivers/s390/char/sclp_early_core.c:38:2: note: Loop condition is false. Exiting loop
__ctl_load(cr0_new.val, 0, 0);
^
arch/s390/include/asm/ctl_reg.h:38:38: note: expanded from macro '__ctl_load'
#define __ctl_load(array, low, high) do { \
^
drivers/s390/char/sclp_early_core.c:40:17: note: Dereference of null pointer
psw_ext_save = S390_lowcore.external_new_psw;
^
arch/s390/include/asm/lowcore.h:215:22: note: expanded from macro 'S390_lowcore'
#define S390_lowcore (*((struct lowcore *) 0))
^
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
4 warnings generated.
Suppressed 4 warnings (4 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
18 warnings generated.
drivers/dma-buf/dma-buf.c:1445:14: warning: Access to field 'resv' results in a dereference of a null pointer (loaded from variable 'dmabuf') [clang-analyzer-core.NullDereference]
might_lock(&dmabuf->resv->lock.base);
^
drivers/dma-buf/dma-buf.c:452:2: note: Value assigned to 'dmabuf'
dmabuf = file->private_data;
^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/dma-buf/dma-buf.c:454:2: note: Control jumps to 'case 1074291200:' at line 455
switch (cmd) {
^
drivers/dma-buf/dma-buf.c:456:3: note: Taking false branch
if (copy_from_user(&sync, (void __user *) arg, sizeof(sync)))
^
drivers/dma-buf/dma-buf.c:459:7: note: Assuming the condition is false
if (sync.flags & ~DMA_BUF_SYNC_VALID_FLAGS_MASK)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/dma-buf/dma-buf.c:459:3: note: Taking false branch
if (sync.flags & ~DMA_BUF_SYNC_VALID_FLAGS_MASK)
^
drivers/dma-buf/dma-buf.c:462:3: note: Control jumps to 'case 3:' at line 469
switch (sync.flags & DMA_BUF_SYNC_RW) {
^
drivers/dma-buf/dma-buf.c:471:4: note: Execution continues on line 476
break;
^
drivers/dma-buf/dma-buf.c:476:7: note: Assuming the condition is true
if (sync.flags & DMA_BUF_SYNC_END)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/dma-buf/dma-buf.c:476:3: note: Taking true branch
if (sync.flags & DMA_BUF_SYNC_END)
^
drivers/dma-buf/dma-buf.c:477:33: note: Passing value via 1st parameter 'dmabuf'
ret = dma_buf_end_cpu_access(dmabuf, direction);
^~~~~~
drivers/dma-buf/dma-buf.c:477:10: note: Calling 'dma_buf_end_cpu_access'
ret = dma_buf_end_cpu_access(dmabuf, direction);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/dma-buf/dma-buf.c:1443:10: note: Assuming 'dmabuf' is null
WARN_ON(!dmabuf);
^
include/asm-generic/bug.h:167:25: note: expanded from macro 'WARN_ON'
int __ret_warn_on = !!(condition); \
^~~~~~~~~
drivers/dma-buf/dma-buf.c:1445:14: note: Access to field 'resv' results in a dereference of a null pointer (loaded from variable 'dmabuf')
might_lock(&dmabuf->resv->lock.base);
^
include/linux/lockdep.h:563:17: note: expanded from macro 'might_lock'
lock_acquire(&(lock)->dep_map, 0, 0, 0, 1, NULL, _THIS_IP_); \
^~~~
Suppressed 17 warnings (5 in non-user code, 12 with check filters).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
24 warnings generated.
>> include/trace/events/rproc_qcom.h:17:1: warning: Dereference of null pointer [clang-analyzer-core.NullDereference]
TRACE_EVENT(rproc_load_event,
^
include/linux/tracepoint.h:553:2: note: expanded from macro 'TRACE_EVENT'
DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
^
include/linux/tracepoint.h:420:15: note: expanded from macro 'DECLARE_TRACE'
cpu_online(raw_smp_processor_id()), \
^
arch/s390/include/asm/smp.h:14:32: note: expanded from macro 'raw_smp_processor_id'
#define raw_smp_processor_id() (S390_lowcore.cpu_nr)
^
drivers/remoteproc/remoteproc_core.c:1918:6: note: Assuming 'rproc' is non-null
if (!rproc) {
^~~~~~
drivers/remoteproc/remoteproc_core.c:1918:2: note: Taking false branch
if (!rproc) {
^
drivers/remoteproc/remoteproc_core.c:1926:6: note: Assuming 'ret' is 0
if (ret) {
^~~
drivers/remoteproc/remoteproc_core.c:1926:2: note: Taking false branch
if (ret) {
^
drivers/remoteproc/remoteproc_core.c:1931:6: note: Assuming field 'state' is not equal to RPROC_DELETED
if (rproc->state == RPROC_DELETED) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/remoteproc/remoteproc_core.c:1931:2: note: Taking false branch
if (rproc->state == RPROC_DELETED) {
^
drivers/remoteproc/remoteproc_core.c:1938:6: note: Assuming the condition is false
if (atomic_inc_return(&rproc->power) > 1) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/remoteproc/remoteproc_core.c:1938:2: note: Taking false branch
if (atomic_inc_return(&rproc->power) > 1) {
^
drivers/remoteproc/remoteproc_core.c:1943:6: note: Assuming field 'state' is not equal to RPROC_DETACHED
if (rproc->state == RPROC_DETACHED) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/remoteproc/remoteproc_core.c:1943:2: note: Taking false branch
if (rproc->state == RPROC_DETACHED) {
^
drivers/remoteproc/remoteproc_core.c:1950:3: note: Left side of '&&' is true
dev_info(dev, "powering up %s\n", rproc->name);
^
include/linux/dev_printk.h:150:2: note: expanded from macro 'dev_info'
dev_printk_index_wrap(_dev_info, KERN_INFO, dev, dev_fmt(fmt), ##__VA_ARGS__)
^
include/linux/dev_printk.h:109:3: note: expanded from macro 'dev_printk_index_wrap'
dev_printk_index_emit(level, fmt); \
^
include/linux/dev_printk.h:105:2: note: expanded from macro 'dev_printk_index_emit'
printk_index_subsys_emit("%s %s: ", level, fmt)
^
include/linux/printk.h:424:2: note: expanded from macro 'printk_index_subsys_emit'
__printk_index_emit(fmt, level, subsys_fmt_prefix)
^
include/linux/printk.h:381:7: note: expanded from macro '__printk_index_emit'
if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level)) { \
^
drivers/remoteproc/remoteproc_core.c:1950:3: note: Taking true branch
dev_info(dev, "powering up %s\n", rproc->name);
^
include/linux/dev_printk.h:150:2: note: expanded from macro 'dev_info'
dev_printk_index_wrap(_dev_info, KERN_INFO, dev, dev_fmt(fmt), ##__VA_ARGS__)
^
include/linux/dev_printk.h:109:3: note: expanded from macro 'dev_printk_index_wrap'
dev_printk_index_emit(level, fmt); \
^
include/linux/dev_printk.h:105:2: note: expanded from macro 'dev_printk_index_emit'
printk_index_subsys_emit("%s %s: ", level, fmt)
^
include/linux/printk.h:424:2: note: expanded from macro 'printk_index_subsys_emit'
__printk_index_emit(fmt, level, subsys_fmt_prefix)
^
include/linux/printk.h:381:3: note: expanded from macro '__printk_index_emit'
if (__builtin_constant_p(_fmt) && __builtin_constant_p(_level)) { \
^
drivers/remoteproc/remoteproc_core.c:1950:3: note: '?' condition is true
dev_info(dev, "powering up %s\n", rproc->name);
^
include/linux/dev_printk.h:150:2: note: expanded from macro 'dev_info'
dev_printk_index_wrap(_dev_info, KERN_INFO, dev, dev_fmt(fmt), ##__VA_ARGS__)
^
include/linux/dev_printk.h:109:3: note: expanded from macro 'dev_printk_index_wrap'
dev_printk_index_emit(level, fmt); \
^
include/linux/dev_printk.h:105:2: note: expanded from macro 'dev_printk_index_emit'
printk_index_subsys_emit("%s %s: ", level, fmt)
^
include/linux/printk.h:424:2: note: expanded from macro 'printk_index_subsys_emit'
__printk_index_emit(fmt, level, subsys_fmt_prefix)
^
include/linux/printk.h:390:12: note: expanded from macro '__printk_index_emit'
.fmt = __builtin_constant_p(_fmt) ? (_fmt) : NULL, \
^
drivers/remoteproc/remoteproc_core.c:1950:3: note: '?' condition is true
dev_info(dev, "powering up %s\n", rproc->name);
^
include/linux/dev_printk.h:150:2: note: expanded from macro 'dev_info'
dev_printk_index_wrap(_dev_info, KERN_INFO, dev, dev_fmt(fmt), ##__VA_ARGS__)
vim +17 include/trace/events/rproc_qcom.h
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 13
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 14 /*
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 15 * Tracepoints for remoteproc and subdevice events
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 16 */
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 @17 TRACE_EVENT(rproc_load_event,
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 18
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 19 TP_PROTO(struct rproc *rproc, int ret),
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 20
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 21 TP_ARGS(rproc, ret),
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 22
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 23 TP_STRUCT__entry(
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 24 __string(name, rproc->name)
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 25 __string(firmware, rproc->firmware)
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 26 __field(int,ret)
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 27 ),
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 28
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 29 TP_fast_assign(
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 30 __assign_str(name, rproc->name);
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 31 __assign_str(firmware, rproc->firmware);
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 32 __entry->ret = ret;
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 33 ),
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 34
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 35 TP_printk("%s loading firmware %s returned %d",
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 36 __get_str(name), __get_str(firmware),
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 37 __entry->ret)
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 38 );
89ccf0f9143e44 Gokul krishna Krishnakumar 2023-03-02 39
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] remoteproc: qcom: Add remoteproc tracing
2023-03-03 3:54 Gokul krishna Krishnakumar
@ 2023-03-06 12:17 ` Mukesh Ojha
2023-03-08 22:48 ` Gokul Krishna Krishnakumar
0 siblings, 1 reply; 4+ messages in thread
From: Mukesh Ojha @ 2023-03-06 12:17 UTC (permalink / raw)
To: Gokul krishna Krishnakumar, Andy Gross, Bjorn Andersson,
Konrad Dybcio, Mathieu Poirier
Cc: linux-arm-msm, linux-remoteproc, linux-kernel, Trilok Soni,
Satya Durga Srinivasu Prabhala, Rajendra Nayak, Elliot Berman,
Guru Das Srinagesh, Sibi Sankar, linux-trace-kernel
On 3/3/2023 9:24 AM, Gokul krishna Krishnakumar wrote:
> This change attempts to add traces for start, stop, crash
> subsystem/subdevice event these will serve as standard checkpoints in
> code and could help in debugging the failures in subdevice/subsystem
> prepare, start, stop and unprepare functions. This will also breakdown
> the time taken for each step in remoteproc bootup/shutdown process.
>
> Change-Id: I202814452192ca0733f134daf7c99201881e2c9c
> Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
> ---
> drivers/remoteproc/Makefile | 1 +
> drivers/remoteproc/qcom_common.c | 37 ++++++++
> drivers/remoteproc/qcom_q6v5.c | 9 ++
> drivers/remoteproc/qcom_tracepoints.c | 12 +++
> drivers/remoteproc/remoteproc_core.c | 8 ++
> include/trace/events/rproc_qcom.h | 128 ++++++++++++++++++++++++++
> 6 files changed, 195 insertions(+)
> create mode 100644 drivers/remoteproc/qcom_tracepoints.c
> create mode 100644 include/trace/events/rproc_qcom.h
I think, it is better to split this where first patch will introduce the
trace event and in the later you can use at respective places.
>
> diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
> index 91314a9b43ce..3399fcaba39b 100644
> --- a/drivers/remoteproc/Makefile
> +++ b/drivers/remoteproc/Makefile
> @@ -10,6 +10,7 @@ remoteproc-y += remoteproc_debugfs.o
> remoteproc-y += remoteproc_sysfs.o
> remoteproc-y += remoteproc_virtio.o
> remoteproc-y += remoteproc_elf_loader.o
> +remoteproc-y += qcom_tracepoints.o
> obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o
> obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o
> obj-$(CONFIG_IMX_DSP_REMOTEPROC) += imx_dsp_rproc.o
> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
> index 020349f8979d..09b79f39ccd6 100644
> --- a/drivers/remoteproc/qcom_common.c
> +++ b/drivers/remoteproc/qcom_common.c
> @@ -18,6 +18,7 @@
> #include <linux/slab.h>
> #include <linux/soc/qcom/mdt_loader.h>
> #include <linux/soc/qcom/smem.h>
> +#include <trace/events/rproc_qcom.h>
>
> #include "remoteproc_internal.h"
> #include "qcom_common.h"
> @@ -186,6 +187,10 @@ static int glink_subdev_start(struct rproc_subdev *subdev)
>
> glink->edge = qcom_glink_smem_register(glink->dev, glink->node);
>
> + trace_rproc_subdev_event(dev_name(glink->dev->parent),
> + "glink", "start",
> + PTR_ERR_OR_ZERO(glink->edge));
> +
> return PTR_ERR_OR_ZERO(glink->edge);
> }
>
> @@ -194,6 +199,11 @@ static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)
> struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
>
> qcom_glink_smem_unregister(glink->edge);
> +
> + trace_rproc_subdev_event(dev_name(glink->dev->parent),
> + "glink", "stop",
> + PTR_ERR_OR_ZERO(glink->edge));
> +
> glink->edge = NULL;
> }
>
> @@ -201,6 +211,10 @@ static void glink_subdev_unprepare(struct rproc_subdev *subdev)
> {
> struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
>
> + trace_rproc_subdev_event(dev_name(glink->dev->parent),
> + "glink", "unprepare",
> + PTR_ERR_OR_ZERO(glink->edge));
> +
> qcom_glink_ssr_notify(glink->ssr_name);
> }
>
> @@ -295,6 +309,10 @@ static int smd_subdev_start(struct rproc_subdev *subdev)
> {
> struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
>
> + trace_rproc_subdev_event(dev_name(smd->dev->parent),
> + "smd", "start",
> + PTR_ERR_OR_ZERO(smd->edge));
> +
> smd->edge = qcom_smd_register_edge(smd->dev, smd->node);
>
> return PTR_ERR_OR_ZERO(smd->edge);
> @@ -304,6 +322,10 @@ static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)
> {
> struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
>
> + trace_rproc_subdev_event(dev_name(smd->dev->parent),
> + "smd", "stop",
> + PTR_ERR_OR_ZERO(smd->edge));
> +
> qcom_smd_unregister_edge(smd->edge);
> smd->edge = NULL;
> }
> @@ -420,6 +442,10 @@ static int ssr_notify_prepare(struct rproc_subdev *subdev)
> .crashed = false,
> };
>
> + trace_rproc_subdev_event(ssr->info->name,
> + "ssr", "QCOM_SSR_BEFORE_POWERUP",
> + data.crashed);
> +
> srcu_notifier_call_chain(&ssr->info->notifier_list,
> QCOM_SSR_BEFORE_POWERUP, &data);
> return 0;
> @@ -432,6 +458,9 @@ static int ssr_notify_start(struct rproc_subdev *subdev)
> .name = ssr->info->name,
> .crashed = false,
> };
> + trace_rproc_subdev_event(ssr->info->name,
> + "ssr", "QCOM_SSR_AFTER_POWERUP",
> + data.crashed);
>
> srcu_notifier_call_chain(&ssr->info->notifier_list,
> QCOM_SSR_AFTER_POWERUP, &data);
> @@ -446,6 +475,10 @@ static void ssr_notify_stop(struct rproc_subdev *subdev, bool crashed)
> .crashed = crashed,
> };
>
> + trace_rproc_subdev_event(ssr->info->name,
> + "ssr", "QCOM_SSR_BEFORE_SHUTDOWN",
> + data.crashed);
> +
> srcu_notifier_call_chain(&ssr->info->notifier_list,
> QCOM_SSR_BEFORE_SHUTDOWN, &data);
> }
> @@ -458,6 +491,10 @@ static void ssr_notify_unprepare(struct rproc_subdev *subdev)
> .crashed = false,
> };
>
> + trace_rproc_subdev_event(ssr->info->name,
> + "ssr", "QCOM_SSR_AFTER_SHUTDOWN",
> + data.crashed);
> +
> srcu_notifier_call_chain(&ssr->info->notifier_list,
> QCOM_SSR_AFTER_SHUTDOWN, &data);
> }
> diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
> index 497acfb33f8f..aff91de3cea0 100644
> --- a/drivers/remoteproc/qcom_q6v5.c
> +++ b/drivers/remoteproc/qcom_q6v5.c
> @@ -15,6 +15,7 @@
> #include <linux/soc/qcom/smem.h>
> #include <linux/soc/qcom/smem_state.h>
> #include <linux/remoteproc.h>
> +#include <trace/events/rproc_qcom.h>
> #include "qcom_common.h"
> #include "qcom_q6v5.h"
>
> @@ -113,6 +114,7 @@ static irqreturn_t q6v5_wdog_interrupt(int irq, void *data)
> dev_err(q6v5->dev, "watchdog without message\n");
>
> q6v5->running = false;
> + trace_rproc_interrupt_event(q6v5->rproc, "q6v5_wdog", msg);
> rproc_report_crash(q6v5->rproc, RPROC_WATCHDOG);
>
> return IRQ_HANDLED;
> @@ -134,6 +136,7 @@ static irqreturn_t q6v5_fatal_interrupt(int irq, void *data)
> dev_err(q6v5->dev, "fatal error without message\n");
>
> q6v5->running = false;
> + trace_rproc_interrupt_event(q6v5->rproc, "fatal", msg);
> rproc_report_crash(q6v5->rproc, RPROC_FATAL_ERROR);
>
> return IRQ_HANDLED;
> @@ -165,6 +168,8 @@ int qcom_q6v5_wait_for_start(struct qcom_q6v5 *q6v5, int timeout)
> if (!ret)
> disable_irq(q6v5->handover_irq);
>
> + trace_rproc_interrupt_event(q6v5->rproc, "Ready", !ret? "-ETIMEDOUT":"done");
> +
> return !ret ? -ETIMEDOUT : 0;
> }
> EXPORT_SYMBOL_GPL(qcom_q6v5_wait_for_start);
> @@ -180,6 +185,8 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *data)
>
> q6v5->handover_issued = true;
>
> + trace_rproc_interrupt_event(q6v5->rproc, "handover", "Proxy votes removed");
> +
> return IRQ_HANDLED;
> }
>
> @@ -216,6 +223,8 @@ int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5, struct qcom_sysmon *sysmon)
>
> qcom_smem_state_update_bits(q6v5->state, BIT(q6v5->stop_bit), 0);
>
> + trace_rproc_interrupt_event(q6v5->rproc, "Stop", ret? "done":"-EETIMEDOUT");
> +
> return ret == 0 ? -ETIMEDOUT : 0;
> }
> EXPORT_SYMBOL_GPL(qcom_q6v5_request_stop);
> diff --git a/drivers/remoteproc/qcom_tracepoints.c b/drivers/remoteproc/qcom_tracepoints.c
> new file mode 100644
> index 000000000000..1b587ef54aa7
> --- /dev/null
> +++ b/drivers/remoteproc/qcom_tracepoints.c'
is it qcom specific ? No, i guess, as you have put traces in generic
path as well.
-Mukesh
> @@ -0,0 +1,12 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#define CREATE_TRACE_POINTS
> +#include <trace/events/rproc_qcom.h>
> +EXPORT_TRACEPOINT_SYMBOL(rproc_load_event);
> +EXPORT_TRACEPOINT_SYMBOL(rproc_start_event);
> +EXPORT_TRACEPOINT_SYMBOL(rproc_stop_event);
> +EXPORT_TRACEPOINT_SYMBOL(rproc_interrupt_event);
> +EXPORT_TRACEPOINT_SYMBOL(rproc_subdev_event);
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index 1cd4815a6dd1..6def868f0a98 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -38,6 +38,7 @@
> #include <linux/virtio_ring.h>
> #include <asm/byteorder.h>
> #include <linux/platform_device.h>
> +#include <trace/events/rproc_qcom.h>
>
> #include "remoteproc_internal.h"
>
> @@ -1270,6 +1271,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
>
> /* load the ELF segments to memory */
> ret = rproc_load_segments(rproc, fw);
> + trace_rproc_load_event(rproc, ret);
> if (ret) {
> dev_err(dev, "Failed to load program segments: %d\n", ret);
> return ret;
> @@ -1305,6 +1307,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
>
> /* Start any subdevices for the remote processor */
> ret = rproc_start_subdevices(rproc);
> +
> if (ret) {
> dev_err(dev, "failed to probe subdevices for %s: %d\n",
> rproc->name, ret);
> @@ -1729,6 +1732,8 @@ static int rproc_stop(struct rproc *rproc, bool crashed)
> return ret;
> }
>
> + trace_rproc_stop_event(rproc, crashed ? "crash stop" : "stop");
> +
> rproc_unprepare_subdevices(rproc);
>
> rproc->state = RPROC_OFFLINE;
> @@ -1939,6 +1944,8 @@ int rproc_boot(struct rproc *rproc)
> dev_info(dev, "attaching to %s\n", rproc->name);
>
> ret = rproc_attach(rproc);
> + trace_rproc_start_event(rproc, ret);
> +
> } else {
> dev_info(dev, "powering up %s\n", rproc->name);
>
> @@ -1950,6 +1957,7 @@ int rproc_boot(struct rproc *rproc)
> }
>
> ret = rproc_fw_boot(rproc, firmware_p);
> + trace_rproc_start_event(rproc, ret);
>
> release_firmware(firmware_p);
> }
> diff --git a/include/trace/events/rproc_qcom.h b/include/trace/events/rproc_qcom.h
> new file mode 100644
> index 000000000000..66b10cb17965
> --- /dev/null
> +++ b/include/trace/events/rproc_qcom.h
> @@ -0,0 +1,128 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#undef TRACE_SYSTEM
> +#define TRACE_SYSTEM rproc_qcom
> +
> +#if !defined(_TRACE_RPROC_QCOM_H) || defined(TRACE_HEADER_MULTI_READ)
> +#define _TRACE_RPROC_QCOM_H
> +#include <linux/tracepoint.h>
> +#include <linux/remoteproc.h>
> +
> +/*
> + * Tracepoints for remoteproc and subdevice events
> + */
> +TRACE_EVENT(rproc_load_event,
> +
> + TP_PROTO(struct rproc *rproc, int ret),
> +
> + TP_ARGS(rproc, ret),
> +
> + TP_STRUCT__entry(
> + __string(name, rproc->name)
> + __string(firmware, rproc->firmware)
> + __field(int,ret)
> + ),
> +
> + TP_fast_assign(
> + __assign_str(name, rproc->name);
> + __assign_str(firmware, rproc->firmware);
> + __entry->ret = ret;
> + ),
> +
> + TP_printk("%s loading firmware %s returned %d",
> + __get_str(name), __get_str(firmware),
> + __entry->ret)
> +);
> +
> +TRACE_EVENT(rproc_start_event,
> +
> + TP_PROTO(struct rproc *rproc, int ret),
> +
> + TP_ARGS(rproc, ret),
> +
> + TP_STRUCT__entry(
> + __string(name, rproc->name)
> + __field(int, ret)
> + ),
> +
> + TP_fast_assign(
> + __assign_str(name, rproc->name);
> + __entry->ret = ret;
> + ),
> +
> + TP_printk("%s %d", __get_str(name), __entry->ret)
> +);
> +
> +TRACE_EVENT(rproc_stop_event,
> +
> + TP_PROTO(struct rproc *rproc, char* crash_msg),
> +
> + TP_ARGS(rproc, crash_msg),
> +
> + TP_STRUCT__entry(
> + __string(name, rproc->name)
> + __string(crash_msg, crash_msg)
> + ),
> +
> + TP_fast_assign(
> + __assign_str(name, rproc->name);
> + __assign_str(crash_msg, crash_msg)
> + ),
> +
> + TP_printk("%s %s", __get_str(name), __get_str(crash_msg))
> +);
> +
> +TRACE_EVENT(rproc_interrupt_event,
> +
> + TP_PROTO(struct rproc *rproc, const char* event,
> + const char* msg),
> +
> + TP_ARGS(rproc, event, msg),
> +
> + TP_STRUCT__entry(
> + __string(name, rproc->name)
> + __string(event, event)
> + __string(msg, msg)
> + ),
> +
> + TP_fast_assign(
> + __assign_str(name, rproc->name);
> + __assign_str(event, event);
> + __assign_str(msg, msg);
> + ),
> +
> + TP_printk("%s %s returned %s", __get_str(name),
> + __get_str(event), __get_str(msg))
> +);
> +
> +TRACE_EVENT(rproc_subdev_event,
> +
> + TP_PROTO(const char* rproc, const char* subdev,
> + const char* event, int ret),
> +
> + TP_ARGS(rproc, subdev, event, ret),
> +
> + TP_STRUCT__entry(
> + __string(rproc, rproc)
> + __string(subdev, subdev)
> + __string(event, event)
> + __field(int, ret)
> + ),
> +
> + TP_fast_assign(
> + __assign_str(rproc, rproc);
> + __assign_str(subdev, subdev);
> + __assign_str(event, event);
> + __entry->ret = ret;
> + ),
> +
> + TP_printk("%s %s %s %d", __get_str(rproc), __get_str(subdev),
> + __get_str(event), __entry->ret)
> +);
> +#endif /* _TRACE_RPROC_QCOM_H */
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] remoteproc: qcom: Add remoteproc tracing
2023-03-06 12:17 ` Mukesh Ojha
@ 2023-03-08 22:48 ` Gokul Krishna Krishnakumar
0 siblings, 0 replies; 4+ messages in thread
From: Gokul Krishna Krishnakumar @ 2023-03-08 22:48 UTC (permalink / raw)
To: Mukesh Ojha, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Mathieu Poirier
Cc: linux-arm-msm, linux-remoteproc, linux-kernel, Trilok Soni,
Satya Durga Srinivasu Prabhala, Rajendra Nayak, Elliot Berman,
Guru Das Srinagesh, Sibi Sankar, linux-trace-kernel
On 3/6/2023 4:17 AM, Mukesh Ojha wrote:
>
>
> On 3/3/2023 9:24 AM, Gokul krishna Krishnakumar wrote:
>> This change attempts to add traces for start, stop, crash
>> subsystem/subdevice event these will serve as standard checkpoints in
>> code and could help in debugging the failures in subdevice/subsystem
>> prepare, start, stop and unprepare functions. This will also breakdown
>> the time taken for each step in remoteproc bootup/shutdown process.
>>
>> Change-Id: I202814452192ca0733f134daf7c99201881e2c9c
>> Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
>> ---
>> drivers/remoteproc/Makefile | 1 +
>> drivers/remoteproc/qcom_common.c | 37 ++++++++
>> drivers/remoteproc/qcom_q6v5.c | 9 ++
>> drivers/remoteproc/qcom_tracepoints.c | 12 +++
>> drivers/remoteproc/remoteproc_core.c | 8 ++
>> include/trace/events/rproc_qcom.h | 128 ++++++++++++++++++++++++++
>> 6 files changed, 195 insertions(+)
>> create mode 100644 drivers/remoteproc/qcom_tracepoints.c
>> create mode 100644 include/trace/events/rproc_qcom.h
>
>
> I think, it is better to split this where first patch will introduce the
> trace event and in the later you can use at respective places.
>
Done.
>>
>> diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
>> index 91314a9b43ce..3399fcaba39b 100644
>> --- a/drivers/remoteproc/Makefile
>> +++ b/drivers/remoteproc/Makefile
>> @@ -10,6 +10,7 @@ remoteproc-y += remoteproc_debugfs.o
>> remoteproc-y += remoteproc_sysfs.o
>> remoteproc-y += remoteproc_virtio.o
>> remoteproc-y += remoteproc_elf_loader.o
>> +remoteproc-y += qcom_tracepoints.o
>> obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o
>> obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o
>> obj-$(CONFIG_IMX_DSP_REMOTEPROC) += imx_dsp_rproc.o
>> diff --git a/drivers/remoteproc/qcom_common.c
>> b/drivers/remoteproc/qcom_common.c
>> index 020349f8979d..09b79f39ccd6 100644
>> --- a/drivers/remoteproc/qcom_common.c
>> +++ b/drivers/remoteproc/qcom_common.c
>> @@ -18,6 +18,7 @@
>> #include <linux/slab.h>
>> #include <linux/soc/qcom/mdt_loader.h>
>> #include <linux/soc/qcom/smem.h>
>> +#include <trace/events/rproc_qcom.h>
>> #include "remoteproc_internal.h"
>> #include "qcom_common.h"
>> @@ -186,6 +187,10 @@ static int glink_subdev_start(struct rproc_subdev
>> *subdev)
>> glink->edge = qcom_glink_smem_register(glink->dev, glink->node);
>> + trace_rproc_subdev_event(dev_name(glink->dev->parent),
>> + "glink", "start",
>> + PTR_ERR_OR_ZERO(glink->edge));
>> +
>> return PTR_ERR_OR_ZERO(glink->edge);
>> }
>> @@ -194,6 +199,11 @@ static void glink_subdev_stop(struct rproc_subdev
>> *subdev, bool crashed)
>> struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
>> qcom_glink_smem_unregister(glink->edge);
>> +
>> + trace_rproc_subdev_event(dev_name(glink->dev->parent),
>> + "glink", "stop",
>> + PTR_ERR_OR_ZERO(glink->edge));
>> +
>> glink->edge = NULL;
>> }
>> @@ -201,6 +211,10 @@ static void glink_subdev_unprepare(struct
>> rproc_subdev *subdev)
>> {
>> struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
>> + trace_rproc_subdev_event(dev_name(glink->dev->parent),
>> + "glink", "unprepare",
>> + PTR_ERR_OR_ZERO(glink->edge));
>> +
>> qcom_glink_ssr_notify(glink->ssr_name);
>> }
>> @@ -295,6 +309,10 @@ static int smd_subdev_start(struct rproc_subdev
>> *subdev)
>> {
>> struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
>> + trace_rproc_subdev_event(dev_name(smd->dev->parent),
>> + "smd", "start",
>> + PTR_ERR_OR_ZERO(smd->edge));
>> +
>> smd->edge = qcom_smd_register_edge(smd->dev, smd->node);
>> return PTR_ERR_OR_ZERO(smd->edge);
>> @@ -304,6 +322,10 @@ static void smd_subdev_stop(struct rproc_subdev
>> *subdev, bool crashed)
>> {
>> struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
>> + trace_rproc_subdev_event(dev_name(smd->dev->parent),
>> + "smd", "stop",
>> + PTR_ERR_OR_ZERO(smd->edge));
>> +
>> qcom_smd_unregister_edge(smd->edge);
>> smd->edge = NULL;
>> }
>> @@ -420,6 +442,10 @@ static int ssr_notify_prepare(struct rproc_subdev
>> *subdev)
>> .crashed = false,
>> };
>> + trace_rproc_subdev_event(ssr->info->name,
>> + "ssr", "QCOM_SSR_BEFORE_POWERUP",
>> + data.crashed);
>> +
>> srcu_notifier_call_chain(&ssr->info->notifier_list,
>> QCOM_SSR_BEFORE_POWERUP, &data);
>> return 0;
>> @@ -432,6 +458,9 @@ static int ssr_notify_start(struct rproc_subdev
>> *subdev)
>> .name = ssr->info->name,
>> .crashed = false,
>> };
>> + trace_rproc_subdev_event(ssr->info->name,
>> + "ssr", "QCOM_SSR_AFTER_POWERUP",
>> + data.crashed);
>> srcu_notifier_call_chain(&ssr->info->notifier_list,
>> QCOM_SSR_AFTER_POWERUP, &data);
>> @@ -446,6 +475,10 @@ static void ssr_notify_stop(struct rproc_subdev
>> *subdev, bool crashed)
>> .crashed = crashed,
>> };
>> + trace_rproc_subdev_event(ssr->info->name,
>> + "ssr", "QCOM_SSR_BEFORE_SHUTDOWN",
>> + data.crashed);
>> +
>> srcu_notifier_call_chain(&ssr->info->notifier_list,
>> QCOM_SSR_BEFORE_SHUTDOWN, &data);
>> }
>> @@ -458,6 +491,10 @@ static void ssr_notify_unprepare(struct
>> rproc_subdev *subdev)
>> .crashed = false,
>> };
>> + trace_rproc_subdev_event(ssr->info->name,
>> + "ssr", "QCOM_SSR_AFTER_SHUTDOWN",
>> + data.crashed);
>> +
>> srcu_notifier_call_chain(&ssr->info->notifier_list,
>> QCOM_SSR_AFTER_SHUTDOWN, &data);
>> }
>> diff --git a/drivers/remoteproc/qcom_q6v5.c
>> b/drivers/remoteproc/qcom_q6v5.c
>> index 497acfb33f8f..aff91de3cea0 100644
>> --- a/drivers/remoteproc/qcom_q6v5.c
>> +++ b/drivers/remoteproc/qcom_q6v5.c
>> @@ -15,6 +15,7 @@
>> #include <linux/soc/qcom/smem.h>
>> #include <linux/soc/qcom/smem_state.h>
>> #include <linux/remoteproc.h>
>> +#include <trace/events/rproc_qcom.h>
>> #include "qcom_common.h"
>> #include "qcom_q6v5.h"
>> @@ -113,6 +114,7 @@ static irqreturn_t q6v5_wdog_interrupt(int irq,
>> void *data)
>> dev_err(q6v5->dev, "watchdog without message\n");
>> q6v5->running = false;
>> + trace_rproc_interrupt_event(q6v5->rproc, "q6v5_wdog", msg);
>> rproc_report_crash(q6v5->rproc, RPROC_WATCHDOG);
>> return IRQ_HANDLED;
>> @@ -134,6 +136,7 @@ static irqreturn_t q6v5_fatal_interrupt(int irq,
>> void *data)
>> dev_err(q6v5->dev, "fatal error without message\n");
>> q6v5->running = false;
>> + trace_rproc_interrupt_event(q6v5->rproc, "fatal", msg);
>> rproc_report_crash(q6v5->rproc, RPROC_FATAL_ERROR);
>> return IRQ_HANDLED;
>> @@ -165,6 +168,8 @@ int qcom_q6v5_wait_for_start(struct qcom_q6v5
>> *q6v5, int timeout)
>> if (!ret)
>> disable_irq(q6v5->handover_irq);
>> + trace_rproc_interrupt_event(q6v5->rproc, "Ready", !ret?
>> "-ETIMEDOUT":"done");
>> +
>> return !ret ? -ETIMEDOUT : 0;
>> }
>> EXPORT_SYMBOL_GPL(qcom_q6v5_wait_for_start);
>> @@ -180,6 +185,8 @@ static irqreturn_t q6v5_handover_interrupt(int
>> irq, void *data)
>> q6v5->handover_issued = true;
>> + trace_rproc_interrupt_event(q6v5->rproc, "handover", "Proxy votes
>> removed");
>> +
>> return IRQ_HANDLED;
>> }
>> @@ -216,6 +223,8 @@ int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5,
>> struct qcom_sysmon *sysmon)
>> qcom_smem_state_update_bits(q6v5->state, BIT(q6v5->stop_bit), 0);
>> + trace_rproc_interrupt_event(q6v5->rproc, "Stop", ret?
>> "done":"-EETIMEDOUT");
>> +
>> return ret == 0 ? -ETIMEDOUT : 0;
>> }
>> EXPORT_SYMBOL_GPL(qcom_q6v5_request_stop);
>> diff --git a/drivers/remoteproc/qcom_tracepoints.c
>> b/drivers/remoteproc/qcom_tracepoints.c
>> new file mode 100644
>> index 000000000000..1b587ef54aa7
>> --- /dev/null
>> +++ b/drivers/remoteproc/qcom_tracepoints.c'
>
> is it qcom specific ? No, i guess, as you have put traces in generic
> path as well.
> Yes you are right the traces are generic to remoteproc events.
> -Mukesh
>
Thanks for the review,
Gokul
>> @@ -0,0 +1,12 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights
>> reserved.
>> + */
>> +
>> +#define CREATE_TRACE_POINTS
>> +#include <trace/events/rproc_qcom.h>
>> +EXPORT_TRACEPOINT_SYMBOL(rproc_load_event);
>> +EXPORT_TRACEPOINT_SYMBOL(rproc_start_event);
>> +EXPORT_TRACEPOINT_SYMBOL(rproc_stop_event);
>> +EXPORT_TRACEPOINT_SYMBOL(rproc_interrupt_event);
>> +EXPORT_TRACEPOINT_SYMBOL(rproc_subdev_event);
>> diff --git a/drivers/remoteproc/remoteproc_core.c
>> b/drivers/remoteproc/remoteproc_core.c
>> index 1cd4815a6dd1..6def868f0a98 100644
>> --- a/drivers/remoteproc/remoteproc_core.c
>> +++ b/drivers/remoteproc/remoteproc_core.c
>> @@ -38,6 +38,7 @@
>> #include <linux/virtio_ring.h>
>> #include <asm/byteorder.h>
>> #include <linux/platform_device.h>
>> +#include <trace/events/rproc_qcom.h>
>> #include "remoteproc_internal.h"
>> @@ -1270,6 +1271,7 @@ static int rproc_start(struct rproc *rproc,
>> const struct firmware *fw)
>> /* load the ELF segments to memory */
>> ret = rproc_load_segments(rproc, fw);
>> + trace_rproc_load_event(rproc, ret);
>> if (ret) {
>> dev_err(dev, "Failed to load program segments: %d\n", ret);
>> return ret;
>> @@ -1305,6 +1307,7 @@ static int rproc_start(struct rproc *rproc,
>> const struct firmware *fw)
>> /* Start any subdevices for the remote processor */
>> ret = rproc_start_subdevices(rproc);
>> +
>> if (ret) {
>> dev_err(dev, "failed to probe subdevices for %s: %d\n",
>> rproc->name, ret);
>> @@ -1729,6 +1732,8 @@ static int rproc_stop(struct rproc *rproc, bool
>> crashed)
>> return ret;
>> }
>> + trace_rproc_stop_event(rproc, crashed ? "crash stop" : "stop");
>> +
>> rproc_unprepare_subdevices(rproc);
>> rproc->state = RPROC_OFFLINE;
>> @@ -1939,6 +1944,8 @@ int rproc_boot(struct rproc *rproc)
>> dev_info(dev, "attaching to %s\n", rproc->name);
>> ret = rproc_attach(rproc);
>> + trace_rproc_start_event(rproc, ret);
>> +
>> } else {
>> dev_info(dev, "powering up %s\n", rproc->name);
>> @@ -1950,6 +1957,7 @@ int rproc_boot(struct rproc *rproc)
>> }
>> ret = rproc_fw_boot(rproc, firmware_p);
>> + trace_rproc_start_event(rproc, ret);
>> release_firmware(firmware_p);
>> }
>> diff --git a/include/trace/events/rproc_qcom.h
>> b/include/trace/events/rproc_qcom.h
>> new file mode 100644
>> index 000000000000..66b10cb17965
>> --- /dev/null
>> +++ b/include/trace/events/rproc_qcom.h
>> @@ -0,0 +1,128 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>> +/*
>> + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights
>> reserved.
>> + */
>> +
>> +#undef TRACE_SYSTEM
>> +#define TRACE_SYSTEM rproc_qcom
>> +
>> +#if !defined(_TRACE_RPROC_QCOM_H) || defined(TRACE_HEADER_MULTI_READ)
>> +#define _TRACE_RPROC_QCOM_H
>> +#include <linux/tracepoint.h>
>> +#include <linux/remoteproc.h>
>> +
>> +/*
>> + * Tracepoints for remoteproc and subdevice events
>> + */
>> +TRACE_EVENT(rproc_load_event,
>> +
>> + TP_PROTO(struct rproc *rproc, int ret),
>> +
>> + TP_ARGS(rproc, ret),
>> +
>> + TP_STRUCT__entry(
>> + __string(name, rproc->name)
>> + __string(firmware, rproc->firmware)
>> + __field(int,ret)
>> + ),
>> +
>> + TP_fast_assign(
>> + __assign_str(name, rproc->name);
>> + __assign_str(firmware, rproc->firmware);
>> + __entry->ret = ret;
>> + ),
>> +
>> + TP_printk("%s loading firmware %s returned %d",
>> + __get_str(name), __get_str(firmware),
>> + __entry->ret)
>> +);
>> +
>> +TRACE_EVENT(rproc_start_event,
>> +
>> + TP_PROTO(struct rproc *rproc, int ret),
>> +
>> + TP_ARGS(rproc, ret),
>> +
>> + TP_STRUCT__entry(
>> + __string(name, rproc->name)
>> + __field(int, ret)
>> + ),
>> +
>> + TP_fast_assign(
>> + __assign_str(name, rproc->name);
>> + __entry->ret = ret;
>> + ),
>> +
>> + TP_printk("%s %d", __get_str(name), __entry->ret)
>> +);
>> +
>> +TRACE_EVENT(rproc_stop_event,
>> +
>> + TP_PROTO(struct rproc *rproc, char* crash_msg),
>> +
>> + TP_ARGS(rproc, crash_msg),
>> +
>> + TP_STRUCT__entry(
>> + __string(name, rproc->name)
>> + __string(crash_msg, crash_msg)
>> + ),
>> +
>> + TP_fast_assign(
>> + __assign_str(name, rproc->name);
>> + __assign_str(crash_msg, crash_msg)
>> + ),
>> +
>> + TP_printk("%s %s", __get_str(name), __get_str(crash_msg))
>> +);
>> +
>> +TRACE_EVENT(rproc_interrupt_event,
>> +
>> + TP_PROTO(struct rproc *rproc, const char* event,
>> + const char* msg),
>> +
>> + TP_ARGS(rproc, event, msg),
>> +
>> + TP_STRUCT__entry(
>> + __string(name, rproc->name)
>> + __string(event, event)
>> + __string(msg, msg)
>> + ),
>> +
>> + TP_fast_assign(
>> + __assign_str(name, rproc->name);
>> + __assign_str(event, event);
>> + __assign_str(msg, msg);
>> + ),
>> +
>> + TP_printk("%s %s returned %s", __get_str(name),
>> + __get_str(event), __get_str(msg))
>> +);
>> +
>> +TRACE_EVENT(rproc_subdev_event,
>> +
>> + TP_PROTO(const char* rproc, const char* subdev,
>> + const char* event, int ret),
>> +
>> + TP_ARGS(rproc, subdev, event, ret),
>> +
>> + TP_STRUCT__entry(
>> + __string(rproc, rproc)
>> + __string(subdev, subdev)
>> + __string(event, event)
>> + __field(int, ret)
>> + ),
>> +
>> + TP_fast_assign(
>> + __assign_str(rproc, rproc);
>> + __assign_str(subdev, subdev);
>> + __assign_str(event, event);
>> + __entry->ret = ret;
>> + ),
>> +
>> + TP_printk("%s %s %s %d", __get_str(rproc), __get_str(subdev),
>> + __get_str(event), __entry->ret)
>> +);
>> +#endif /* _TRACE_RPROC_QCOM_H */
>> +
>> +/* This part must be outside protection */
>> +#include <trace/define_trace.h>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-08 22:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-05 8:28 [PATCH v2 1/1] remoteproc: qcom: Add remoteproc tracing kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2023-03-03 3:54 Gokul krishna Krishnakumar
2023-03-06 12:17 ` Mukesh Ojha
2023-03-08 22:48 ` Gokul Krishna Krishnakumar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.