lkml.org 
[lkml]   [2015]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 29/62] KVM: MIPS: Fix trace event to save PC directly
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: James Hogan <james.hogan@imgtec.com>

    commit b3cffac04eca9af46e1e23560a8ee22b1bd36d43 upstream.

    Currently the guest exit trace event saves the VCPU pointer to the
    structure, and the guest PC is retrieved by dereferencing it when the
    event is printed rather than directly from the trace record. This isn't
    safe as the printing may occur long afterwards, after the PC has changed
    and potentially after the VCPU has been freed. Usually this results in
    the same (wrong) PC being printed for multiple trace events. It also
    isn't portable as userland has no way to access the VCPU data structure
    when interpreting the trace record itself.

    Lets save the actual PC in the structure so that the correct value is
    accessible later.

    Fixes: 669e846e6c4e ("KVM/MIPS32: MIPS arch specific APIs for KVM")
    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Marcelo Tosatti <mtosatti@redhat.com>
    Cc: Gleb Natapov <gleb@kernel.org>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: linux-mips@linux-mips.org
    Cc: kvm@vger.kernel.org
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/kvm/trace.h | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/mips/kvm/trace.h
    +++ b/arch/mips/kvm/trace.h
    @@ -26,18 +26,18 @@ TRACE_EVENT(kvm_exit,
    TP_PROTO(struct kvm_vcpu *vcpu, unsigned int reason),
    TP_ARGS(vcpu, reason),
    TP_STRUCT__entry(
    - __field(struct kvm_vcpu *, vcpu)
    + __field(unsigned long, pc)
    __field(unsigned int, reason)
    ),

    TP_fast_assign(
    - __entry->vcpu = vcpu;
    + __entry->pc = vcpu->arch.pc;
    __entry->reason = reason;
    ),

    TP_printk("[%s]PC: 0x%08lx",
    kvm_mips_exit_types_str[__entry->reason],
    - __entry->vcpu->arch.pc)
    + __entry->pc)
    );

    #endif /* _TRACE_KVM_H */



    \
     
     \ /
      Last update: 2015-03-16 15:41    [W:4.003 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site