[Mesa-dev] [PATCH] winsys/radeon: add command stream replay dump for faulty lockup
Jerome Glisse
j.glisse at gmail.com
Wed Mar 27 08:38:06 PDT 2013
On Wed, Mar 27, 2013 at 11:27 AM, <j.glisse at gmail.com> wrote:
> From: Jerome Glisse <jglisse at redhat.com>
>
> Build time option, set RADEON_CS_DUMP_ON_LOCKUP to 1 in radeon_drm_cs.h to
> enable it.
>
> When enabled after each cs submission the code will try to detect lockup by
> waiting on one of the buffer of the cs to become idle, after a timeout it
> will consider that the cs triggered a lockup and will write a radeon_lockup.c
> file in current directory that have all information for replaying the cs.
>
> To build this file :
> gcc -O0 -g radeon_lockup.c -ldrm -o radeon_lockup -I/usr/include/libdrm
>
> Signed-off-by: Jerome Glisse <jglisse at redhat.com>
Maybe i should add the radeon_ctx.h file to winsys dir as you need it
to build the radeon_lockup.c i did not wanted to printf the whole
helper. For example you can check radeon_lockup.c and radeon_ctx.h
here :
http://people.freedesktop.org/~glisse/rlockup/
Note this is a radeon si verde capture for a 2d tiling that lockup
(can be hard lockup sometimes so be careful).
Cheers,
Jerome
> ---
> src/gallium/winsys/radeon/drm/Makefile.sources | 1 +
> src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 80 ++++++------
> src/gallium/winsys/radeon/drm/radeon_drm_bo.h | 2 +
> src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 4 +
> src/gallium/winsys/radeon/drm/radeon_drm_cs.h | 6 +
> src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c | 135 +++++++++++++++++++++
> 6 files changed, 191 insertions(+), 37 deletions(-)
> create mode 100644 src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c
>
> diff --git a/src/gallium/winsys/radeon/drm/Makefile.sources b/src/gallium/winsys/radeon/drm/Makefile.sources
> index 1d18d61..4ca5ebb 100644
> --- a/src/gallium/winsys/radeon/drm/Makefile.sources
> +++ b/src/gallium/winsys/radeon/drm/Makefile.sources
> @@ -1,4 +1,5 @@
> C_SOURCES := \
> radeon_drm_bo.c \
> radeon_drm_cs.c \
> + radeon_drm_cs_dump.c \
> radeon_drm_winsys.c
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
> index f4ac526..5a9493a 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
> @@ -391,14 +391,54 @@ static void radeon_bo_destroy(struct pb_buffer *_buf)
> FREE(bo);
> }
>
> +void *radeon_bo_do_map(struct radeon_bo *bo)
> +{
> + struct drm_radeon_gem_mmap args = {0};
> + void *ptr;
> +
> + /* Return the pointer if it's already mapped. */
> + if (bo->ptr)
> + return bo->ptr;
> +
> + /* Map the buffer. */
> + pipe_mutex_lock(bo->map_mutex);
> + /* Return the pointer if it's already mapped (in case of a race). */
> + if (bo->ptr) {
> + pipe_mutex_unlock(bo->map_mutex);
> + return bo->ptr;
> + }
> + args.handle = bo->handle;
> + args.offset = 0;
> + args.size = (uint64_t)bo->base.size;
> + if (drmCommandWriteRead(bo->rws->fd,
> + DRM_RADEON_GEM_MMAP,
> + &args,
> + sizeof(args))) {
> + pipe_mutex_unlock(bo->map_mutex);
> + fprintf(stderr, "radeon: gem_mmap failed: %p 0x%08X\n",
> + bo, bo->handle);
> + return NULL;
> + }
> +
> + ptr = os_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED,
> + bo->rws->fd, args.addr_ptr);
> + if (ptr == MAP_FAILED) {
> + pipe_mutex_unlock(bo->map_mutex);
> + fprintf(stderr, "radeon: mmap failed, errno: %i\n", errno);
> + return NULL;
> + }
> + bo->ptr = ptr;
> + pipe_mutex_unlock(bo->map_mutex);
> +
> + return bo->ptr;
> +}
> +
> static void *radeon_bo_map(struct radeon_winsys_cs_handle *buf,
> struct radeon_winsys_cs *rcs,
> enum pipe_transfer_usage usage)
> {
> struct radeon_bo *bo = (struct radeon_bo*)buf;
> struct radeon_drm_cs *cs = (struct radeon_drm_cs*)rcs;
> - struct drm_radeon_gem_mmap args = {0};
> - void *ptr;
>
> /* If it's not unsynchronized bo_map, flush CS if needed and then wait. */
> if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
> @@ -461,41 +501,7 @@ static void *radeon_bo_map(struct radeon_winsys_cs_handle *buf,
> }
> }
>
> - /* Return the pointer if it's already mapped. */
> - if (bo->ptr)
> - return bo->ptr;
> -
> - /* Map the buffer. */
> - pipe_mutex_lock(bo->map_mutex);
> - /* Return the pointer if it's already mapped (in case of a race). */
> - if (bo->ptr) {
> - pipe_mutex_unlock(bo->map_mutex);
> - return bo->ptr;
> - }
> - args.handle = bo->handle;
> - args.offset = 0;
> - args.size = (uint64_t)bo->base.size;
> - if (drmCommandWriteRead(bo->rws->fd,
> - DRM_RADEON_GEM_MMAP,
> - &args,
> - sizeof(args))) {
> - pipe_mutex_unlock(bo->map_mutex);
> - fprintf(stderr, "radeon: gem_mmap failed: %p 0x%08X\n",
> - bo, bo->handle);
> - return NULL;
> - }
> -
> - ptr = os_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED,
> - bo->rws->fd, args.addr_ptr);
> - if (ptr == MAP_FAILED) {
> - pipe_mutex_unlock(bo->map_mutex);
> - fprintf(stderr, "radeon: mmap failed, errno: %i\n", errno);
> - return NULL;
> - }
> - bo->ptr = ptr;
> - pipe_mutex_unlock(bo->map_mutex);
> -
> - return bo->ptr;
> + return radeon_bo_do_map(bo);
> }
>
> static void radeon_bo_unmap(struct radeon_winsys_cs_handle *_buf)
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
> index 82ea141..c962b37 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.h
> @@ -78,4 +78,6 @@ void radeon_bo_reference(struct radeon_bo **dst, struct radeon_bo *src)
> pb_reference((struct pb_buffer**)dst, (struct pb_buffer*)src);
> }
>
> +void *radeon_bo_do_map(struct radeon_bo *bo);
> +
> #endif
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> index 6a7115b..aa7e295 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
> @@ -428,6 +428,10 @@ void radeon_drm_cs_emit_ioctl_oneshot(struct radeon_cs_context *csc)
> }
> }
>
> +#if RADEON_CS_DUMP_ON_LOCKUP
> + radeon_dump_cs_on_lockup(csc);
> +#endif
> +
> for (i = 0; i < csc->crelocs; i++)
> p_atomic_dec(&csc->relocs_bo[i]->num_active_ioctls);
>
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h
> index 570842d..66aee55 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h
> @@ -30,6 +30,8 @@
> #include "radeon_drm_bo.h"
> #include <radeon_drm.h>
>
> +#define RADEON_CS_DUMP_ON_LOCKUP 0
> +
> struct radeon_cs_context {
> uint32_t buf[RADEON_MAX_CMDBUF_DWORDS];
>
> @@ -121,4 +123,8 @@ void radeon_drm_cs_sync_flush(struct radeon_winsys_cs *rcs);
> void radeon_drm_cs_init_functions(struct radeon_drm_winsys *ws);
> void radeon_drm_cs_emit_ioctl_oneshot(struct radeon_cs_context *csc);
>
> +#if RADEON_CS_DUMP_ON_LOCKUP
> +void radeon_dump_cs_on_lockup(struct radeon_cs_context *csc);
> +#endif
> +
> #endif
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c
> new file mode 100644
> index 0000000..d1f50c2
> --- /dev/null
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs_dump.c
> @@ -0,0 +1,135 @@
> +/*
> + * Copyright © 2013 Jérôme Glisse
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining
> + * a copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS, AUTHORS
> + * AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> + * USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + */
> +/*
> + * Authors:
> + * Jérôme Glisse <jglisse at redhat.com>
> + */
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <stdint.h>
> +#include <xf86drm.h>
> +#include "radeon_drm_cs.h"
> +#include "radeon_drm_bo.h"
> +
> +#if RADEON_CS_DUMP_ON_LOCKUP
> +void radeon_dump_cs_on_lockup(struct radeon_cs_context *csc)
> +{
> + struct drm_radeon_gem_busy args;
> + FILE *dump;
> + unsigned i, lockup;
> + uint32_t *ptr;
> +
> + if (!csc->crelocs) {
> + /* can not determine if there was a lockup if no bo were use by
> + * the cs and most likely in such case no lockup occurs
> + */
> + return;
> + }
> +
> + memset(&args, 0, sizeof(args));
> + args.handle = csc->relocs_bo[0]->handle;
> + for (i = 0; i < 10; i++) {
> + usleep(5);
> + lockup = drmCommandWriteRead(csc->fd, DRM_RADEON_GEM_BUSY, &args, sizeof(args));
> + if (!lockup) {
> + break;
> + }
> + }
> + if (!lockup || i < 10) {
> + return;
> + }
> +
> + /* ok we are most likely facing a lockup write the standalone replay file */
> + dump = fopen("radeon_lockup.c", "w");
> + if (dump == NULL) {
> + return;
> + }
> + fprintf(dump, "#include <stdio.h>\n");
> + fprintf(dump, "#include <stdint.h>\n");
> + fprintf(dump, "#include \"radeon_ctx.h\"\n\n");
> +
> + for (i = 0; i < csc->crelocs; i++) {
> + unsigned j, ndw = (csc->relocs_bo[i]->base.size + 3) >> 2;
> +
> + ptr = radeon_bo_do_map(csc->relocs_bo[i]);
> + if (ptr) {
> + fprintf(dump, "static uint32_t bo_%04d_data[%d] = {\n ", i, ndw);
> + for (j = 0; j < ndw; j++) {
> + fprintf(dump, " 0x%08x,", ptr[j]);
> + if (j && !(j % 8)) {
> + fprintf(dump, "\n ");
> + }
> + }
> + fprintf(dump, "};\n\n");
> + }
> + }
> +
> + fprintf(dump, "static uint32_t bo_relocs[%d] = {\n", csc->crelocs * 4);
> + for (i = 0; i < csc->crelocs; i++) {
> + fprintf(dump, " 0x%08x, 0x%08x, 0x%08x, 0x%08x,\n",
> + 0, csc->relocs[i].read_domains, csc->relocs[i].write_domain, csc->relocs[i].flags);
> + }
> + fprintf(dump, "};\n\n");
> +
> + fprintf(dump, "static uint32_t cs[%d] = {\n", csc->chunks[0].length_dw);
> + ptr = csc->buf;
> + for (i = 0; i < csc->chunks[0].length_dw; i++) {
> + fprintf(dump, " 0x%08x,\n", ptr[i]);
> + }
> + fprintf(dump, "};\n\n");
> +
> + fprintf(dump, "static uint32_t cs_flags[2] = {\n");
> + fprintf(dump, " 0x%08x,\n", csc->flags[0]);
> + fprintf(dump, " 0x%08x,\n", csc->flags[1]);
> + fprintf(dump, "};\n\n");
> +
> + fprintf(dump, "int main(int argc, char *argv[])\n");
> + fprintf(dump, "{\n");
> + fprintf(dump, " struct bo *bo[%d];\n", csc->crelocs);
> + fprintf(dump, " struct ctx ctx;\n");
> + fprintf(dump, "\n");
> + fprintf(dump, " ctx_init(&ctx);\n");
> + fprintf(dump, "\n");
> +
> + for (i = 0; i < csc->crelocs; i++) {
> + unsigned ndw = (csc->relocs_bo[i]->base.size + 3) >> 2;
> + uint32_t *ptr;
> +
> + ptr = radeon_bo_do_map(csc->relocs_bo[i]);
> + if (ptr) {
> + fprintf(dump, " bo[%d] = bo_new(&ctx, %d, bo_%04d_data, 0x%016lx, 0x%08x);\n",
> + i, ndw, i, csc->relocs_bo[i]->va, csc->relocs_bo[i]->base.alignment);
> + } else {
> + fprintf(dump, " bo[%d] = bo_new(&ctx, %d, NULL, 0x%016lx, 0x%08x);\n",
> + i, ndw, csc->relocs_bo[i]->va, csc->relocs_bo[i]->base.alignment);
> + }
> + }
> + fprintf(dump, "\n");
> + fprintf(dump, " ctx_cs(&ctx, cs, cs_flags, %d, bo, bo_relocs, %d);\n", csc->chunks[0].length_dw, csc->crelocs);
> + fprintf(dump, "}\n");
> + fclose(dump);
> +}
> +#endif
> --
> 1.8.1.4
>
More information about the mesa-dev
mailing list