diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index d536d03730636449f4749ce4ab9f6ff40ae21a63..f3de7d387d5d4ee1a27df978f002384ad3d2d3a5 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -3772,6 +3772,18 @@ union bpf_attr {
  *		different workloads.
  *	Return
  *		Task tag, if used, 0 as default tag, or a negative error in case of failure.
+ *
+ * int bpf_sched_set_tg_tag(struct task_group *tg, s64 tag)
+ *	Description
+ *		Set tag to *tg* and its descendants.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * int bpf_sched_set_task_tag(struct task_struct *tsk, s64 tag)
+ *	Description
+ *		Set tag to *tsk*.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
@@ -3934,6 +3946,8 @@ union bpf_attr {
 	FN(sk_original_addr),		\
 	FN(sched_tg_tag_of),		\
 	FN(sched_task_tag_of),		\
+	FN(sched_set_tg_tag),		\
+	FN(sched_set_task_tag),		\
 	/* */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index ef2d8cb87807569b48289d8a8e2f7c66b277e01f..5fccf33196b5dff4c249e4fc608128f076348342 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -660,6 +660,8 @@ const struct bpf_func_proto bpf_probe_read_kernel_proto __weak;
 const struct bpf_func_proto bpf_probe_read_kernel_str_proto __weak;
 const struct bpf_func_proto bpf_sched_tg_tag_of_proto __weak;
 const struct bpf_func_proto bpf_sched_task_tag_of_proto __weak;
+const struct bpf_func_proto bpf_sched_set_tg_tag_proto __weak;
+const struct bpf_func_proto bpf_sched_set_task_tag_proto __weak;
 
 const struct bpf_func_proto *
 bpf_base_func_proto(enum bpf_func_id func_id)
@@ -721,6 +723,10 @@ bpf_base_func_proto(enum bpf_func_id func_id)
 		return &bpf_per_cpu_ptr_proto;
 	case BPF_FUNC_this_cpu_ptr:
 		return &bpf_this_cpu_ptr_proto;
+	case BPF_FUNC_sched_set_tg_tag:
+		return &bpf_sched_set_tg_tag_proto;
+	case BPF_FUNC_sched_set_task_tag:
+		return &bpf_sched_set_task_tag_proto;
 	default:
 		break;
 	}
diff --git a/kernel/sched/bpf_sched.c b/kernel/sched/bpf_sched.c
index ad42e521cee3d89f3b8e9317fb6f0117d5bdec02..31a76cf337e6fc61e49510b3b4d7a94e00110f17 100644
--- a/kernel/sched/bpf_sched.c
+++ b/kernel/sched/bpf_sched.c
@@ -102,3 +102,48 @@ const struct bpf_func_proto bpf_sched_task_tag_of_proto = {
 	.arg1_type	= PTR_MAYBE_NULL | ARG_PTR_TO_BTF_ID,
 	.arg1_btf_id	= &btf_sched_task_ids[0],
 };
+
+BPF_CALL_2(bpf_sched_set_tg_tag, struct task_group *, tg, s64, tag)
+{
+#if CONFIG_CGROUP_SCHED
+	if (tg == NULL || tg == &root_task_group)
+		return -EINVAL;
+
+	if (tg->tag == tag)
+		return 0;
+
+	rcu_read_lock();
+	walk_tg_tree_from(tg, tg_change_tag, tg_nop, (void *)(&tag));
+	rcu_read_unlock();
+
+	return 0;
+#endif
+	return -EPERM;
+}
+
+const struct bpf_func_proto bpf_sched_set_tg_tag_proto = {
+	.func		= bpf_sched_set_tg_tag,
+	.gpl_only	= false,
+	.ret_type	= RET_INTEGER,
+	.arg1_type	= PTR_MAYBE_NULL | ARG_PTR_TO_BTF_ID,
+	.arg1_btf_id	= &btf_sched_tg_ids[0],
+	.arg2_type	= ARG_ANYTHING,
+};
+
+BPF_CALL_2(bpf_sched_set_task_tag, struct task_struct *, tsk, s64, tag)
+{
+	if (tsk == NULL)
+		return -EINVAL;
+
+	sched_settag(tsk, tag);
+	return 0;
+}
+
+const struct bpf_func_proto bpf_sched_set_task_tag_proto = {
+	.func		= bpf_sched_set_task_tag,
+	.gpl_only	= false,
+	.ret_type	= RET_INTEGER,
+	.arg1_type	= PTR_MAYBE_NULL | ARG_PTR_TO_BTF_ID,
+	.arg1_btf_id	= &btf_sched_task_ids[0],
+	.arg2_type	= ARG_ANYTHING,
+};
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index ae938aef7532ae1842732a1f697c52a09199cc85..5249add91b7cdfd232ecf1c28a00131632a432a6 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -3772,6 +3772,18 @@ union bpf_attr {
  *		different workloads.
  *	Return
  *		Task tag, if used, 0 as default tag, or a negative error in case of failure.
+ *
+ * int bpf_sched_set_tg_tag(struct task_group *tg, s64 tag)
+ *	Description
+ *		Set tag to *tg* and its descendants.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * int bpf_sched_set_task_tag(struct task_struct *tsk, s64 tag)
+ *	Description
+ *		Set tag to *tsk*.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
@@ -3934,6 +3946,8 @@ union bpf_attr {
 	FN(sk_original_addr),		\
 	FN(sched_tg_tag_of),		\
 	FN(sched_task_tag_of),		\
+	FN(sched_set_tg_tag),		\
+	FN(sched_set_task_tag),		\
 	/* */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper