kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/include/linux/kmsg_dump.h
..
..
@@ -30,18 +30,6 @@
30
30
 };
31
31
 
32
32
 /**
33
- * struct kmsg_dumper_iter - iterator for kernel crash message dumper
34
- * @active:	Flag that specifies if this is currently dumping
35
- * @cur_seq:	Points to the oldest message to dump (private)
36
- * @next_seq:	Points after the newest message to dump (private)
37
- */
38
-struct kmsg_dumper_iter {
39
-	bool	active;
40
-	u64	cur_seq;
41
-	u64	next_seq;
42
-};
43
-
44
-/**
45
33
  * struct kmsg_dumper - kernel crash message dumper structure
46
34
  * @list:	Entry in the dumper list (private)
47
35
  * @dump:	Call into dumping code which will retrieve the data with
..
..
@@ -51,22 +39,33 @@
51
39
  */
52
40
 struct kmsg_dumper {
53
41
 	struct list_head list;
54
-	void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason,
55
-		     struct kmsg_dumper_iter *iter);
42
+	void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason);
56
43
 	enum kmsg_dump_reason max_reason;
44
+	bool active;
57
45
 	bool registered;
46
+
47
+	/* private state of the kmsg iterator */
48
+	u32 cur_idx;
49
+	u32 next_idx;
50
+	u64 cur_seq;
51
+	u64 next_seq;
58
52
 };
59
53
 
60
54
 #ifdef CONFIG_PRINTK
61
55
 void kmsg_dump(enum kmsg_dump_reason reason);
62
56
 
63
-bool kmsg_dump_get_line(struct kmsg_dumper_iter *iter, bool syslog,
57
+bool kmsg_dump_get_line_nolock(struct kmsg_dumper *dumper, bool syslog,
58
+			       char *line, size_t size, size_t *len);
59
+
60
+bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog,
64
61
 			char *line, size_t size, size_t *len);
65
62
 
66
-bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog,
67
-			  char *buf, size_t size, size_t *len_out);
63
+bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog,
64
+			  char *buf, size_t size, size_t *len);
68
65
 
69
-void kmsg_dump_rewind(struct kmsg_dumper_iter *iter);
66
+void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper);
67
+
68
+void kmsg_dump_rewind(struct kmsg_dumper *dumper);
70
69
 
71
70
 int kmsg_dump_register(struct kmsg_dumper *dumper);
72
71
 
..
..
@@ -78,19 +77,30 @@
78
77
 {
79
78
 }
80
79
 
81
-static inline bool kmsg_dump_get_line(struct kmsg_dumper_iter *iter, bool syslog,
80
+static inline bool kmsg_dump_get_line_nolock(struct kmsg_dumper *dumper,
81
+					     bool syslog, const char *line,
82
+					     size_t size, size_t *len)
83
+{
84
+	return false;
85
+}
86
+
87
+static inline bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog,
82
88
 				const char *line, size_t size, size_t *len)
83
89
 {
84
90
 	return false;
85
91
 }
86
92
 
87
-static inline bool kmsg_dump_get_buffer(struct kmsg_dumper_iter *iter, bool syslog,
93
+static inline bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog,
88
94
 					char *buf, size_t size, size_t *len)
89
95
 {
90
96
 	return false;
91
97
 }
92
98
 
93
-static inline void kmsg_dump_rewind(struct kmsg_dumper_iter *iter)
99
+static inline void kmsg_dump_rewind_nolock(struct kmsg_dumper *dumper)
100
+{
101
+}
102
+
103
+static inline void kmsg_dump_rewind(struct kmsg_dumper *dumper)
94
104
 {
95
105
 }
96
106