From 40f057fb2df215844acbdf56b30fef2e648c8789 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 1 Sep 2020 18:25:58 -0700 Subject: [PATCH 01/20] FROMGIT: mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary Currently __set_oom_adj loops through all processes in the system to keep oom_score_adj and oom_score_adj_min in sync between processes sharing their mm. This is done for any task with more that one mm_users, which includes processes with multiple threads (sharing mm and signals). However for such processes the loop is unnecessary because their signal structure is shared as well. Android updates oom_score_adj whenever a tasks changes its role (background/foreground/...) or binds to/unbinds from a service, making it more/less important. Such operation can happen frequently. We noticed that updates to oom_score_adj became more expensive and after further investigation found out that the patch mentioned in "Fixes" introduced a regression. Using Pixel 4 with a typical Android workload, write time to oom_score_adj increased from ~3.57us to ~362us. Moreover this regression linearly depends on the number of multi-threaded processes running on the system. Mark the mm with a new MMF_MULTIPROCESS flag bit when task is created with (CLONE_VM && !CLONE_THREAD && !CLONE_VFORK). Change __set_oom_adj to use MMF_MULTIPROCESS instead of mm_users to decide whether oom_score_adj update should be synchronized between multiple processes. To prevent races between clone() and __set_oom_adj(), when oom_score_adj of the process being cloned might be modified from userspace, we use oom_adj_mutex. Its scope is changed to global. The combination of (CLONE_VM && !CLONE_THREAD) is rarely used except for the case of vfork(). To prevent performance regressions of vfork(), we skip taking oom_adj_mutex and setting MMF_MULTIPROCESS when CLONE_VFORK is specified. Clearing the MMF_MULTIPROCESS flag (when the last process sharing the mm exits) is left out of this patch to keep it simple and because it is believed that this threading model is rare. Should there ever be a need for optimizing that case as well, it can be done by hooking into the exit path, likely following the mm_update_next_owner pattern. With the combination of (CLONE_VM && !CLONE_THREAD && !CLONE_VFORK) being quite rare, the regression is gone after the change is applied. Fixes: 44a70adec910 ("mm, oom_adj: make sure processes sharing mm have same view of oom_score_adj") Reported-by: Tim Murray Debugged-by: Minchan Kim Suggested-by: Michal Hocko Signed-off-by: Suren Baghdasaryan Bug: 168521639 Link: https://lore.kernel.org/linux-fsdevel/20200902012558.2335613-1-surenb@google.com/ [isaacm: upstream bound, no cherry-pick info because patch is in mm tree] Change-Id: I20352a77815fbc358c36e686bb1503fdeea658ed Signed-off-by: Isaac J. Manjarres --- fs/proc/base.c | 3 +-- include/linux/oom.h | 1 + include/linux/sched/coredump.h | 1 + kernel/fork.c | 21 +++++++++++++++++++++ mm/oom_kill.c | 2 ++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 7d13501910ee..78aeaafa2384 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1037,7 +1037,6 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count, static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) { - static DEFINE_MUTEX(oom_adj_mutex); struct mm_struct *mm = NULL; struct task_struct *task; int err = 0; @@ -1077,7 +1076,7 @@ static int __set_oom_adj(struct file *file, int oom_adj, bool legacy) struct task_struct *p = find_lock_task_mm(task); if (p) { - if (atomic_read(&p->mm->mm_users) > 1) { + if (test_bit(MMF_MULTIPROCESS, &p->mm->flags)) { mm = p->mm; mmgrab(mm); } diff --git a/include/linux/oom.h b/include/linux/oom.h index c696c265f019..b9df34326772 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -55,6 +55,7 @@ struct oom_control { }; extern struct mutex oom_lock; +extern struct mutex oom_adj_mutex; static inline void set_current_oom_origin(void) { diff --git a/include/linux/sched/coredump.h b/include/linux/sched/coredump.h index ecdc6542070f..dfd82eab2902 100644 --- a/include/linux/sched/coredump.h +++ b/include/linux/sched/coredump.h @@ -72,6 +72,7 @@ static inline int get_dumpable(struct mm_struct *mm) #define MMF_DISABLE_THP 24 /* disable THP for all VMAs */ #define MMF_OOM_VICTIM 25 /* mm is the oom victim */ #define MMF_OOM_REAP_QUEUED 26 /* mm was queued for oom_reaper */ +#define MMF_MULTIPROCESS 27 /* mm is shared between processes */ #define MMF_DISABLE_THP_MASK (1 << MMF_DISABLE_THP) #define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\ diff --git a/kernel/fork.c b/kernel/fork.c index e0a1e1187728..41ce6de4d5d1 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1760,6 +1760,25 @@ static __always_inline void delayed_free_task(struct task_struct *tsk) free_task(tsk); } +static void copy_oom_score_adj(u64 clone_flags, struct task_struct *tsk) +{ + /* Skip if kernel thread */ + if (!tsk->mm) + return; + + /* Skip if spawning a thread or using vfork */ + if ((clone_flags & (CLONE_VM | CLONE_THREAD | CLONE_VFORK)) != CLONE_VM) + return; + + /* We need to synchronize with __set_oom_adj */ + mutex_lock(&oom_adj_mutex); + set_bit(MMF_MULTIPROCESS, &tsk->mm->flags); + /* Update the values in case they were changed after copy_signal */ + tsk->signal->oom_score_adj = current->signal->oom_score_adj; + tsk->signal->oom_score_adj_min = current->signal->oom_score_adj_min; + mutex_unlock(&oom_adj_mutex); +} + /* * This creates a new process as a copy of the old one, * but does not actually start it yet. @@ -2234,6 +2253,8 @@ static __latent_entropy struct task_struct *copy_process( trace_task_newtask(p, clone_flags); uprobe_copy_process(p, clone_flags); + copy_oom_score_adj(clone_flags, p); + return p; bad_fork_cancel_cgroup: diff --git a/mm/oom_kill.c b/mm/oom_kill.c index d58c481b3df8..212e71874301 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -63,6 +63,8 @@ int sysctl_oom_dump_tasks = 1; * and mark_oom_victim */ DEFINE_MUTEX(oom_lock); +/* Serializes oom_score_adj and oom_score_adj_min updates */ +DEFINE_MUTEX(oom_adj_mutex); static inline bool is_memcg_oom(struct oom_control *oc) { From 802f3427132ac1d3ebbde92d6712f35960cc8354 Mon Sep 17 00:00:00 2001 From: yong qian Date: Tue, 15 Sep 2020 21:14:57 +0800 Subject: [PATCH 02/20] ANDROID: vendor_hooks: Add hooks for debugging exception context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When some processes crashed, we want to save cpu regs(x0-x30、pc、sp)， and context(task_struct、thread_info) to log for debugging Bug: 166228327 Signed-off-by: yong qian Change-Id: I4f49ffed583a0e20f1aaa7e445e85a0cbb603bbe --- arch/arm64/kernel/process.c | 2 ++ drivers/android/vendor_hooks.c | 2 ++ include/trace/hooks/minidump.h | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 include/trace/hooks/minidump.h diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 08637a8d911f..a07a5feeb9fe 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -55,6 +55,7 @@ #include #include #include +#include #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK) #include @@ -254,6 +255,7 @@ void __show_regs(struct pt_regs *regs) top_reg = 29; } + trace_android_vh_show_regs(regs); show_regs_print_info(KERN_DEFAULT); print_pstate(regs); diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 2ed3b8b2bccf..4dc0d89c835b 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -17,6 +17,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -56,3 +57,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ipi_stop); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_printk_store); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_regs); diff --git a/include/trace/hooks/minidump.h b/include/trace/hooks/minidump.h new file mode 100644 index 000000000000..11283e43322d --- /dev/null +++ b/include/trace/hooks/minidump.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM minidump + +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_MINIDUMP_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_MINIDUMP_H +#include +#include + +#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) +struct pt_regs; +DECLARE_HOOK(android_vh_show_regs, + TP_PROTO(struct pt_regs *regs), + TP_ARGS(regs)); +#else +#define trace_android_vh_show_regs(regs) +#endif + +#endif /* _TRACE_HOOK_MINIDUMP_H */ +/* This part must be outside protection */ +#include + From a3cb7a0327889c39c1bc8e4e3c062f2671bbc6cc Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Thu, 10 Sep 2020 15:33:56 -0700 Subject: [PATCH 03/20] ANDROID: mm: add generic __va_function and __pa_function We use non-canonical CFI jump tables with CONFIG_CFI_CLANG, which means the compiler replaces function address references with the address of the function's CFI jump table entry. This results in __pa_symbol(function), for example, returning the physical address of the jump table entry, which can lead to address space confusion since the jump table itself points to a virtual address. This change adds generic definitions for __pa/va_function, which architectures that support CFI can override. Bug: 166220312 Change-Id: If4a162de7854547d8437bf59be03eb6d16220832 Signed-off-by: Sami Tolvanen --- include/linux/mm.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 2f821accb850..e032e34213aa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -116,6 +116,14 @@ extern int mmap_rnd_compat_bits __read_mostly; #define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0)) #endif +#ifndef __va_function +#define __va_function(x) (x) +#endif + +#ifndef __pa_function +#define __pa_function(x) __pa_symbol(x) +#endif + #ifndef page_to_virt #define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x))) #endif From 5d5378d6086e5b19641f8adc526dc7d8bd377c2b Mon Sep 17 00:00:00 2001 From: Prasad Sodagudi Date: Tue, 15 Sep 2020 10:07:13 -0700 Subject: [PATCH 04/20] ANDROID: lkdtm/usercopy: Use __va_function to find proper vm_mmap address With CFI enabled compiler replacing the reference to vm_mmap passed to copy_to_user with a pointer to the CFI jump table in the module itself. So use the __va_function API for finding the proper address of vm_mmap. Bug: 166220312 Suggested-by: Sami Tolvanen Change-Id: Id5bd96cc9bfa1aa99f34bd4785792e0a4eeae5b1 Signed-off-by: Prasad Sodagudi --- drivers/misc/lkdtm/usercopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/lkdtm/usercopy.c b/drivers/misc/lkdtm/usercopy.c index b833367a45d0..120e9ffd0f28 100644 --- a/drivers/misc/lkdtm/usercopy.c +++ b/drivers/misc/lkdtm/usercopy.c @@ -314,7 +314,7 @@ void lkdtm_USERCOPY_KERNEL(void) pr_info("attempting bad copy_to_user from kernel text: %px\n", vm_mmap); - if (copy_to_user((void __user *)user_addr, vm_mmap, + if (copy_to_user((void __user *)user_addr, __va_function(vm_mmap), unconst + PAGE_SIZE)) { pr_warn("copy_to_user failed, but lacked Oops\n"); goto free_user; From f82716d6b72aa2a2a27d188b5a48af4fb61e52d6 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 30 Jun 2020 03:07:36 +0000 Subject: [PATCH 05/20] ANDROID: hikey960_gki.fragment: Remove UFS and USB bits Remove CONFIG_SCSI_UFS_HISI=m and CONFIG_TYPEC_TCPM=m from the hikey960_gki.fragment, as those configs have been added to the gki_defconfig Fixes: bb765ef8427e ("ANDROID: GKI: enable QCOM and HISI UFS drivers") Fixes: 5625a6460e96 ("ANDROID: GKI: enable CONFIG_TYPEC_TCPM") Signed-off-by: John Stultz Change-Id: I124a0d050c7170557d9672968729af196ad2f81c (cherry picked from commit ae78c73104aa2fa957cbb7b4524c3e3e862174fd) --- arch/arm64/configs/hikey960_gki.fragment | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/configs/hikey960_gki.fragment b/arch/arm64/configs/hikey960_gki.fragment index 854372329ff8..d303efbe3a5a 100644 --- a/arch/arm64/configs/hikey960_gki.fragment +++ b/arch/arm64/configs/hikey960_gki.fragment @@ -4,7 +4,6 @@ CONFIG_CONNECTOR=m CONFIG_BLK_DEV_NVME=m CONFIG_NVME_TARGET=m CONFIG_HISI_HIKEY_USB=m -CONFIG_SCSI_UFS_HISI=m CONFIG_WLAN_VENDOR_TI=y CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m @@ -37,7 +36,6 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_DWC3=m CONFIG_USB_GADGETFS=m -CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_RT1711H=m CONFIG_MMC_BLOCK=m From ba4ec0ee1b3c48bed1ca128d5925e04c754cade4 Mon Sep 17 00:00:00 2001 From: Jeehong Kim Date: Wed, 16 Sep 2020 14:46:20 +0900 Subject: [PATCH 06/20] ANDROID: ABI: Update allowed list for GALAXY Leaf changes summary: 10 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 8 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 2 Added variables 8 Added functions: [A] 'function void __napi_schedule_irqoff(napi_struct*)' [A] 'function void drm_edid_get_monitor_name(edid*, char*, int)' [A] 'function char* get_options(const char*, int, int*)' [A] 'function packet_offload* gro_find_complete_by_type(unsigned short int)' [A] 'function packet_offload* gro_find_receive_by_type(unsigned short int)' [A] 'function __be32 in_aton(const char*)' [A] 'function void kfree_skb_partial(sk_buff*, bool)' [A] 'function int smp_call_function_single_async(int, __call_single_data*)' 2 Added variables: [A] 'tracepoint __tracepoint_android_vh_kfree_skb' [A] 'tracepoint __tracepoint_android_vh_ptype_head' Bug: 168666995 Signed-off-by: Jeehong Kim Change-Id: Ie93e39ef988e2287741819a81cd44d41d7f0fcd7 --- android/abi_gki_aarch64.xml | 1084 +++++++++++++++++--------------- android/abi_gki_aarch64_galaxy | 13 + 2 files changed, 586 insertions(+), 511 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index e41f5234a571..969c4f8bae0f 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -149,6 +149,7 @@ + @@ -1257,6 +1258,7 @@ + @@ -1562,6 +1564,7 @@ + @@ -1641,6 +1644,8 @@ + + @@ -1816,6 +1821,7 @@ + @@ -2044,6 +2050,7 @@ + @@ -3288,6 +3295,7 @@ + @@ -4264,6 +4272,8 @@ + + @@ -4516,7 +4526,7 @@ - + @@ -4567,7 +4577,7 @@ - + @@ -5264,6 +5274,17 @@ + + + + + + + + + + + @@ -7647,114 +7668,114 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7783,7 +7804,7 @@ - + @@ -11197,6 +11218,23 @@ + + + + + + + + + + + + + + + + + @@ -14184,23 +14222,6 @@ - - - - - - - - - - - - - - - - - @@ -14329,17 +14350,6 @@ - - - - - - - - - - - @@ -14494,7 +14504,7 @@ - + @@ -14529,8 +14539,8 @@ - - + + @@ -14588,7 +14598,7 @@ - + @@ -14599,7 +14609,7 @@ - + @@ -15182,7 +15192,7 @@ - + @@ -16234,7 +16244,21 @@ + + + + + + + + + + + + + + @@ -16249,6 +16273,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19692,23 +19749,6 @@ - - - - - - - - - - - - - - - - - @@ -19867,6 +19907,23 @@ + + + + + + + + + + + + + + + + + @@ -21964,6 +22021,8 @@ + + @@ -35683,6 +35742,12 @@ + + + + + + @@ -77695,17 +77760,6 @@ - - - - - - - - - - - @@ -85212,7 +85266,7 @@ - + @@ -85221,13 +85275,13 @@ - + - + @@ -85988,16 +86042,6 @@ - - - - - - - - - - @@ -86289,14 +86333,6 @@ - - - - - - - - @@ -86352,6 +86388,17 @@ + + + + + + + + + + + @@ -86377,6 +86424,14 @@ + + + + + + + + @@ -86700,6 +86755,23 @@ + + + + + + + + + + + + + + + + + @@ -87049,11 +87121,11 @@ - + - + @@ -87555,23 +87627,6 @@ - - - - - - - - - - - - - - - - - @@ -87706,46 +87761,25 @@ - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + @@ -88953,7 +88987,7 @@ - + @@ -89197,7 +89231,7 @@ - + @@ -89353,7 +89387,7 @@ - + @@ -89364,7 +89398,7 @@ - + @@ -89497,7 +89531,7 @@ - + @@ -90517,39 +90551,39 @@ - - - - - + + + + + - + - - + + - - + + - - + + - - - + + + - - - - - - + + + + + + @@ -90780,6 +90814,7 @@ + @@ -90788,6 +90823,11 @@ + + + + + @@ -91008,7 +91048,7 @@ - + @@ -91028,7 +91068,7 @@ - + @@ -99771,23 +99811,6 @@ - - - - - - - - - - - - - - - - - @@ -103690,7 +103713,7 @@ - + @@ -103724,21 +103747,21 @@ - + - + - + - + - + - + @@ -103910,12 +103933,12 @@ - - + + - - + + @@ -104262,7 +104285,7 @@ - + @@ -104453,13 +104476,213 @@ - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104543,7 +104766,7 @@ - + @@ -104594,7 +104817,18 @@ + + + + + + + + + + + @@ -104629,6 +104863,12 @@ + + + + + + @@ -104729,6 +104969,10 @@ + + + + @@ -104767,6 +105011,13 @@ + + + + + + + @@ -104774,6 +105025,10 @@ + + + + @@ -105088,6 +105343,11 @@ + + + + + @@ -105228,6 +105488,10 @@ + + + + @@ -105295,17 +105559,35 @@ - - - + + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + @@ -105319,6 +105601,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -105355,7 +105660,6 @@ - @@ -105411,11 +105715,6 @@ - - - - - @@ -110203,6 +110502,25 @@ + + + + + + + + + + + + + + + + + + + @@ -110411,23 +110729,15 @@ - + - + - - - - - - + - - - - + @@ -112578,17 +112888,6 @@ - - - - - - - - - - - @@ -112741,7 +113040,7 @@ - + @@ -112780,7 +113079,7 @@ - + @@ -112862,7 +113161,7 @@ - + @@ -112877,7 +113176,7 @@ - + @@ -112889,7 +113188,7 @@ - + @@ -112898,7 +113197,7 @@ - + @@ -112980,207 +113279,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -113191,7 +113290,7 @@ - + @@ -113199,18 +113298,7 @@ - - - - - - - - - - - @@ -113282,17 +113370,6 @@ - - - - - - - - - - - @@ -113356,7 +113433,7 @@ - + @@ -119232,21 +119309,6 @@ - - - - - - - - - - - - - - - diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy index acceef3b6eb0..93db4ed575cd 100644 --- a/android/abi_gki_aarch64_galaxy +++ b/android/abi_gki_aarch64_galaxy @@ -93,6 +93,7 @@ __mutex_init __napi_alloc_skb __napi_schedule + __napi_schedule_irqoff __netdev_alloc_skb __netlink_kernel_create __nlmsg_put @@ -145,6 +146,8 @@ __tasklet_schedule __trace_bprintk __tracepoint_android_vh_is_fpsimd_save + __tracepoint_android_vh_kfree_skb + __tracepoint_android_vh_ptype_head __tracepoint_device_pm_callback_end __tracepoint_device_pm_callback_start __tracepoint_pelt_cfs_tp @@ -415,6 +418,8 @@ cpufreq_table_index_unsorted cpufreq_unregister_driver cpuhp_tasks_frozen + cpuidle_pause_and_lock + cpuidle_resume_and_unlock cpumask_next cpumask_next_and cpus_read_lock @@ -797,6 +802,7 @@ drm_dp_update_payload_part1 drm_dp_update_payload_part2 drm_edid_duplicate + drm_edid_get_monitor_name drm_encoder_cleanup drm_encoder_init drm_err @@ -853,6 +859,7 @@ drm_mode_create drm_mode_create_dp_colorspace_property drm_mode_debug_printmodeline + drm_mode_destroy drm_mode_duplicate drm_mode_equal drm_mode_object_find @@ -987,6 +994,7 @@ get_cpu_device get_cpu_idle_time get_device + get_options get_pid_task get_random_bytes get_random_u32 @@ -1041,6 +1049,8 @@ gpiod_set_value gpiod_set_value_cansleep gpiod_to_irq + gro_find_complete_by_type + gro_find_receive_by_type gs_alloc_req gs_free_req gserial_alloc_line @@ -1131,6 +1141,7 @@ iio_read_channel_processed iio_read_channel_raw import_iovec + in_aton in_egroup_p init_dummy_netdev init_net @@ -1289,6 +1300,7 @@ kfree_call_rcu kfree_const kfree_skb + kfree_skb_partial kill_fasync kimage_vaddr kimage_voffset @@ -2022,6 +2034,7 @@ smp_call_function smp_call_function_many smp_call_function_single + smp_call_function_single_async smp_call_on_cpu snd_card_free snd_card_new From e83321764ff3443a134957efbc74409d0473b579 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 15 Sep 2020 14:45:04 +0100 Subject: [PATCH 07/20] ANDROID: KMI symbol lists: migrate section name Libabigail learned to accept 'symbol_list' as a valid suffix for symbol list sections. Hence make use of it consistently. Bug: 162536543 Signed-off-by: Matthias Maennich Change-Id: I1454b0068769c9e57a533dafb6267e63adb7ceb0 --- android/abi_gki_aarch64_cuttlefish | 2 +- android/abi_gki_aarch64_db845c | 2 +- android/abi_gki_aarch64_exynos | 2 +- android/abi_gki_aarch64_galaxy | 2 +- android/abi_gki_aarch64_goldfish | 2 +- android/abi_gki_aarch64_hikey960 | 2 +- android/abi_gki_aarch64_oneplus | 2 +- android/abi_gki_aarch64_oplus | 2 +- android/abi_gki_aarch64_qcom | 2 +- android/abi_gki_aarch64_sunxi | 2 +- android/abi_gki_aarch64_unisoc | 2 +- android/abi_gki_aarch64_vivo | 2 +- android/abi_gki_aarch64_workarounds | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/android/abi_gki_aarch64_cuttlefish b/android/abi_gki_aarch64_cuttlefish index 289794edf98a..df6a9c3c7eb0 100644 --- a/android/abi_gki_aarch64_cuttlefish +++ b/android/abi_gki_aarch64_cuttlefish @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols add_wait_queue alloc_etherdev_mqs diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index e0c60b2d616d..cb55ce982af9 100644 --- a/android/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols __arch_copy_from_user __arch_copy_to_user diff --git a/android/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos index ef9721e4d3b5..97cf3901b7a1 100644 --- a/android/abi_gki_aarch64_exynos +++ b/android/abi_gki_aarch64_exynos @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] add_timer add_timer_on add_uevent_var diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy index 93db4ed575cd..3e4c50792f6c 100644 --- a/android/abi_gki_aarch64_galaxy +++ b/android/abi_gki_aarch64_galaxy @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] ___ratelimit __alloc_disk_node __alloc_pages_nodemask diff --git a/android/abi_gki_aarch64_goldfish b/android/abi_gki_aarch64_goldfish index be17c303b5fe..93efcaf60f8a 100644 --- a/android/abi_gki_aarch64_goldfish +++ b/android/abi_gki_aarch64_goldfish @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols __alloc_disk_node alloc_etherdev_mqs diff --git a/android/abi_gki_aarch64_hikey960 b/android/abi_gki_aarch64_hikey960 index 6ce7564f0826..f4997bb0639b 100644 --- a/android/abi_gki_aarch64_hikey960 +++ b/android/abi_gki_aarch64_hikey960 @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols add_uevent_var alloc_chrdev_region diff --git a/android/abi_gki_aarch64_oneplus b/android/abi_gki_aarch64_oneplus index 7cdf6d261ab5..9d8fa8a826ad 100644 --- a/android/abi_gki_aarch64_oneplus +++ b/android/abi_gki_aarch64_oneplus @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols add_timer alloc_chrdev_region diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus index 39e7e1905b82..15ac9a66a517 100644 --- a/android/abi_gki_aarch64_oplus +++ b/android/abi_gki_aarch64_oplus @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols alloc_workqueue __arch_copy_from_user diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index ab8314462433..4878c5f5fb7d 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] add_device_randomness add_timer add_timer_on diff --git a/android/abi_gki_aarch64_sunxi b/android/abi_gki_aarch64_sunxi index cfa5e5b29a40..9fb7727b17a4 100644 --- a/android/abi_gki_aarch64_sunxi +++ b/android/abi_gki_aarch64_sunxi @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols pinctrl_get pinctrl_gpio_set_config diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc index a743719eb889..c40f652bfbcd 100644 --- a/android/abi_gki_aarch64_unisoc +++ b/android/abi_gki_aarch64_unisoc @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols add_timer add_uevent_var diff --git a/android/abi_gki_aarch64_vivo b/android/abi_gki_aarch64_vivo index 2ddab083f547..b739d3bee3dc 100644 --- a/android/abi_gki_aarch64_vivo +++ b/android/abi_gki_aarch64_vivo @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] add_device_randomness add_timer add_uevent_var diff --git a/android/abi_gki_aarch64_workarounds b/android/abi_gki_aarch64_workarounds index 3e4b6d16c687..c96aebcba081 100644 --- a/android/abi_gki_aarch64_workarounds +++ b/android/abi_gki_aarch64_workarounds @@ -1,3 +1,3 @@ -[abi_whitelist] +[abi_symbol_list] # b/167230325 ehci_handshake From 1944a78d12c1686d91f940844056ddfe8dc4fbfb Mon Sep 17 00:00:00 2001 From: Mayank Grover Date: Tue, 22 Sep 2020 17:05:16 +0530 Subject: [PATCH 08/20] ANDROID: ABI: update allowed list for QCOM Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function void devm_of_clk_del_provider(device*)' Bug: 169127322 Change-Id: I7a05b43ba95bcde895cff221727fcc36ea7b5468 Signed-off-by: Mayank Grover Signed-off-by: Mukesh Ojha --- android/abi_gki_aarch64.xml | 1656 +++++++++++++++++++--------------- android/abi_gki_aarch64_qcom | 1 + 2 files changed, 910 insertions(+), 747 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 969c4f8bae0f..ae2c02e28b8f 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -954,6 +954,7 @@ + @@ -19749,6 +19750,23 @@ + + + + + + + + + + + + + + + + + @@ -19907,23 +19925,6 @@ - - - - - - - - - - - - - - - - - @@ -27202,6 +27203,10 @@ + + + + @@ -32167,7 +32172,7 @@ - + @@ -33551,7 +33556,7 @@ - + @@ -33812,7 +33817,7 @@ - + @@ -34818,7 +34823,7 @@ - + @@ -36491,14 +36496,6 @@ - - - - - - - - @@ -44085,7 +44082,7 @@ - + @@ -44355,7 +44352,7 @@ - + @@ -52196,6 +52193,7 @@ + @@ -52376,6 +52374,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52513,6 +52672,7 @@ + @@ -53134,6 +53294,14 @@ + + + + + + + + @@ -57761,7 +57929,7 @@ - + @@ -60118,20 +60286,6 @@ - - - - - - - - - - - - - - @@ -61743,6 +61897,7 @@ + @@ -61885,7 +62040,6 @@ - @@ -82741,6 +82895,23 @@ + + + + + + + + + + + + + + + + + @@ -86716,10 +86887,6 @@ - - - - @@ -86736,111 +86903,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -86929,67 +86998,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -87579,20 +87587,6 @@ - - - - - - - - - - - - - - @@ -88206,6 +88200,7 @@ + @@ -88216,6 +88211,7 @@ + @@ -88315,6 +88311,16 @@ + + + + + + + + + + @@ -88328,6 +88334,10 @@ + + + + @@ -90383,6 +90393,14 @@ + + + + + + + + @@ -91055,7 +91073,7 @@ - + @@ -91078,7 +91096,7 @@ - + @@ -93029,7 +93047,7 @@ - + @@ -95022,7 +95040,7 @@ - + @@ -100036,7 +100054,7 @@ - + @@ -103687,7 +103705,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103740,6 +103818,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104017,7 +104142,7 @@ - + @@ -104028,7 +104153,7 @@ - + @@ -104053,6 +104178,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -104479,209 +104626,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -104817,18 +104764,7 @@ - - - - - - - - - - - @@ -105011,13 +104947,6 @@ - - - - - - - @@ -105025,10 +104954,6 @@ - - - - @@ -105126,6 +105051,17 @@ + + + + + + + + + + + @@ -105853,6 +105789,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106512,7 +106664,7 @@ - + @@ -107785,9 +107937,20 @@ + + + + + + + + + + + - - + + @@ -108018,7 +108181,7 @@ - + @@ -108703,15 +108866,7 @@ - - - - - - - - - + @@ -108725,7 +108880,7 @@ - + @@ -108733,7 +108888,7 @@ - + @@ -109592,7 +109747,7 @@ - + @@ -109612,7 +109767,7 @@ - + @@ -109620,12 +109775,12 @@ - + - + @@ -109756,7 +109911,7 @@ - + @@ -110502,25 +110657,6 @@ - - - - - - - - - - - - - - - - - - - @@ -110729,15 +110865,23 @@ - + - + - + + + + + + - + + + + @@ -111673,62 +111817,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -112006,8 +112094,6 @@ - - @@ -112192,183 +112278,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -112393,7 +112308,7 @@ - + @@ -112401,14 +112316,26 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -113040,7 +112967,7 @@ - + @@ -113079,7 +113006,7 @@ - + @@ -113161,7 +113088,7 @@ - + @@ -113176,7 +113103,7 @@ - + @@ -113188,7 +113115,7 @@ - + @@ -113197,7 +113124,7 @@ - + @@ -113279,7 +113206,207 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113290,7 +113417,7 @@ - + @@ -113298,7 +113425,18 @@ + + + + + + + + + + + @@ -113370,6 +113508,17 @@ + + + + + + + + + + + @@ -113433,7 +113582,7 @@ - + @@ -118009,15 +118158,15 @@ - + - + - + - + @@ -119309,6 +119458,21 @@ + + + + + + + + + + + + + + + @@ -121493,8 +121657,6 @@ - - @@ -125576,6 +125738,6 @@ diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index 4878c5f5fb7d..a1b98f3e267d 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -417,6 +417,7 @@ devm_nvmem_device_get devm_nvmem_register devm_of_clk_add_hw_provider + devm_of_clk_del_provider devm_of_pci_get_host_bridge_resources __devm_of_phy_provider_register devm_of_platform_populate From 1bb4dcbb7a8f1c04a304c3a46130d03871a45c10 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 22 Sep 2020 17:33:09 +0100 Subject: [PATCH 09/20] ANDROID: Refresh ABI.xmls with libabigail 1.8.0-1dca710a This upgrades some types from declaration-only tracking to full type tracking, but creates this one-time churn. Bug: 158736583 Signed-off-by: Matthias Maennich Change-Id: I39f778d7660fb4065eec2ecb6dd1ed47816e25b6 --- android/abi_gki_aarch64 | 2 +- android/abi_gki_aarch64.xml | 4987 +++++++++++++++++++++++++++++------ 2 files changed, 4213 insertions(+), 776 deletions(-) diff --git a/android/abi_gki_aarch64 b/android/abi_gki_aarch64 index 233ea230c8b5..57914f291962 100644 --- a/android/abi_gki_aarch64 +++ b/android/abi_gki_aarch64 @@ -1,4 +1,4 @@ -[abi_whitelist] +[abi_symbol_list] # commonly used symbols module_layout __put_task_struct diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index ae2c02e28b8f..d798d258de56 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -4508,26 +4508,16 @@ - - - - - - - - - - @@ -4536,16 +4526,10 @@ - - - - - - @@ -4554,38 +4538,22 @@ - - - - - - - - - - - - - - - - @@ -11219,23 +11187,6 @@ - - - - - - - - - - - - - - - - - @@ -14223,6 +14174,23 @@ + + + + + + + + + + + + + + + + + @@ -14976,6 +14944,14 @@ + + + + + + + + @@ -15469,7 +15445,6 @@ - @@ -16179,6 +16154,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16245,6 +16249,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16315,6 +16350,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16398,6 +16488,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16782,6 +16919,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17251,25 +17417,17 @@ - - - - - - - - @@ -19750,23 +19908,6 @@ - - - - - - - - - - - - - - - - - @@ -19925,6 +20066,23 @@ + + + + + + + + + + + + + + + + + @@ -22097,6 +22255,17 @@ + + + + + + + + + + + @@ -22335,6 +22504,20 @@ + + + + + + + + + + + + + + @@ -22652,7 +22835,6 @@ - @@ -23559,7 +23741,6 @@ - @@ -24011,7 +24192,6 @@ - @@ -25047,7 +25227,6 @@ - @@ -26428,7 +26607,6 @@ - @@ -26442,7 +26620,6 @@ - @@ -26778,7 +26955,6 @@ - @@ -27057,6 +27233,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28253,7 +28556,6 @@ - @@ -28281,6 +28583,23 @@ + + + + + + + + + + + + + + + + + @@ -29879,6 +30198,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30790,11 +31164,9 @@ - - @@ -32172,7 +32544,7 @@ - + @@ -33556,7 +33928,7 @@ - + @@ -33817,7 +34189,7 @@ - + @@ -34823,7 +35195,7 @@ - + @@ -35921,6 +36293,20 @@ + + + + + + + + + + + + + + @@ -36260,6 +36646,14 @@ + + + + + + + + @@ -36945,7 +37339,6 @@ - @@ -39100,6 +39493,17 @@ + + + + + + + + + + + @@ -39334,8 +39738,6 @@ - - @@ -40047,6 +40449,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40058,6 +40504,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -40305,7 +40774,6 @@ - @@ -41418,6 +41886,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -42098,6 +42589,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42321,9 +42847,8 @@ - - + @@ -42395,6 +42920,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43478,8 +44046,6 @@ - - @@ -45640,6 +46206,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45654,6 +46252,20 @@ + + + + + + + + + + + + + + @@ -46726,7 +47338,6 @@ - @@ -50588,8 +51199,6 @@ - - @@ -51814,6 +52423,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52193,7 +52828,6 @@ - @@ -52374,167 +53008,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -52646,6 +53119,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52672,7 +53201,6 @@ - @@ -52883,6 +53411,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53843,6 +54406,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55253,6 +55901,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56360,7 +57039,6 @@ - @@ -57923,16 +58601,11 @@ - - - - - - + @@ -57966,6 +58639,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -60286,6 +60979,20 @@ + + + + + + + + + + + + + + @@ -60504,6 +61211,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -60525,6 +61289,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -60607,6 +61538,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -61090,6 +62044,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -61897,7 +62874,6 @@ - @@ -62040,6 +63016,7 @@ + @@ -63392,6 +64369,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63603,6 +64656,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63617,6 +64714,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63851,9 +65031,7 @@ - - @@ -65119,37 +66297,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -65234,6 +66407,23 @@ + + + + + + + + + + + + + + + + + @@ -65650,8 +66840,6 @@ - - @@ -66376,6 +67564,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66994,6 +68214,20 @@ + + + + + + + + + + + + + + @@ -67043,6 +68277,20 @@ + + + + + + + + + + + + + + @@ -67224,8 +68472,6 @@ - - @@ -67962,6 +69208,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -68869,7 +70144,6 @@ - @@ -69644,8 +70918,6 @@ - - @@ -72662,6 +73934,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -74585,7 +75883,6 @@ - @@ -75497,6 +76794,14 @@ + + + + + + + + @@ -76176,6 +77481,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78177,6 +79538,20 @@ + + + + + + + + + + + + + + @@ -79013,7 +80388,6 @@ - @@ -79608,6 +80982,17 @@ + + + + + + + + + + + @@ -79640,17 +81025,6 @@ - - - - - - - - - - - @@ -80340,6 +81714,23 @@ + + + + + + + + + + + + + + + + + @@ -80385,8 +81776,6 @@ - - @@ -81748,8 +83137,6 @@ - - @@ -82044,6 +83431,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -82839,6 +84261,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -82895,23 +84346,6 @@ - - - - - - - - - - - - - - - - - @@ -83537,7 +84971,6 @@ - @@ -85992,6 +87425,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86504,6 +88002,14 @@ + + + + + + + + @@ -86595,14 +88101,52 @@ - - - + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86887,6 +88431,10 @@ + + + + @@ -86903,13 +88451,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86998,6 +88690,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87299,7 +89052,6 @@ - @@ -87587,6 +89339,20 @@ + + + + + + + + + + + + + + @@ -87621,6 +89387,23 @@ + + + + + + + + + + + + + + + + + @@ -87755,6 +89538,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87951,7 +89792,6 @@ - @@ -88096,7 +89936,6 @@ - @@ -88152,6 +89991,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88200,7 +90065,6 @@ - @@ -88211,7 +90075,6 @@ - @@ -88311,16 +90174,6 @@ - - - - - - - - - - @@ -88334,10 +90187,6 @@ - - - - @@ -88477,6 +90326,17 @@ + + + + + + + + + + + @@ -89036,6 +90896,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -89108,6 +90988,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89248,6 +91226,14 @@ + + + + + + + + @@ -89330,6 +91316,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89889,6 +91910,17 @@ + + + + + + + + + + + @@ -90138,6 +92170,17 @@ + + + + + + + + + + + @@ -90146,6 +92189,17 @@ + + + + + + + + + + + @@ -91040,70 +93094,39 @@ - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - + - - - - @@ -92677,6 +94700,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93047,7 +95147,7 @@ - + @@ -93208,6 +95308,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -93500,6 +95620,23 @@ + + + + + + + + + + + + + + + + + @@ -94129,6 +96266,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -94685,6 +96857,14 @@ + + + + + + + + @@ -94698,6 +96878,17 @@ + + + + + + + + + + + @@ -95040,7 +97231,7 @@ - + @@ -96397,6 +98588,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97719,6 +100112,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -99004,6 +101427,17 @@ + + + + + + + + + + + @@ -99829,6 +102263,23 @@ + + + + + + + + + + + + + + + + + @@ -100054,7 +102505,7 @@ - + @@ -101310,6 +103761,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -102145,6 +104619,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102203,6 +104786,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102252,6 +104906,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102469,6 +105151,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103645,6 +106392,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -103671,6 +106438,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103705,67 +106498,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -103818,53 +106551,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -103919,6 +106605,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -104142,7 +106848,7 @@ - + @@ -104153,7 +106859,7 @@ - + @@ -104178,28 +106884,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -104239,6 +106923,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104553,7 +107323,6 @@ - @@ -104629,6 +107398,23 @@ + + + + + + + + + + + + + + + + + @@ -105010,6 +107796,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -105051,17 +107905,6 @@ - - - - - - - - - - - @@ -105120,6 +107963,14 @@ + + + + + + + + @@ -105293,6 +108144,11 @@ + + + + + @@ -105756,6 +108612,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -105781,138 +108659,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -106000,11 +108746,23 @@ - - - - + + + + + + + + + + + + + + + + @@ -106459,6 +109217,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106664,7 +109486,7 @@ - + @@ -106865,9 +109687,7 @@ - - @@ -107728,6 +110548,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107937,20 +110816,9 @@ - - - - - - - - - - - - - + + @@ -108181,7 +111049,7 @@ - + @@ -108866,21 +111734,23 @@ - + - + - - - - - - - + - + + + + + + + + + @@ -108888,7 +111758,7 @@ - + @@ -109747,7 +112617,7 @@ - + @@ -109767,7 +112637,7 @@ - + @@ -109775,12 +112645,12 @@ - + - + @@ -109911,7 +112781,7 @@ - + @@ -110657,6 +113527,25 @@ + + + + + + + + + + + + + + + + + + + @@ -110795,14 +113684,6 @@ - - - - - - - - @@ -110865,23 +113746,26 @@ - + - + - + - + - + - + - + + + + @@ -111122,6 +114006,11 @@ + + + + + @@ -111321,6 +114210,11 @@ + + + + + @@ -111732,6 +114626,14 @@ + + + + + + + + @@ -111817,6 +114719,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111878,6 +114836,17 @@ + + + + + + + + + + + @@ -112068,6 +115037,14 @@ + + + + + + + + @@ -112094,6 +115071,8 @@ + + @@ -112278,12 +115257,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112308,7 +115500,7 @@ - + @@ -112316,26 +115508,14 @@ + + - - - - - - - - - - - - - - - - - + + + @@ -112798,6 +115978,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112815,6 +116051,17 @@ + + + + + + + + + + + @@ -112827,6 +116074,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -113217,6 +116484,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -113385,6 +116675,14 @@ + + + + + + + + @@ -113406,7 +116704,7 @@ - + @@ -113417,7 +116715,7 @@ - + @@ -113582,7 +116880,6 @@ - @@ -118150,22 +121447,6 @@ - - - - - - - - - - - - - - - - @@ -119458,6 +122739,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -119722,7 +123029,6 @@ - @@ -120000,6 +123306,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120008,6 +123343,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120767,6 +124167,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121657,6 +125092,8 @@ + + @@ -124828,6 +128265,14 @@ + + + + + + + + @@ -125026,14 +128471,6 @@ - - - - - - - - @@ -125738,6 +129175,6 @@ From eaf38dc2bbb22ae23f4b9324a54c3cb34f6b57b4 Mon Sep 17 00:00:00 2001 From: Jack Pham Date: Wed, 9 Sep 2020 14:52:54 -0700 Subject: [PATCH 10/20] ANDROID: kallsyms: ignore ThinLTO+CFI hash suffix in kallsyms_lookup_name() Similar to commit f683c8dc7f32 ("ANDROID: kallsyms: strip hashes from static functions with ThinLTO and CFI"), since LLVM adds a hash to static function names when CONFIG_THINLTO and CFI are enabled, callers of kallsyms_lookup_name() which aren't aware of the additional suffix will fail to find the symbol. One example is kprobes (both compiled and the dynamic events) which rely on this to resolve the function name to attach a kprobe/kretprobe to. Address this by also calling the cleanup_symbol_name() helper from kallsyms_lookup_name() when failing to match a symbol by name. This will strip off the hash suffix, if any, and attempt the strcmp() again. Bug: 167595670 Change-Id: I4c79c818c29b4b82a94a5a7e86ae9783a41e853d Signed-off-by: Jack Pham --- kernel/kallsyms.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index a4f6dd5a6089..14de0c7bf756 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -159,6 +159,26 @@ static unsigned long kallsyms_sym_address(int idx) return kallsyms_relative_base - 1 - kallsyms_offsets[idx]; } +#if defined(CONFIG_CFI_CLANG) && defined(CONFIG_THINLTO) +/* + * LLVM appends a hash to static function names when ThinLTO and CFI are + * both enabled, which causes confusion and potentially breaks user space + * tools, so we will strip the postfix from expanded symbol names. + */ +static inline char *cleanup_symbol_name(char *s) +{ + char *res = NULL; + + res = strrchr(s, '$'); + if (res) + *res = '\0'; + + return res; +} +#else +static inline char *cleanup_symbol_name(char *s) { return NULL; } +#endif + /* Lookup the address for this symbol. Returns 0 if not found. */ unsigned long kallsyms_lookup_name(const char *name) { @@ -171,6 +191,9 @@ unsigned long kallsyms_lookup_name(const char *name) if (strcmp(namebuf, name) == 0) return kallsyms_sym_address(i); + + if (cleanup_symbol_name(namebuf) && strcmp(namebuf, name) == 0) + return kallsyms_sym_address(i); } return module_kallsyms_lookup_name(name); } @@ -269,24 +292,6 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize, !!__bpf_address_lookup(addr, symbolsize, offset, namebuf); } -#if defined(CONFIG_CFI_CLANG) && defined(CONFIG_THINLTO) -/* - * LLVM appends a hash to static function names when ThinLTO and CFI are - * both enabled, which causes confusion and potentially breaks user space - * tools, so we will strip the postfix from expanded symbol names. - */ -static inline void cleanup_symbol_name(char *s) -{ - char *res; - - res = strrchr(s, '$'); - if (res) - *res = '\0'; -} -#else -static inline void cleanup_symbol_name(char *s) {} -#endif - /* * Lookup an address * - modname is set to NULL if it's in the kernel. From 1d65a4b7a6b467a77712051466b33ba4a1c0cc8e Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 25 Aug 2020 18:38:39 +0000 Subject: [PATCH 11/20] ANDROID: dts: hi3660: Fix duplicate adv7533 nodes The adv7533 node had a duplicate entry in the hi3660.dtsi which is misplaced as that hardware is board specific and not soc specific. A recent changes upstream were backported to -stable which recently broke the driver from loading properly, so this patch moves the details from the incorrect node into its proper place, resolving the issue. Fixes: 274f4e9c575a ("arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding") Signed-off-by: John Stultz Change-Id: Iffe78badb08a1a49ed99fb8ab2257cb95e368f3f (cherry picked from commit 623715b470c6c51e54344a274ca90df19556b56a) --- .../boot/dts/hisilicon/hi3660-hikey960.dts | 11 ++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 20 ------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index 32f373f19a73..cb9c7c6b746f 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -654,12 +654,23 @@ status = "ok"; compatible = "adi,adv7533"; reg = <0x39>; + v1p2-supply = <&ldo3>; + vdd-supply = <&ldo3>; + interrupt-parent = <&gpio1>; + interrupts = <1 2>; + pd-gpio = <&gpio5 1 0>; + sel-gpio = <&gpio2 4 0>; adi,dsi-lanes = <4>; + adi,disable-timing-generator; + #sound-dai-cells = <0>; ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; + adv7533_in: endpoint@0 { + remote-endpoint = <&dsi_out0>; + }; }; port@1 { reg = <1>; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index f6a501e4963b..0637e5883a9b 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -446,26 +446,6 @@ pinctrl-0 = <&i2c1_pmx_func &i2c1_cfg_func>; status = "ok"; - adv7533: adv7533@39 { - status = "ok"; - compatible = "adi,adv7533"; - reg = <0x39>; - v1p2-supply = <&ldo3>; - vdd-supply = <&ldo3>; - interrupt-parent = <&gpio1>; - interrupts = <1 2>; - pd-gpio = <&gpio5 1 0>; - sel-gpio = <&gpio2 4 0>; - adi,dsi-lanes = <4>; - adi,disable-timing-generator; - #sound-dai-cells = <0>; - - port { - adv7533_in: endpoint { - remote-endpoint = <&dsi_out0>; - }; - }; - }; }; i2c3: i2c@fdf0c000 { From 3a95b9057af6671d7c6b1bfdd632bf111f32b081 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Wed, 23 Sep 2020 19:33:32 +0800 Subject: [PATCH 12/20] ANDROID: abi: update for hikey960 Leaf changes summary: 9 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 9 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 9 Added functions: [A] 'function void tcpm_cc_change(tcpm_port*)' [A] 'function void tcpm_pd_hard_reset(tcpm_port*)' [A] 'function void tcpm_pd_receive(tcpm_port*, const pd_message*)' [A] 'function void tcpm_pd_transmit_complete(tcpm_port*, tcpm_transmit_status)' [A] 'function tcpm_port* tcpm_register_port(device*, tcpc_dev*)' [A] 'function void tcpm_tcpc_reset(tcpm_port*)' [A] 'function void tcpm_unregister_port(tcpm_port*)' [A] 'function void tcpm_vbus_change(tcpm_port*)' [A] 'function usb_role usb_role_switch_get_role(usb_role_switch*)' and fix insmod failures reported like the following when use the gki kernel: [ 5.829264] hisi_hikey_usb: Unknown symbol usb_role_switch_get_role (err -2) [ 7.989462] tcpci: Unknown symbol tcpm_cc_change (err -2) [ 7.994896] tcpci: Unknown symbol tcpm_tcpc_reset (err -2) [ 8.000384] tcpci: Unknown symbol tcpm_vbus_change (err -2) [ 8.005961] tcpci: Unknown symbol tcpm_pd_receive (err -2) [ 8.011462] tcpci: Unknown symbol tcpm_pd_hard_reset (err -2) [ 8.017221] tcpci: Unknown symbol tcpm_pd_transmit_complete (err -2) [ 8.023576] tcpci: Unknown symbol tcpm_register_port (err -2) [ 8.029323] tcpci: Unknown symbol tcpm_unregister_port (err -2) Via the following commands: $ ./build/abi/bootstrap $ BUILD_CONFIG=common/build.config.hikey960 build/build_abi.sh --update --print-report $ BUILD_CONFIG=common/build.config.gki.aarch64 build/build_abi.sh --update --print-report Test: boot tested with hikey960 android11 builds Fixes: bb765ef8427e ("ANDROID: GKI: enable QCOM and HISI UFS drivers") Fixes: 5625a6460e96 ("ANDROID: GKI: enable CONFIG_TYPEC_TCPM") Fixes: f82716d6b72a ("ANDROID: hikey960_gki.fragment: Remove UFS and USB bits") Signed-off-by: Yongqin Liu Change-Id: I700cc535d7281ea43b72a5268493656151c77d3d --- android/abi_gki_aarch64.xml | 1826 ++++++++++++++++++++---------- android/abi_gki_aarch64_hikey960 | 80 +- 2 files changed, 1256 insertions(+), 650 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index d798d258de56..f5fd708293b7 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -3614,6 +3614,14 @@ + + + + + + + + @@ -3712,13 +3720,8 @@ - - - - - @@ -3949,6 +3952,7 @@ + @@ -4551,6 +4555,7 @@ + @@ -11187,6 +11192,23 @@ + + + + + + + + + + + + + + + + + @@ -14174,23 +14196,6 @@ - - - - - - - - - - - - - - - - - @@ -32544,7 +32549,7 @@ - + @@ -33928,7 +33933,7 @@ - + @@ -34189,7 +34194,7 @@ - + @@ -35195,7 +35200,7 @@ - + @@ -42848,7 +42853,6 @@ - @@ -53857,12 +53861,15 @@ - + - + - + + + + @@ -66297,6 +66304,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -80982,17 +81070,6 @@ - - - - - - - - - - - @@ -81025,6 +81102,17 @@ + + + + + + + + + + + @@ -84324,6 +84412,10 @@ + + + + @@ -84510,7 +84602,6 @@ - @@ -84533,13 +84624,6 @@ - - - - - - - @@ -84839,10 +84923,6 @@ - - - - @@ -84877,18 +84957,6 @@ - - - - - - - - - - - - @@ -84971,13 +85039,642 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -84986,11 +85683,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88002,14 +88764,6 @@ - - - - - - - - @@ -88065,6 +88819,14 @@ + + + + + + + + @@ -88101,6 +88863,14 @@ + + + + + + + + @@ -88139,14 +88909,6 @@ - - - - - - - - @@ -88513,6 +89275,23 @@ + + + + + + + + + + + + + + + + + @@ -89387,23 +90166,6 @@ - - - - - - - - - - - - - - - - - @@ -90326,64 +91088,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -91927,9 +92631,9 @@ - - - + + + @@ -102263,23 +102967,6 @@ - - - - - - - - - - - - - - - - - @@ -106884,7 +107571,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107395,9 +108140,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -107550,7 +108526,18 @@ + + + + + + + + + + + @@ -107733,6 +108720,13 @@ + + + + + + + @@ -107740,6 +108734,10 @@ + + + + @@ -108659,93 +109657,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108754,7 +109665,6 @@ - @@ -111590,9 +112500,6 @@ - - - @@ -111734,15 +112641,7 @@ - - - - - - - - - + @@ -111750,7 +112649,21 @@ - + + + + + + + + + + + + + + + @@ -111758,7 +112671,7 @@ - + @@ -112617,7 +113530,7 @@ - + @@ -112781,7 +113694,7 @@ - + @@ -113527,25 +114440,6 @@ - - - - - - - - - - - - - - - - - - - @@ -113684,6 +114578,14 @@ + + + + + + + + @@ -113746,26 +114648,23 @@ - + - + - + - + - + - + - - - - + @@ -115274,6 +116173,7 @@ + @@ -116473,268 +117373,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -116806,17 +117445,6 @@ - - - - - - - - - - - @@ -121447,7 +122075,23 @@ - + + + + + + + + + + + + + + + + + @@ -128265,14 +128909,6 @@ - - - - - - - - @@ -128471,6 +129107,14 @@ + + + + + + + + @@ -129175,6 +129819,6 @@ diff --git a/android/abi_gki_aarch64_hikey960 b/android/abi_gki_aarch64_hikey960 index f4997bb0639b..128ac45e94b9 100644 --- a/android/abi_gki_aarch64_hikey960 +++ b/android/abi_gki_aarch64_hikey960 @@ -1,6 +1,5 @@ [abi_symbol_list] # commonly used symbols - add_uevent_var alloc_chrdev_region __alloc_disk_node __alloc_pages_nodemask @@ -89,11 +88,9 @@ device_property_present device_property_read_string device_property_read_u32_array - device_register device_release_driver device_remove_file device_set_wakeup_capable - device_unregister device_wakeup_enable _dev_info devm_clk_get @@ -172,7 +169,6 @@ free_irq __free_pages free_pages - fwnode_property_present get_device __get_free_pages get_random_bytes @@ -203,7 +199,6 @@ irq_of_parse_and_map irq_set_irq_wake jiffies - jiffies_to_msecs kfree kfree_const kfree_skb @@ -213,7 +208,6 @@ kmalloc_order_trace kmem_cache_alloc_trace kmemdup - kstrtobool kstrtoint kstrtouint kstrtoull @@ -462,6 +456,8 @@ usb_hub_clear_tt_buffer usb_put_hcd usb_remove_hcd + usb_role_switch_register + usb_role_switch_unregister usb_root_hub_lost_power __usecs_to_jiffies usleep_range @@ -700,6 +696,12 @@ # required by hi655x-regulator.ko regulator_list_voltage_linear +# required by hisi_hikey_usb.ko + usb_role_switch_get + usb_role_switch_get_role + usb_role_switch_put + usb_role_switch_set_role + # required by hisi_powerkey.ko devm_input_allocate_device devm_request_any_context_irq @@ -716,6 +718,8 @@ # required by hwmon.ko __class_register class_unregister + device_register + device_unregister kstrtoll strpbrk @@ -1058,6 +1062,7 @@ spi_sync_locked # required by nvme-core.ko + add_uevent_var blk_freeze_queue_start blk_mq_alloc_request blk_mq_alloc_request_hctx @@ -1161,6 +1166,7 @@ kmem_cache_create kmem_cache_destroy kstrndup + kstrtobool kstrtou16 mempool_alloc_slab mempool_create @@ -1211,15 +1217,6 @@ rfkill_register rfkill_unregister -# required by roles.ko - class_find_device - device_connection_find_match - device_match_fwnode - device_match_name - fwnode_connection_find_match - fwnode_get_parent - __sysfs_match_string - # required by rtc-efi.ko devm_rtc_device_register efi @@ -1291,54 +1288,18 @@ # required by tcpci.ko device_get_named_child_node + tcpm_cc_change + tcpm_pd_hard_reset + tcpm_pd_receive + tcpm_pd_transmit_complete + tcpm_register_port + tcpm_tcpc_reset + tcpm_unregister_port + tcpm_vbus_change # required by tcpci_rt1711h.ko i2c_smbus_read_word_data -# required by tcpm.ko - devm_power_supply_register - fwnode_property_read_string - fwnode_property_read_u32_array - power_supply_changed - power_supply_get_drvdata - typec_altmode_attention - typec_altmode_notify - typec_altmode_update_active - typec_altmode_vdm - typec_find_port_data_role - typec_find_port_power_role - typec_find_power_role - typec_get_drvdata - typec_match_altmode - typec_partner_register_altmode - typec_partner_set_identity - typec_port_register_altmode - typec_register_partner - typec_register_port - typec_set_data_role - typec_set_mode - typec_set_orientation - typec_set_pwr_opmode - typec_set_pwr_role - typec_set_vconn_role - typec_unregister_altmode - typec_unregister_partner - typec_unregister_port - -# required by ufs-hisi.ko - devm_platform_ioremap_resource - ufshcd_dme_get_attr - ufshcd_dme_set_attr - ufshcd_get_pwr_dev_param - ufshcd_pltfrm_init - ufshcd_pltfrm_resume - ufshcd_pltfrm_runtime_idle - ufshcd_pltfrm_runtime_resume - ufshcd_pltfrm_runtime_suspend - ufshcd_pltfrm_shutdown - ufshcd_pltfrm_suspend - ufshcd_remove - # required by wl18xx.ko __cfg80211_alloc_event_skb __cfg80211_send_event_skb @@ -1388,6 +1349,7 @@ ieee80211_unregister_hw ieee80211_wake_queue ieee80211_wake_queues + jiffies_to_msecs jiffies_to_usecs __local_bh_enable_ip __netdev_alloc_skb From eed9382d521763c70e016ba7415516ea7186d881 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 23 Apr 2020 23:23:52 +0900 Subject: [PATCH 13/20] UPSTREAM: kbuild: ensure full rebuild when the compiler is updated Commit 21c54b774744 ("kconfig: show compiler version text in the top comment") added the environment variable, CC_VERSION_TEXT in the comment of the top Kconfig file. It can detect the compiler update, and invoke the syncconfig because all environment variables referenced in Kconfig files are recorded in include/config/auto.conf.cmd This commit makes it a CONFIG option in order to ensure the full rebuild when the compiler is updated. This works like follows: include/config/kconfig.h contains "CONFIG_CC_VERSION_TEXT" in the comment block. The top Makefile specifies "-include $(srctree)/include/linux/kconfig.h" to guarantee it is included from all kernel source files. fixdep parses every source file and all headers included from it, searching for words prefixed with "CONFIG_". Then, fixdep finds CONFIG_CC_VERSION_TEXT in include/config/kconfig.h and adds include/config/cc/version/text.h into every .*.cmd file. When the compiler is updated, syncconfig is invoked because init/Kconfig contains the reference to the environment variable CC_VERTION_TEXT. CONFIG_CC_VERSION_TEXT is updated to the new version string, and include/config/cc/version/text.h is touched. In the next rebuild, Make will rebuild every files since the timestamp of include/config/cc/version/text.h is newer than that of target. Bug: 168274246 Signed-off-by: Masahiro Yamada (cherry picked from commit 8b59cd81dc5e724eaea283fa6006985891c7bff4) Signed-off-by: Mars Lin Change-Id: Ie52bb8e33b95d0e97998024d28c0d8d7caf8aa59 --- Kconfig | 2 -- include/linux/kconfig.h | 2 ++ init/Kconfig | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Kconfig b/Kconfig index e10b3ee084d4..745bc773f567 100644 --- a/Kconfig +++ b/Kconfig @@ -5,8 +5,6 @@ # mainmenu "Linux/$(ARCH) $(KERNELVERSION) Kernel Configuration" -comment "Compiler: $(CC_VERSION_TEXT)" - source "scripts/Kconfig.include" source "init/Kconfig" diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index cc8fa109cfa3..9d12c970f18f 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -2,6 +2,8 @@ #ifndef __LINUX_KCONFIG_H #define __LINUX_KCONFIG_H +/* CONFIG_CC_VERSION_TEXT (Do not delete this comment. See help in Kconfig) */ + #include #ifdef CONFIG_CPU_BIG_ENDIAN diff --git a/init/Kconfig b/init/Kconfig index 2e28155b461f..455105d007cd 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -9,6 +9,23 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG default "arch/$(ARCH)/defconfig" +config CC_VERSION_TEXT + string + default "$(CC_VERSION_TEXT)" + help + This is used in unclear ways: + + - Re-run Kconfig when the compiler is updated + The 'default' property references the environment variable, + CC_VERSION_TEXT so it is recorded in include/config/auto.conf.cmd. + When the compiler is updated, Kconfig will be invoked. + + - Ensure full rebuild when the compier is updated + include/linux/kconfig.h contains this option in the comment line so + fixdep adds include/config/cc/version/text.h into the auto-generated + dependency. When the compiler is updated, syncconfig will touch it + and then every file will be rebuilt. + config CC_IS_GCC def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc) From 68aee2bc3d15bdfcc348042114d4223bbceb9ddd Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 4 Apr 2020 06:24:59 +0900 Subject: [PATCH 14/20] UPSTREAM: kbuild: do not pass $(KBUILD_CFLAGS) to scripts/mkcompile_h scripts/mkcompile_h uses $(CC) only for getting the version string. I suspected there was a specific reason why the additional flags were needed, and dug the commit history. This code dates back to at least 2002 [1], but I could not get any more clue. Just get rid of it. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=29f3df7eba8ddf91a55183f9967f76fbcc3ab742 Bug: 168274246 Signed-off-by: Masahiro Yamada Reviewed-by: Kees Cook (cherry picked from commit 01a6126b5f7efdf75480a2b970377f5724cb885a) Signed-off-by: Mars Lin Change-Id: If887ea1e9e43b9ce83bf8fe9cc0db809818c3bb8 --- init/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Makefile b/init/Makefile index 30aa8ab11120..d45e967483b2 100644 --- a/init/Makefile +++ b/init/Makefile @@ -35,4 +35,4 @@ include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \ - "$(CONFIG_PREEMPT_RT)" "$(CC) $(KBUILD_CFLAGS)" "$(LD)" + "$(CONFIG_PREEMPT_RT)" "$(CC)" "$(LD)" From bc93285fae0ba5fedcb0cefd5acf711547f0d16d Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 23 Apr 2020 23:23:54 +0900 Subject: [PATCH 15/20] UPSTREAM: kbuild: use CONFIG_CC_VERSION_TEXT to construct LINUX_COMPILER macro scripts/mkcompile_h runs $(CC) just for getting the version string. Reuse CONFIG_CC_VERSION_TEXT for optimization. For GCC, this slightly changes the version string. I do not think it is a big deal as we do not have the defined format for LINUX_COMPILER. In fact, the recent commit 4831f7ad6c569 ("kbuild: mkcompile_h: Include $LD version in /proc/version") added the linker version. Bug: 168274246 Signed-off-by: Masahiro Yamada (cherry picked from commit 9a950154668729a472d17b8e307d92e7c60f45f7) Signed-off-by: Mars Lin Change-Id: I66bac5b44bf764e7c0e432ae17bcdf06d79c96d0 --- init/Makefile | 2 +- scripts/mkcompile_h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/init/Makefile b/init/Makefile index d45e967483b2..57499b1ff471 100644 --- a/init/Makefile +++ b/init/Makefile @@ -35,4 +35,4 @@ include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \ - "$(CONFIG_PREEMPT_RT)" "$(CC)" "$(LD)" + "$(CONFIG_PREEMPT_RT)" $(CONFIG_CC_VERSION_TEXT) "$(LD)" diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 528edd041cdf..4578e413bf13 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -6,7 +6,7 @@ ARCH=$2 SMP=$3 PREEMPT=$4 PREEMPT_RT=$5 -CC=$6 +CC_VERSION="$6" LD=$7 vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; } @@ -75,7 +75,6 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\" echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\" - CC_VERSION=$($CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//') LD_VERSION=$($LD -v | head -n1 | sed 's/(compatible with [^)]*)//' \ | sed 's/[[:space:]]*$//') printf '#define LINUX_COMPILER "%s"\n' "$CC_VERSION, $LD_VERSION" From ce50287a2b7d56f86357a42f7c712e469abea3eb Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Wed, 16 Sep 2020 18:18:25 +0100 Subject: [PATCH 16/20] UPSTREAM: ehci-hcd: Move include to keep CRC stable The CRC calculation done by genksyms is triggered when the parser hits EXPORT_SYMBOL*() macros. At this point, genksyms recursively expands the types of the function parameters, and uses that as the input for the CRC calculation. In the case of forward-declared structs, the type expands to 'UNKNOWN'. Following this, it appears that the result of the expansion of each type is cached somewhere, and seems to be re-used when/if the same type is seen again for another exported symbol in the same C file. Unfortunately, this can cause CRC 'stability' issues when a struct definition becomes visible in the middle of a C file. For example, let's assume code with the following pattern: struct foo; int bar(struct foo *arg) { /* Do work ... */ } EXPORT_SYMBOL_GPL(bar); /* This contains struct foo's definition */ #include "foo.h" int baz(struct foo *arg) { /* Do more work ... */ } EXPORT_SYMBOL_GPL(baz); Here, baz's CRC will be computed using the expansion of struct foo that was cached after bar's CRC calculation ('UNKOWN' here). But if EXPORT_SYMBOL_GPL(bar) is removed from the file (because of e.g. symbol trimming using CONFIG_TRIM_UNUSED_KSYMS), struct foo will be expanded late, during baz's CRC calculation, which now has visibility over the full struct definition, hence resulting in a different CRC for baz. The proper fix for this certainly is in genksyms, but that will take me some time to get right. In the meantime, we have seen one occurrence of this in the ehci-hcd code which hits this problem because of the way it includes C files halfway through the code together with an unlucky mix of symbol trimming. In order to workaround this, move the include done in ehci-hub.c early in ehci-hcd.c, hence making sure the struct definitions are visible to the entire file. This improves CRC stability of the ehci-hcd exports even when symbol trimming is enabled. Bug: 167230325 Acked-by: Alan Stern Cc: stable Signed-off-by: Quentin Perret Link: https://lore.kernel.org/r/20200916171825.3228122-1-qperret@google.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 29231826f3bd65500118c473fccf31c0cf14dbc0) Change-Id: Iae19ae10feb15fd775076acdd2e0b29d7ccb6b20 --- drivers/usb/host/ehci-hcd.c | 1 + drivers/usb/host/ehci-hub.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index cf2b7ae93b7e..0e5c56e06559 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index ce0eaf7d7c12..087402aec5cb 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -14,7 +14,6 @@ */ /*-------------------------------------------------------------------------*/ -#include #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) From 9ed03658fe1a3ba7911d05ae2ba97027b40d93ca Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Thu, 24 Sep 2020 13:56:52 +0100 Subject: [PATCH 17/20] ANDROID: Update android/abi_gki_aarch64.xml Leaf changes summary: 5 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 5 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 5 functions with some sub-type change: [C] 'function int ehci_handshake(ehci_hcd*, void*, u32, u32, int)' at ehci-hcd.c:148:1 has some sub-type changes: CRC value (modversions) changed from 0xab5f23a3 to 0xe32dc66c [C] 'function void ehci_init_driver(hc_driver*, const ehci_driver_overrides*)' at ehci.h:879:1 has some sub-type changes: CRC value (modversions) changed from 0x70c01a65 to 0x5bd6ac93 [C] 'function int ehci_resume(usb_hcd*, bool)' at ehci.h:887:1 has some sub-type changes: CRC value (modversions) changed from 0x51dbddda to 0xa250ac83 [C] 'function int ehci_setup(usb_hcd*)' at ehci.h:881:1 has some sub-type changes: CRC value (modversions) changed from 0x175f644c to 0xda517721 [C] 'function int ehci_suspend(usb_hcd*, bool)' at ehci-hcd.c:1085:1 has some sub-type changes: CRC value (modversions) changed from 0x3afe7f3 to 0x5a7df441 Bug: 167230325 Signed-off-by: Quentin Perret Change-Id: I85a93343482eacce6e989f545dcd89432ad70c85 --- android/abi_gki_aarch64.xml | 845 +++++++++++++++++++----------------- 1 file changed, 435 insertions(+), 410 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index f5fd708293b7..b495cd20117a 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1430,11 +1430,11 @@ - - - - - + + + + + @@ -4522,6 +4522,7 @@ + @@ -14525,6 +14526,21 @@ + + + + + + + + + + + + + + + @@ -32549,7 +32565,7 @@ - + @@ -33933,7 +33949,7 @@ - + @@ -34194,7 +34210,7 @@ - + @@ -35200,7 +35216,7 @@ - + @@ -53861,17 +53877,6 @@ - - - - - - - - - - - @@ -55134,14 +55139,6 @@ - - - - - - - - @@ -83207,17 +83204,17 @@ - - - - - - + + + + + + - - - + + + @@ -88819,14 +88816,6 @@ - - - - - - - - @@ -89053,6 +89042,16 @@ + + + + + + + + + + @@ -90338,7 +90337,7 @@ - + @@ -90352,7 +90351,7 @@ - + @@ -90364,19 +90363,20 @@ - + - + - + - + - + + @@ -91088,6 +91088,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91889,7 +91947,6 @@ - @@ -91899,24 +91956,12 @@ - - - - - - - - - - - - @@ -107571,65 +107616,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108140,240 +108127,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108526,18 +108282,7 @@ - - - - - - - - - - - @@ -108720,13 +108465,6 @@ - - - - - - - @@ -108734,10 +108472,6 @@ - - - - @@ -109334,6 +109068,25 @@ + + + + + + + + + + + + + + + + + + + @@ -109436,7 +109189,7 @@ - + @@ -109447,8 +109200,8 @@ - - + + @@ -109465,7 +109218,7 @@ - + @@ -109528,6 +109281,17 @@ + + + + + + + + + + + @@ -112663,22 +112427,6 @@ - - - - - - - - - - - - - - - - @@ -113530,7 +113278,7 @@ - + @@ -113694,7 +113442,7 @@ - + @@ -116951,17 +116699,6 @@ - - - - - - - - - - - @@ -117373,7 +117110,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117445,6 +117443,17 @@ + + + + + + + + + + + @@ -122814,6 +122823,22 @@ + + + + + + + + + + + + + + + + @@ -129819,6 +129844,6 @@ From a24fabe78ac911462ba4ce3519ce0eb36ec6435a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 24 Sep 2020 15:03:31 +0000 Subject: [PATCH 18/20] Revert "ANDROID: Update android/abi_gki_aarch64.xml" Revert submission 1437052 Reason for revert: ABI is changed. While is is correct, we will hold off doing this for another week. Reverted Changes: Iae19ae10f:UPSTREAM: ehci-hcd: Move include to keep CRC stabl... I85a933434:ANDROID: Update android/abi_gki_aarch64.xml Change-Id: If22472924ae1a42956123806eeb4fed750db5204 Signed-off-by: Greg Kroah-Hartman --- android/abi_gki_aarch64.xml | 845 +++++++++++++++++------------------- 1 file changed, 410 insertions(+), 435 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index b495cd20117a..f5fd708293b7 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1430,11 +1430,11 @@ - - - - - + + + + + @@ -4522,7 +4522,6 @@ - @@ -14526,21 +14525,6 @@ - - - - - - - - - - - - - - - @@ -32565,7 +32549,7 @@ - + @@ -33949,7 +33933,7 @@ - + @@ -34210,7 +34194,7 @@ - + @@ -35216,7 +35200,7 @@ - + @@ -53877,6 +53861,17 @@ + + + + + + + + + + + @@ -55139,6 +55134,14 @@ + + + + + + + + @@ -83204,17 +83207,17 @@ - - - - - - + + + + + + - - - + + + @@ -88816,6 +88819,14 @@ + + + + + + + + @@ -89042,16 +89053,6 @@ - - - - - - - - - - @@ -90337,7 +90338,7 @@ - + @@ -90351,7 +90352,7 @@ - + @@ -90363,20 +90364,19 @@ - + - + - + - + - - + @@ -91088,64 +91088,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -91947,6 +91889,7 @@ + @@ -91956,12 +91899,24 @@ + + + + + + + + + + + + @@ -107616,7 +107571,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108127,9 +108140,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108282,7 +108526,18 @@ + + + + + + + + + + + @@ -108465,6 +108720,13 @@ + + + + + + + @@ -108472,6 +108734,10 @@ + + + + @@ -109068,25 +109334,6 @@ - - - - - - - - - - - - - - - - - - - @@ -109189,7 +109436,7 @@ - + @@ -109200,8 +109447,8 @@ - - + + @@ -109218,7 +109465,7 @@ - + @@ -109281,17 +109528,6 @@ - - - - - - - - - - - @@ -112427,6 +112663,22 @@ + + + + + + + + + + + + + + + + @@ -113278,7 +113530,7 @@ - + @@ -113442,7 +113694,7 @@ - + @@ -116699,6 +116951,17 @@ + + + + + + + + + + + @@ -117110,268 +117373,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117443,17 +117445,6 @@ - - - - - - - - - - - @@ -122823,22 +122814,6 @@ - - - - - - - - - - - - - - - - @@ -129844,6 +129819,6 @@ From 7dded4ebf0d6414f8f876bdb385651dbf0a88f6b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 24 Sep 2020 15:03:31 +0000 Subject: [PATCH 19/20] Revert "UPSTREAM: ehci-hcd: Move include to keep CRC stable" Revert submission 1437052 Reason for revert: ABI is changed. While is is correct, we will hold off doing this for another week. Reverted Changes: Iae19ae10f:UPSTREAM: ehci-hcd: Move include to keep CRC stabl... I85a933434:ANDROID: Update android/abi_gki_aarch64.xml Change-Id: I2859f7b3ffa293371f842c01ecf433a84d5e1179 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/ehci-hcd.c | 1 - drivers/usb/host/ehci-hub.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 0e5c56e06559..cf2b7ae93b7e 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 087402aec5cb..ce0eaf7d7c12 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -14,6 +14,7 @@ */ /*-------------------------------------------------------------------------*/ +#include #define PORT_WAKE_BITS (PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E) From e32adae0a69881ce86532c5d2b0fef385da4b1eb Mon Sep 17 00:00:00 2001 From: Raghavendra Rao Ananta Date: Thu, 24 Sep 2020 11:05:23 -0700 Subject: [PATCH 20/20] ANDROID: ABI: Update allowed list for QCOM Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function int check_zeroed_user(void*, unsigned long int)' Bug: 169321538 Change-Id: Iaa693ec807daf12485d14c54a7205b4703c12de7 Signed-off-by: Raghavendra Rao Ananta --- android/abi_gki_aarch64.xml | 1047 +++++++++++++++++----------------- android/abi_gki_aarch64_qcom | 1 + 2 files changed, 537 insertions(+), 511 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index f5fd708293b7..ec6984e5a793 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -552,6 +552,7 @@ + @@ -14525,6 +14526,21 @@ + + + + + + + + + + + + + + + @@ -19884,35 +19900,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20071,6 +20058,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32549,7 +32565,7 @@ - + @@ -33933,7 +33949,7 @@ - + @@ -34194,7 +34210,7 @@ - + @@ -35200,7 +35216,7 @@ - + @@ -36561,7 +36577,7 @@ - + @@ -36581,26 +36597,26 @@ - + - + - + - + - + @@ -36895,6 +36911,14 @@ + + + + + + + + @@ -38262,12 +38286,12 @@ - - + + - + @@ -38281,12 +38305,12 @@ - + - + @@ -38306,7 +38330,7 @@ - + @@ -38334,7 +38358,7 @@ - + @@ -44652,7 +44676,7 @@ - + @@ -44922,7 +44946,7 @@ - + @@ -48625,7 +48649,7 @@ - + @@ -50272,7 +50296,7 @@ - + @@ -50628,7 +50652,7 @@ - + @@ -50638,247 +50662,247 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -50892,13 +50916,13 @@ - + - + @@ -50910,7 +50934,7 @@ - + @@ -50919,11 +50943,11 @@ - + - + @@ -50954,12 +50978,12 @@ - + - + @@ -51060,7 +51084,7 @@ - + @@ -51092,7 +51116,7 @@ - + @@ -51148,7 +51172,7 @@ - + @@ -51159,7 +51183,7 @@ - + @@ -52817,13 +52841,13 @@ - + - + @@ -53861,15 +53885,12 @@ - + - + - - - - + @@ -64294,20 +64315,6 @@ - - - - - - - - - - - - - - @@ -79363,6 +79370,17 @@ + + + + + + + + + + + @@ -86667,7 +86685,7 @@ - + @@ -88764,6 +88782,23 @@ + + + + + + + + + + + + + + + + + @@ -88819,25 +88854,6 @@ - - - - - - - - - - - - - - - - - - - @@ -89275,23 +89291,6 @@ - - - - - - - - - - - - - - - - - @@ -89563,7 +89562,6 @@ - @@ -90118,7 +90116,7 @@ - + @@ -90831,6 +90829,7 @@ + @@ -91088,6 +91087,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91889,7 +91946,6 @@ - @@ -91899,24 +91955,12 @@ - - - - - - - - - - - - @@ -92075,6 +92119,23 @@ + + + + + + + + + + + + + + + + + @@ -92257,6 +92318,11 @@ + + + + + @@ -93151,14 +93217,6 @@ - - - - - - - - @@ -104336,6 +104394,20 @@ + + + + + + + + + + + + + + @@ -107571,65 +107643,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108140,240 +108154,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108526,18 +108309,7 @@ - - - - - - - - - - - @@ -108720,13 +108492,6 @@ - - - - - - - @@ -108734,10 +108499,6 @@ - - - - @@ -110358,7 +110119,7 @@ - + @@ -117373,7 +117134,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117445,6 +117467,17 @@ + + + + + + + + + + + @@ -122083,15 +122116,7 @@ - - - - - - - - - + diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index a1b98f3e267d..f14b9dbce9ff 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -168,6 +168,7 @@ cfg80211_vendor_cmd_reply check_disk_change __check_object_size + check_zeroed_user __class_create class_destroy class_find_device