tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: Guard dynamic task_struct size feature with config option

Browse Source 
Ensure that dynamic task_struct size feature is enabled only for GKI
platforms. With this patch, non-GKI platforms will not face build issues
anymore due to incorrect configuration earlier.

Bug: 233921394
Fixes: 5e9a8cb714 ("ANDROID: GKI: Add to task_struct size via
cmdline")
Change-Id: Ice341f4826baf8d20a3c846d55db5ea870753c7d
Signed-off-by: Sai Harshini Nimmala <quic_snimmala@quicinc.com>
This commit is contained in:
Sai Harshini Nimmala
2024-10-17 14:29:12 -07:00
parent cf234cc9d0
commit de863f65b8
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
init/main.c
+21 -3
View File
@@ -899,11 +899,29 @@ static void __init early_numa_node_init(void)
#endif
}
#ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT
#ifdef CONFIG_GKI_DYNAMIC_TASK_STRUCT_SIZE
static void __init setup_arch_task_struct_size(void)
{
arch_task_struct_size = sizeof(struct task_struct);
}
static int __init task_struct_vendor_size_setup(char *str)
{
u64 size;
if (!str)
return -EINVAL;
size = memparse(str, &str);
if (size < 0 || size > CONFIG_GKI_TASK_STRUCT_VENDOR_SIZE_MAX)
return -EINVAL;
arch_task_struct_size = sizeof(struct task_struct) + size;
return 0;
}
early_param("android_arch_task_struct_size", task_struct_vendor_size_setup);
#endif
asmlinkage __visible __init __no_sanitize_address __noreturn __no_stack_protector
@@ -929,8 +947,8 @@ void start_kernel(void)
boot_cpu_init();
page_address_init();
pr_notice("%s", linux_banner);
#ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT
setup_arch_task_struct_size();
#ifdef CONFIG_GKI_DYNAMIC_TASK_STRUCT_SIZE
setup_arch_task_struct_size();
#endif
setup_arch(&command_line);
/* Static keys and static calls are needed by LSMs */
kernel/fork.c
-18
View File
@@ -1034,24 +1034,6 @@ static void __init set_max_threads(unsigned int max_threads_suggested)
#ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT
/* Initialized by the architecture: */
int arch_task_struct_size __read_mostly;
static int __init arch_task_struct_size_setup(char *str)
{
u64 size;
if (!str)
return -EINVAL;
size = memparse(str, &str);
if (size < 0 || size > CONFIG_GKI_TASK_STRUCT_VENDOR_SIZE_MAX)
return -EINVAL;
arch_task_struct_size = sizeof(struct task_struct) + size;
return 0;
}
early_param("android_task_struct_vendor_size", arch_task_struct_size_setup);
#endif
static void __init task_struct_whitelist(unsigned long *offset, unsigned long *size)