Current Hardware events and Hardware cache events have special perf types, PERF_TYPE_HARDWARE and PERF_TYPE_HW_CACHE. The two types don't pass the PMU type in the user interface. For a hybrid system, the perf subsystem doesn't know which PMU the events belong to. The first capable PMU will always be assigned to the events. The events never get a chance to run on the other capable PMUs. Extend the two types to become PMU aware types. The PMU type ID is stored at attr.config[63:32]. Add a new PMU capability, PERF_PMU_CAP_EXTENDED_HW_TYPE, to indicate a PMU which supports the extended PERF_TYPE_HARDWARE and PERF_TYPE_HW_CACHE. The PMU type is only required when searching a specific PMU. The PMU specific codes will only be interested in the 'real' config value, which is stored in the low 32 bit of the event->attr.config. Update the event->attr.config in the generic code, so the PMU specific codes don't need to calculate it separately. If a user specifies a PMU type, but the PMU doesn't support the extended type, error out. If an event cannot be initialized in a PMU specified by a user, error out immediately. Perf should not try to open it on other PMUs. The new PMU capability is only set for the X86 hybrid PMUs for now. Other architectures, e.g., ARM, may need it as well. The support on ARM may be implemented later separately.
Showing the changes to include/uapi (1 of 4 files). Show all
Unified · Split
| @@ -37,6 +37,21 @@ enum perf_type_id { · 36 unmodified lines | |||
| 37 | PERF_TYPE_MAX, /* non-ABI */ | 37 | PERF_TYPE_MAX, /* non-ABI */ |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | /* | ||
| 41 | * attr.config layout for type PERF_TYPE_HARDWARE and PERF_TYPE_HW_CACHE | ||
| 42 | * PERF_TYPE_HARDWARE: 0xEEEEEEEE000000AA | ||
| 43 | * AA: hardware event ID | ||
| 44 | * EEEEEEEE: PMU type ID | ||
| 45 | * PERF_TYPE_HW_CACHE: 0xEEEEEEEE00DDCCBB | ||
| 46 | * BB: hardware cache ID | ||
| 47 | * CC: hardware cache op ID | ||
| 48 | * DD: hardware cache op result ID | ||
| 49 | * EEEEEEEE: PMU type ID | ||
| 50 | * If the PMU type ID is 0, the PERF_TYPE_RAW will be applied. | ||
| 51 | */ | ||
| 52 | #define PERF_PMU_TYPE_SHIFT 32 | ||
| 53 | #define PERF_HW_EVENT_MASK 0xffffffff | ||
| 54 | |||
| 40 | /* | 55 | /* |
| 41 | * Generalized performance event event_id types, used by the | 56 | * Generalized performance event event_id types, used by the |
| 42 | * attr.event_id parameter of the sys_perf_event_open() | 57 | * attr.event_id parameter of the sys_perf_event_open() |