From 4bd97e7a02006409a3f344da25ea283369f2ebca Mon Sep 17 00:00:00 2001
From: "T.J. Mercier" <tjmercier@google.com>
Date: Tue, 13 May 2025 17:59:14 +0000
Subject: [PATCH] ANDROID: GKI: Add cgroup ABI padding

To facilitate nonspecific potential future backports and fixes.

Bug: 417480479
Change-Id: I827457b81ac5f485f477b960bf5d241576a757b6
Signed-off-by: T.J. Mercier <tjmercier@google.com>
---
 include/linux/cgroup-defs.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 38b2af336e4a..8f28ec157674 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -8,6 +8,7 @@
 #ifndef _LINUX_CGROUP_DEFS_H
 #define _LINUX_CGROUP_DEFS_H
 
+#include <linux/android_kabi.h>
 #include <linux/limits.h>
 #include <linux/list.h>
 #include <linux/idr.h>
@@ -219,6 +220,8 @@ struct cgroup_subsys_state {
 	 * Protected by cgroup_mutex.
 	 */
 	int nr_descendants;
+
+	ANDROID_BACKPORT_RESERVE(1);
 };
 
 /*
@@ -316,6 +319,8 @@ struct css_set {
 
 	/* For RCU-protected deletion */
 	struct rcu_head rcu_head;
+
+	ANDROID_BACKPORT_RESERVE(1);
 };
 
 struct cgroup_base_stat {
@@ -565,6 +570,8 @@ struct cgroup {
 	struct bpf_local_storage __rcu  *bpf_cgrp_storage;
 #endif
 
+	ANDROID_BACKPORT_RESERVE(1);
+
 	/* All ancestors including self */
 	struct cgroup *ancestors[];
 };
@@ -608,6 +615,8 @@ struct cgroup_root {
 
 	/* The name for this hierarchy - may be empty */
 	char name[MAX_CGROUP_ROOT_NAMELEN];
+
+	ANDROID_BACKPORT_RESERVE(1);
 };
 
 /*
@@ -790,6 +799,8 @@ struct cgroup_subsys {
 	 * specifies the mask of subsystems that this one depends on.
 	 */
 	unsigned int depends_on;
+
+	ANDROID_BACKPORT_RESERVE(1);
 };
 
 extern struct percpu_rw_semaphore cgroup_threadgroup_rwsem;