kernel: update kernel 4.9 to 4.9.34
[openwrt/staging/wigyori.git] / target / linux / generic / patches-4.9 / 930-crashlog.patch
1 --- /dev/null
2 +++ b/include/linux/crashlog.h
3 @@ -0,0 +1,17 @@
4 +#ifndef __CRASHLOG_H
5 +#define __CRASHLOG_H
6 +
7 +#ifdef CONFIG_CRASHLOG
8 +void crashlog_init_bootmem(struct bootmem_data *bdata);
9 +void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size);
10 +#else
11 +static inline void crashlog_init_bootmem(struct bootmem_data *bdata)
12 +{
13 +}
14 +
15 +static inline void crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
16 +{
17 +}
18 +#endif
19 +
20 +#endif
21 --- a/init/Kconfig
22 +++ b/init/Kconfig
23 @@ -1308,6 +1308,10 @@ config RELAY
24
25 If unsure, say N.
26
27 +config CRASHLOG
28 + bool "Crash logging"
29 + depends on (!NO_BOOTMEM || HAVE_MEMBLOCK)
30 +
31 config BLK_DEV_INITRD
32 bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
33 depends on BROKEN || !FRV
34 --- a/kernel/Makefile
35 +++ b/kernel/Makefile
36 @@ -113,6 +113,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
37 obj-$(CONFIG_MEMBARRIER) += membarrier.o
38
39 obj-$(CONFIG_HAS_IOMEM) += memremap.o
40 +obj-$(CONFIG_CRASHLOG) += crashlog.o
41
42 $(obj)/configs.o: $(obj)/config_data.h
43
44 --- /dev/null
45 +++ b/kernel/crashlog.c
46 @@ -0,0 +1,213 @@
47 +/*
48 + * Crash information logger
49 + * Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
50 + *
51 + * Based on ramoops.c
52 + * Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
53 + *
54 + * This program is free software; you can redistribute it and/or
55 + * modify it under the terms of the GNU General Public License
56 + * version 2 as published by the Free Software Foundation.
57 + *
58 + * This program is distributed in the hope that it will be useful, but
59 + * WITHOUT ANY WARRANTY; without even the implied warranty of
60 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
61 + * General Public License for more details.
62 + *
63 + * You should have received a copy of the GNU General Public License
64 + * along with this program; if not, write to the Free Software
65 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
66 + * 02110-1301 USA
67 + *
68 + */
69 +
70 +#include <linux/module.h>
71 +#include <linux/bootmem.h>
72 +#include <linux/memblock.h>
73 +#include <linux/debugfs.h>
74 +#include <linux/crashlog.h>
75 +#include <linux/kmsg_dump.h>
76 +#include <linux/module.h>
77 +#include <linux/pfn.h>
78 +#include <linux/vmalloc.h>
79 +#include <asm/io.h>
80 +
81 +#define CRASHLOG_PAGES 4
82 +#define CRASHLOG_SIZE (CRASHLOG_PAGES * PAGE_SIZE)
83 +#define CRASHLOG_MAGIC 0xa1eedead
84 +
85 +/*
86 + * Start the log at 1M before the end of RAM, as some boot loaders like
87 + * to use the end of the RAM for stack usage and other things
88 + * If this fails, fall back to using the last part.
89 + */
90 +#define CRASHLOG_OFFSET (1024 * 1024)
91 +
92 +struct crashlog_data {
93 + u32 magic;
94 + u32 len;
95 + u8 data[];
96 +};
97 +
98 +static struct debugfs_blob_wrapper crashlog_blob;
99 +static unsigned long crashlog_addr = 0;
100 +static struct crashlog_data *crashlog_buf;
101 +static struct kmsg_dumper dump;
102 +static bool first = true;
103 +
104 +extern struct list_head *crashlog_modules;
105 +
106 +static bool crashlog_set_addr(phys_addr_t addr, phys_addr_t size)
107 +{
108 + /* Limit to lower 64 MB to avoid highmem */
109 + phys_addr_t limit = 64 * 1024 * 1024;
110 +
111 + if (crashlog_addr)
112 + return false;
113 +
114 + if (addr > limit)
115 + return false;
116 +
117 + if (addr + size > limit)
118 + size = limit - addr;
119 +
120 + crashlog_addr = addr;
121 +
122 + if (addr + size > CRASHLOG_OFFSET)
123 + crashlog_addr += size - CRASHLOG_OFFSET;
124 +
125 + return true;
126 +}
127 +
128 +#ifndef CONFIG_NO_BOOTMEM
129 +void __init crashlog_init_bootmem(bootmem_data_t *bdata)
130 +{
131 + phys_addr_t start, end;
132 +
133 + start = PFN_PHYS(bdata->node_low_pfn);
134 + end = PFN_PHYS(bdata->node_min_pfn);
135 + if (!crashlog_set_addr(start, end - start))
136 + return;
137 +
138 + if (reserve_bootmem(crashlog_addr, CRASHLOG_SIZE, BOOTMEM_EXCLUSIVE) < 0) {
139 + printk("Crashlog failed to allocate RAM at address 0x%lx\n",
140 + crashlog_addr);
141 + crashlog_addr = 0;
142 + }
143 +}
144 +#endif
145 +
146 +#ifdef CONFIG_HAVE_MEMBLOCK
147 +void __init_memblock crashlog_init_memblock(phys_addr_t addr, phys_addr_t size)
148 +{
149 + if (!crashlog_set_addr(addr, size))
150 + return;
151 +
152 + if (memblock_reserve(crashlog_addr, CRASHLOG_SIZE)) {
153 + printk("Crashlog failed to allocate RAM at address 0x%lx\n",
154 + crashlog_addr);
155 + crashlog_addr = 0;
156 + }
157 +}
158 +#endif
159 +
160 +static void __init crashlog_copy(void)
161 +{
162 + if (crashlog_buf->magic != CRASHLOG_MAGIC)
163 + return;
164 +
165 + if (!crashlog_buf->len || crashlog_buf->len >
166 + CRASHLOG_SIZE - sizeof(*crashlog_buf))
167 + return;
168 +
169 + crashlog_blob.size = crashlog_buf->len;
170 + crashlog_blob.data = kmemdup(crashlog_buf->data,
171 + crashlog_buf->len, GFP_KERNEL);
172 +
173 + debugfs_create_blob("crashlog", 0700, NULL, &crashlog_blob);
174 +}
175 +
176 +static int get_maxlen(void)
177 +{
178 + return CRASHLOG_SIZE - sizeof(*crashlog_buf) - crashlog_buf->len;
179 +}
180 +
181 +static void crashlog_printf(const char *fmt, ...)
182 +{
183 + va_list args;
184 + int len = get_maxlen();
185 +
186 + if (!len)
187 + return;
188 +
189 + va_start(args, fmt);
190 + crashlog_buf->len += vscnprintf(
191 + &crashlog_buf->data[crashlog_buf->len],
192 + len, fmt, args);
193 + va_end(args);
194 +}
195 +
196 +static void crashlog_do_dump(struct kmsg_dumper *dumper,
197 + enum kmsg_dump_reason reason)
198 +{
199 + struct timeval tv;
200 + struct module *m;
201 + char *buf;
202 + size_t len;
203 +
204 + if (!first)
205 + crashlog_printf("\n===================================\n");
206 +
207 + do_gettimeofday(&tv);
208 + crashlog_printf("Time: %lu.%lu\n",
209 + (long)tv.tv_sec, (long)tv.tv_usec);
210 +
211 + if (first) {
212 + crashlog_printf("Modules:");
213 + list_for_each_entry(m, crashlog_modules, list) {
214 + crashlog_printf("\t%s@%p+%x", m->name,
215 + m->core_layout.base, m->core_layout.size,
216 + m->init_layout.base, m->init_layout.size);
217 + }
218 + crashlog_printf("\n");
219 + first = false;
220 + }
221 +
222 + buf = (char *)&crashlog_buf->data[crashlog_buf->len];
223 +
224 + kmsg_dump_get_buffer(dumper, true, buf, get_maxlen(), &len);
225 +
226 + crashlog_buf->len += len;
227 +}
228 +
229 +
230 +int __init crashlog_init_fs(void)
231 +{
232 + struct page *pages[CRASHLOG_PAGES];
233 + pgprot_t prot;
234 + int i;
235 +
236 + if (!crashlog_addr) {
237 + printk("No memory allocated for crashlog\n");
238 + return -ENOMEM;
239 + }
240 +
241 + printk("Crashlog allocated RAM at address 0x%lx\n", (unsigned long) crashlog_addr);
242 + for (i = 0; i < CRASHLOG_PAGES; i++)
243 + pages[i] = pfn_to_page((crashlog_addr >> PAGE_SHIFT) + i);
244 +
245 + prot = pgprot_writecombine(PAGE_KERNEL);
246 + crashlog_buf = vmap(pages, CRASHLOG_PAGES, VM_MAP, prot);
247 +
248 + crashlog_copy();
249 +
250 + crashlog_buf->magic = CRASHLOG_MAGIC;
251 + crashlog_buf->len = 0;
252 +
253 + dump.max_reason = KMSG_DUMP_OOPS;
254 + dump.dump = crashlog_do_dump;
255 + kmsg_dump_register(&dump);
256 +
257 + return 0;
258 +}
259 +module_init(crashlog_init_fs);
260 --- a/kernel/module.c
261 +++ b/kernel/module.c
262 @@ -253,6 +253,9 @@ static void mod_update_bounds(struct mod
263 #ifdef CONFIG_KGDB_KDB
264 struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
265 #endif /* CONFIG_KGDB_KDB */
266 +#ifdef CONFIG_CRASHLOG
267 +struct list_head *crashlog_modules = &modules;
268 +#endif
269
270 static void module_assert_mutex(void)
271 {
272 --- a/mm/memblock.c
273 +++ b/mm/memblock.c
274 @@ -19,6 +19,7 @@
275 #include <linux/debugfs.h>
276 #include <linux/seq_file.h>
277 #include <linux/memblock.h>
278 +#include <linux/crashlog.h>
279
280 #include <asm/sections.h>
281 #include <linux/io.h>
282 @@ -499,6 +500,8 @@ static void __init_memblock memblock_ins
283 memblock_set_region_node(rgn, nid);
284 type->cnt++;
285 type->total_size += size;
286 + if (type == &memblock.memory)
287 + crashlog_init_memblock(base, size);
288 }
289
290 /**
291 @@ -538,6 +541,8 @@ int __init_memblock memblock_add_range(s
292 type->regions[0].flags = flags;
293 memblock_set_region_node(&type->regions[0], nid);
294 type->total_size = size;
295 + if (type == &memblock.memory)
296 + crashlog_init_memblock(base, size);
297 return 0;
298 }
299 repeat:
300 --- a/mm/bootmem.c
301 +++ b/mm/bootmem.c
302 @@ -14,6 +14,7 @@
303 #include <linux/export.h>
304 #include <linux/kmemleak.h>
305 #include <linux/range.h>
306 +#include <linux/crashlog.h>
307 #include <linux/bug.h>
308 #include <linux/io.h>
309 #include <linux/bootmem.h>
310 @@ -174,6 +175,7 @@ static unsigned long __init free_all_boo
311 if (!bdata->node_bootmem_map)
312 return 0;
313
314 + crashlog_init_bootmem(bdata);
315 map = bdata->node_bootmem_map;
316 start = bdata->node_min_pfn;
317 end = bdata->node_low_pfn;