diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-06-04 17:09:36 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-06-10 08:43:35 -0400 |
commit | c9d76a24a28917c1ef6833f40c4ceff2e81b3ebb (patch) | |
tree | 0380b3874a5f02520208baa654f8258cbaae3c8c /arch/x86/xen | |
parent | 31620a198cf6891dfdf5477607621da9aa092380 (diff) |
xen/time: Don't leak interrupt name when offlining.
When the user does:
echo 0 > /sys/devices/system/cpu/cpu1/online
echo 1 > /sys/devices/system/cpu/cpu1/online
kmemleak reports:
kmemleak: 7 new suspected memory leaks (see /sys/kernel/debug/kmemleak)
One of the leaks is from xen/time:
unreferenced object 0xffff88003fa51280 (size 32):
comm "swapper/0", pid 1, jiffies 4294667339 (age 1027.789s)
hex dump (first 32 bytes):
74 69 6d 65 72 31 00 00 00 00 00 00 00 00 00 00 timer1..........
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff81660721>] kmemleak_alloc+0x21/0x50
[<ffffffff81190aac>] __kmalloc_track_caller+0xec/0x2a0
[<ffffffff812fe1bb>] kvasprintf+0x5b/0x90
[<ffffffff812fe228>] kasprintf+0x38/0x40
[<ffffffff81041ec1>] xen_setup_timer+0x51/0xf0
[<ffffffff8166339f>] xen_cpu_up+0x5f/0x3e8
[<ffffffff8166bbf5>] _cpu_up+0xd1/0x14b
[<ffffffff8166bd48>] cpu_up+0xd9/0xec
[<ffffffff81ae6e4a>] smp_init+0x4b/0xa3
[<ffffffff81ac4981>] kernel_init_freeable+0xdb/0x1e6
[<ffffffff8165ce39>] kernel_init+0x9/0xf0
[<ffffffff8167edfc>] ret_from_fork+0x7c/0xb0
[<ffffffffffffffff>] 0xffffffffffffffff
This patch fixes it by stashing away the 'name' in the per-cpu
data structure and freeing it when offlining the CPU.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/time.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 5190687ca569..011f1bf85765 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
15 | #include <linux/math64.h> | 15 | #include <linux/math64.h> |
16 | #include <linux/gfp.h> | 16 | #include <linux/gfp.h> |
17 | #include <linux/slab.h> | ||
17 | 18 | ||
18 | #include <asm/pvclock.h> | 19 | #include <asm/pvclock.h> |
19 | #include <asm/xen/hypervisor.h> | 20 | #include <asm/xen/hypervisor.h> |
@@ -402,7 +403,7 @@ static irqreturn_t xen_timer_interrupt(int irq, void *dev_id) | |||
402 | 403 | ||
403 | void xen_setup_timer(int cpu) | 404 | void xen_setup_timer(int cpu) |
404 | { | 405 | { |
405 | const char *name; | 406 | char *name; |
406 | struct clock_event_device *evt; | 407 | struct clock_event_device *evt; |
407 | int irq; | 408 | int irq; |
408 | 409 | ||
@@ -425,6 +426,7 @@ void xen_setup_timer(int cpu) | |||
425 | 426 | ||
426 | evt->cpumask = cpumask_of(cpu); | 427 | evt->cpumask = cpumask_of(cpu); |
427 | evt->irq = irq; | 428 | evt->irq = irq; |
429 | per_cpu(xen_clock_events, cpu).name = name; | ||
428 | } | 430 | } |
429 | 431 | ||
430 | void xen_teardown_timer(int cpu) | 432 | void xen_teardown_timer(int cpu) |
@@ -434,6 +436,8 @@ void xen_teardown_timer(int cpu) | |||
434 | evt = &per_cpu(xen_clock_events, cpu).evt; | 436 | evt = &per_cpu(xen_clock_events, cpu).evt; |
435 | unbind_from_irqhandler(evt->irq, NULL); | 437 | unbind_from_irqhandler(evt->irq, NULL); |
436 | evt->irq = -1; | 438 | evt->irq = -1; |
439 | kfree(per_cpu(xen_clock_events, cpu).name); | ||
440 | per_cpu(xen_clock_events, cpu).name = NULL; | ||
437 | } | 441 | } |
438 | 442 | ||
439 | void xen_setup_cpu_clockevents(void) | 443 | void xen_setup_cpu_clockevents(void) |