fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/hang_replay: add option to dump VM state as part of the dump

Browse source 
Replaying a dump file requires the VM state in order to feed the
replay tool with the necessary VMA properties that described the hang,
however, these properties are not necessarily useful once the replay
tool re-runs said traces, however, this patch makes this optional.

Signed-off-by: Carlos Santa <carlos.santa@intel.com>
This commit is contained in:
Carlos Santa 2025-10-22 15:34:36 -07:00 • committed by Carlos Santa
parent 3c58fbb6bd
commit f83c4b0f6d
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/intel/tools/intel_hang_replay.c
View file

@ -243,6 +243,7 @@ print_help(const char *filename, FILE *f)
fprintf(f, " -s, --shader ADDR print shader at ADDR\n");
fprintf(f, " -h, --help print this screen\n");
fprintf(f, " -a, --address ADDR Find BO containing ADDR\n");
fprintf(f, " -D, --dumpable add DRM_XE_VM_BIND_FLAG_DUMPABLE to all VMA binds\n");
}
static int
@ -403,7 +404,8 @@ static int
replay_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *devinfo,
struct util_dynarray *buffers, void *mem_ctx,
struct intel_hang_dump_block_exec *init,
struct intel_hang_dump_block_exec *exec, uint32_t vm_flags)
struct intel_hang_dump_block_exec *exec,
uint32_t vm_flags, uint32_t bo_dumpable)
{
/* Sort buffers by size */
qsort(util_dynarray_begin(buffers),
@ -414,7 +416,8 @@ replay_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *devinfo
if (devinfo->kmd_type == INTEL_KMD_TYPE_I915)
return process_i915_dmp_file(file_fd, drm_fd, buffers, mem_ctx, init, exec);
else if (devinfo->kmd_type == INTEL_KMD_TYPE_XE)
return process_xe_dmp_file(file_fd, drm_fd, devinfo, buffers, mem_ctx, init, exec, vm_flags);
return process_xe_dmp_file(file_fd, drm_fd, devinfo, buffers, mem_ctx, init, exec,
vm_flags, bo_dumpable);
else
fprintf(stderr, "driver is unknown, exiting\n");
@ -424,12 +427,13 @@ replay_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *devinfo
int
main(int argc, char *argv[])
{
bool help = false, list = false;
bool help = false, list = false, bo_dumpable = false;
const struct option aubinator_opts[] = {
{ "address", required_argument, NULL, 'a' },
{ "dump", required_argument, NULL, 'd' },
{ "shader", required_argument, NULL, 's' },
{ "list", no_argument, NULL, 'l' },
{ "dumpable", no_argument, 0, 'D'},
{ "help", no_argument, NULL, 'h' },
{ NULL, 0, NULL, 0 },
};
@ -444,7 +448,7 @@ main(int argc, char *argv[])
uint64_t check_addr = -1;
uint32_t vm_flags = -1;
int c, i;
while ((c = getopt_long(argc, argv, "a:d:hls:", aubinator_opts, &i)) != -1) {
while ((c = getopt_long(argc, argv, "a:d:hlDs:", aubinator_opts, &i)) != -1) {
switch (c) {
case 'a':
check_addr = strtol(optarg, NULL, 0);
@ -464,6 +468,9 @@ main(int argc, char *argv[])
case 'l':
list = true;
break;
case 'D':
bo_dumpable = true;
break;
default:
break;
}
@ -654,7 +661,7 @@ main(int argc, char *argv[])
}
if (!list && util_dynarray_num_elements(&shader_addresses, uint64_t) == 0)
replay_dmp_file(file_fd, drm_fd, &devinfo, &buffers, mem_ctx, &init, &exec, vm_flags);
replay_dmp_file(file_fd, drm_fd, &devinfo, &buffers, mem_ctx, &init, &exec, vm_flags, bo_dumpable);
close(drm_fd);
close(file_fd);

7
src/intel/tools/intel_hang_replay_xe.c
View file

@ -283,7 +283,7 @@ process_xe_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *dev
struct util_dynarray *buffers, void *mem_ctx,
struct intel_hang_dump_block_exec *init,
struct intel_hang_dump_block_exec *block_exec,
uint32_t vm_flags)
uint32_t vm_flags, uint32_t bo_dumpable)
{
void *hw_img = NULL;
uint32_t hw_img_size = 0;
@ -298,6 +298,7 @@ process_xe_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *dev
.syncs = to_user_pointer(&sync),
.num_batch_buffer = 1,
};
const uint32_t dumpable_bit = bo_dumpable ? DRM_XE_VM_BIND_FLAG_DUMPABLE : 0;
uint32_t vm = xe_vm_create(drm_fd, vm_flags);
@ -311,7 +312,7 @@ process_xe_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *dev
}
util_dynarray_foreach(buffers, struct gem_bo, bo) {
uint32_t ops = 0;
uint32_t flags = 0;
uint32_t flags = dumpable_bit;
uint64_t obj_offset = 0;
int ret;
@ -339,7 +340,7 @@ process_xe_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *dev
}
write_xe_bo_data(drm_fd, bo->gem_handle, file_fd, bo->size, bo->props.pat_index, devinfo);
ops = DRM_XE_VM_BIND_OP_MAP;
flags = DRM_XE_VM_BIND_FLAG_READONLY;
flags |= DRM_XE_VM_BIND_FLAG_READONLY;
} else if (bo->props.mem_type == INTEL_HANG_DUMP_BLOCK_MEM_TYPE_USERPTR) {
ops = DRM_XE_VM_BIND_OP_MAP_USERPTR;

3
src/intel/tools/intel_hang_replay_xe.h
View file

@ -15,4 +15,5 @@
bool process_xe_dmp_file(int file_fd, int drm_fd, const struct intel_device_info *devinfo,
struct util_dynarray *buffers, void *mem_ctx,
struct intel_hang_dump_block_exec *init,
struct intel_hang_dump_block_exec *exec, uint32_t vm_uapi_flags);
struct intel_hang_dump_block_exec *exec,
uint32_t vm_uapi_flags, uint32_t bo_dumpable);