diff --git a/source/tools/detect/cgroup/cgtool_comm.h b/source/tools/detect/cgroup/cgtool_comm.h index 07af7325e5bfafc608c64a7594086449705cf9b1..9bae7bbecb6da02d123a85bf5c085e019199956a 100644 --- a/source/tools/detect/cgroup/cgtool_comm.h +++ b/source/tools/detect/cgroup/cgtool_comm.h @@ -74,61 +74,6 @@ struct mm_struct___MEMCG { long unsigned int cpu_bitmap[0]; }; -struct page_counter { - atomic_long_t usage; - long unsigned int min; - long unsigned int low; - long unsigned int max; - struct page_counter *parent; - long unsigned int emin; - atomic_long_t min_usage; - atomic_long_t children_min_usage; - long unsigned int elow; - atomic_long_t low_usage; - atomic_long_t children_low_usage; - long unsigned int wmark_low; - long unsigned int wmark_high; - long unsigned int watermark; - long unsigned int failcnt; -}; - -struct vmpressure { - long unsigned int scanned; - long unsigned int reclaimed; - long unsigned int tree_scanned; - long unsigned int tree_reclaimed; - struct spinlock sr_lock; - struct list_head events; - struct mutex events_lock; - struct work_struct work; -}; - -struct mem_cgroup_thresholds { - struct mem_cgroup_threshold_ary *primary; - struct mem_cgroup_threshold_ary *spare; -}; - -struct memcg_padding { - char x[0]; -}; - -enum memcg_kmem_state { - KMEM_NONE = 0, - KMEM_ALLOCATED = 1, - KMEM_ONLINE = 2, -}; - -struct mem_cgroup_id { - int id; - atomic_t ref; -}; - -struct deferred_split { - spinlock_t split_queue_lock; - struct list_head split_queue; - long unsigned int split_queue_len; -}; - union kernfs_node_id { struct { u32 ino; @@ -137,84 +82,6 @@ union kernfs_node_id { u64 id; }; -struct mem_cgroup { - struct cgroup_subsys_state css; - struct mem_cgroup_id id; - struct page_counter memory; - struct page_counter swap; - struct page_counter memsw; - struct page_counter kmem; - struct page_counter tcpmem; - long unsigned int high; - struct work_struct high_work; - long unsigned int soft_limit; - struct vmpressure vmpressure; - bool use_hierarchy; - bool oom_group; - bool oom_lock; - int under_oom; - int swappiness; - int oom_kill_disable; - struct cgroup_file events_file; - struct cgroup_file swap_events_file; - struct mutex thresholds_lock; - struct mem_cgroup_thresholds thresholds; - struct mem_cgroup_thresholds memsw_thresholds; - struct list_head oom_notify; - long unsigned int move_charge_at_immigrate; - spinlock_t move_lock; - long unsigned int move_lock_flags; - long: 64; - long: 64; - long: 64; - long: 64; - long: 64; - long: 64; - struct memcg_padding _pad1_; - atomic_t moving_account; - struct task_struct *move_lock_task; - struct mem_cgroup_stat_cpu *stat_cpu; - long: 64; - long: 64; - long: 64; - long: 64; - long: 64; - struct memcg_padding _pad2_; - atomic_long_t stat[35]; - atomic_long_t events[84]; - atomic_long_t memory_events[7]; - long unsigned int socket_pressure; - bool tcpmem_active; - int tcpmem_pressure; - unsigned int wmark_ratio; - struct work_struct wmark_work; - unsigned int wmark_scale_factor; - int kmemcg_id; - enum memcg_kmem_state kmem_state; - struct list_head kmem_caches; - int last_scanned_node; - nodemask_t scan_nodes; - atomic_t numainfo_events; - atomic_t numainfo_updating; - struct list_head cgwb_list; - struct wb_domain cgwb_domain; - struct list_head event_list; - spinlock_t event_list_lock; - struct deferred_split deferred_split_queue; - long unsigned int ali_reserved1; - long unsigned int ali_reserved2; - long unsigned int ali_reserved3; - long unsigned int ali_reserved4; - struct mem_cgroup_per_node *nodeinfo[0]; - long: 64; - long: 64; - long: 64; - long: 64; - long: 64; - long: 64; - long: 64; -}; - struct cgroup___MEMCG { struct cgroup_subsys_state self; long unsigned int flags; diff --git a/source/tools/detect/cgroup/cgtoollib_bpf.h b/source/tools/detect/cgroup/cgtoollib_bpf.h index 80e553b1e365026f9f9d30241a1eb8065409294c..f802fef7373cac23e68e3f1c312f829518001569 100644 --- a/source/tools/detect/cgroup/cgtoollib_bpf.h +++ b/source/tools/detect/cgroup/cgtoollib_bpf.h @@ -10,7 +10,6 @@ #include "cgtool_comm.h" #define BPF_ANY 0 -#define NULL ((void*)0) static u64 get_knid_by_cgroup(struct cgroup___MEMCG *cgrp) {