* x86: pvclock kvm: align allocation size to page size
@ 2013-02-19 1:58 Marcelo Tosatti
2013-02-19 13:22 ` Gleb Natapov
0 siblings, 1 reply; 2+ messages in thread
From: Marcelo Tosatti @ 2013-02-19 1:58 UTC (permalink / raw)
To: kvm; +Cc: Gleb Natapov
To match whats mapped via vsyscalls to userspace.
Reported-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 220a360..5bedbdd 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -218,6 +218,9 @@ static void kvm_shutdown(void)
void __init kvmclock_init(void)
{
unsigned long mem;
+ int size;
+
+ size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
if (!kvm_para_available())
return;
@@ -231,16 +234,14 @@ void __init kvmclock_init(void)
printk(KERN_INFO "kvm-clock: Using msrs %x and %x",
msr_kvm_system_time, msr_kvm_wall_clock);
- mem = memblock_alloc(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS,
- PAGE_SIZE);
+ mem = memblock_alloc(size, PAGE_SIZE);
if (!mem)
return;
hv_clock = __va(mem);
if (kvm_register_clock("boot clock")) {
hv_clock = NULL;
- memblock_free(mem,
- sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
+ memblock_free(mem, size);
return;
}
pv_time_ops.sched_clock = kvm_clock_read;
@@ -275,7 +276,7 @@ int __init kvm_setup_vsyscall_timeinfo(void)
struct pvclock_vcpu_time_info *vcpu_time;
unsigned int size;
- size = sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS;
+ size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
preempt_disable();
cpu = smp_processor_id();
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: x86: pvclock kvm: align allocation size to page size
2013-02-19 1:58 x86: pvclock kvm: align allocation size to page size Marcelo Tosatti
@ 2013-02-19 13:22 ` Gleb Natapov
0 siblings, 0 replies; 2+ messages in thread
From: Gleb Natapov @ 2013-02-19 13:22 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: kvm
On Mon, Feb 18, 2013 at 10:58:14PM -0300, Marcelo Tosatti wrote:
>
> To match whats mapped via vsyscalls to userspace.
>
> Reported-by: Peter Hurley <peter@hurleysoftware.com>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>
Reviewed-by: Gleb Natapov <gleb@redhat.com>
> diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
> index 220a360..5bedbdd 100644
> --- a/arch/x86/kernel/kvmclock.c
> +++ b/arch/x86/kernel/kvmclock.c
> @@ -218,6 +218,9 @@ static void kvm_shutdown(void)
> void __init kvmclock_init(void)
> {
> unsigned long mem;
> + int size;
> +
> + size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
>
> if (!kvm_para_available())
> return;
> @@ -231,16 +234,14 @@ void __init kvmclock_init(void)
> printk(KERN_INFO "kvm-clock: Using msrs %x and %x",
> msr_kvm_system_time, msr_kvm_wall_clock);
>
> - mem = memblock_alloc(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS,
> - PAGE_SIZE);
> + mem = memblock_alloc(size, PAGE_SIZE);
> if (!mem)
> return;
> hv_clock = __va(mem);
>
> if (kvm_register_clock("boot clock")) {
> hv_clock = NULL;
> - memblock_free(mem,
> - sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
> + memblock_free(mem, size);
> return;
> }
> pv_time_ops.sched_clock = kvm_clock_read;
> @@ -275,7 +276,7 @@ int __init kvm_setup_vsyscall_timeinfo(void)
> struct pvclock_vcpu_time_info *vcpu_time;
> unsigned int size;
>
> - size = sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS;
> + size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
>
> preempt_disable();
> cpu = smp_processor_id();
>
--
Gleb.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-19 13:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-19 1:58 x86: pvclock kvm: align allocation size to page size Marcelo Tosatti
2013-02-19 13:22 ` Gleb Natapov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.