lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 074/100] x86: pvclock kvm: align allocation size to page size
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marcelo Tosatti <mtosatti@redhat.com>

    commit ed55705dd5008b408c48a8459b8b34b01f3de985 upstream.

    To match whats mapped via vsyscalls to userspace.

    Reported-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/kvmclock.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- 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(v
    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();



    \
     
     \ /
      Last update: 2013-03-13 01:01    [W:4.156 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site