enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/fs/proc/meminfo.c
..
..
@@ -8,7 +8,6 @@
8
8
 #include <linux/mmzone.h>
9
9
 #include <linux/proc_fs.h>
10
10
 #include <linux/percpu.h>
11
-#include <linux/quicklist.h>
12
11
 #include <linux/seq_file.h>
13
12
 #include <linux/swap.h>
14
13
 #include <linux/vmstat.h>
..
..
@@ -18,9 +17,8 @@
18
17
 #include <linux/cma.h>
19
18
 #endif
20
19
 #include <asm/page.h>
21
-#include <asm/pgtable.h>
22
20
 #include "internal.h"
23
-
21
+#include <trace/hooks/mm.h>
24
22
 void __attribute__((weak)) arch_report_meminfo(struct seq_file *m)
25
23
 {
26
24
 }
..
..
@@ -43,7 +41,7 @@
43
41
 
44
42
 	si_meminfo(&i);
45
43
 	si_swapinfo(&i);
46
-	committed = percpu_counter_read_positive(&vm_committed_as);
44
+	committed = vm_memory_committed();
47
45
 
48
46
 	cached = global_node_page_state(NR_FILE_PAGES) -
49
47
 			total_swapcache_pages() - i.bufferram;
..
..
@@ -54,8 +52,8 @@
54
52
 		pages[lru] = global_node_page_state(NR_LRU_BASE + lru);
55
53
 
56
54
 	available = si_mem_available();
57
-	sreclaimable = global_node_page_state(NR_SLAB_RECLAIMABLE);
58
-	sunreclaim = global_node_page_state(NR_SLAB_UNRECLAIMABLE);
55
+	sreclaimable = global_node_page_state_pages(NR_SLAB_RECLAIMABLE_B);
56
+	sunreclaim = global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B);
59
57
 
60
58
 	show_val_kb(m, "MemTotal:       ", i.totalram);
61
59
 	show_val_kb(m, "MemFree:        ", i.freeram);
..
..
@@ -103,19 +101,15 @@
103
101
 	show_val_kb(m, "SReclaimable:   ", sreclaimable);
104
102
 	show_val_kb(m, "SUnreclaim:     ", sunreclaim);
105
103
 	seq_printf(m, "KernelStack:    %8lu kB\n",
106
-		   global_zone_page_state(NR_KERNEL_STACK_KB));
104
+		   global_node_page_state(NR_KERNEL_STACK_KB));
107
105
 #ifdef CONFIG_SHADOW_CALL_STACK
108
106
 	seq_printf(m, "ShadowCallStack:%8lu kB\n",
109
-		   global_zone_page_state(NR_KERNEL_SCS_BYTES) / 1024);
107
+		   global_node_page_state(NR_KERNEL_SCS_KB));
110
108
 #endif
111
109
 	show_val_kb(m, "PageTables:     ",
112
110
 		    global_zone_page_state(NR_PAGETABLE));
113
-#ifdef CONFIG_QUICKLIST
114
-	show_val_kb(m, "Quicklists:     ", quicklist_total_size());
115
-#endif
116
111
 
117
-	show_val_kb(m, "NFS_Unstable:   ",
118
-		    global_node_page_state(NR_UNSTABLE_NFS));
112
+	show_val_kb(m, "NFS_Unstable:   ", 0);
119
113
 	show_val_kb(m, "Bounce:         ",
120
114
 		    global_zone_page_state(NR_BOUNCE));
121
115
 	show_val_kb(m, "WritebackTmp:   ",
..
..
@@ -140,15 +134,22 @@
140
134
 		    global_node_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR);
141
135
 	show_val_kb(m, "ShmemPmdMapped: ",
142
136
 		    global_node_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR);
137
+	show_val_kb(m, "FileHugePages:  ",
138
+		    global_node_page_state(NR_FILE_THPS) * HPAGE_PMD_NR);
139
+	show_val_kb(m, "FilePmdMapped:  ",
140
+		    global_node_page_state(NR_FILE_PMDMAPPED) * HPAGE_PMD_NR);
143
141
 #endif
144
142
 
145
143
 #ifdef CONFIG_CMA
146
144
 	show_val_kb(m, "CmaTotal:       ", totalcma_pages);
145
+#ifdef CONFIG_NO_GKI
147
146
 	show_val_kb(m, "CmaAllocated:   ", cma_used_pages());
148
147
 	show_val_kb(m, "CmaReleased:    ", totalcma_pages - cma_used_pages());
148
+#endif
149
149
 	show_val_kb(m, "CmaFree:        ",
150
150
 		    global_zone_page_state(NR_FREE_CMA_PAGES));
151
151
 #endif
152
+	trace_android_vh_meminfo_proc_show(m);
152
153
 
153
154
 	hugetlb_report_meminfo(m);
154
155