From 4d70900718765404719e83be71e98ddbe655e1b6 Mon Sep 17 00:00:00 2001 From: Giuliano Procida Date: Wed, 3 May 2023 09:23:36 +0100 Subject: [PATCH] ANDROID: GKI: add missing vendor hook and other ktrace symbols For each traceiter or tracepoint symbol in a section of a symbol list, this change ensures its partner is also present in the same section. 38 function symbol(s) added 'int __traceiter_android_rvh_arm64_serror_panic(void*, struct pt_regs*, unsigned int)' 'int __traceiter_android_rvh_bad_mode(void*, struct pt_regs*, unsigned int, int)' 'int __traceiter_android_rvh_dequeue_task_idle(void*, struct task_struct*)' 'int __traceiter_android_rvh_do_ptrauth_fault(void*, struct pt_regs*, unsigned int, bool)' 'int __traceiter_android_rvh_do_sea(void*, struct pt_regs*, unsigned int, unsigned long int, const char*)' 'int __traceiter_android_rvh_do_undefinstr(void*, struct pt_regs*, bool)' 'int __traceiter_android_rvh_refrigerator(void*, bool)' 'int __traceiter_android_rvh_tcp_recvmsg(void*, struct sock*)' 'int __traceiter_android_rvh_tcp_recvmsg_stat(void*, struct sock*, int)' 'int __traceiter_android_rvh_tcp_sendmsg_locked(void*, struct sock*, int)' 'int __traceiter_android_rvh_udp_recvmsg(void*, struct sock*)' 'int __traceiter_android_rvh_udp_sendmsg(void*, struct sock*)' 'int __traceiter_android_vh_disable_thermal_cooling_stats(void*, struct thermal_cooling_device*, bool*)' 'int __traceiter_android_vh_dup_task_struct(void*, struct task_struct*, struct task_struct*)' 'int __traceiter_android_vh_handle_tlb_conf(void*, unsigned long int, unsigned int, int*)' 'int __traceiter_android_vh_irqtime_account_process_tick(void*, struct task_struct*, struct rq*, int, int)' 'int __traceiter_android_vh_madvise_cold_or_pageout(void*, struct vm_area_struct*, bool*)' 'int __traceiter_android_vh_oom_check_panic(void*, struct oom_control*, int*)' 'int __traceiter_android_vh_psi_event(void*, struct psi_trigger*)' 'int __traceiter_android_vh_psi_group(void*, struct psi_group*)' 'int __traceiter_android_vh_rtmutex_wait_finish(void*, struct rt_mutex*)' 'int __traceiter_android_vh_rtmutex_wait_start(void*, struct rt_mutex*)' 'int __traceiter_android_vh_rwsem_read_wait_finish(void*, struct rw_semaphore*)' 'int __traceiter_android_vh_rwsem_read_wait_start(void*, struct rw_semaphore*)' 'int __traceiter_android_vh_rwsem_write_wait_finish(void*, struct rw_semaphore*)' 'int __traceiter_android_vh_rwsem_write_wait_start(void*, struct rw_semaphore*)' 'int __traceiter_android_vh_sched_show_task(void*, struct task_struct*)' 'int __traceiter_android_vh_shmem_alloc_page(void*, struct page**)' 'int __traceiter_android_vh_subpage_dma_contig_alloc(void*, bool*, struct device*, size_t*)' 'int __traceiter_android_vh_try_to_freeze_todo(void*, unsigned int, unsigned int, bool)' 'int __traceiter_android_vh_try_to_freeze_todo_unfrozen(void*, struct task_struct*)' 'int __traceiter_android_vh_vmpressure(void*, struct mem_cgroup*, bool*)' 'int __traceiter_android_vh_watchdog_timer_softlockup(void*, int, struct pt_regs*, bool)' 'int __traceiter_android_vh_wq_lockup_pool(void*, int, unsigned long int)' 'int __traceiter_net_dev_queue(void*, struct sk_buff*)' 'int __traceiter_net_dev_xmit(void*, struct sk_buff*, int, struct net_device*, unsigned int)' 'int __traceiter_netif_receive_skb(void*, struct sk_buff*)' 'int __traceiter_netif_rx(void*, struct sk_buff*)' Bug: 280431338 Change-Id: Id46fa6a5f9d7923897e29a46d39d9d17c6d2fa9a Signed-off-by: Giuliano Procida --- android/abi_gki_aarch64.xml | 522 ++++++++++++++++++++++++++------- android/abi_gki_aarch64_galaxy | 47 +++ android/abi_gki_aarch64_mtk | 1 + android/abi_gki_aarch64_oplus | 4 + android/abi_gki_aarch64_qcom | 13 + android/abi_gki_aarch64_unisoc | 3 + android/abi_gki_aarch64_vivo | 13 + 7 files changed, 500 insertions(+), 103 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index f67fa1192d73..6a06ed9aaa13 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -307,6 +307,8 @@ + + @@ -322,11 +324,15 @@ + + + + @@ -357,6 +363,7 @@ + @@ -386,6 +393,9 @@ + + + @@ -393,6 +403,8 @@ + + @@ -472,6 +484,7 @@ + @@ -480,6 +493,7 @@ + @@ -514,6 +528,7 @@ + @@ -524,6 +539,7 @@ + @@ -533,6 +549,7 @@ + @@ -558,6 +575,7 @@ + @@ -571,6 +589,8 @@ + + @@ -582,11 +602,15 @@ + + + + @@ -594,10 +618,13 @@ + + + @@ -618,6 +645,7 @@ + @@ -631,6 +659,7 @@ + @@ -639,6 +668,8 @@ + + @@ -666,7 +697,10 @@ + + + @@ -703,6 +737,10 @@ + + + + @@ -9739,6 +9777,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10645,7 +10718,7 @@ - + @@ -13946,7 +14019,7 @@ - + @@ -18720,42 +18793,42 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -25950,6 +26023,7 @@ + @@ -27308,7 +27382,7 @@ - + @@ -29387,18 +29461,18 @@ - + - + - + - + - + @@ -33250,7 +33324,7 @@ - + @@ -40888,18 +40962,18 @@ - + - + - + - + - + @@ -42924,6 +42998,13 @@ + + + + + + + @@ -44532,23 +44613,7 @@ - - - - - - - - - - - - - - - - - + @@ -47445,7 +47510,7 @@ - + @@ -48241,6 +48306,16 @@ + + + + + + + + + + @@ -48878,7 +48953,6 @@ - @@ -52438,6 +52512,20 @@ + + + + + + + + + + + + + + @@ -53822,13 +53910,6 @@ - - - - - - - @@ -62584,7 +62665,7 @@ - + @@ -64249,6 +64330,7 @@ + @@ -66488,13 +66570,6 @@ - - - - - - - @@ -68164,18 +68239,18 @@ - + - + - + - + - + @@ -78094,7 +78169,7 @@ - + @@ -84503,6 +84578,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91260,7 +91361,6 @@ - @@ -95433,6 +95533,7 @@ + @@ -96091,24 +96192,24 @@ - + - + - + - + - + - + - + @@ -103027,12 +103128,6 @@ - - - - - - @@ -104649,7 +104744,7 @@ - + @@ -111181,6 +111276,7 @@ + @@ -111278,7 +111374,6 @@ - @@ -118124,6 +118219,19 @@ + + + + + + + + + + + + + @@ -118228,6 +118336,11 @@ + + + + + @@ -118250,11 +118363,26 @@ + + + + + + + + + + + + + + + @@ -118263,6 +118391,12 @@ + + + + + + @@ -118463,6 +118597,11 @@ + + + + + @@ -118645,6 +118784,23 @@ + + + + + + + + + + + + + + + + + @@ -118689,6 +118845,16 @@ + + + + + + + + + + @@ -119223,6 +119389,12 @@ + + + + + + @@ -119283,6 +119455,12 @@ + + + + + + @@ -119494,6 +119672,13 @@ + + + + + + + @@ -119561,6 +119746,14 @@ + + + + + + + + @@ -119617,6 +119810,12 @@ + + + + + + @@ -119769,6 +119968,12 @@ + + + + + + @@ -119850,6 +120055,16 @@ + + + + + + + + + + @@ -119917,6 +120132,16 @@ + + + + + + + + + + @@ -119950,6 +120175,16 @@ + + + + + + + + + + @@ -119985,6 +120220,16 @@ + + + + + + + + + + @@ -120011,6 +120256,11 @@ + + + + + @@ -120127,6 +120377,11 @@ + + + + + @@ -120205,6 +120460,13 @@ + + + + + + + @@ -120251,6 +120513,18 @@ + + + + + + + + + + + + @@ -120435,11 +120709,30 @@ + + + + + + + + + + + + + + + + + + + @@ -120659,6 +120952,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -123575,8 +123891,8 @@ - - + + @@ -130526,10 +130842,10 @@ - - - - + + + + @@ -140701,8 +141017,8 @@ - - + + @@ -145795,8 +146111,8 @@ - - + + @@ -146172,11 +146488,11 @@ - - - - - + + + + + @@ -146658,9 +146974,9 @@ - - - + + + @@ -146709,8 +147025,8 @@ - - + + diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy index 6b921ab3a901..db5abff44b22 100644 --- a/android/abi_gki_aarch64_galaxy +++ b/android/abi_gki_aarch64_galaxy @@ -3712,6 +3712,8 @@ trace_event_reg trace_handle_return __traceiter_android_rvh_account_irq + __traceiter_android_rvh_arm64_serror_panic + __traceiter_android_rvh_bad_mode __traceiter_android_rvh_build_perf_domains __traceiter_android_rvh_can_migrate_task __traceiter_android_rvh_check_preempt_wakeup @@ -3721,9 +3723,12 @@ __traceiter_android_rvh_cpufreq_transition __traceiter_android_rvh_cpu_overutilized __traceiter_android_rvh_dequeue_task + __traceiter_android_rvh_dequeue_task_idle __traceiter_android_rvh_die_kernel_fault __traceiter_android_rvh_do_mem_abort + __traceiter_android_rvh_do_sea __traceiter_android_rvh_do_sp_pc_abort + __traceiter_android_rvh_do_undefinstr __traceiter_android_rvh_enqueue_task __traceiter_android_rvh_find_busiest_queue __traceiter_android_rvh_find_energy_efficient_cpu @@ -3777,6 +3782,7 @@ __traceiter_android_vh_binder_set_priority __traceiter_android_vh_binder_transaction_init __traceiter_android_vh_binder_wakeup_ilocked + __traceiter_android_vh_cgroup_attach __traceiter_android_vh_cma_alloc_finish __traceiter_android_vh_cma_alloc_start __traceiter_android_vh_cpu_idle_enter @@ -3798,10 +3804,19 @@ __traceiter_android_vh_logbuf __traceiter_android_vh_logbuf_pr_cont __traceiter_android_vh_meminfo_proc_show + __traceiter_android_vh_mutex_wait_finish + __traceiter_android_vh_mutex_wait_start __traceiter_android_vh_pagecache_get_page __traceiter_android_vh_printk_hotplug __traceiter_android_vh_ptype_head __traceiter_android_vh_rmqueue + __traceiter_android_vh_rtmutex_wait_finish + __traceiter_android_vh_rtmutex_wait_start + __traceiter_android_vh_rwsem_read_wait_finish + __traceiter_android_vh_rwsem_read_wait_start + __traceiter_android_vh_rwsem_write_wait_finish + __traceiter_android_vh_rwsem_write_wait_start + __traceiter_android_vh_sched_show_task __traceiter_android_vh_scheduler_tick __traceiter_android_vh_show_max_freq __traceiter_android_vh_show_mem @@ -3809,6 +3824,8 @@ __traceiter_android_vh_show_suspend_epoch_val __traceiter_android_vh_timer_calc_index __traceiter_android_vh_timerfd_create + __traceiter_android_vh_try_to_freeze_todo + __traceiter_android_vh_try_to_freeze_todo_unfrozen __traceiter_android_vh_typec_store_partner_src_caps __traceiter_android_vh_typec_tcpci_override_toggling __traceiter_android_vh_typec_tcpm_adj_current_limit @@ -3822,14 +3839,44 @@ __traceiter_android_vh_ufs_send_uic_command __traceiter_android_vh_ufs_update_sdev __traceiter_android_vh_ufs_update_sysfs + __traceiter_android_vh_watchdog_timer_softlockup + __traceiter_android_vh_wq_lockup_pool + __traceiter_binder_transaction_received __traceiter_clock_set_rate __traceiter_cpu_frequency + __traceiter_cpu_frequency_limits + __traceiter_cpu_idle + __traceiter_device_pm_callback_end + __traceiter_device_pm_callback_start __traceiter_dma_fence_emit + __traceiter_dwc3_ep_queue __traceiter_dwc3_readl __traceiter_dwc3_writel __traceiter_gpu_mem_total + __traceiter_hrtimer_expire_entry + __traceiter_hrtimer_expire_exit + __traceiter_ipi_entry + __traceiter_ipi_exit + __traceiter_ipi_raise + __traceiter_irq_handler_entry + __traceiter_irq_handler_exit __traceiter_kfree_skb + __traceiter_pelt_cfs_tp + __traceiter_pelt_dl_tp + __traceiter_pelt_irq_tp + __traceiter_pelt_rt_tp + __traceiter_pelt_se_tp + __traceiter_rwmmio_post_read + __traceiter_rwmmio_read + __traceiter_rwmmio_write + __traceiter_sched_cpu_capacity_tp + __traceiter_sched_overutilized_tp + __traceiter_sched_switch + __traceiter_sched_util_est_cfs_tp __traceiter_sched_util_est_se_tp + __traceiter_suspend_resume + __traceiter_workqueue_execute_end + __traceiter_workqueue_execute_start __traceiter_xdp_exception trace_output_call __tracepoint_android_rvh_account_irq diff --git a/android/abi_gki_aarch64_mtk b/android/abi_gki_aarch64_mtk index 5473f314864b..2ac7b11faf77 100644 --- a/android/abi_gki_aarch64_mtk +++ b/android/abi_gki_aarch64_mtk @@ -3142,6 +3142,7 @@ __traceiter_android_vh_snd_soc_card_get_comp_chain __traceiter_android_vh_sound_usb_support_cpu_suspend __traceiter_android_vh_syscall_prctl_finished + __traceiter_android_vh_ufs_update_sdev __traceiter_android_vh_v4l2subdev_set_fmt __traceiter_android_vh_v4l2subdev_set_frame_interval __traceiter_android_vh_v4l2subdev_set_selection diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus index b1b464d893fe..9544ea84c8f1 100644 --- a/android/abi_gki_aarch64_oplus +++ b/android/abi_gki_aarch64_oplus @@ -2925,6 +2925,10 @@ __traceiter_ipi_entry __traceiter_ipi_raise __traceiter_irq_handler_entry + __traceiter_net_dev_queue + __traceiter_net_dev_xmit + __traceiter_netif_receive_skb + __traceiter_netif_rx __traceiter_pelt_se_tp __traceiter_rwmmio_post_read __traceiter_rwmmio_read diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index bc5d94e3630a..b269c937101c 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -2514,6 +2514,7 @@ __traceiter_android_rvh_cpu_cgroup_online __traceiter_android_rvh_cpufreq_transition __traceiter_android_rvh_dequeue_task + __traceiter_android_rvh_do_ptrauth_fault __traceiter_android_rvh_do_sched_yield __traceiter_android_rvh_enqueue_task __traceiter_android_rvh_find_busiest_queue @@ -2561,14 +2562,18 @@ __traceiter_android_rvh_update_misfit_status __traceiter_android_rvh_wake_up_new_task __traceiter_android_vh_allow_domain_state + __traceiter_android_vh_alter_rwsem_list_add __traceiter_android_vh_binder_restore_priority __traceiter_android_vh_binder_set_priority __traceiter_android_vh_binder_transaction_init __traceiter_android_vh_binder_wakeup_ilocked + __traceiter_android_vh_check_uninterruptible_tasks + __traceiter_android_vh_check_uninterruptible_tasks_dn __traceiter_android_vh_cpu_idle_enter __traceiter_android_vh_cpu_idle_exit __traceiter_android_vh_cpuidle_psci_enter __traceiter_android_vh_cpuidle_psci_exit + __traceiter_android_vh_disable_thermal_cooling_stats __traceiter_android_vh_dump_throttled_rt_tasks __traceiter_android_vh_freq_table_limits __traceiter_android_vh_ftrace_dump_buffer @@ -2578,18 +2583,26 @@ __traceiter_android_vh_ftrace_size_check __traceiter_android_vh_gic_resume __traceiter_android_vh_gpio_block_read + __traceiter_android_vh_handle_tlb_conf __traceiter_android_vh_iommu_setup_dma_ops __traceiter_android_vh_ipi_stop __traceiter_android_vh_jiffies_update __traceiter_android_vh_logbuf __traceiter_android_vh_logbuf_pr_cont + __traceiter_android_vh_madvise_cold_or_pageout + __traceiter_android_vh_oom_check_panic __traceiter_android_vh_printk_hotplug + __traceiter_android_vh_process_killed + __traceiter_android_vh_psi_event + __traceiter_android_vh_psi_group __traceiter_android_vh_rproc_recovery __traceiter_android_vh_rproc_recovery_set __traceiter_android_vh_scheduler_tick + __traceiter_android_vh_shmem_alloc_page __traceiter_android_vh_show_max_freq __traceiter_android_vh_show_resume_epoch_val __traceiter_android_vh_show_suspend_epoch_val + __traceiter_android_vh_subpage_dma_contig_alloc __traceiter_android_vh_timer_calc_index __traceiter_android_vh_ufs_check_int_errors __traceiter_android_vh_ufs_clock_scaling diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc index d065398a5fd0..ec061835a335 100644 --- a/android/abi_gki_aarch64_unisoc +++ b/android/abi_gki_aarch64_unisoc @@ -254,6 +254,9 @@ __tasklet_schedule thermal_zone_device_disable thermal_zone_device_enable + __traceiter_rwmmio_post_read + __traceiter_rwmmio_read + __traceiter_rwmmio_write __tracepoint_rwmmio_post_read __tracepoint_rwmmio_read __tracepoint_rwmmio_write diff --git a/android/abi_gki_aarch64_vivo b/android/abi_gki_aarch64_vivo index 9b890ada7ad6..9143afa6c2dc 100644 --- a/android/abi_gki_aarch64_vivo +++ b/android/abi_gki_aarch64_vivo @@ -1687,6 +1687,7 @@ __traceiter_android_rvh_flush_task __traceiter_android_rvh_migrate_queued_task __traceiter_android_rvh_new_task_stats + __traceiter_android_rvh_refrigerator __traceiter_android_rvh_replace_next_task_fair __traceiter_android_rvh_resume_cpus __traceiter_android_rvh_sched_cpu_dying @@ -1704,22 +1705,30 @@ __traceiter_android_rvh_set_readahead_gfp_mask __traceiter_android_rvh_set_skip_swapcache_flags __traceiter_android_rvh_set_task_cpu + __traceiter_android_rvh_tcp_recvmsg + __traceiter_android_rvh_tcp_recvmsg_stat + __traceiter_android_rvh_tcp_sendmsg_locked __traceiter_android_rvh_tick_entry __traceiter_android_rvh_try_to_wake_up __traceiter_android_rvh_try_to_wake_up_success __traceiter_android_rvh_ttwu_cond + __traceiter_android_rvh_udp_recvmsg + __traceiter_android_rvh_udp_sendmsg __traceiter_android_rvh_update_cpu_capacity __traceiter_android_rvh_update_cpus_allowed __traceiter_android_rvh_update_misfit_status __traceiter_android_rvh_wake_up_new_task + __traceiter_android_vh_account_task_time __traceiter_android_vh_allow_domain_state __traceiter_android_vh_binder_restore_priority __traceiter_android_vh_binder_set_priority + __traceiter_android_vh_binder_trans __traceiter_android_vh_binder_wakeup_ilocked __traceiter_android_vh_blk_alloc_rqs __traceiter_android_vh_blk_rq_ctx_init __traceiter_android_vh_cpu_idle_enter __traceiter_android_vh_cpu_idle_exit + __traceiter_android_vh_dup_task_struct __traceiter_android_vh_filemap_fault_cache_page __traceiter_android_vh_filemap_fault_get_page __traceiter_android_vh_ftrace_dump_buffer @@ -1729,6 +1738,7 @@ __traceiter_android_vh_ftrace_size_check __traceiter_android_vh_iommu_setup_dma_ops __traceiter_android_vh_ipi_stop + __traceiter_android_vh_irqtime_account_process_tick __traceiter_android_vh_jiffies_update __traceiter_android_vh_mmap_region __traceiter_android_vh_mmc_attach_sd @@ -1746,10 +1756,13 @@ __traceiter_android_vh_shrink_slab_bypass __traceiter_android_vh_timer_calc_index __traceiter_android_vh_try_to_unmap_one + __traceiter_android_vh_tune_scan_type + __traceiter_android_vh_tune_swappiness __traceiter_android_vh_ufs_check_int_errors __traceiter_android_vh_ufs_compl_command __traceiter_android_vh_ufs_send_command __traceiter_android_vh_ufs_update_sdev + __traceiter_android_vh_vmpressure __traceiter_binder_transaction_received __traceiter_block_bio_complete __traceiter_block_bio_queue