rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/include/trace/events/jbd2.h
..
..
@@ -40,7 +40,7 @@
40
40
 	TP_STRUCT__entry(
41
41
 		__field(	dev_t,	dev			)
42
42
 		__field(	char,	sync_commit		  )
43
-		__field(	int,	transaction		  )
43
+		__field(	tid_t,	transaction		  )
44
44
 	),
45
45
 
46
46
 	TP_fast_assign(
..
..
@@ -49,7 +49,7 @@
49
49
 		__entry->transaction	= commit_transaction->t_tid;
50
50
 	),
51
51
 
52
-	TP_printk("dev %d,%d transaction %d sync %d",
52
+	TP_printk("dev %d,%d transaction %u sync %d",
53
53
 		  MAJOR(__entry->dev), MINOR(__entry->dev),
54
54
 		  __entry->transaction, __entry->sync_commit)
55
55
 );
..
..
@@ -97,8 +97,8 @@
97
97
 	TP_STRUCT__entry(
98
98
 		__field(	dev_t,	dev			)
99
99
 		__field(	char,	sync_commit		  )
100
-		__field(	int,	transaction		  )
101
-		__field(	int,	head		  	  )
100
+		__field(	tid_t,	transaction		  )
101
+		__field(	tid_t,	head		  	  )
102
102
 	),
103
103
 
104
104
 	TP_fast_assign(
..
..
@@ -108,7 +108,7 @@
108
108
 		__entry->head		= journal->j_tail_sequence;
109
109
 	),
110
110
 
111
-	TP_printk("dev %d,%d transaction %d sync %d head %d",
111
+	TP_printk("dev %d,%d transaction %u sync %d head %u",
112
112
 		  MAJOR(__entry->dev), MINOR(__entry->dev),
113
113
 		  __entry->transaction, __entry->sync_commit, __entry->head)
114
114
 );
..
..
@@ -133,15 +133,15 @@
133
133
 		  (unsigned long) __entry->ino)
134
134
 );
135
135
 
136
-TRACE_EVENT(jbd2_handle_start,
137
-	TP_PROTO(dev_t dev, unsigned long tid, unsigned int type,
136
+DECLARE_EVENT_CLASS(jbd2_handle_start_class,
137
+	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,
138
138
 		 unsigned int line_no, int requested_blocks),
139
139
 
140
140
 	TP_ARGS(dev, tid, type, line_no, requested_blocks),
141
141
 
142
142
 	TP_STRUCT__entry(
143
143
 		__field(		dev_t,	dev		)
144
-		__field(	unsigned long,	tid		)
144
+		__field(		tid_t,	tid		)
145
145
 		__field(	 unsigned int,	type		)
146
146
 		__field(	 unsigned int,	line_no		)
147
147
 		__field(		  int,	requested_blocks)
..
..
@@ -155,14 +155,28 @@
155
155
 		__entry->requested_blocks = requested_blocks;
156
156
 	),
157
157
 
158
-	TP_printk("dev %d,%d tid %lu type %u line_no %u "
158
+	TP_printk("dev %d,%d tid %u type %u line_no %u "
159
159
 		  "requested_blocks %d",
160
160
 		  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
161
161
 		  __entry->type, __entry->line_no, __entry->requested_blocks)
162
162
 );
163
163
 
164
+DEFINE_EVENT(jbd2_handle_start_class, jbd2_handle_start,
165
+	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,
166
+		 unsigned int line_no, int requested_blocks),
167
+
168
+	TP_ARGS(dev, tid, type, line_no, requested_blocks)
169
+);
170
+
171
+DEFINE_EVENT(jbd2_handle_start_class, jbd2_handle_restart,
172
+	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,
173
+		 unsigned int line_no, int requested_blocks),
174
+
175
+	TP_ARGS(dev, tid, type, line_no, requested_blocks)
176
+);
177
+
164
178
 TRACE_EVENT(jbd2_handle_extend,
165
-	TP_PROTO(dev_t dev, unsigned long tid, unsigned int type,
179
+	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,
166
180
 		 unsigned int line_no, int buffer_credits,
167
181
 		 int requested_blocks),
168
182
 
..
..
@@ -170,7 +184,7 @@
170
184
 
171
185
 	TP_STRUCT__entry(
172
186
 		__field(		dev_t,	dev		)
173
-		__field(	unsigned long,	tid		)
187
+		__field(		tid_t,	tid		)
174
188
 		__field(	 unsigned int,	type		)
175
189
 		__field(	 unsigned int,	line_no		)
176
190
 		__field(		  int,	buffer_credits  )
..
..
@@ -186,7 +200,7 @@
186
200
 		__entry->requested_blocks = requested_blocks;
187
201
 	),
188
202
 
189
-	TP_printk("dev %d,%d tid %lu type %u line_no %u "
203
+	TP_printk("dev %d,%d tid %u type %u line_no %u "
190
204
 		  "buffer_credits %d requested_blocks %d",
191
205
 		  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
192
206
 		  __entry->type, __entry->line_no, __entry->buffer_credits,
..
..
@@ -194,7 +208,7 @@
194
208
 );
195
209
 
196
210
 TRACE_EVENT(jbd2_handle_stats,
197
-	TP_PROTO(dev_t dev, unsigned long tid, unsigned int type,
211
+	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,
198
212
 		 unsigned int line_no, int interval, int sync,
199
213
 		 int requested_blocks, int dirtied_blocks),
200
214
 
..
..
@@ -203,7 +217,7 @@
203
217
 
204
218
 	TP_STRUCT__entry(
205
219
 		__field(		dev_t,	dev		)
206
-		__field(	unsigned long,	tid		)
220
+		__field(		tid_t,	tid		)
207
221
 		__field(	 unsigned int,	type		)
208
222
 		__field(	 unsigned int,	line_no		)
209
223
 		__field(		  int,	interval	)
..
..
@@ -223,7 +237,7 @@
223
237
 		__entry->dirtied_blocks	  = dirtied_blocks;
224
238
 	),
225
239
 
226
-	TP_printk("dev %d,%d tid %lu type %u line_no %u interval %d "
240
+	TP_printk("dev %d,%d tid %u type %u line_no %u interval %d "
227
241
 		  "sync %d requested_blocks %d dirtied_blocks %d",
228
242
 		  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
229
243
 		  __entry->type, __entry->line_no, __entry->interval,
..
..
@@ -232,14 +246,14 @@
232
246
 );
233
247
 
234
248
 TRACE_EVENT(jbd2_run_stats,
235
-	TP_PROTO(dev_t dev, unsigned long tid,
249
+	TP_PROTO(dev_t dev, tid_t tid,
236
250
 		 struct transaction_run_stats_s *stats),
237
251
 
238
252
 	TP_ARGS(dev, tid, stats),
239
253
 
240
254
 	TP_STRUCT__entry(
241
255
 		__field(		dev_t,	dev		)
242
-		__field(	unsigned long,	tid		)
256
+		__field(		tid_t,	tid		)
243
257
 		__field(	unsigned long,	wait		)
244
258
 		__field(	unsigned long,	request_delay	)
245
259
 		__field(	unsigned long,	running		)
..
..
@@ -265,7 +279,7 @@
265
279
 		__entry->blocks_logged	= stats->rs_blocks_logged;
266
280
 	),
267
281
 
268
-	TP_printk("dev %d,%d tid %lu wait %u request_delay %u running %u "
282
+	TP_printk("dev %d,%d tid %u wait %u request_delay %u running %u "
269
283
 		  "locked %u flushing %u logging %u handle_count %u "
270
284
 		  "blocks %u blocks_logged %u",
271
285
 		  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
..
..
@@ -280,14 +294,14 @@
280
294
 );
281
295
 
282
296
 TRACE_EVENT(jbd2_checkpoint_stats,
283
-	TP_PROTO(dev_t dev, unsigned long tid,
297
+	TP_PROTO(dev_t dev, tid_t tid,
284
298
 		 struct transaction_chp_stats_s *stats),
285
299
 
286
300
 	TP_ARGS(dev, tid, stats),
287
301
 
288
302
 	TP_STRUCT__entry(
289
303
 		__field(		dev_t,	dev		)
290
-		__field(	unsigned long,	tid		)
304
+		__field(		tid_t,	tid		)
291
305
 		__field(	unsigned long,	chp_time	)
292
306
 		__field(		__u32,	forced_to_close	)
293
307
 		__field(		__u32,	written		)
..
..
@@ -303,7 +317,7 @@
303
317
 		__entry->dropped	= stats->cs_dropped;
304
318
 	),
305
319
 
306
-	TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "
320
+	TP_printk("dev %d,%d tid %u chp_time %u forced_to_close %u "
307
321
 		  "written %u dropped %u",
308
322
 		  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
309
323
 		  jiffies_to_msecs(__entry->chp_time),