add ax88772C AX88772C_eeprom_tools

hc

2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2

 kernel/kernel/sched/cpuacct.c
..
..
@@ -21,15 +21,11 @@
21
21
 	[CPUACCT_STAT_SYSTEM] = "system",
22
22
 };
23
23
 
24
-struct cpuacct_usage {
25
-	u64	usages[CPUACCT_STAT_NSTATS];
26
-};
27
-
28
24
 /* track CPU usage of a group of tasks and its child groups */
29
25
 struct cpuacct {
30
26
 	struct cgroup_subsys_state	css;
31
27
 	/* cpuusage holds pointer to a u64-type object on every CPU */
32
-	struct cpuacct_usage __percpu	*cpuusage;
28
+	u64 __percpu	*cpuusage;
33
29
 	struct kernel_cpustat __percpu	*cpustat;
34
30
 };
35
31
 
..
..
@@ -49,7 +45,7 @@
49
45
 	return css_ca(ca->css.parent);
50
46
 }
51
47
 
52
-static DEFINE_PER_CPU(struct cpuacct_usage, root_cpuacct_cpuusage);
48
+static DEFINE_PER_CPU(u64, root_cpuacct_cpuusage);
53
49
 static struct cpuacct root_cpuacct = {
54
50
 	.cpustat	= &kernel_cpustat,
55
51
 	.cpuusage	= &root_cpuacct_cpuusage,
..
..
@@ -68,7 +64,7 @@
68
64
 	if (!ca)
69
65
 		goto out;
70
66
 
71
-	ca->cpuusage = alloc_percpu(struct cpuacct_usage);
67
+	ca->cpuusage = alloc_percpu(u64);
72
68
 	if (!ca->cpuusage)
73
69
 		goto out_free_ca;
74
70
 
..
..
@@ -99,7 +95,8 @@
99
95
 static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,
100
96
 				 enum cpuacct_stat_index index)
101
97
 {
102
-	struct cpuacct_usage *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
98
+	u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
99
+	u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;
103
100
 	u64 data;
104
101
 
105
102
 	/*
..
..
@@ -115,14 +112,17 @@
115
112
 	raw_spin_lock_irq(&cpu_rq(cpu)->lock);
116
113
 #endif
117
114
 
118
-	if (index == CPUACCT_STAT_NSTATS) {
119
-		int i = 0;
120
-
121
-		data = 0;
122
-		for (i = 0; i < CPUACCT_STAT_NSTATS; i++)
123
-			data += cpuusage->usages[i];
124
-	} else {
125
-		data = cpuusage->usages[index];
115
+	switch (index) {
116
+	case CPUACCT_STAT_USER:
117
+		data = cpustat[CPUTIME_USER] + cpustat[CPUTIME_NICE];
118
+		break;
119
+	case CPUACCT_STAT_SYSTEM:
120
+		data = cpustat[CPUTIME_SYSTEM] + cpustat[CPUTIME_IRQ] +
121
+			cpustat[CPUTIME_SOFTIRQ];
122
+		break;
123
+	case CPUACCT_STAT_NSTATS:
124
+		data = *cpuusage;
125
+		break;
126
126
 	}
127
127
 
128
128
 #ifndef CONFIG_64BIT
..
..
@@ -132,10 +132,14 @@
132
132
 	return data;
133
133
 }
134
134
 
135
-static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
135
+static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu)
136
136
 {
137
-	struct cpuacct_usage *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
138
-	int i;
137
+	u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
138
+	u64 *cpustat = per_cpu_ptr(ca->cpustat, cpu)->cpustat;
139
+
140
+	/* Don't allow to reset global kernel_cpustat */
141
+	if (ca == &root_cpuacct)
142
+		return;
139
143
 
140
144
 #ifndef CONFIG_64BIT
141
145
 	/*
..
..
@@ -143,9 +147,10 @@
143
147
 	 */
144
148
 	raw_spin_lock_irq(&cpu_rq(cpu)->lock);
145
149
 #endif
146
-
147
-	for (i = 0; i < CPUACCT_STAT_NSTATS; i++)
148
-		cpuusage->usages[i] = val;
150
+	*cpuusage = 0;
151
+	cpustat[CPUTIME_USER] = cpustat[CPUTIME_NICE] = 0;
152
+	cpustat[CPUTIME_SYSTEM] = cpustat[CPUTIME_IRQ] = 0;
153
+	cpustat[CPUTIME_SOFTIRQ] = 0;
149
154
 
150
155
 #ifndef CONFIG_64BIT
151
156
 	raw_spin_unlock_irq(&cpu_rq(cpu)->lock);
..
..
@@ -196,7 +201,7 @@
196
201
 		return -EINVAL;
197
202
 
198
203
 	for_each_possible_cpu(cpu)
199
-		cpuacct_cpuusage_write(ca, cpu, 0);
204
+		cpuacct_cpuusage_write(ca, cpu);
200
205
 
201
206
 	return 0;
202
207
 }
..
..
@@ -243,25 +248,10 @@
243
248
 	seq_puts(m, "\n");
244
249
 
245
250
 	for_each_possible_cpu(cpu) {
246
-		struct cpuacct_usage *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
247
-
248
251
 		seq_printf(m, "%d", cpu);
249
-
250
-		for (index = 0; index < CPUACCT_STAT_NSTATS; index++) {
251
-#ifndef CONFIG_64BIT
252
-			/*
253
-			 * Take rq->lock to make 64-bit read safe on 32-bit
254
-			 * platforms.
255
-			 */
256
-			raw_spin_lock_irq(&cpu_rq(cpu)->lock);
257
-#endif
258
-
259
-			seq_printf(m, " %llu", cpuusage->usages[index]);
260
-
261
-#ifndef CONFIG_64BIT
262
-			raw_spin_unlock_irq(&cpu_rq(cpu)->lock);
263
-#endif
264
-		}
252
+		for (index = 0; index < CPUACCT_STAT_NSTATS; index++)
253
+			seq_printf(m, " %llu",
254
+				   cpuacct_cpuusage_read(ca, cpu, index));
265
255
 		seq_puts(m, "\n");
266
256
 	}
267
257
 	return 0;
..
..
@@ -338,19 +328,13 @@
338
328
  */
339
329
 void cpuacct_charge(struct task_struct *tsk, u64 cputime)
340
330
 {
331
+	unsigned int cpu = task_cpu(tsk);
341
332
 	struct cpuacct *ca;
342
-	int index = CPUACCT_STAT_SYSTEM;
343
-	struct pt_regs *regs = get_irq_regs() ? : task_pt_regs(tsk);
344
333
 
345
-	if (regs && user_mode(regs))
346
-		index = CPUACCT_STAT_USER;
347
-
348
-	rcu_read_lock();
334
+	lockdep_assert_held(&cpu_rq(cpu)->lock);
349
335
 
350
336
 	for (ca = task_ca(tsk); ca; ca = parent_ca(ca))
351
-		__this_cpu_add(ca->cpuusage->usages[index], cputime);
352
-
353
-	rcu_read_unlock();
337
+		*per_cpu_ptr(ca->cpuusage, cpu) += cputime;
354
338
 }
355
339
 
356
340
 /*