From 2a1bc2387d3425191b3a242dc561fd1bb3c14e3e Mon Sep 17 00:00:00 2001 From: Shaleen Agrawal Date: Thu, 3 Jun 2021 16:58:19 -0700 Subject: [PATCH] ANDROID: abi_gki_aarch64_qcom: Add symbols for 32bit execve Export cpu_maps_update_begin, cpu_maps_update_done to be used by vendor modules, particularly to hold locks when affinity is being updated for 32 bit task exec. Leaf changes summary: 6 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 4 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 2 Added variables 4 Added functions: [A] 'function int __traceiter_android_vh_force_compatible_post(void*, void*)' [A] 'function int __traceiter_android_vh_force_compatible_pre(void*, void*)' [A] 'function void cpu_maps_update_begin()' [A] 'function void cpu_maps_update_done()' 2 Added variables: [A] 'tracepoint __tracepoint_android_vh_force_compatible_post' [A] 'tracepoint __tracepoint_android_vh_force_compatible_pre' Bug: 187917024 Change-Id: I02b28f7c34b21a1bfb309fcbd4e9afc306febdd6 Signed-off-by: Shaleen Agrawal --- android/abi_gki_aarch64.xml | 638 ++++++++++++++++++----------------- android/abi_gki_aarch64_qcom | 6 + kernel/cpu.c | 2 + 3 files changed, 339 insertions(+), 307 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 952339ba35c8..4a6cefea19a0 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -306,6 +306,8 @@ + + @@ -818,6 +820,8 @@ + + @@ -4674,6 +4678,8 @@ + + @@ -17987,7 +17993,7 @@ - + @@ -18009,7 +18015,7 @@ - + @@ -18034,7 +18040,7 @@ - + @@ -18296,7 +18302,7 @@ - + @@ -18312,7 +18318,7 @@ - + @@ -18347,7 +18353,7 @@ - + @@ -18355,7 +18361,7 @@ - + @@ -18371,7 +18377,7 @@ - + @@ -18398,7 +18404,7 @@ - + @@ -24273,7 +24279,7 @@ - + @@ -39925,6 +39931,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40174,6 +40241,7 @@ + @@ -40186,6 +40254,7 @@ + @@ -40207,160 +40276,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -40460,7 +40375,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44629,6 +44635,8 @@ + + @@ -44823,6 +44831,16 @@ + + + + + + + + + + @@ -119923,10 +119941,10 @@ - - - - + + + + @@ -125357,23 +125375,23 @@ - - + + - - - - - + + + + + - - + + - - + + @@ -125381,21 +125399,21 @@ - - - + + + - - + + - - + + - - + + @@ -144968,75 +144986,81 @@ - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - + - - + + - - + + - - + + - + - + - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + @@ -151370,25 +151394,25 @@ - + - - - + + + - + - + - - - + + + @@ -151396,7 +151420,7 @@ - + @@ -151406,9 +151430,9 @@ - - - + + + @@ -151461,12 +151485,12 @@ - - + + - - + + @@ -151474,54 +151498,54 @@ - - + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - - + + + + + - - + + @@ -151536,8 +151560,8 @@ - - + + @@ -152015,38 +152039,38 @@ - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + @@ -165544,20 +165568,20 @@ - - - - + + + + - - - - + + + + diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 1237cffba15b..6a6635dbe938 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -276,6 +276,8 @@ cpu_latency_qos_remove_request cpu_latency_qos_request_active cpu_latency_qos_update_request + cpu_maps_update_begin + cpu_maps_update_done cpumask_any_but cpumask_next cpumask_next_and @@ -2453,6 +2455,8 @@ __traceiter_android_vh_cpu_idle_enter __traceiter_android_vh_cpu_idle_exit __traceiter_android_vh_dump_throttled_rt_tasks + __traceiter_android_vh_force_compatible_post + __traceiter_android_vh_force_compatible_pre __traceiter_android_vh_freq_table_limits __traceiter_android_vh_ftrace_dump_buffer __traceiter_android_vh_ftrace_format_check @@ -2543,6 +2547,8 @@ __tracepoint_android_vh_cpu_idle_enter __tracepoint_android_vh_cpu_idle_exit __tracepoint_android_vh_dump_throttled_rt_tasks + __tracepoint_android_vh_force_compatible_post + __tracepoint_android_vh_force_compatible_pre __tracepoint_android_vh_freq_table_limits __tracepoint_android_vh_ftrace_dump_buffer __tracepoint_android_vh_ftrace_format_check diff --git a/kernel/cpu.c b/kernel/cpu.c index 135037717b0b..49d2eea2bd43 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -278,11 +278,13 @@ void cpu_maps_update_begin(void) { mutex_lock(&cpu_add_remove_lock); } +EXPORT_SYMBOL_GPL(cpu_maps_update_begin); void cpu_maps_update_done(void) { mutex_unlock(&cpu_add_remove_lock); } +EXPORT_SYMBOL_GPL(cpu_maps_update_done); /* * If set, cpu_up and cpu_down will return -EBUSY and do nothing.