Commit e92e03af authored by He Yujie's avatar He Yujie
Browse files

rseq/mm_cid: change KABI consistency interface 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB1OJX



--------------------------------

The KABI consistency interface of the mmcid data structure is
changed from KABI_REPLACE to KABI_DEPRECATE.

Fixes: 7a35fa06 ("rseq/mm_cid: change the mm_cid macro default status and keep KABI consistent")
Signed-off-by: default avatarHe Yujie <coka.heyujie@huawei.com>
parent ab293c3a

include/linux/mm_types.h

+2 −3
Original line number Diff line number Diff line
@@ -788,9 +788,8 @@ struct mm_struct { 
		 */

		unsigned long mm_cid_next_scan;

#else

		KABI_REPLACE(struct mm_cid __percpu *pcpu_cid,

				struct mm_cid __percpu *pcpu_cid)

		KABI_REPLACE(unsigned long mm_cid_next_scan, unsigned long mm_cid_next_scan)

		KABI_DEPRECATE(struct mm_cid __percpu *, pcpu_cid)

		KABI_DEPRECATE(unsigned long, mm_cid_next_scan)

#endif

#ifdef CONFIG_MMU

		atomic_long_t pgtables_bytes;	/* size of all page tables */

include/linux/sched.h

+5 −6
Original line number Diff line number Diff line
@@ -1358,12 +1358,11 @@ struct task_struct { 
	int				mm_cid_active;	/* Whether cid bitmap is active */

	struct callback_head		cid_work;

#else

	KABI_REPLACE(int mm_cid, int mm_cid)

	KABI_REPLACE(int last_mm_cid, int last_mm_cid)

	KABI_REPLACE(int migrate_from_cpu, int migrate_from_cpu)

	KABI_REPLACE(int mm_cid_active, int mm_cid_active)

	KABI_REPLACE(struct callback_head cid_work,

			struct callback_head cid_work)

	KABI_DEPRECATE(int, mm_cid)

	KABI_DEPRECATE(int, last_mm_cid)

	KABI_DEPRECATE(int, migrate_from_cpu)

	KABI_DEPRECATE(int, mm_cid_active)

	KABI_DEPRECATE(struct callback_head, cid_work)

#endif



	struct tlbflush_unmap_batch	tlb_ubc;