* [PATCH] drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers
@ 2020-02-18 21:00 Rob Clark
2020-02-18 23:06 ` [Freedreno] " Jordan Crouse
0 siblings, 1 reply; 2+ messages in thread
From: Rob Clark @ 2020-02-18 21:00 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR MSM ADRENO GPU,
open list:DRM DRIVER FOR MSM ADRENO GPU, open list
From: Rob Clark <robdclark@chromium.org>
Also log buffers with the DUMP flag set, to ensure we capture all useful
cmdstream in crashdump state with modern mesa.
Otherwise we miss out on the contents of "state object" cmdstream
buffers.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_gem.h | 10 ++++++++++
drivers/gpu/drm/msm/msm_gpu.c | 28 +++++++++++++++++++++++-----
drivers/gpu/drm/msm/msm_rd.c | 8 +-------
3 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index 9e0953c2b7ce..22b4ccd7bb28 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -160,4 +160,14 @@ struct msm_gem_submit {
} bos[0];
};
+/* helper to determine of a buffer in submit should be dumped, used for both
+ * devcoredump and debugfs cmdstream dumping:
+ */
+static bool
+should_dump(struct msm_gem_submit *submit, int idx)
+{
+ extern bool rd_full;
+ return rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP);
+}
+
#endif /* __MSM_GEM_H__ */
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 18f3a5c53ffb..615c5cda5389 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -355,16 +355,34 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
state->cmd = kstrdup(cmd, GFP_KERNEL);
if (submit) {
- int i;
-
- state->bos = kcalloc(submit->nr_cmds,
+ int i, nr = 0;
+
+ /* count # of buffers to dump: */
+ for (i = 0; i < submit->nr_bos; i++)
+ if (should_dump(submit, i))
+ nr++;
+ /* always dump cmd bo's, but don't double count them: */
+ for (i = 0; i < submit->nr_cmds; i++)
+ if (!should_dump(submit, submit->cmd[i].idx))
+ nr++;
+
+ state->bos = kcalloc(nr,
sizeof(struct msm_gpu_state_bo), GFP_KERNEL);
+ for (i = 0; i < submit->nr_bos; i++) {
+ if (should_dump(submit, i)) {
+ msm_gpu_crashstate_get_bo(state, submit->bos[i].obj,
+ submit->bos[i].iova, submit->bos[i].flags);
+ }
+ }
+
for (i = 0; state->bos && i < submit->nr_cmds; i++) {
int idx = submit->cmd[i].idx;
- msm_gpu_crashstate_get_bo(state, submit->bos[idx].obj,
- submit->bos[idx].iova, submit->bos[idx].flags);
+ if (!should_dump(submit, submit->cmd[i].idx)) {
+ msm_gpu_crashstate_get_bo(state, submit->bos[idx].obj,
+ submit->bos[idx].iova, submit->bos[idx].flags);
+ }
}
}
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index af7ceb246c7c..732f65df5c4f 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -43,7 +43,7 @@
#include "msm_gpu.h"
#include "msm_gem.h"
-static bool rd_full = false;
+bool rd_full = false;
MODULE_PARM_DESC(rd_full, "If true, $debugfs/.../rd will snapshot all buffer contents");
module_param_named(rd_full, rd_full, bool, 0600);
@@ -336,12 +336,6 @@ static void snapshot_buf(struct msm_rd_state *rd,
msm_gem_put_vaddr(&obj->base);
}
-static bool
-should_dump(struct msm_gem_submit *submit, int idx)
-{
- return rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP);
-}
-
/* called under struct_mutex */
void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,
const char *fmt, ...)
--
2.24.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Freedreno] [PATCH] drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers
2020-02-18 21:00 [PATCH] drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers Rob Clark
@ 2020-02-18 23:06 ` Jordan Crouse
0 siblings, 0 replies; 2+ messages in thread
From: Jordan Crouse @ 2020-02-18 23:06 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, Rob Clark, open list:DRM DRIVER FOR MSM ADRENO GPU,
David Airlie, open list:DRM DRIVER FOR MSM ADRENO GPU, open list,
Daniel Vetter, Sean Paul
On Tue, Feb 18, 2020 at 01:00:21PM -0800, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> Also log buffers with the DUMP flag set, to ensure we capture all useful
> cmdstream in crashdump state with modern mesa.
>
> Otherwise we miss out on the contents of "state object" cmdstream
> buffers.
One nit, but with that:
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/msm_gem.h | 10 ++++++++++
> drivers/gpu/drm/msm/msm_gpu.c | 28 +++++++++++++++++++++++-----
> drivers/gpu/drm/msm/msm_rd.c | 8 +-------
> 3 files changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
> index 9e0953c2b7ce..22b4ccd7bb28 100644
> --- a/drivers/gpu/drm/msm/msm_gem.h
> +++ b/drivers/gpu/drm/msm/msm_gem.h
> @@ -160,4 +160,14 @@ struct msm_gem_submit {
> } bos[0];
> };
>
> +/* helper to determine of a buffer in submit should be dumped, used for both
> + * devcoredump and debugfs cmdstream dumping:
> + */
> +static bool
Static inline? Surprised you didn't get an unused warning or two.
> +should_dump(struct msm_gem_submit *submit, int idx)
> +{
> + extern bool rd_full;
> + return rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP);
> +}
> +
> #endif /* __MSM_GEM_H__ */
> diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
> index 18f3a5c53ffb..615c5cda5389 100644
> --- a/drivers/gpu/drm/msm/msm_gpu.c
> +++ b/drivers/gpu/drm/msm/msm_gpu.c
> @@ -355,16 +355,34 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
> state->cmd = kstrdup(cmd, GFP_KERNEL);
>
> if (submit) {
> - int i;
> -
> - state->bos = kcalloc(submit->nr_cmds,
> + int i, nr = 0;
> +
> + /* count # of buffers to dump: */
> + for (i = 0; i < submit->nr_bos; i++)
> + if (should_dump(submit, i))
> + nr++;
> + /* always dump cmd bo's, but don't double count them: */
> + for (i = 0; i < submit->nr_cmds; i++)
> + if (!should_dump(submit, submit->cmd[i].idx))
> + nr++;
> +
> + state->bos = kcalloc(nr,
> sizeof(struct msm_gpu_state_bo), GFP_KERNEL);
>
> + for (i = 0; i < submit->nr_bos; i++) {
> + if (should_dump(submit, i)) {
> + msm_gpu_crashstate_get_bo(state, submit->bos[i].obj,
> + submit->bos[i].iova, submit->bos[i].flags);
> + }
> + }
> +
> for (i = 0; state->bos && i < submit->nr_cmds; i++) {
> int idx = submit->cmd[i].idx;
>
> - msm_gpu_crashstate_get_bo(state, submit->bos[idx].obj,
> - submit->bos[idx].iova, submit->bos[idx].flags);
> + if (!should_dump(submit, submit->cmd[i].idx)) {
> + msm_gpu_crashstate_get_bo(state, submit->bos[idx].obj,
> + submit->bos[idx].iova, submit->bos[idx].flags);
> + }
> }
> }
>
> diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
> index af7ceb246c7c..732f65df5c4f 100644
> --- a/drivers/gpu/drm/msm/msm_rd.c
> +++ b/drivers/gpu/drm/msm/msm_rd.c
> @@ -43,7 +43,7 @@
> #include "msm_gpu.h"
> #include "msm_gem.h"
>
> -static bool rd_full = false;
> +bool rd_full = false;
> MODULE_PARM_DESC(rd_full, "If true, $debugfs/.../rd will snapshot all buffer contents");
> module_param_named(rd_full, rd_full, bool, 0600);
>
> @@ -336,12 +336,6 @@ static void snapshot_buf(struct msm_rd_state *rd,
> msm_gem_put_vaddr(&obj->base);
> }
>
> -static bool
> -should_dump(struct msm_gem_submit *submit, int idx)
> -{
> - return rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP);
> -}
> -
> /* called under struct_mutex */
> void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,
> const char *fmt, ...)
> --
> 2.24.1
>
> _______________________________________________
> Freedreno mailing list
> Freedreno@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/freedreno
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-18 23:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-18 21:00 [PATCH] drm/msm: devcoredump should dump MSM_SUBMIT_BO_DUMP buffers Rob Clark
2020-02-18 23:06 ` [Freedreno] " Jordan Crouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).