Unverified Commit 2f0cfe4b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14225 kabi OLK-6.6 reverve space 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YSZMTG2ROK3RCLCZ5Y2G5VM7LO4C24R5/ 
Luo Gengkun (3):
  kabi: reserve space for perf_event.h
  kabi: reserve space for internal.h
  kabi: reserve space for uprobes.h


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IBC1PM 
 
Link:https://gitee.com/openeuler/kernel/pulls/14225

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 0fd797fd 59a2a3e8

include/linux/perf_event.h

+16 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,14 @@ struct perf_cpu_pmu_context { 
	struct hrtimer			hrtimer;

	ktime_t				hrtimer_interval;

	unsigned int			hrtimer_active;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



/**
@@ -1031,6 +1039,14 @@ struct perf_cpu_context { 
	int				heap_size;

	struct perf_event		**heap;

	struct perf_event		*heap_default[2];

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



struct perf_output_handle {

include/linux/uprobes.h

+9 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct uprobe_consumer { 


#ifdef CONFIG_UPROBES

#include <asm/uprobes.h>

#include <linux/kabi.h>



enum uprobe_task_state {

	UTASK_RUNNING,
@@ -78,6 +79,14 @@ struct uprobe_task { 


	struct return_instance		*return_instances;

	unsigned int			depth;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



struct return_instance {

kernel/events/internal.h

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/hardirq.h>

#include <linux/uaccess.h>

#include <linux/refcount.h>

#include <linux/kabi.h>



/* Buffer handling */
@@ -54,6 +55,15 @@ struct perf_buffer { 
	void				**aux_pages;

	void				*aux_priv;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)



	struct perf_event_mmap_page	*user_page;

	void				*data_pages[];

};