ANDROID: GKI: include more type definitions in vendor hooks

The following types are now fully defined in ABI XML.

* `struct binder_transaction_data`
* `struct blk_mq_alloc_data`
* `struct media_link_desc`
* `struct packet_type`
* `struct printk_record`
* `struct printk_ringbuffer`

Bug: 233047575
Change-Id: Ib7a096c937cfa9facca89b8a26edd2f4b00416a1
Signed-off-by: Giuliano Procida <gprocida@google.com>

include/trace/hooks/binder.h

@@ -11,13 +11,26 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-struct binder_transaction;
-struct task_struct;
+#ifdef __GENKSYMS__
 struct binder_alloc;
 struct binder_proc;
 struct binder_thread;
-struct binder_transaction_data;
+struct binder_transaction;
+struct task_struct;
 struct seq_file;
+struct binder_transaction_data;
+#else
+/* struct binder_alloc */
+#include <../drivers/android/binder_alloc.h>
+/* struct binder_proc, struct binder_thread, struct binder_transaction */
+#include <../drivers/android/binder_internal.h>
+/* struct task_struct */
+#include <linux/sched.h>
+/* struct seq_file */
+#include <linux/seq_file.h>
+/* struct binder_transaction_data */
+#include <uapi/linux/android/binder.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_binder_transaction_init,
 	TP_PROTO(struct binder_transaction *t),
 	TP_ARGS(t));
@@ -30,8 +43,6 @@ DECLARE_HOOK(android_vh_binder_set_priority,
 DECLARE_HOOK(android_vh_binder_restore_priority,
 	TP_PROTO(struct binder_transaction *t, struct task_struct *task),
 	TP_ARGS(t, task));
-struct binder_proc;
-struct binder_thread;
 DECLARE_HOOK(android_vh_binder_wakeup_ilocked,
 	TP_PROTO(struct task_struct *task, bool sync, struct binder_proc *proc),
 	TP_ARGS(task, sync, proc));

include/trace/hooks/block.h

@@ -10,9 +10,18 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-struct blk_mq_tag_set;
+#ifdef __GENKSYMS__
 struct blk_mq_tags;
 struct blk_mq_alloc_data;
+struct blk_mq_tag_set;
+#else
+/* struct blk_mq_tags */
+#include <../block/blk-mq-tag.h>
+/* struct blk_mq_alloc_data */
+#include <../block/blk-mq.h>
+/* struct blk_mq_tag_set */
+#include <linux/blk-mq.h>
+#endif /* __GENKSYMS__ */
 
 DECLARE_HOOK(android_vh_blk_alloc_rqs,
 	TP_PROTO(size_t *rq_size, struct blk_mq_tag_set *set,

include/trace/hooks/cgroup.h

@@ -8,7 +8,18 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
+struct cgroup_taskset;
+struct cgroup_subsys;
 struct task_struct;
+#else
+/* struct cgroup_taskset */
+#include <../kernel/cgroup/cgroup-internal.h>
+/* struct cgroup_subsys */
+#include <linux/cgroup-defs.h>
+/* struct task_struct */
+#include <linux/sched.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_cgroup_set_task,
 	TP_PROTO(int ret, struct task_struct *task),
 	TP_ARGS(ret, task));
@@ -22,8 +33,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_refrigerator,
 	TP_PROTO(bool f),
 	TP_ARGS(f), 1);
 
-struct cgroup_subsys;
-struct cgroup_taskset;
 DECLARE_HOOK(android_vh_cgroup_attach,
 	TP_PROTO(struct cgroup_subsys *ss, struct cgroup_taskset *tset),
 	TP_ARGS(ss, tset))

include/trace/hooks/cpuidle.h

@@ -10,7 +10,12 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
 struct cpuidle_device;
+#else
+/* struct cpuidle_device */
+#include <linux/cpuidle.h>
+#endif /* __GENKSYMS__ */
 
 DECLARE_HOOK(android_vh_cpu_idle_enter,
 	TP_PROTO(int *state, struct cpuidle_device *dev),

include/trace/hooks/cpuidle_psci.h

@@ -11,7 +11,12 @@
  * mechanism for vendor modules to hook and extend functionality
  */
 
+#ifdef __GENKSYMS__
 struct cpuidle_device;
+#else
+/* struct cpuidle_device */
+#include <linux/cpuidle.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_cpuidle_psci_enter,
 	TP_PROTO(struct cpuidle_device *dev, bool s2idle),
 	TP_ARGS(dev, s2idle));

include/trace/hooks/creds.h

@@ -11,8 +11,15 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+#ifdef __GENKSYMS__
 struct cred;
 struct task_struct;
+#else
+/* struct cred */
+#include <linux/cred.h>
+/* struct task_struct */
+#include <linux/sched.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_commit_creds,
 	TP_PROTO(const struct task_struct *task, const struct cred *new),
 	TP_ARGS(task, new));

include/trace/hooks/debug.h

@@ -11,7 +11,12 @@
 #include <trace/hooks/vendor_hooks.h>
 
 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
+#ifdef __GENKSYMS__
 struct pt_regs;
+#else
+/* struct pt_regs */
+#include <asm/ptrace.h>
+#endif /* __GENKSYMS__ */
 
 DECLARE_HOOK(android_vh_ipi_stop,
 	TP_PROTO(struct pt_regs *regs),

include/trace/hooks/dtask.h

@@ -11,7 +11,21 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+#ifdef __GENKSYMS__
 struct mutex;
+struct rt_mutex;
+struct rw_semaphore;
+struct task_struct;
+#else
+/* struct mutex */
+#include <linux/mutex.h>
+/* struct rt_mutex */
+#include <linux/rtmutex.h>
+/* struct rw_semaphore */
+#include <linux/rwsem.h>
+/* struct task_struct */
+#include <linux/sched.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_mutex_wait_start,
 	TP_PROTO(struct mutex *lock),
 	TP_ARGS(lock));
@@ -19,7 +33,6 @@ DECLARE_HOOK(android_vh_mutex_wait_finish,
 	TP_PROTO(struct mutex *lock),
 	TP_ARGS(lock));
 
-struct rt_mutex;
 DECLARE_HOOK(android_vh_rtmutex_wait_start,
 	TP_PROTO(struct rt_mutex *lock),
 	TP_ARGS(lock));
@@ -27,7 +40,6 @@ DECLARE_HOOK(android_vh_rtmutex_wait_finish,
 	TP_PROTO(struct rt_mutex *lock),
 	TP_ARGS(lock));
 
-struct rw_semaphore;
 DECLARE_HOOK(android_vh_rwsem_read_wait_start,
 	TP_PROTO(struct rw_semaphore *sem),
 	TP_ARGS(sem));
@@ -41,7 +53,6 @@ DECLARE_HOOK(android_vh_rwsem_write_wait_finish,
 	TP_PROTO(struct rw_semaphore *sem),
 	TP_ARGS(sem));
 
-struct task_struct;
 DECLARE_HOOK(android_vh_sched_show_task,
 	TP_PROTO(struct task_struct *task),
 	TP_ARGS(task));

include/trace/hooks/fault.h

@@ -11,7 +11,12 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+#ifdef __GENKSYMS__
 struct pt_regs;
+#else
+/* struct pt_regs */
+#include <asm/ptrace.h>
+#endif /* __GENKSYMS__ */
 DECLARE_RESTRICTED_HOOK(android_rvh_die_kernel_fault,
 	TP_PROTO(struct pt_regs *regs, unsigned int esr, unsigned long addr, const char *msg),
 	TP_ARGS(regs, esr, addr, msg), 1);

include/trace/hooks/fips140.h

@@ -8,7 +8,12 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
 struct crypto_aes_ctx;
+#else
+/* struct crypto_aes_ctx */
+#include <crypto/aes.h>
+#endif /* __GENKSYMS__ */
 
 /*
  * These hooks exist only for the benefit of the FIPS140 crypto module, which

include/trace/hooks/fpsimd.h

@@ -10,7 +10,12 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
 struct task_struct;
+#else
+/* struct task_struct */
+#include <linux/sched.h>
+#endif /* __GENKSYMS__ */
 
 DECLARE_HOOK(android_vh_is_fpsimd_save,
 	TP_PROTO(struct task_struct *prev, struct task_struct *next),

include/trace/hooks/gic_v3.h

@@ -10,8 +10,15 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-struct irq_data;
+#ifdef __GENKSYMS__
 struct cpumask;
+struct irq_data;
+#else
+/* struct cpumask */
+#include <linux/cpumask.h>
+/* struct irq_data */
+#include <linux/irq.h>
+#endif /* __GENKSYMS__ */
 DECLARE_RESTRICTED_HOOK(android_rvh_gic_v3_set_affinity,
 	TP_PROTO(struct irq_data *d, const struct cpumask *mask_val,
 		 u64 *affinity, bool force, void __iomem *base),

include/trace/hooks/iommu.h

@@ -12,6 +12,12 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
+struct iova_domain;
+#else
+/* struct iova_domain */
+#include <linux/iova.h>
+#endif /* __GENKSYMS__ */
 DECLARE_RESTRICTED_HOOK(android_rvh_iommu_setup_dma_ops,
 	TP_PROTO(struct device *dev, u64 dma_base, u64 size),
 	TP_ARGS(dev, dma_base, size), 1);
@@ -24,7 +30,6 @@ DECLARE_HOOK(android_vh_iommu_alloc_iova,
 	TP_PROTO(struct device *dev, dma_addr_t iova, size_t size),
 	TP_ARGS(dev, iova, size));
 
-struct iova_domain;
 
 DECLARE_HOOK(android_vh_iommu_iovad_alloc_iova,
 	TP_PROTO(struct device *dev, struct iova_domain *iovad, dma_addr_t iova, size_t size),

include/trace/hooks/logbuf.h

@@ -10,8 +10,13 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-struct printk_ringbuffer;
+#ifdef __GENKSYMS__
 struct printk_record;
+struct printk_ringbuffer;
+#else
+/* struct printk_record, struct printk_ringbuffer */
+#include <../kernel/printk/printk_ringbuffer.h>
+#endif /* __GENKSYMS__ */
 
 DECLARE_HOOK(android_vh_logbuf,
 	TP_PROTO(struct printk_ringbuffer *rb, struct printk_record *r),

include/trace/hooks/mm.h

@@ -14,6 +14,24 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
+struct slabinfo;
+struct cgroup_subsys_state;
+struct device;
+struct mem_cgroup;
+struct readahead_control;
+#else
+/* struct slabinfo */
+#include <../mm/slab.h>
+/* struct cgroup_subsys_state */
+#include <linux/cgroup-defs.h>
+/* struct device */
+#include <linux/device.h>
+/* struct mem_cgroup */
+#include <linux/memcontrol.h>
+/* struct readahead_control */
+#include <linux/pagemap.h>
+#endif /* __GENKSYMS__ */
 struct cma;
 
 DECLARE_RESTRICTED_HOOK(android_rvh_set_skip_swapcache_flags,
@@ -68,7 +86,6 @@ DECLARE_HOOK(android_vh_include_reserved_zone,
 DECLARE_HOOK(android_vh_show_mem,
 	TP_PROTO(unsigned int filter, nodemask_t *nodemask),
 	TP_ARGS(filter, nodemask));
-struct slabinfo;
 struct dirty_throttle_control;
 DECLARE_HOOK(android_vh_mm_dirty_limits,
 	TP_PROTO(struct dirty_throttle_control *const gdtc, bool strictlimit,
@@ -88,7 +105,6 @@ DECLARE_HOOK(android_vh_show_stack_hash,
 DECLARE_HOOK(android_vh_save_track_hash,
 	TP_PROTO(bool alloc, unsigned long p),
 	TP_ARGS(alloc, p));
-struct mem_cgroup;
 DECLARE_HOOK(android_vh_vmpressure,
 	TP_PROTO(struct mem_cgroup *memcg, bool *bypass),
 	TP_ARGS(memcg, bypass));
@@ -101,7 +117,6 @@ DECLARE_HOOK(android_vh_mem_cgroup_free,
 DECLARE_HOOK(android_vh_mem_cgroup_id_remove,
 	TP_PROTO(struct mem_cgroup *memcg),
 	TP_ARGS(memcg));
-struct cgroup_subsys_state;
 DECLARE_HOOK(android_vh_mem_cgroup_css_online,
 	TP_PROTO(struct cgroup_subsys_state *css, struct mem_cgroup *memcg),
 	TP_ARGS(css, memcg));
@@ -128,11 +143,9 @@ DECLARE_HOOK(android_vh_cma_drain_all_pages_bypass,
 DECLARE_HOOK(android_vh_pcplist_add_cma_pages_bypass,
 	TP_PROTO(int migratetype, bool *bypass),
 	TP_ARGS(migratetype, bypass));
-struct device;
 DECLARE_HOOK(android_vh_subpage_dma_contig_alloc,
 	TP_PROTO(bool *allow_subpage_alloc, struct device *dev, size_t *size),
 	TP_ARGS(allow_subpage_alloc, dev, size));
-struct readahead_control;
 DECLARE_HOOK(android_vh_ra_tuning_max_page,
 	TP_PROTO(struct readahead_control *ractl, unsigned long *max_page),
 	TP_ARGS(ractl, max_page));

include/trace/hooks/mmc_core.h

@@ -10,9 +10,18 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-struct mmc_host;
-struct mmc_card;
+#ifdef __GENKSYMS__
 struct sdhci_host;
+struct mmc_card;
+struct mmc_host;
+#else
+/* struct sdhci_host */
+#include <../drivers/mmc/host/sdhci.h>
+/* struct mmc_card */
+#include <linux/mmc/card.h>
+/* struct mmc_host */
+#include <linux/mmc/host.h>
+#endif /* __GENKSYMS__ */
 
 DECLARE_HOOK(android_vh_mmc_blk_reset,
 	     TP_PROTO(struct mmc_host *host, int err, bool *allow),

include/trace/hooks/module.h

@@ -11,7 +11,12 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+#ifdef __GENKSYMS__
 struct module;
+#else
+/* struct module */
+#include <linux/module.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_set_module_permit_before_init,
 	TP_PROTO(const struct module *mod),
 	TP_ARGS(mod));

include/trace/hooks/net.h

@@ -9,9 +9,18 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
 struct packet_type;
-struct list_head;
 struct sk_buff;
+struct list_head;
+#else
+/* struct packet_type */
+#include <linux/netdevice.h>
+/* struct sk_buff */
+#include <linux/skbuff.h>
+/* struct list_head */
+#include <linux/types.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_ptype_head,
 	TP_PROTO(const struct packet_type *pt, struct list_head *vendor_pt),
 	TP_ARGS(pt, vendor_pt));

include/trace/hooks/pm_domain.h

@@ -11,7 +11,12 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#ifdef __GENKSYMS__
 struct generic_pm_domain;
+#else
+/* struct generic_pm_domain */
+#include <linux/pm_domain.h>
+#endif /* __GENKSYMS__ */
 DECLARE_HOOK(android_vh_allow_domain_state,
 	TP_PROTO(struct generic_pm_domain *genpd, uint32_t idx, bool *allow),
 	TP_ARGS(genpd, idx, allow))