Merge keystone/mirror-android12-5.10 into keystone/android12-5.10-keystone-qcom-dev

* keystone/mirror-android12-5.10:
  ANDROID: dma-buf: heaps: export defer-free list size
  ANDROID: Update symbol list for mtk
  ANDROID: GKI: Update abi_gki_aarch64_qcom for logbuf_pr_cont tracepoint
  ANDROID: abi_gki_aarch64_qcom: Update ufs symbol list
  ANDROID: ABI: update for new qcom symbols
  ANDROID: Fix lost track action type in save_track_hash
  ANDROID: usb: export built-in tracepoint functions
  ANDROID: sched: Add trace for __setscheduler_uclamp
Signed-off-by: Daniel Norman <danielnorman@google.com>
Bug: 184928480
Bug: 185182649
Bug: 191951106
Bug: 191973176
Bug: 192041645
Bug: 192512300
Change-Id: If02a8ce4dee129802edfee40eaca1c91ff81bccd

android/abi_gki_aarch64_mtk

@@ -739,6 +739,7 @@
   get_cpu_iowait_time_us
   get_device
   get_each_dmabuf
+  get_freelist_nr_pages
   __get_free_pages
   get_governor_parent_kobj
   get_kernel_pages

android/abi_gki_aarch64_qcom

@@ -2494,12 +2494,22 @@
   __traceiter_android_vh_ipi_stop
   __traceiter_android_vh_jiffies_update
   __traceiter_android_vh_logbuf
+  __traceiter_android_vh_logbuf_pr_cont
   __traceiter_android_vh_printk_hotplug
   __traceiter_android_vh_scheduler_tick
   __traceiter_android_vh_show_max_freq
   __traceiter_android_vh_show_resume_epoch_val
   __traceiter_android_vh_show_suspend_epoch_val
   __traceiter_android_vh_timer_calc_index
+  __traceiter_android_vh_ufs_check_int_errors
+  __traceiter_android_vh_ufs_compl_command
+  __traceiter_android_vh_ufs_fill_prdt
+  __traceiter_android_vh_ufs_prepare_command
+  __traceiter_android_vh_ufs_send_command
+  __traceiter_android_vh_ufs_send_tm_command
+  __traceiter_android_vh_ufs_send_uic_command
+  __traceiter_android_vh_ufs_update_sdev
+  __traceiter_android_vh_ufs_update_sysfs
   __traceiter_android_vh_update_topology_flags_workfn
   __traceiter_binder_transaction_received
   __traceiter_cpu_frequency
@@ -2593,6 +2603,7 @@
   __tracepoint_android_vh_ipi_stop
   __tracepoint_android_vh_jiffies_update
   __tracepoint_android_vh_logbuf
+  __tracepoint_android_vh_logbuf_pr_cont
   __tracepoint_android_vh_printk_hotplug
   __tracepoint_android_vh_process_killed
   __tracepoint_android_vh_psi_event
@@ -2602,6 +2613,15 @@
   __tracepoint_android_vh_show_resume_epoch_val
   __tracepoint_android_vh_show_suspend_epoch_val
   __tracepoint_android_vh_timer_calc_index
+  __tracepoint_android_vh_ufs_check_int_errors
+  __tracepoint_android_vh_ufs_compl_command
+  __tracepoint_android_vh_ufs_fill_prdt
+  __tracepoint_android_vh_ufs_prepare_command
+  __tracepoint_android_vh_ufs_send_command
+  __tracepoint_android_vh_ufs_send_tm_command
+  __tracepoint_android_vh_ufs_send_uic_command
+  __tracepoint_android_vh_ufs_update_sdev
+  __tracepoint_android_vh_ufs_update_sysfs
   __tracepoint_android_vh_update_topology_flags_workfn
   __tracepoint_binder_transaction_received
   __tracepoint_cpu_frequency

drivers/android/vendor_hooks.c

@@ -338,3 +338,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_aes_decrypt);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_force_compatible_pre);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_force_compatible_post);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_print_transaction_info);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_setscheduler_uclamp);

drivers/dma-buf/heaps/deferred-free-helper.c

@@ -62,7 +62,7 @@ static size_t free_one_item(enum df_reason reason)
 	return nr_pages;
 }
 
-static unsigned long get_freelist_nr_pages(void)
+unsigned long get_freelist_nr_pages(void)
 {
 	unsigned long nr_pages;
 	unsigned long flags;
@@ -72,6 +72,7 @@ static unsigned long get_freelist_nr_pages(void)
 	spin_unlock_irqrestore(&free_list_lock, flags);
 	return nr_pages;
 }
+EXPORT_SYMBOL_GPL(get_freelist_nr_pages);
 
 static unsigned long freelist_shrink_count(struct shrinker *shrinker,
 					   struct shrink_control *sc)

drivers/dma-buf/heaps/deferred-free-helper.h

@@ -52,4 +52,6 @@ void deferred_free(struct deferred_freelist_item *item,
 		   void (*free)(struct deferred_freelist_item *i,
 				enum df_reason reason),
 		   size_t nr_pages);
+
+unsigned long get_freelist_nr_pages(void);
 #endif

drivers/usb/host/xhci-trace.c

@@ -12,3 +12,6 @@
 #include "xhci-trace.h"
 
 EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_dbg_quirks);
+EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_urb_enqueue);
+EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_handle_transfer);
+EXPORT_TRACEPOINT_SYMBOL_GPL(xhci_urb_giveback);

include/trace/hooks/mm.h

@@ -95,8 +95,8 @@ DECLARE_HOOK(android_vh_show_stack_hash,
 	TP_PROTO(struct seq_file *m, struct vm_struct *v),
 	TP_ARGS(m, v));
 DECLARE_HOOK(android_vh_save_track_hash,
-	TP_PROTO(unsigned long p),
+	TP_PROTO(bool alloc, unsigned long p),
-	TP_ARGS(p));
+	TP_ARGS(alloc, p));
 /* macro versions of hooks are no longer required */
 
 #endif /* _TRACE_HOOK_MM_H */

include/trace/hooks/sched.h

@@ -385,6 +385,11 @@ DECLARE_RESTRICTED_HOOK(android_rvh_force_compatible_pre,
 DECLARE_RESTRICTED_HOOK(android_rvh_force_compatible_post,
 	TP_PROTO(void *unused),
 	TP_ARGS(unused), 1);
+
+DECLARE_HOOK(android_vh_setscheduler_uclamp,
+	TP_PROTO(struct task_struct *tsk, int clamp_id, unsigned int value),
+	TP_ARGS(tsk, clamp_id, value));
+
 /* macro versions of hooks are no longer required */
 
 #endif /* _TRACE_HOOK_SCHED_H */

kernel/sched/core.c

@@ -1545,12 +1545,14 @@ static void __setscheduler_uclamp(struct task_struct *p,
 	    attr->sched_util_min != -1) {
 		uclamp_se_set(&p->uclamp_req[UCLAMP_MIN],
 			      attr->sched_util_min, true);
+		trace_android_vh_setscheduler_uclamp(p, UCLAMP_MIN, attr->sched_util_min);
 	}
 
 	if (attr->sched_flags & SCHED_FLAG_UTIL_CLAMP_MAX &&
 	    attr->sched_util_max != -1) {
 		uclamp_se_set(&p->uclamp_req[UCLAMP_MAX],
 			      attr->sched_util_max, true);
+		trace_android_vh_setscheduler_uclamp(p, UCLAMP_MAX, attr->sched_util_max);
 	}
 }
 

mm/slub.c

@@ -618,7 +618,8 @@ static void set_track(struct kmem_cache *s, void *object,
 
 		if (nr_entries < TRACK_ADDRS_COUNT)
 			p->addrs[nr_entries] = 0;
-		trace_android_vh_save_track_hash((unsigned long)p);
+		trace_android_vh_save_track_hash(alloc == TRACK_ALLOC,
+						(unsigned long)p);
 #endif
 		p->addr = addr;
 		p->cpu = smp_processor_id();