Merge branch 'android12-5.10' into branch 'android12-5.10-lts'

Sync up with android12-5.10 for the following commits:

568ee90a7e ANDROID: fix execute bit on android/abi_gki_aarch64_asus
9ecb2fcca3 ANDROID: avoid huge-page not to clear trylock-bit after shrink_page_list.
548da5d23d ANDROID: vendor_hooks: Add hooks for oem futex optimization
3c2f107ad2 ANDROID: mm: memblock: avoid to create memmap for memblock nomap regions
97e5ac2b55 ANDROID: abi_gki_aarch64_qcom: Add android_vh_disable_thermal_cooling_stats
a3e8b04796 ANDROID: thermal: vendor hook to disable thermal cooling stats
a47cec9c43 ANDROID: GKI: Update symbols to symbol list
f32894eadf ANDROID: GKI: rockchip: update fragment file
052619d9e1 ANDROID: GKI: rockchip: Enable symbols bcmdhd-sdio
4f116d326e ANDROID: GKI: rockchip: Update symbols for rga driver
d1e180148e BACKPORT: cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock
ef04c4095d UPSTREAM: cgroup: Elide write-locking threadgroup_rwsem when updating csses on an empty subtree
15ad83d91f ANDROID: GKI: Update symbol list for transsion
a47fb6a9ae ANDROID: vendor_hook: Add hook in __free_pages()
6c56a05b87 ANDROID: vendor_hooks: Add hooks to extend the struct swap_info_struct
7449d8120a ANDROID: vendor_hook: Add hook in si_swapinfo()
7ff95bd758 ANDROID: GKI: Update symbols to symbol list
04c766fa76 ANDROID: Use rq_clock_task without CONFIG_SMP
4e13870877 ANDROID: abi_gki_aarch64_qcom: Add skb and scatterlist helpers
86be1a3d9f Revert "ANDROID: vendor_hook: Add hook in si_swapinfo()"
40b3533213 Revert "ANDROID: vendor_hooks:vendor hook for pidfd_open"
d0590b99c9 Revert "ANDROID: vendor_hooks: Add hooks to extend the struct swap_info_struct"
501063ce66 Revert "ANDROID: vendor_hooks:vendor hook for mmput"
23fdb24a48 ANDROID: GKI: Update symbols to symbol list
567d65e536 ANDROID: Guard rq_clock_task_mult with CONFIG_SMP
eb99e6d80e Revert "ANDROID: vendor_hook: Add hook in __free_pages()"
8d86846781 Revert "ANDROID: vendor_hooks: Add hooks for binder"
eed2741ae6 ANDROID: vendor_hook: add hooks to protect locking-tsk in cpu scheduler

Update the .xml file to add the following new symbols that were now
started to be tracked in the android12-5.10 branch:

Leaf changes summary: 88 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 51 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 37 Added variables

51 Added functions:

  [A] 'function int __traceiter_android_vh_account_swap_pages(void*, swap_info_struct*, bool*)'
  [A] 'function int __traceiter_android_vh_alloc_si(void*, swap_info_struct**, bool*)'
  [A] 'function int __traceiter_android_vh_alloc_swap_slot_cache(void*, swap_slots_cache*, int*, bool*)'
  [A] 'function int __traceiter_android_vh_count_pswpin(void*, swap_info_struct*)'
  [A] 'function int __traceiter_android_vh_count_pswpout(void*, swap_info_struct*)'
  [A] 'function int __traceiter_android_vh_count_swpout_vm_event(void*, swap_info_struct*, page*, bool*)'
  [A] 'function int __traceiter_android_vh_cow_user_page(void*, vm_fault*, page*)'
  [A] 'function int __traceiter_android_vh_do_page_trylock(void*, page*, rw_semaphore*, bool*, bool*)'
  [A] 'function int __traceiter_android_vh_drain_slots_cache_cpu(void*, swap_slots_cache*, unsigned int, bool, bool*)'
  [A] 'function int __traceiter_android_vh_free_pages(void*, page*, unsigned int)'
  [A] 'function int __traceiter_android_vh_free_swap_slot(void*, swp_entry_t, swap_slots_cache*, bool*)'
  [A] 'function int __traceiter_android_vh_get_swap_page(void*, page*, swp_entry_t*, swap_slots_cache*, bool*)'
  [A] 'function int __traceiter_android_vh_handle_failed_page_trylock(void*, list_head*)'
  [A] 'function int __traceiter_android_vh_handle_pte_fault_end(void*, vm_fault*, unsigned long int)'
  [A] 'function int __traceiter_android_vh_inactive_is_low(void*, unsigned long int, unsigned long int*, lru_list, bool*)'
  [A] 'function int __traceiter_android_vh_init_swap_info_struct(void*, swap_info_struct*, plist_head*)'
  [A] 'function int __traceiter_android_vh_migrate_page_states(void*, page*, page*)'
  [A] 'function int __traceiter_android_vh_page_isolated_for_reclaim(void*, mm_struct*, page*)'
  [A] 'function int __traceiter_android_vh_page_referenced_one_end(void*, vm_area_struct*, page*, int)'
  [A] 'function int __traceiter_android_vh_page_trylock_clear(void*, page*)'
  [A] 'function int __traceiter_android_vh_page_trylock_get_result(void*, page*, bool*)'
  [A] 'function int __traceiter_android_vh_page_trylock_set(void*, page*)'
  [A] 'function int __traceiter_android_vh_record_mutex_lock_starttime(void*, task_struct*, unsigned long int)'
  [A] 'function int __traceiter_android_vh_record_percpu_rwsem_lock_starttime(void*, task_struct*, unsigned long int)'
  [A] 'function int __traceiter_android_vh_record_rtmutex_lock_starttime(void*, task_struct*, unsigned long int)'
  [A] 'function int __traceiter_android_vh_record_rwsem_lock_starttime(void*, task_struct*, unsigned long int)'
  [A] 'function int __traceiter_android_vh_remove_vmalloc_stack(void*, vm_struct*)'
  [A] 'function int __traceiter_android_vh_set_shmem_page_flag(void*, page*)'
  [A] 'function int __traceiter_android_vh_si_swapinfo(void*, swap_info_struct*, bool*)'
  [A] 'function int __traceiter_android_vh_snapshot_refaults(void*, lruvec*)'
  [A] 'function int __traceiter_android_vh_swap_slot_cache_active(void*, bool)'
  [A] 'function int __traceiter_android_vh_swapin_add_anon_rmap(void*, vm_fault*, page*)'
  [A] 'function int __traceiter_android_vh_unuse_swap_page(void*, swap_info_struct*, page*)'
  [A] 'function int __traceiter_android_vh_waiting_for_page_migration(void*, page*)'
  [A] 'function unsigned long int alloc_iova_fast(iova_domain*, unsigned long int, unsigned long int, bool)'
  [A] 'function void free_iova_fast(iova_domain*, unsigned long int, unsigned long int)'
  [A] 'function int mmc_sw_reset(mmc_host*)'
  [A] 'function int pinctrl_generic_add_group(pinctrl_dev*, const char*, int*, int, void*)'
  [A] 'function int pinmux_generic_add_function(pinctrl_dev*, const char*, const char**, const unsigned int, void*)'
  [A] 'function void plist_del(plist_node*, plist_head*)'
  [A] 'function void plist_requeue(plist_node*, plist_head*)'
  [A] 'function unsigned long int reclaim_pages(list_head*)'
  [A] 'function u16 sdio_readw(sdio_func*, unsigned int, int*)'
  [A] 'function void sdio_retune_crc_disable(sdio_func*)'
  [A] 'function void sdio_retune_crc_enable(sdio_func*)'
  [A] 'function void sdio_retune_hold_now(sdio_func*)'
  [A] 'function void sdio_retune_release(sdio_func*)'
  [A] 'function void sdio_writew(sdio_func*, u16, unsigned int, int*)'
  [A] 'function bool sg_miter_skip(sg_mapping_iter*, off_t)'
  [A] 'function int skb_copy_datagram_from_iter(sk_buff*, int, iov_iter*, int)'
  [A] 'function sk_buff* sock_alloc_send_pskb(sock*, unsigned long int, unsigned long int, int, int*, int)'

37 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_account_swap_pages'
  [A] 'tracepoint __tracepoint_android_vh_alloc_si'
  [A] 'tracepoint __tracepoint_android_vh_alloc_swap_slot_cache'
  [A] 'tracepoint __tracepoint_android_vh_count_pswpin'
  [A] 'tracepoint __tracepoint_android_vh_count_pswpout'
  [A] 'tracepoint __tracepoint_android_vh_count_swpout_vm_event'
  [A] 'tracepoint __tracepoint_android_vh_cow_user_page'
  [A] 'tracepoint __tracepoint_android_vh_disable_thermal_cooling_stats'
  [A] 'tracepoint __tracepoint_android_vh_do_page_trylock'
  [A] 'tracepoint __tracepoint_android_vh_drain_slots_cache_cpu'
  [A] 'tracepoint __tracepoint_android_vh_free_pages'
  [A] 'tracepoint __tracepoint_android_vh_free_swap_slot'
  [A] 'tracepoint __tracepoint_android_vh_get_swap_page'
  [A] 'tracepoint __tracepoint_android_vh_handle_failed_page_trylock'
  [A] 'tracepoint __tracepoint_android_vh_handle_pte_fault_end'
  [A] 'tracepoint __tracepoint_android_vh_inactive_is_low'
  [A] 'tracepoint __tracepoint_android_vh_init_swap_info_struct'
  [A] 'tracepoint __tracepoint_android_vh_migrate_page_states'
  [A] 'tracepoint __tracepoint_android_vh_page_isolated_for_reclaim'
  [A] 'tracepoint __tracepoint_android_vh_page_referenced_one_end'
  [A] 'tracepoint __tracepoint_android_vh_page_trylock_clear'
  [A] 'tracepoint __tracepoint_android_vh_page_trylock_get_result'
  [A] 'tracepoint __tracepoint_android_vh_page_trylock_set'
  [A] 'tracepoint __tracepoint_android_vh_record_mutex_lock_starttime'
  [A] 'tracepoint __tracepoint_android_vh_record_percpu_rwsem_lock_starttime'
  [A] 'tracepoint __tracepoint_android_vh_record_rtmutex_lock_starttime'
  [A] 'tracepoint __tracepoint_android_vh_record_rwsem_lock_starttime'
  [A] 'tracepoint __tracepoint_android_vh_remove_vmalloc_stack'
  [A] 'tracepoint __tracepoint_android_vh_set_shmem_page_flag'
  [A] 'tracepoint __tracepoint_android_vh_si_swapinfo'
  [A] 'tracepoint __tracepoint_android_vh_snapshot_refaults'
  [A] 'tracepoint __tracepoint_android_vh_swap_slot_cache_active'
  [A] 'tracepoint __tracepoint_android_vh_swapin_add_anon_rmap'
  [A] 'tracepoint __tracepoint_android_vh_unuse_swap_page'
  [A] 'tracepoint __tracepoint_android_vh_waiting_for_page_migration'
  [A] 'atomic_long_t nr_swap_pages'
  [A] 'unsigned long int zero_pfn'

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I719eb9d92df0832855b90b31a5d2264b51dc0d96

Documentation/admin-guide/kernel-parameters.txt

@@ -2533,6 +2533,12 @@
 
 	memblock=debug	[KNL] Enable memblock debug messages.
 
+	android12_only.will_be_removed_soon.memblock_nomap_remove= [KNL]
+			Setting this to true through kernel command line will
+			call memblock_remove on the regions marked with no-map
+			property thereby saving memory by removing page structs
+			for those regions. By default this is set to false.
+
 	load_ramdisk=	[RAM] [Deprecated]
 
 	lockd.nlm_grace_period=P  [NFS] Assign grace period.

android/abi_gki_aarch64_oplus

@@ -2100,6 +2100,7 @@
   rdev_get_regmap
   read_cache_page_gfp
   reboot_mode
+  reclaim_pages
   refcount_dec_and_lock
   refcount_dec_not_one
   refcount_warn_saturate
@@ -2798,6 +2799,7 @@
   __traceiter_android_vh_futex_sleep_start
   __traceiter_android_vh_get_from_fragment_pool
   __traceiter_android_vh_gpio_block_read
+  __traceiter_android_vh_handle_failed_page_trylock
   __traceiter_android_vh_include_reserved_zone
   __traceiter_android_vh_iommu_alloc_iova
   __traceiter_android_vh_iommu_free_iova
@@ -2823,9 +2825,13 @@
   __traceiter_android_vh_override_creds
   __traceiter_android_vh_page_referenced_check_bypass
   __traceiter_android_vh_page_should_be_protected
+  __traceiter_android_vh_page_trylock_set
+  __traceiter_android_vh_page_trylock_clear
+  __traceiter_android_vh_page_trylock_get_result
   __traceiter_android_vh_mark_page_accessed
   __traceiter_android_vh_show_mapcount_pages
   __traceiter_android_vh_do_traversal_lruvec
+  __traceiter_android_vh_do_page_trylock
   __traceiter_android_vh_update_page_mapcount
   __traceiter_android_vh_add_page_to_lrulist
   __traceiter_android_vh_del_page_from_lrulist
@@ -2834,6 +2840,10 @@
   __traceiter_android_vh_printk_hotplug
   __traceiter_android_vh_process_killed
   __traceiter_android_vh_revert_creds
+  __traceiter_android_vh_record_mutex_lock_starttime
+  __traceiter_android_vh_record_rtmutex_lock_starttime
+  __traceiter_android_vh_record_rwsem_lock_starttime
+  __traceiter_android_vh_record_percpu_rwsem_lock_starttime
   __traceiter_android_vh_rmqueue
   __traceiter_android_vh_rwsem_init
   __traceiter_android_vh_rwsem_mark_wake_readers
@@ -2846,6 +2856,7 @@
   __traceiter_android_vh_rwsem_write_finished
   __traceiter_android_vh_save_track_hash
   __traceiter_android_vh_save_vmalloc_stack
+  __traceiter_android_vh_remove_vmalloc_stack
   __traceiter_android_vh_sched_stat_runtime_rt
   __traceiter_android_vh_scheduler_tick
   __traceiter_android_vh_selinux_avc_insert
@@ -3021,6 +3032,7 @@
   __tracepoint_android_vh_futex_sleep_start
   __tracepoint_android_vh_get_from_fragment_pool
   __tracepoint_android_vh_gpio_block_read
+  __tracepoint_android_vh_handle_failed_page_trylock
   __tracepoint_android_vh_include_reserved_zone
   __tracepoint_android_vh_iommu_alloc_iova
   __tracepoint_android_vh_iommu_free_iova
@@ -3046,9 +3058,13 @@
   __tracepoint_android_vh_override_creds
   __tracepoint_android_vh_page_referenced_check_bypass
   __tracepoint_android_vh_page_should_be_protected
+  __tracepoint_android_vh_page_trylock_set
+  __tracepoint_android_vh_page_trylock_clear
+  __tracepoint_android_vh_page_trylock_get_result
   __tracepoint_android_vh_mark_page_accessed
   __tracepoint_android_vh_show_mapcount_pages
   __tracepoint_android_vh_do_traversal_lruvec
+  __tracepoint_android_vh_do_page_trylock
   __tracepoint_android_vh_update_page_mapcount
   __tracepoint_android_vh_add_page_to_lrulist
   __tracepoint_android_vh_del_page_from_lrulist
@@ -3057,6 +3073,10 @@
   __tracepoint_android_vh_printk_hotplug
   __tracepoint_android_vh_process_killed
   __tracepoint_android_vh_revert_creds
+  __tracepoint_android_vh_record_mutex_lock_starttime
+  __tracepoint_android_vh_record_rtmutex_lock_starttime
+  __tracepoint_android_vh_record_rwsem_lock_starttime
+  __tracepoint_android_vh_record_percpu_rwsem_lock_starttime
   __tracepoint_android_vh_rmqueue
   __tracepoint_android_vh_rwsem_init
   __tracepoint_android_vh_rwsem_mark_wake_readers
@@ -3069,6 +3089,7 @@
   __tracepoint_android_vh_rwsem_write_finished
   __tracepoint_android_vh_save_track_hash
   __tracepoint_android_vh_save_vmalloc_stack
+  __tracepoint_android_vh_remove_vmalloc_stack
   __tracepoint_android_vh_sched_stat_runtime_rt
   __tracepoint_android_vh_scheduler_tick
   __tracepoint_android_vh_selinux_avc_insert

android/abi_gki_aarch64_qcom

@@ -1965,7 +1965,6 @@
   register_kretprobe
   register_memory_notifier
   register_module_notifier
-  register_qdisc
   register_netdev
   register_netdevice
   register_netdevice_notifier
@@ -1973,6 +1972,7 @@
   register_oom_notifier
   register_pernet_device
   register_pm_notifier
+  register_qdisc
   register_reboot_notifier
   register_restart_handler
   __register_rpmsg_driver
@@ -2194,6 +2194,7 @@
   sg_init_one
   sg_init_table
   sg_miter_next
+  sg_miter_skip
   sg_miter_start
   sg_miter_stop
   sg_next
@@ -2233,6 +2234,7 @@
   skb_complete_wifi_ack
   skb_copy
   skb_copy_bits
+  skb_copy_datagram_from_iter
   skb_copy_datagram_iter
   skb_copy_expand
   skb_dequeue
@@ -2321,6 +2323,7 @@
   snprintf
   soc_device_register
   soc_device_unregister
+  sock_alloc_send_pskb
   sock_alloc_send_skb
   __sock_create
   sock_create_kern
@@ -2682,6 +2685,7 @@
   __tracepoint_android_vh_cpu_idle_exit
   __tracepoint_android_vh_cpuidle_psci_enter
   __tracepoint_android_vh_cpuidle_psci_exit
+  __tracepoint_android_vh_disable_thermal_cooling_stats
   __tracepoint_android_vh_dump_throttled_rt_tasks
   __tracepoint_android_vh_freq_table_limits
   __tracepoint_android_vh_ftrace_dump_buffer

android/abi_gki_aarch64_transsion

@@ -6,3 +6,55 @@
   scan_swap_map_slots
   swap_alloc_cluster
   check_cache_active
+  zero_pfn
+  nr_swap_pages
+  plist_requeue
+  plist_del
+  __traceiter_android_vh_handle_pte_fault_end
+  __traceiter_android_vh_cow_user_page
+  __traceiter_android_vh_swapin_add_anon_rmap
+  __traceiter_android_vh_waiting_for_page_migration
+  __traceiter_android_vh_migrate_page_states
+  __traceiter_android_vh_page_referenced_one_end
+  __traceiter_android_vh_count_pswpin
+  __traceiter_android_vh_count_pswpout
+  __traceiter_android_vh_count_swpout_vm_event
+  __traceiter_android_vh_swap_slot_cache_active
+  __traceiter_android_vh_drain_slots_cache_cpu
+  __traceiter_android_vh_alloc_swap_slot_cache
+  __traceiter_android_vh_free_swap_slot
+  __traceiter_android_vh_get_swap_page
+  __traceiter_android_vh_page_isolated_for_reclaim
+  __traceiter_android_vh_inactive_is_low
+  __traceiter_android_vh_snapshot_refaults
+  __traceiter_android_vh_account_swap_pages
+  __traceiter_android_vh_unuse_swap_page
+  __traceiter_android_vh_init_swap_info_struct
+  __traceiter_android_vh_si_swapinfo
+  __traceiter_android_vh_alloc_si
+  __traceiter_android_vh_free_pages
+  __traceiter_android_vh_set_shmem_page_flag
+  __tracepoint_android_vh_handle_pte_fault_end
+  __tracepoint_android_vh_cow_user_page
+  __tracepoint_android_vh_swapin_add_anon_rmap
+  __tracepoint_android_vh_waiting_for_page_migration
+  __tracepoint_android_vh_migrate_page_states
+  __tracepoint_android_vh_page_referenced_one_end
+  __tracepoint_android_vh_count_pswpin
+  __tracepoint_android_vh_count_pswpout
+  __tracepoint_android_vh_count_swpout_vm_event
+  __tracepoint_android_vh_swap_slot_cache_active
+  __tracepoint_android_vh_drain_slots_cache_cpu
+  __tracepoint_android_vh_alloc_swap_slot_cache
+  __tracepoint_android_vh_free_swap_slot
+  __tracepoint_android_vh_get_swap_page
+  __tracepoint_android_vh_page_isolated_for_reclaim
+  __tracepoint_android_vh_inactive_is_low
+  __tracepoint_android_vh_snapshot_refaults
+  __tracepoint_android_vh_account_swap_pages
+  __tracepoint_android_vh_unuse_swap_page
+  __tracepoint_android_vh_init_swap_info_struct
+  __tracepoint_android_vh_si_swapinfo
+  __tracepoint_android_vh_alloc_si
+  __tracepoint_android_vh_free_pages
+  __tracepoint_android_vh_set_shmem_page_flag

arch/arm64/configs/rockchip_gki.fragment

@@ -1,20 +1,24 @@
+CONFIG_AP6XXX=m
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=m
 CONFIG_ARM_ROCKCHIP_CPUFREQ=m
-# CONFIG_ATA_SFF is not set
+CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_CW2017=m
+CONFIG_BATTERY_CW221X=m
 CONFIG_BATTERY_RK817=m
 CONFIG_BATTERY_RK818=m
 CONFIG_BLK_DEV_NVME=m
 CONFIG_BMA2XX_ACC=m
 CONFIG_CHARGER_BQ25700=m
+CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_RK817=m
 CONFIG_CHARGER_RK818=m
+CONFIG_CHARGER_SC89890=m
+CONFIG_CHARGER_SGM41542=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CLK_RK1808 is not set
-# CONFIG_CLK_RK3308 is not set
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_ROCKCHIP=m
@@ -25,12 +29,10 @@ CONFIG_COMPASS_DEVICE=m
 CONFIG_CPUFREQ_DT=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_PX30=y
-CONFIG_CPU_RK3328=y
-CONFIG_CPU_RK3368=y
-CONFIG_CPU_RK3399=y
-CONFIG_CPU_RK3568=y
+CONFIG_CPU_RK3588=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_ROCKCHIP_DEV=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_SHA1_ARM64_CE=m
 CONFIG_CRYPTO_TWOFISH=m
@@ -38,13 +40,20 @@ CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=m
 CONFIG_DMABUF_HEAPS_CMA=m
 CONFIG_DMABUF_HEAPS_SYSTEM=m
 CONFIG_DRAGONRISE_FF=y
+CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_MAXIM_MAX96745=m
+CONFIG_DRM_MAXIM_MAX96752F=m
+CONFIG_DRM_MAXIM_MAX96755F=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_RK1000_TVE=m
+CONFIG_DRM_RK630_TVE=m
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_DRM_ROCKCHIP_RK628=m
+CONFIG_DRM_ROHM_BU18XL82=m
 CONFIG_DRM_SII902X=m
 CONFIG_DTC_SYMBOLS=y
-# CONFIG_DWMAC_GENERIC is not set
 CONFIG_DW_WATCHDOG=m
 CONFIG_GPIO_ROCKCHIP=m
 CONFIG_GREENASIA_FF=y
@@ -116,13 +125,12 @@ CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_HID=m
 CONFIG_I2C_RK3X=m
+CONFIG_IEP=m
 CONFIG_IIO_BUFFER_CB=m
 CONFIG_INPUT_RK805_PWRKEY=m
-CONFIG_ION=y
-CONFIG_ION_SYSTEM_HEAP=y
-CONFIG_JOLIET=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_RGB13H=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -131,7 +139,16 @@ CONFIG_LSM330_ACC=m
 CONFIG_LS_CM3217=m
 CONFIG_LS_CM3218=m
 CONFIG_LS_STK3410=m
-# CONFIG_MALI400_PROFILING is not set
+CONFIG_LS_UCS14620=m
+CONFIG_MALI_BIFROST=m
+CONFIG_MALI_BIFROST_DEBUG=y
+CONFIG_MALI_BIFROST_EXPERT=y
+CONFIG_MALI_CSF_SUPPORT=y
+CONFIG_MALI_PLATFORM_NAME="rk"
+CONFIG_MALI_PWRSOFT_765=y
+CONFIG_MFD_RK628=m
+CONFIG_MFD_RK630_I2C=m
+CONFIG_MFD_RK806_SPI=m
 CONFIG_MFD_RK808=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_ROCKCHIP=m
@@ -141,22 +158,33 @@ CONFIG_MPU6500_ACC=m
 CONFIG_MPU6880_ACC=m
 CONFIG_OPTEE=m
 CONFIG_PANTHERLORD_FF=y
+CONFIG_PCIEASPM_EXT=m
+CONFIG_PCIE_DW_ROCKCHIP=m
+CONFIG_PCIE_ROCKCHIP_HOST=m
+CONFIG_PHY_ROCKCHIP_CSI2_DPHY=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=m
 CONFIG_PHY_ROCKCHIP_INNO_USB3=m
 CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
 CONFIG_PHY_ROCKCHIP_NANENG_EDP=m
 CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY=m
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=m
 CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
 CONFIG_PHY_ROCKCHIP_TYPEC=m
 CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_ROCKCHIP_USBDP=m
 CONFIG_PINCTRL_RK805=m
+CONFIG_PINCTRL_RK806=m
 CONFIG_PINCTRL_ROCKCHIP=m
 CONFIG_PL330_DMA=m
 CONFIG_PROXIMITY_DEVICE=m
 CONFIG_PS_STK3410=m
+CONFIG_PS_UCS14620=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_FAN53555=m
@@ -164,25 +192,43 @@ CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_LP8752=m
 CONFIG_REGULATOR_MP8865=m
 CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_RK806=m
 CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK860X=m
 CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_WL2868C=m
 CONFIG_REGULATOR_XZ3216=m
+CONFIG_RFKILL_RK=m
 CONFIG_RK_CONSOLE_THREAD=y
-CONFIG_RK_NAND=m
+CONFIG_RK_HEADSET=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_CPUINFO=m
 CONFIG_ROCKCHIP_DEBUG=m
+CONFIG_ROCKCHIP_DW_DP=y
+CONFIG_ROCKCHIP_DW_HDCP2=m
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_ROCKCHIP_FIQ_DEBUGGER=m
 CONFIG_ROCKCHIP_GRF=m
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_IOMMU=m
 CONFIG_ROCKCHIP_IPA=m
 CONFIG_ROCKCHIP_LVDS=y
+CONFIG_ROCKCHIP_MPP_AV1DEC=y
+CONFIG_ROCKCHIP_MPP_IEP2=y
+CONFIG_ROCKCHIP_MPP_JPGDEC=y
+CONFIG_ROCKCHIP_MPP_RKVDEC=y
+CONFIG_ROCKCHIP_MPP_RKVDEC2=y
+CONFIG_ROCKCHIP_MPP_RKVENC=y
+CONFIG_ROCKCHIP_MPP_RKVENC2=y
+CONFIG_ROCKCHIP_MPP_SERVICE=m
+CONFIG_ROCKCHIP_MPP_VDPU1=y
+CONFIG_ROCKCHIP_MPP_VDPU2=y
+CONFIG_ROCKCHIP_MPP_VEPU1=y
+CONFIG_ROCKCHIP_MPP_VEPU2=y
+CONFIG_ROCKCHIP_MULTI_RGA=m
 CONFIG_ROCKCHIP_OPP=m
 CONFIG_ROCKCHIP_OTP=m
 CONFIG_ROCKCHIP_PHY=m
@@ -191,14 +237,19 @@ CONFIG_ROCKCHIP_PVTM=m
 CONFIG_ROCKCHIP_REMOTECTL=m
 CONFIG_ROCKCHIP_REMOTECTL_PWM=m
 CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_RKNPU=m
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_ROCKCHIP_SIP=m
+CONFIG_ROCKCHIP_SUSPEND_MODE=m
 CONFIG_ROCKCHIP_SYSTEM_MONITOR=m
 CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ROCKCHIP_TIMER=m
 CONFIG_ROCKCHIP_VENDOR_STORAGE=m
 CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y
+CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_RK808=m
 CONFIG_SENSOR_DEVICE=m
+CONFIG_SERIAL_8250_DW=m
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SOC_BT_SCO=m
@@ -209,13 +260,20 @@ CONFIG_SND_SOC_ES7210=m
 CONFIG_SND_SOC_ES7243E=m
 CONFIG_SND_SOC_ES8311=m
 CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8323=m
+CONFIG_SND_SOC_ES8326=m
 CONFIG_SND_SOC_ES8396=m
 CONFIG_SND_SOC_RK3328=m
 CONFIG_SND_SOC_RK817=m
 CONFIG_SND_SOC_RK_CODEC_DIGITAL=m
 CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_HDMI=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
+CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=m
 CONFIG_SND_SOC_ROCKCHIP_PDM=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SPI_ROCKCHIP=m
@@ -224,14 +282,61 @@ CONFIG_SW_SYNC=m
 CONFIG_SYSCON_REBOOT_MODE=m
 CONFIG_TEE=m
 CONFIG_TEST_POWER=m
+CONFIG_TOUCHSCREEN_ELAN5515=m
+CONFIG_TOUCHSCREEN_GSL3673=m
 CONFIG_TOUCHSCREEN_GSLX680_PAD=m
-CONFIG_TOUCHSCREEN_GT1X=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_HUSB311=m
+CONFIG_UCS12CM0=m
+CONFIG_USB_DWC2=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_PCI is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_VIDEO_AW36518=m
+CONFIG_VIDEO_AW8601=m
+CONFIG_VIDEO_CN3927V=m
 CONFIG_VIDEO_DW9714=m
-CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_FP5510=m
+CONFIG_VIDEO_GC2145=m
+CONFIG_VIDEO_GC2385=m
+CONFIG_VIDEO_GC4C33=m
+CONFIG_VIDEO_GC8034=m
+CONFIG_VIDEO_IMX415=m
+CONFIG_VIDEO_LT6911UXC=m
+CONFIG_VIDEO_LT7911D=m
+CONFIG_VIDEO_NVP6188=m
+CONFIG_VIDEO_OV02B10=m
+CONFIG_VIDEO_OV13850=m
+CONFIG_VIDEO_OV13855=m
+CONFIG_VIDEO_OV50C40=m
 CONFIG_VIDEO_OV5695=m
-CONFIG_ZISOFS=y
+CONFIG_VIDEO_OV8858=m
+CONFIG_VIDEO_RK628_BT1120=m
+CONFIG_VIDEO_RK628_CSI=m
+CONFIG_VIDEO_RK_IRCUT=m
+CONFIG_VIDEO_ROCKCHIP_CIF=m
+CONFIG_VIDEO_ROCKCHIP_ISP=m
+CONFIG_VIDEO_ROCKCHIP_ISPP=m
+CONFIG_VIDEO_S5K3L6XX=m
+CONFIG_VIDEO_S5KJN1=m
+CONFIG_VIDEO_SGM3784=m
+CONFIG_VIDEO_THCV244=m
+CONFIG_VL6180=m
+CONFIG_WIFI_BUILD_MODULE=y
+CONFIG_WL_ROCKCHIP=m
 CONFIG_ZRAM=m
 CONFIG_ZSMALLOC=m
 # CONFIG_USB_DUMMY_HCD is not set

build.config.rockchip

@@ -3,6 +3,6 @@
 
 DEFCONFIG=rockchip_aarch64_gki_defconfig
 KMI_SYMBOL_LIST=android/abi_gki_aarch64_rockchip
-PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/common/arch/arm64/configs/rockchip_gki.config"
+PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/common/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/common/arch/arm64/configs/rockchip_gki.fragment"
 POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/common/arch/arm64/configs/${DEFCONFIG}"
 

drivers/android/binder.c

@@ -2576,7 +2576,6 @@ static int binder_proc_transaction(struct binder_transaction *t,
 	struct binder_priority node_prio;
 	bool oneway = !!(t->flags & TF_ONE_WAY);
 	bool pending_async = false;
-	bool skip = false;
 	struct binder_transaction *t_outdated = NULL;
 
 	BUG_ON(!node);
@@ -2605,10 +2604,7 @@ static int binder_proc_transaction(struct binder_transaction *t,
 		return proc->is_frozen ? BR_FROZEN_REPLY : BR_DEAD_REPLY;
 	}
 
-	trace_android_vh_binder_proc_transaction_entry(proc, t,
-		&thread, node->debug_id, pending_async, !oneway, &skip);
-
-	if (!thread && !pending_async && !skip)
+	if (!thread && !pending_async)
 		thread = binder_select_thread_ilocked(proc);
 
 	trace_android_vh_binder_proc_transaction(current, proc->tsk,
@@ -4150,10 +4146,6 @@ retry:
 		size_t trsize = sizeof(*trd);
 
 		binder_inner_proc_lock(proc);
-		trace_android_vh_binder_select_worklist_ilocked(&list, thread,
-						proc, wait_for_proc_work);
-		if (list)
-			goto skip;
 		if (!binder_worklist_empty_ilocked(&thread->todo))
 			list = &thread->todo;
 		else if (!binder_worklist_empty_ilocked(&proc->todo) &&
@@ -4167,7 +4159,7 @@ retry:
 				goto retry;
 			break;
 		}
-skip:
+
 		if (end - ptr < sizeof(tr) + 4) {
 			binder_inner_proc_unlock(proc);
 			break;

drivers/android/vendor_hooks.c

@@ -106,6 +106,12 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_finished);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_futex_sleep_start);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_futex);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_futex_wait_start);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_futex_wait_end);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_futex_wake_traverse_plist);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_futex_wake_this);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_futex_wake_up_q_finish);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_wait_start);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_wait_finish);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rtmutex_wait_start);
@@ -259,6 +265,10 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_commit_creds);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_creds);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_override_creds);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_revert_creds);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_record_mutex_lock_starttime);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_record_rtmutex_lock_starttime);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_record_rwsem_lock_starttime);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_record_percpu_rwsem_lock_starttime);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_x);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_nx);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_ro);
@@ -290,10 +300,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_reply);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_trans);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_binder_transaction);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_preset);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_proc_transaction_entry);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_proc_transaction);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_proc_transaction_end);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_select_worklist_ilocked);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_new_ref);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_del_ref);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_post_init_entity_util_avg);
@@ -399,6 +407,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_udp_recvmsg);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_recvmsg_stat);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_pci_d3_sleep);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_kmalloc_slab);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_disable_thermal_cooling_stats);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mmap_region);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_update_page_mapcount);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_add_page_to_lrulist);
@@ -446,6 +455,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_si_swapinfo);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_si);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_pages);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_shmem_page_flag);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_pidfd_open);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mmput);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sched_pelt_multiplier);

drivers/of/fdt.c

@@ -1181,6 +1181,9 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
 		if (memblock_is_region_reserved(base, size))
 			return -EBUSY;
 
+		if (memblock_is_nomap_remove())
+			return memblock_remove(base, size);
+
 		return memblock_mark_nomap(base, size);
 	}
 	return memblock_reserve(base, size);

drivers/thermal/thermal_sysfs.c

@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/jiffies.h>
+#include <trace/hooks/thermal.h>
 
 #include "thermal_core.h"
 
@@ -886,9 +887,22 @@ static struct attribute *cooling_device_stats_attrs[] = {
 	NULL
 };
 
+static umode_t cooling_device_stats_is_visible(struct kobject *kobj,
+				       struct attribute *attr, int attrno)
+{
+	struct thermal_cooling_device *cdev = to_cooling_device(
+						kobj_to_dev(kobj));
+
+	if (!cdev->stats)
+		return 0;
+
+	return attr->mode;
+}
+
 static const struct attribute_group cooling_device_stats_attr_group = {
 	.attrs = cooling_device_stats_attrs,
-	.name = "stats"
+	.name = "stats",
+	.is_visible = cooling_device_stats_is_visible,
 };
 
 static void cooling_device_stats_setup(struct thermal_cooling_device *cdev)
@@ -896,6 +910,12 @@ static void cooling_device_stats_setup(struct thermal_cooling_device *cdev)
 	struct cooling_dev_stats *stats;
 	unsigned long states;
 	int var;
+	bool disable_cdev_stats = false;
+
+	trace_android_vh_disable_thermal_cooling_stats(cdev,
+						&disable_cdev_stats);
+	if (disable_cdev_stats)
+		return;
 
 	if (cdev->ops->get_max_state(cdev, &states))
 		return;

include/linux/memblock.h

@@ -487,6 +487,7 @@ bool memblock_is_map_memory(phys_addr_t addr);
 bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size);
 bool memblock_is_reserved(phys_addr_t addr);
 bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);
+bool memblock_is_nomap_remove(void);
 
 void memblock_dump_all(void);
 

include/linux/percpu-rwsem.h

@@ -9,6 +9,9 @@
 #include <linux/rcu_sync.h>
 #include <linux/lockdep.h>
 
+void _trace_android_vh_record_percpu_rwsem_lock_starttime(
+		struct task_struct *tsk, unsigned long settime);
+
 struct percpu_rw_semaphore {
 	struct rcu_sync		rss;
 	unsigned int __percpu	*read_count;
@@ -73,6 +76,7 @@ static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
 	 * bleeding the critical section out.
 	 */
 	preempt_enable();
+	_trace_android_vh_record_percpu_rwsem_lock_starttime(current, jiffies);
 }
 
 static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
@@ -93,14 +97,17 @@ static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
 	 * bleeding the critical section out.
 	 */
 
-	if (ret)
+	if (ret) {
+		_trace_android_vh_record_percpu_rwsem_lock_starttime(current, jiffies);
 		rwsem_acquire_read(&sem->dep_map, 0, 1, _RET_IP_);
+	}
 
 	return ret;
 }
 
 static inline void percpu_up_read(struct percpu_rw_semaphore *sem)
 {
+	_trace_android_vh_record_percpu_rwsem_lock_starttime(current, 0);
 	rwsem_release(&sem->dep_map, _RET_IP_);
 
 	preempt_disable();

include/trace/hooks/binder.h

@@ -75,11 +75,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_binder_transaction,
 DECLARE_HOOK(android_vh_binder_preset,
 	TP_PROTO(struct hlist_head *hhead, struct mutex *lock),
 	TP_ARGS(hhead, lock));
-DECLARE_HOOK(android_vh_binder_proc_transaction_entry,
-	TP_PROTO(struct binder_proc *proc, struct binder_transaction *t,
-	struct binder_thread **thread, int node_debug_id, bool pending_async,
-	bool sync, bool *skip),
-	TP_ARGS(proc, t, thread, node_debug_id, pending_async, sync, skip));
 DECLARE_HOOK(android_vh_binder_proc_transaction,
 	TP_PROTO(struct task_struct *caller_task, struct task_struct *binder_proc_task,
 		struct task_struct *binder_th_task, int node_debug_id,
@@ -90,10 +85,6 @@ DECLARE_HOOK(android_vh_binder_proc_transaction_end,
 		struct task_struct *binder_th_task, unsigned int code,
 		bool pending_async, bool sync),
 	TP_ARGS(caller_task, binder_proc_task, binder_th_task, code, pending_async, sync));
-DECLARE_HOOK(android_vh_binder_select_worklist_ilocked,
-	TP_PROTO(struct list_head **list, struct binder_thread *thread, struct binder_proc *proc,
-	int wait_for_proc_work),
-	TP_ARGS(list, thread, proc, wait_for_proc_work));
 DECLARE_HOOK(android_vh_binder_new_ref,
 	TP_PROTO(struct task_struct *proc, uint32_t ref_desc, int node_debug_id),
 	TP_ARGS(proc, ref_desc, node_debug_id));

include/trace/hooks/dtask.h

@@ -71,7 +71,18 @@ DECLARE_HOOK(android_vh_mutex_unlock_slowpath_end,
 DECLARE_HOOK(android_vh_mutex_start_check_new_owner,
 	TP_PROTO(struct mutex *lock),
 	TP_ARGS(lock));
-
+DECLARE_HOOK(android_vh_record_mutex_lock_starttime,
+	TP_PROTO(struct task_struct *tsk, unsigned long settime_jiffies),
+	TP_ARGS(tsk, settime_jiffies));
+DECLARE_HOOK(android_vh_record_rtmutex_lock_starttime,
+	TP_PROTO(struct task_struct *tsk, unsigned long settime_jiffies),
+	TP_ARGS(tsk, settime_jiffies));
+DECLARE_HOOK(android_vh_record_rwsem_lock_starttime,
+	TP_PROTO(struct task_struct *tsk, unsigned long settime_jiffies),
+	TP_ARGS(tsk, settime_jiffies));
+DECLARE_HOOK(android_vh_record_percpu_rwsem_lock_starttime,
+	TP_PROTO(struct task_struct *tsk, unsigned long settime_jiffies),
+	TP_ARGS(tsk, settime_jiffies));
 /* macro versions of hooks are no longer required */
 
 #endif /* _TRACE_HOOK_DTASK_H */

include/trace/hooks/futex.h

@@ -8,6 +8,10 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 #include <linux/plist.h>
+#ifndef __GENKSYMS__
+#include <linux/futex.h>
+#endif
+
 /*
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
@@ -22,6 +26,36 @@ DECLARE_HOOK(android_vh_futex_sleep_start,
 	TP_PROTO(struct task_struct *p),
 	TP_ARGS(p));
 
+DECLARE_HOOK(android_vh_do_futex,
+	TP_PROTO(int cmd,
+		 unsigned int *flags,
+		 u32 __user *uaddr2),
+	TP_ARGS(cmd, flags, uaddr2));
+
+DECLARE_HOOK(android_vh_futex_wait_start,
+	TP_PROTO(unsigned int flags,
+		 u32 bitset),
+	TP_ARGS(flags, bitset));
+
+DECLARE_HOOK(android_vh_futex_wait_end,
+	TP_PROTO(unsigned int flags,
+		 u32 bitset),
+	TP_ARGS(flags, bitset));
+
+DECLARE_HOOK(android_vh_futex_wake_traverse_plist,
+	TP_PROTO(struct plist_head *chain, int *target_nr,
+		 union futex_key key, u32 bitset),
+	TP_ARGS(chain, target_nr, key, bitset));
+
+DECLARE_HOOK(android_vh_futex_wake_this,
+	TP_PROTO(int ret, int nr_wake, int target_nr,
+		 struct task_struct *p),
+	TP_ARGS(ret, nr_wake, target_nr, p));
+
+DECLARE_HOOK(android_vh_futex_wake_up_q_finish,
+	TP_PROTO(int nr_wake, int target_nr),
+	TP_ARGS(nr_wake, target_nr));
+
 /* macro versions of hooks are no longer required */
 
 #endif /* _TRACE_HOOK_FUTEX_H */

include/trace/hooks/sched.h

@@ -391,14 +391,6 @@ DECLARE_HOOK(android_vh_setscheduler_uclamp,
 	TP_PROTO(struct task_struct *tsk, int clamp_id, unsigned int value),
 	TP_ARGS(tsk, clamp_id, value));
 
-DECLARE_HOOK(android_vh_pidfd_open,
-	TP_PROTO(struct pid *p),
-	TP_ARGS(p));
-
-DECLARE_HOOK(android_vh_mmput,
-	TP_PROTO(void *unused),
-	TP_ARGS(unused));
-
 DECLARE_HOOK(android_vh_sched_pelt_multiplier,
 	TP_PROTO(unsigned int old, unsigned int cur, int *ret),
 	TP_ARGS(old, cur, ret));

include/trace/hooks/thermal.h

@@ -24,6 +24,11 @@ DECLARE_HOOK(android_vh_thermal_pm_notify_suspend,
 	     TP_PROTO(struct thermal_zone_device *tz, int *irq_wakeable),
 	     TP_ARGS(tz, irq_wakeable));
 
+struct thermal_cooling_device;
+DECLARE_HOOK(android_vh_disable_thermal_cooling_stats,
+	TP_PROTO(struct thermal_cooling_device *cdev, bool *disable_stats),
+	TP_ARGS(cdev, disable_stats));
+
 #endif /* _TRACE_HOOK_THERMAL_H */
 /* This part must be outside protection */
 #include <trace/define_trace.h>