From: James Clark <james.clark@linaro.org> mainline inclusion from mainline-v6.19-rc1 commit cbbfba4847b8a5299d36e002bf864b21bb83295d category: feature bugzilla: https://atomgit.com/openeuler/kernel/issues/9066 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... ----------------------------------------------- Arm FEAT_SPE_FDS adds the ability to filter on the data source of a packet using another 64-bits of event filtering control. As the existing perf_event_attr::configN fields are all used up for SPE PMU, an additional field is needed. Add a new 'config4' field. Reviewed-by: Leo Yan <leo.yan@arm.com> Tested-by: Leo Yan <leo.yan@arm.com> Reviewed-by: Ian Rogers <irogers@google.com> Signed-off-by: James Clark <james.clark@linaro.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Yushan Wang <wangyushan12@huawei.com> Conflicts: include/uapi/linux/perf_event.h [resolved due to local perf_event UAPI context differences] Signed-off-by: Ying Jiang <jiangying44@h-partners.com> --- include/uapi/linux/perf_event.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 365184d931ad..e6d353d220a4 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -17,6 +17,8 @@ #include <linux/types.h> #include <linux/ioctl.h> +#include <linux/kabi.h> + #include <asm/byteorder.h> /* @@ -382,6 +384,7 @@ enum perf_event_read_format { #define PERF_ATTR_SIZE_VER6 120 /* Add: aux_sample_size */ #define PERF_ATTR_SIZE_VER7 128 /* Add: sig_data */ #define PERF_ATTR_SIZE_VER8 136 /* Add: config3 */ +#define PERF_ATTR_SIZE_VER9 144 /* add: config4 */ /* * 'struct perf_event_attr' contains various attributes that define @@ -534,6 +537,7 @@ struct perf_event_attr { __u64 sig_data; __u64 config3; /* extension of config2 */ + KABI_EXTEND(__u64 config4) /* extension of config3 */ }; /* -- 2.33.0