diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 51c707897c8d696f315506cda91d227271615be9..c53c032a378a7647dba27a0eb763ba41da6cd81e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7755,6 +7755,13 @@ static void sched_free_group(struct task_group *tg)
 	kmem_cache_free(task_group_cache, tg);
 }
 
+#ifdef CONFIG_BPF_SCHED
+static inline void tg_init_tag(struct task_group *tg, struct task_group *ptg)
+{
+	tg->tag = ptg->tag;
+}
+#endif
+
 /* allocate runqueue etc for a new task group */
 struct task_group *sched_create_group(struct task_group *parent)
 {
@@ -7775,6 +7782,10 @@ struct task_group *sched_create_group(struct task_group *parent)
 	if (!alloc_rt_sched_group(tg, parent))
 		goto err;
 
+#ifdef CONFIG_BPF_SCHED
+	tg_init_tag(tg, parent);
+#endif
+
 	alloc_uclamp_sched_group(tg, parent);
 
 	return tg;
@@ -7846,6 +7857,14 @@ static void sched_change_group(struct task_struct *tsk, int type)
 	sched_change_qos_group(tsk, tg);
 #endif
 
+#ifdef CONFIG_BPF_SCHED
+	/*
+	 * This function has cleared and restored the task status,
+	 * so we do not need to dequeue and enqueue the task again.
+	 */
+	tsk->tag = tg->tag;
+#endif
+
 #ifdef CONFIG_FAIR_GROUP_SCHED
 	if (tsk->sched_class->task_change_group)
 		tsk->sched_class->task_change_group(tsk, type);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 42d5fb7d946437531a3511de026ad856722d14a1..d44d2ee8799bba5b141102a797b1d1df1d8f8a08 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -455,7 +455,12 @@ struct task_group {
 	struct uclamp_se	uclamp[UCLAMP_CNT];
 #endif
 
+#ifdef CONFIG_BPF_SCHED
+	/* Used to pad the tag of a group */
+	long tag;
+#else
 	KABI_RESERVE(1)
+#endif
 	KABI_RESERVE(2)
 	KABI_RESERVE(3)
 	KABI_RESERVE(4)