History

Revert "drm/amdkfd: SMI report dropped event count"

This reverts commit a3ab2d45b9887ee609cd3bea39f668236935774c. The userspace side for this code is not ready yet so revert for now.

Alex Deucher committed 2 years ago

Commit 97ddae71 parent 32e7ee22 files · +4 −29Browse files

Showing the changes to include/uapi (1 of 2 files). Show all

Unified · Split

include/uapi/linux/kfd_ioctl.h+0−6
@@ -530,7 +530,6 @@ enum kfd_smi_event { · 529 unmodified lines
530 KFD_SMI_EVENT_QUEUE_EVICTION = 9,530 KFD_SMI_EVENT_QUEUE_EVICTION = 9,
531 KFD_SMI_EVENT_QUEUE_RESTORE = 10,531 KFD_SMI_EVENT_QUEUE_RESTORE = 10,
532 KFD_SMI_EVENT_UNMAP_FROM_GPU = 11,532 KFD_SMI_EVENT_UNMAP_FROM_GPU = 11,
533 KFD_SMI_EVENT_DROPPED_EVENT = 12,
534 533
535 /*534 /*
536 * max event number, as a flag bit to get events from all processes,535 * max event number, as a flag bit to get events from all processes,
@@ -611,7 +610,6 @@ struct kfd_ioctl_smi_events_args { · 74 unmodified lines
611 * rw: 'W' for write page fault, 'R' for read page fault610 * rw: 'W' for write page fault, 'R' for read page fault
612 * rescheduled: 'R' if the queue restore failed and rescheduled to try again611 * rescheduled: 'R' if the queue restore failed and rescheduled to try again
613 * error_code: migrate failure error code, 0 if no error612 * error_code: migrate failure error code, 0 if no error
614 * drop_count: how many events dropped when fifo is full
615 */613 */
616#define KFD_EVENT_FMT_UPDATE_GPU_RESET(reset_seq_num, reset_cause)\614#define KFD_EVENT_FMT_UPDATE_GPU_RESET(reset_seq_num, reset_cause)\
617 "%x %s\n", (reset_seq_num), (reset_cause)615 "%x %s\n", (reset_seq_num), (reset_cause)
@@ -647,10 +645,6 @@ struct kfd_ioctl_smi_events_args { · 29 unmodified lines
647 "%lld -%d @%lx(%lx) %x %d\n", (ns), (pid), (addr), (size),\645 "%lld -%d @%lx(%lx) %x %d\n", (ns), (pid), (addr), (size),\
648 (node), (unmap_trigger)646 (node), (unmap_trigger)
649 647
650#define KFD_EVENT_FMT_DROPPED_EVENT(ns, pid, drop_count)\
651 "%lld -%d %d\n", (ns), (pid), (drop_count)
652
653
654/**************************************************************************************************648/**************************************************************************************************
655 * CRIU IOCTLs (Checkpoint Restore In Userspace)649 * CRIU IOCTLs (Checkpoint Restore In Userspace)
656 *650 *