Unverified Commit 245c31af authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3903 kabi: Reserve space for perf subsystem related structures 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Jihong <yangjihong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5FD7GNP7PXG5NAGJB6RYYP6PKN4Q3L6H/ 
 
https://gitee.com/openeuler/kernel/issues/I8UOCZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/3903

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents d4cdb57c c2dc3a13

include/linux/perf_event.h

+31 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ struct perf_guest_info_callbacks { 
#include <linux/security.h>

#include <linux/static_call.h>

#include <linux/lockdep.h>

#include <linux/kabi.h>

#include <asm/local.h>



struct perf_callchain_entry {
@@ -324,6 +325,11 @@ struct pmu { 
	/* number of address filters this PMU can do */

	unsigned int			nr_addr_filters;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)



	/*

	 * Fully disable/enable this PMU, can be used to protect from the PMI

	 * as well as for lazy/batch writing of the MSRs.
@@ -540,6 +546,11 @@ struct pmu { 
	 * Check period value for PERF_EVENT_IOC_PERIOD ioctl.

	 */

	int (*check_period)		(struct perf_event *event, u64 value); /* optional */



	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



enum perf_addr_filter_action_t {
@@ -839,6 +850,13 @@ struct perf_event { 
	 * user.

	 */

	__u32				orig_type;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

#endif /* CONFIG_PERF_EVENTS */

};
@@ -965,6 +983,11 @@ struct perf_event_context { 
	 * that until the signal is delivered.

	 */

	local_t				nr_pending;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



/*
@@ -1040,6 +1063,9 @@ struct perf_cgroup_info { 
	u64				timestamp;

	u64				timeoffset;

	int				active;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct perf_cgroup {
@@ -1202,6 +1228,11 @@ struct perf_sample_data { 
	u64				data_page_size;

	u64				code_page_size;

	u64				aux_size;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

} ____cacheline_aligned;



/* default value for data source */